From vtigercrm-commits at vtiger.fosslabs.com  Fri Dec  1 03:41:56 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 01 Dec 2006 11:41:56 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9930 - in
 /vtigercrm/branches/5.0.3: Smarty/templates/CustomView.tpl
 modules/CustomView/EditView.php
Message-ID: <20061201114156.799FC788A9D@vtiger.fosslabs.com>

Author: richie
Date: Fri Dec  1 04:41:49 2006
New Revision: 9930

Log:
i18N support added for custom filter columns

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl
    vtigercrm/branches/5.0.3/modules/CustomView/EditView.php

Modified: vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl Fri Dec  1 04:41:49 2006
@@ -146,7 +146,18 @@
 			{foreach item=filteroption key=label from=$CHOOSECOLUMN1}
 				<optgroup label="{$label}" class=\"select\" style=\"border:none\">
 					{foreach item=text from=$filteroption}
-		   		         <option {$text.selected} value={$text.value}>{$text.text}</option>
+					 {assign var=option_values value=$text.text}
+		   		         <option {$text.selected} value={$text.value}>
+			{if $MOD.$option_values neq ''}
+				{$MOD.$option_values}
+
+			{elseif $APP.$option_values neq ''}
+				{$APP.$option_values}
+
+			{else}
+				{$option_values}
+			{/if}
+</option>
                     {/foreach}
 			{/foreach}
           	        {$CHOOSECOLUMN1}
@@ -156,7 +167,18 @@
                         {foreach item=filteroption key=label from=$CHOOSECOLUMN2}
                                 <optgroup label="{$label}" class=\"select\" style=\"border:none\">
                                 {foreach item=text from=$filteroption}
-                                     <option {$text.selected} value={$text.value}>{$text.text}</option>
+                              	 {assign var=option_values value=$text.text}
+		   		         <option {$text.selected} value={$text.value}>
+			{if $MOD.$option_values neq ''}
+				{$MOD.$option_values}
+
+			{elseif $APP.$option_values neq ''}
+				{$APP.$option_values}
+
+			{else}
+				{$option_values}
+			{/if}
+</option>
                                 {/foreach}
                         {/foreach}
                         {$CHOOSECOLUMN2}
@@ -166,7 +188,18 @@
                         {foreach item=filteroption key=label from=$CHOOSECOLUMN3}
                                 <optgroup label="{$label}" class=\"select\" style=\"border:none\">
                                 {foreach item=text from=$filteroption}
-                                     <option {$text.selected} value={$text.value}>{$text.text}</option>
+                                    	 {assign var=option_values value=$text.text}
+		   		         <option {$text.selected} value={$text.value}>
+			{if $MOD.$option_values neq ''}
+				{$MOD.$option_values}
+
+			{elseif $APP.$option_values neq ''}
+				{$APP.$option_values}
+
+			{else}
+				{$option_values}
+			{/if}
+</option>
                                 {/foreach}
                         {/foreach}
                         {$CHOOSECOLUMN3}
@@ -176,7 +209,18 @@
                         {foreach item=filteroption key=label from=$CHOOSECOLUMN4}
                                 <optgroup label="{$label}" class=\"select\" style=\"border:none\">
                                 {foreach item=text from=$filteroption}
-                                     <option {$text.selected} value={$text.value}>{$text.text}</option>
+                                    	 {assign var=option_values value=$text.text}
+		   		         <option {$text.selected} value={$text.value}>
+			{if $MOD.$option_values neq ''}
+				{$MOD.$option_values}
+
+			{elseif $APP.$option_values neq ''}
+				{$APP.$option_values}
+
+			{else}
+				{$option_values}
+			{/if}
+</option>
                                 {/foreach}
                         {/foreach}
                         {$CHOOSECOLUMN4}
@@ -189,7 +233,18 @@
                         {foreach item=filteroption key=label from=$CHOOSECOLUMN5}
                                 <optgroup label="{$label}" class=\"select\" style=\"border:none\">
                                 {foreach item=text from=$filteroption}
-                                     <option {$text.selected} value={$text.value}>{$text.text}</option>
+                                    	 {assign var=option_values value=$text.text}
+		   		         <option {$text.selected} value={$text.value}>
+			{if $MOD.$option_values neq ''}
+				{$MOD.$option_values}
+
+			{elseif $APP.$option_values neq ''}
+				{$APP.$option_values}
+
+			{else}
+				{$option_values}
+			{/if}
+</option>
                                 {/foreach}
                         {/foreach}
                         {$CHOOSECOLUMN5}
@@ -199,7 +254,18 @@
                         {foreach item=filteroption key=label from=$CHOOSECOLUMN6}
                                 <optgroup label="{$label}" class=\"select\" style=\"border:none\">
                                 {foreach item=text from=$filteroption}
-                                     <option {$text.selected} value={$text.value}>{$text.text}</option>
+                                   	 {assign var=option_values value=$text.text}
+		   		         <option {$text.selected} value={$text.value}>
+			{if $MOD.$option_values neq ''}
+				{$MOD.$option_values}
+
+			{elseif $APP.$option_values neq ''}
+				{$APP.$option_values}
+
+			{else}
+				{$option_values}
+			{/if}
+</option>
                                 {/foreach}
                         {/foreach}
                         {$CHOOSECOLUMN6}
@@ -209,7 +275,18 @@
                         {foreach item=filteroption key=label from=$CHOOSECOLUMN7}
                                 <optgroup label="{$label}" class=\"select\" style=\"border:none\">
                                 {foreach item=text from=$filteroption}
-                                     <option {$text.selected} value={$text.value}>{$text.text}</option>
+                                    	 {assign var=option_values value=$text.text}
+		   		         <option {$text.selected} value={$text.value}>
+			{if $MOD.$option_values neq ''}
+				{$MOD.$option_values}
+
+			{elseif $APP.$option_values neq ''}
+				{$APP.$option_values}
+
+			{else}
+				{$option_values}
+			{/if}
+</option>
                                 {/foreach}
                         {/foreach}
                         {$CHOOSECOLUMN7}
@@ -219,7 +296,18 @@
                         {foreach item=filteroption key=label from=$CHOOSECOLUMN8}
                                 <optgroup label="{$label}" class=\"select\" style=\"border:none\">
                                 {foreach item=text from=$filteroption}
-                                     <option {$text.selected} value={$text.value}>{$text.text}</option>
+                                    	 {assign var=option_values value=$text.text}
+		   		         <option {$text.selected} value={$text.value}>
+			{if $MOD.$option_values neq ''}
+				{$MOD.$option_values}
+
+			{elseif $APP.$option_values neq ''}
+				{$APP.$option_values}
+
+			{else}
+				{$option_values}
+			{/if}
+</option>
                                 {/foreach}
                         {/foreach}
                         {$CHOOSECOLUMN8}
@@ -231,7 +319,18 @@
                         {foreach item=filteroption key=label from=$CHOOSECOLUMN9}
                                 <optgroup label="{$label}" class=\"select\" style=\"border:none\">
                                 {foreach item=text from=$filteroption}
-                                     <option {$text.selected} value={$text.value}>{$text.text}</option>
+                                    	 {assign var=option_values value=$text.text}
+		   		         <option {$text.selected} value={$text.value}>
+			{if $MOD.$option_values neq ''}
+				{$MOD.$option_values}
+
+			{elseif $APP.$option_values neq ''}
+				{$APP.$option_values}
+
+			{else}
+				{$option_values}
+			{/if}
+</option>
                                 {/foreach}
                         {/foreach}
                         {$CHOOSECOLUMN9}

Modified: vtigercrm/branches/5.0.3/modules/CustomView/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/CustomView/EditView.php (original)
+++ vtigercrm/branches/5.0.3/modules/CustomView/EditView.php Fri Dec  1 04:41:49 2006
@@ -54,7 +54,7 @@
 	$log->info('CustomView :: Successfully got StandardFilter for the module'.$cv_module);
 	$stdfiltercolhtml = getStdFilterHTML($cv_module);
 	$stdfilterjs = $oCustomView->getCriteriaJS();
-
+	$smarty->assign("MOD",$mod_strings);
 	//step4
 	$advfilterhtml = getAdvCriteriaHTML();
 	for($i=1;$i<10;$i++)



From vtigercrm-commits at vtiger.fosslabs.com  Fri Dec  1 05:19:01 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 01 Dec 2006 13:19:01 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9931 - in
 /vtigercrm/branches/5.0.3: Smarty/templates/ modules/Settings/
 modules/Settings/language/ modules/Users/ modules/Users/language/
 modules/Webmails/
Message-ID: <20061201131901.5F0EC7896DF@vtiger.fosslabs.com>

Author: richie
Date: Fri Dec  1 06:18:44 2006
New Revision: 9931

Log:
* Non admin users are allowed to confifure their own incoming mail server by done these changes

Added:
    vtigercrm/branches/5.0.3/modules/Users/AddMailAccount.php
    vtigercrm/branches/5.0.3/modules/Users/SaveMailAccount.php
Removed:
    vtigercrm/branches/5.0.3/modules/Settings/AddMailAccount.php
    vtigercrm/branches/5.0.3/modules/Settings/SaveMailAccount.php
Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/AddMailAccount.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/Emails.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl
    vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php
    vtigercrm/branches/5.0.3/modules/Users/language/en_us.lang.php
    vtigercrm/branches/5.0.3/modules/Webmails/MailBox.php

Modified: vtigercrm/branches/5.0.3/Smarty/templates/AddMailAccount.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/AddMailAccount.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/AddMailAccount.tpl Fri Dec  1 06:18:44 2006
@@ -21,7 +21,7 @@
                         <hr noshade="noshade" size="1"><br>
 
   		<form action="index.php" method="post" name="EditView" id="form">
-			<input type="hidden" name="module" value="Settings">
+			<input type="hidden" name="module" value="Users">
 		  	<input type="hidden" name="action">
   			<input type="hidden" name="server_type" value="email">
 			<input type="hidden" name="record" value="{$ID}">

Modified: vtigercrm/branches/5.0.3/Smarty/templates/Emails.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/Emails.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/Emails.tpl Fri Dec  1 06:18:44 2006
@@ -66,7 +66,7 @@
 </script>
 		{include file='Buttons_List.tpl'}
 <script language="JavaScript" type="text/javascript" src="modules/Emails/Email.js"></script>
-<div id="mailconfchk" class="small" style="position:absolute;display:none;left:350px;top:160px;height:27px;white-space:nowrap;z-index:10000007px;"><font color='red'><b>{$MOD.LBL_CONFIGURE_MAIL_SETTINGS}.<br> {$APP.LBL_PLEASE_CLICK} <a href="index.php?module=Settings&action=AddMailAccount&record={$USERID}">{$APP.LBL_HERE}</a> {$APP.LBL_TO_CONFIGURE}</b></font></div>
+<div id="mailconfchk" class="small" style="position:absolute;display:none;left:350px;top:160px;height:27px;white-space:nowrap;z-index:10000007px;"><font color='red'><b>{$MOD.LBL_CONFIGURE_MAIL_SETTINGS}.<br> {$APP.LBL_PLEASE_CLICK} <a href="index.php?module=Users&action=AddMailAccount&record={$USERID}">{$APP.LBL_HERE}</a> {$APP.LBL_TO_CONFIGURE}</b></font></div>
 <!-- Shadow starts here -->
 <table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
 	<tr>
@@ -96,7 +96,7 @@
 												</td>
 												<td nowrap style="padding-left:20px;padding-right:20px" class=small>
 												<img src="{$IMAGE_PATH}webmail_settings.gif" align="absmiddle" />
-							&nbsp;<a href="index.php?module=Settings&action=AddMailAccount&record={$USERID}" >{$MOD.LBL_SETTINGS}</a>
+							&nbsp;<a href="index.php?module=Users&action=AddMailAccount&record={$USERID}" >{$MOD.LBL_SETTINGS}</a>
 												</td>
 											</tr>
 											</table>

Modified: vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl Fri Dec  1 06:18:44 2006
@@ -37,7 +37,7 @@
 							</td>
 							<td width="10%">
 								<img src="{$IMAGE_PATH}webmail_settings.gif" align="absmiddle" />
-								&nbsp;<a href="index.php?module=Settings&action=AddMailAccount&record={$USERID}" class="webMnu">{$MOD.LBL_SETTINGS}</a>
+								&nbsp;<a href="index.php?module=Users&action=AddMailAccount&record={$USERID}" class="webMnu">{$MOD.LBL_SETTINGS}</a>
 							</td>
 							<!--td width="12%">
 								<img src="{$IMAGE_PATH}webmail_settings.gif" align="absmiddle" />

Modified: vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php Fri Dec  1 06:18:44 2006
@@ -510,58 +510,11 @@
 
 'LBL_RSS_CATEGORY'=>'Rss Category',
 
-//Added for Web based Email client integration (post 4.0.1 release)
-
-'LBL_ADD_MAIL_ACCOUNT'=>'Add Mail Account',
-'LBL_NEW_MAIL_ACCOUNT_TITLE'=>'New Mail Account [Alt+M]',
-'LBL_NEW_MAIL_ACCOUNT_KEY'=>'M',
-'LBL_NEW_MAIL_ACCOUNT_LABEL'=>'New Mail Account',
-'LBL_GENERAL_INFO'=>'General Information',
-'LBL_DISPLAY_NAME'=>'Display Name',
-'LBL_MAIL_PROTOCOL'=>'Mail Protocol',
-'LBL_LIST_PASSWORD'=>'Password',
-'LBL_MAIL_SERVER_NAME'=>'Mail Server Name or IP',
-'LBL_MAIL_SERVER_SETTINGS'=>'Outgoing Server',
-'LBL_INCOME_SERVER_SETTINGS'=>'Incoming Server',
-'LBL_TEST_SETTINGS'=>'Test my account setting immediately',
-'LBL_TEST_BUTTON_TITLE'=>'Test my account now! [Alt+T]',
-'LBL_TEST_BUTTON_KEY'=>'T',
-'LBL_TEST_BUTTON_LABEL'=>'Test my account now!',
-'LBL_DEFAULT'=>'Default',
-'LBL_IMAP2'=>'IMAP2',
-'LBL_IMAP4'=>'IMAP4',
-'LBL_POP'=>'POP',
-'LBL_IMAP'=>'IMAP',
-'LBL_MAIL_DISCLAIM'=>'Items marked with <font color="red">*</font> are required<br>Items marked with <font color="red">* *</font> are not fully supported',
-'LBL_SSL_OPTIONS'=>'SSL Options',
-'LBL_TLS'=>'TLS',
-'LBL_NO_TLS'=>'No TLS',
-'LBL_CERT_VAL'=>'Certificate Validations',
-'LBL_INT_MAILER'=>'Use Internal Mailer?',
-'LBL_INT_MAILER_USE'=>'Yes',
-'LBL_INT_MAILER_NOUSE'=>'No',
-'LBL_VAL_SSL_CERT'=>'Validate SSL Cert',
-'LBL_DONOT_VAL_SSL_CERT'=>'Do Not Validate SSL Cert',
-'LBL_WEB_MAIL_CONFIG'=>'Web Mail Configuration',
-'LBL_CONFIGURE_WEB_MAIL'=>' - Configure Web Mail',
-'LBL_LIST_MAIL_ACCOUNT'=>'  List Mail Account',
 'LBL_USAGEUNIT'=>'Usage Unit',
 'LBL_GLACCT'=>'GL Account',
 'LBL_QUOTE_STAGE'=>'Quote Stage',
 'LBL_CARRIER'=>'Carrier',
 'LBL_TAXCLASS'=>'Tax Class',
-'LBL_MY_DETAILS'=>'My Details',
-'LBL_MY_MAIL_SERVER_DET'=>'My Incoming Mail Server Details',
-'LBL_EMAIL_ID'=>'Email ID',
-'LBL_NAME_EXAMPLE'=>'(example : John Fenner)',
-'LBL_EMAIL_EXAMPLE'=>'(example : johnfenner at xyz.com)',
-'LBL_REFRESH_TIMEOUT'=>'Refresh Timeout',
-'LBL_1_MIN'=>'1 minute',
-'LBL_2_MIN'=>'2 minutes',
-'LBL_3_MIN'=>'3 minutes',
-'LBL_4_MIN'=>'4 minutes',
-'LBL_5_MIN'=>'5 minutes',
-'LBL_EMAILS_PER_PAGE'=>'Emails per Page',
 
 //Added for Organization Details (4.2 release)
 'LBL_ORGANIZATION_NAME'=>'Company Name',

Modified: vtigercrm/branches/5.0.3/modules/Users/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Users/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Users/language/en_us.lang.php Fri Dec  1 06:18:44 2006
@@ -611,6 +611,56 @@
 
 'LBL_ASSIGN_ROLE'=>'Assign Role',
 
+//Moved from Settings to here for Webmail client integration (for 5.0.3 release)
+
+'LBL_ADD_MAIL_ACCOUNT'=>'Add Mail Account',
+'LBL_NEW_MAIL_ACCOUNT_TITLE'=>'New Mail Account [Alt+M]',
+'LBL_NEW_MAIL_ACCOUNT_KEY'=>'M',
+'LBL_NEW_MAIL_ACCOUNT_LABEL'=>'New Mail Account',
+'LBL_GENERAL_INFO'=>'General Information',
+'LBL_DISPLAY_NAME'=>'Display Name',
+'LBL_MAIL_PROTOCOL'=>'Mail Protocol',
+'LBL_LIST_PASSWORD'=>'Password',
+'LBL_MAIL_SERVER_NAME'=>'Mail Server Name or IP',
+'LBL_MAIL_SERVER_SETTINGS'=>'Outgoing Server',
+'LBL_INCOME_SERVER_SETTINGS'=>'Incoming Server',
+'LBL_TEST_SETTINGS'=>'Test my account setting immediately',
+'LBL_TEST_BUTTON_TITLE'=>'Test my account now! [Alt+T]',
+'LBL_TEST_BUTTON_KEY'=>'T',
+'LBL_TEST_BUTTON_LABEL'=>'Test my account now!',
+'LBL_DEFAULT'=>'Default',
+'LBL_IMAP2'=>'IMAP2',
+'LBL_IMAP4'=>'IMAP4',
+'LBL_POP'=>'POP',
+'LBL_IMAP'=>'IMAP',
+'LBL_MAIL_DISCLAIM'=>'Items marked with <font color="red">*</font> are required<br>Items marked with <font color="red">* *</font> are not fully supported',
+'LBL_SSL_OPTIONS'=>'SSL Options',
+'LBL_TLS'=>'TLS',
+'LBL_NO_TLS'=>'No TLS',
+'LBL_CERT_VAL'=>'Certificate Validations',
+'LBL_INT_MAILER'=>'Use Internal Mailer?',
+'LBL_INT_MAILER_USE'=>'Yes',
+'LBL_INT_MAILER_NOUSE'=>'No',
+'LBL_VAL_SSL_CERT'=>'Validate SSL Cert',
+'LBL_DONOT_VAL_SSL_CERT'=>'Do Not Validate SSL Cert',
+'LBL_WEB_MAIL_CONFIG'=>'Web Mail Configuration',
+'LBL_CONFIGURE_WEB_MAIL'=>' - Configure Web Mail',
+'LBL_LIST_MAIL_ACCOUNT'=>'  List Mail Account',
+'LBL_MY_MAIL_SERVER_DET'=>'My Incoming Mail Server Details',
+'LBL_MY_DETAILS'=>'My Details',
+'LBL_EMAIL_ID'=>'Email ID',
+'LBL_EMAIL_ADDRESS'=>'Email',
+'LBL_NAME_EXAMPLE'=>'(example : John Fenner)',
+'LBL_EMAIL_EXAMPLE'=>'(example : johnfenner at xyz.com)',
+'LBL_REFRESH_TIMEOUT'=>'Refresh Timeout',
+'LBL_1_MIN'=>'1 minute',
+'LBL_2_MIN'=>'2 minutes',
+'LBL_3_MIN'=>'3 minutes',
+'LBL_4_MIN'=>'4 minutes',
+'LBL_5_MIN'=>'5 minutes',
+'LBL_EMAILS_PER_PAGE'=>'Emails per Page',
+
+
 );
 
 ?>

Modified: vtigercrm/branches/5.0.3/modules/Webmails/MailBox.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Webmails/MailBox.php (original)
+++ vtigercrm/branches/5.0.3/modules/Webmails/MailBox.php Fri Dec  1 06:18:44 2006
@@ -1,4 +1,4 @@
-<?php
+<?php
 /*********************************************************************************
  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
   * ("License"); You may not use this file except in compliance with the License
@@ -167,7 +167,7 @@
 			{
 				global $current_user;
 				$this->db->println("CONNECTION ERROR - Could not be connected to the server using imap_open function through the connection strings $connectString and $connectString1");
-				echo "<br>&nbsp;<b>Could not connect to the server. Please check the server details <a href='index.php?module=Settings&action=AddMailAccount&record=".$current_user->id."'> Here </a></b>";
+				echo "<br>&nbsp;<b>Could not connect to the server. Please check the server details <a href='index.php?module=Users&action=AddMailAccount&record=".$current_user->id."'> Here </a></b>";
 				exit;
 			}
 		}



From vtigercrm-commits at vtiger.fosslabs.com  Mon Dec  4 22:08:08 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 05 Dec 2006 06:08:08 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9932 - in
 /vtigercrm/branches/5.0.3/modules/Webmails: DetailView.php ListView.php
 MailParse.php Webmail.php body.php
Message-ID: <20061205060808.994F5788AA5@vtiger.fosslabs.com>

Author: richie
Date: Mon Dec  4 23:08:02 2006
New Revision: 9932

Log:
* Added utf6 decoding to display the all language characters correctly -- Mickie

Modified:
    vtigercrm/branches/5.0.3/modules/Webmails/DetailView.php
    vtigercrm/branches/5.0.3/modules/Webmails/ListView.php
    vtigercrm/branches/5.0.3/modules/Webmails/MailParse.php
    vtigercrm/branches/5.0.3/modules/Webmails/Webmail.php
    vtigercrm/branches/5.0.3/modules/Webmails/body.php

Modified: vtigercrm/branches/5.0.3/modules/Webmails/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Webmails/DetailView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Webmails/DetailView.php Mon Dec  4 23:08:02 2006
@@ -31,6 +31,10 @@
 echo '<table border="0" width="100%" cellpadding="0" cellspacing="0">';
 echo '<tr><td width="10%">From:</td><td>'.$elist->from.'</td></tr>';
 echo '<tr><td width="10%">To:</td><td>'.$elist->to.'</td></tr>';
+
+//Added to get the UTF-8 string - 30-11-06 - Mickie
+$elist->subject = utf8_decode(imap_utf8($elist->subject));
+
 echo '<tr><td width="10%">Subject:</td><td>'.$elist->subject.'</td></tr>';
 echo '<tr><td width="10%">Date:</td><td>'.$elist->date.'</td></tr>';
 echo '</table>';

Modified: vtigercrm/branches/5.0.3/modules/Webmails/ListView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Webmails/ListView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Webmails/ListView.php Mon Dec  4 23:08:02 2006
@@ -157,7 +157,7 @@
 );
 </script>
 <script language="JavaScript" type="text/javascript" src="modules/Webmails/webmails.js"></script>
-<?
+<?php
 
 global $displayed_msgs;
 // AJAX commands (should be moved)
@@ -217,7 +217,7 @@
 // these are mainly used in the preview window and could be ajaxified/
 // during the preview window load instead.
 var msgCount = "<?php echo $numEmails;?>";
-<?
+<?php
 $mails = array();
 if (is_array($overview)) {
    foreach ($overview as $val) {
@@ -226,9 +226,15 @@
 	webmail[<?php echo $val->msgno;?>] = new Array();
 	webmail[<?php echo $val->msgno;?>]["from"]="<?php echo addslashes($val->from);?>";
 	webmail[<?php echo $val->msgno;?>]["to"]="<?php echo addslashes($val->to);?>";
+
+	<?php 
+		//Added to get the UTF-8 string - 30-11-06 - Mickie
+		$val->subject = utf8_decode(imap_utf8($val->subject));
+	?>
+		
 	webmail[<?php echo $val->msgno;?>]["subject"]="<?php echo addslashes($val->subject);?>";
 	webmail[<?php echo $val->msgno;?>]["date"]="<?php echo addslashes($val->date);?>";
-	<?
+	<?php
    }
 }
 echo "</script>";

Modified: vtigercrm/branches/5.0.3/modules/Webmails/MailParse.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Webmails/MailParse.php (original)
+++ vtigercrm/branches/5.0.3/modules/Webmails/MailParse.php Mon Dec  4 23:08:02 2006
@@ -1,4 +1,4 @@
-<?php
+<?php
 /*********************************************************************************
  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
   * ("License"); You may not use this file except in compliance with the License
@@ -11,35 +11,47 @@
 
 
 // draw a row for the listview entry
-function show_msg($mails,$start_message) {
-        global $MailBox,$displayed_msgs,$show_hidden,$new_msgs;
+function show_msg($mails,$start_message)
+{
+	global $MailBox,$displayed_msgs,$show_hidden,$new_msgs;
 
-        $num = $mails[$start_message]->msgno;
-        $msg_ob = new Webmail($MailBox->mbox,$mails[$start_message]->msgno);
+	$num = $mails[$start_message]->msgno;
+	$msg_ob = new Webmail($MailBox->mbox,$mails[$start_message]->msgno);
 
-        // TODO: scan the current db vtiger_tables to find a
-        // matching email address that will make a good
-        // candidate for record_id
-        // this module will also need to be able to associate to any entity type
-        $record_id='';
+	// TODO: scan the current db vtiger_tables to find a
+	// matching email address that will make a good
+	// candidate for record_id
+	// this module will also need to be able to associate to any entity type
+	$record_id='';
 
-        if($mails[$start_message]->subject=="")
-                $mails[$start_message]->subject="(No Subject)";
+	if($mails[$start_message]->subject=="")
+		$mails[$start_message]->subject="(No Subject)";
 
-        // Let's pre-build our URL parameters since it's too much of a pain not to
-        $detailParams = 'record='.$num.'&mailbox='.$mailbox.'&mailid='.$num.'&parenttab=My Home Page';
+	// Let's pre-build our URL parameters since it's too much of a pain not to
+	$detailParams = 'record='.$num.'&mailbox='.$mailbox.'&mailid='.$num.'&parenttab=My Home Page';
 
-        $displayed_msgs++;
-        if ($mails[$start_message]->deleted && !$show_hidden) {
+	$displayed_msgs++;
+	if ($mails[$start_message]->deleted && !$show_hidden)
+	{
                 $flags = "<tr id='row_".$num."' class='mailSelected' style='display:none'><td width='2px'><input type='checkbox' name='checkbox_".$num."' class='msg_check'></td><td colspan='1'>";
-        $displayed_msgs--;
-        } elseif ($mails[$start_message]->deleted && $show_hidden)
-                $flags = "<tr id='row_".$num."' class='mailSelected'><td width='2px'><input type='checkbox' name='checkbox_".$num."' class='msg_check'></td><td colspan='1'>";
-        elseif (!$mails[$start_message]->seen || $mails[$start_message]->recent) {
-                $flags = "<tr class='mailSelected' id='row_".$num."'><td width='2px'><input type='checkbox' name='checkbox_".$num."' class='msg_check'></td><td colspan='1'>";
-                $new_msgs++;
-        } else
-                $flags = "<tr onmouseover='this.className=\"tabSelected\"' onmouseout='this.className=\"\"' id='row_".$num."'><td width='2px'><input type='checkbox' name='checkbox_".$num."' class='msg_check'></td><td colspan='1'>";
+        	$displayed_msgs--;
+	}
+	elseif ($mails[$start_message]->deleted && $show_hidden)
+	{
+		$flags = "<tr id='row_".$num."' class='mailSelected'><td width='2px'><input type='checkbox' name='checkbox_".$num."' class='msg_check'></td><td colspan='1'>";
+	}
+	elseif (!$mails[$start_message]->seen || $mails[$start_message]->recent)
+	{
+		$flags = "<tr class='mailSelected' id='row_".$num."'><td width='2px'><input type='checkbox' name='checkbox_".$num."' class='msg_check'></td><td colspan='1'>";
+		$new_msgs++;
+	}
+	else
+	{
+		$flags = "<tr onmouseover='this.className=\"tabSelected\"' onmouseout='this.className=\"\"' id='row_".$num."'><td width='2px'><input type='checkbox' name='checkbox_".$num."' class='msg_check'></td><td colspan='1'>";
+	}
+
+
+
 
         // Attachment Icons
         if($msg_ob->has_attachments)
@@ -47,17 +59,25 @@
         else
                 $flags.='<img src="modules/Webmails/images/blank.png" border="0" width="14px" height="14" alt="">&nbsp;';
 
+
+
         // read/unread/forwarded/replied
         if(!$mails[$start_message]->seen || $mails[$start_message]->recent)
-        {
-                $flags.='<span id="unread_img_'.$num.'"><a href="javascript:;" onclick="OpenCompose(\''.$num.'\',\'reply\');"><img src="modules/Webmails/images/stock_mail-unread.png" border="0" width="10" height="14"></a></span>&nbsp;';
-        }
-        elseif ($mails[$start_message]->in_reply_to || $mails[$start_message]->references || preg_match("/^re:/i",$mails[$start_message]->subject))
-                $flags.='<a href="javascript:;" onclick="OpenCompose(\''.$num.'\',\'reply\');"><img src="modules/Webmails/images/stock_mail-replied.png" border="0" width="10" height="12"></a>&nbsp;';
-        elseif (preg_match("/^fw:/i",$mails[$start_message]->subject))
-                $flags.='<a href="javascript:;" onclick="OpenCompose(\''.$num.'\',\'reply\');"><img src="modules/Webmails/images/stock_mail-forward.png" border="0" width="10" height="13"></a>&nbsp;';
-        else
+	{
+		$flags.='<span id="unread_img_'.$num.'"><a href="javascript:;" onclick="OpenCompose(\''.$num.'\',\'reply\');"><img src="modules/Webmails/images/stock_mail-unread.png" border="0" width="10" height="14"></a></span>&nbsp;';
+	}
+	elseif ($mails[$start_message]->in_reply_to || $mails[$start_message]->references || preg_match("/^re:/i",$mails[$start_message]->subject))
+	{
+		$flags.='<a href="javascript:;" onclick="OpenCompose(\''.$num.'\',\'reply\');"><img src="modules/Webmails/images/stock_mail-replied.png" border="0" width="10" height="12"></a>&nbsp;';
+	}
+	elseif (preg_match("/^fw:/i",$mails[$start_message]->subject))
+	{
+		$flags.='<a href="javascript:;" onclick="OpenCompose(\''.$num.'\',\'reply\');"><img src="modules/Webmails/images/stock_mail-forward.png" border="0" width="10" height="13"></a>&nbsp;';
+	}
+	else
+	{
                 $flags.='<a href="javascript:;" onclick="OpenCompose(\''.$num.'\',\'reply\');"><img src="modules/Webmails/images/stock_mail-read.png" border="0" width="10" height="11"></a>&nbsp;';
+	}
 
         // Set IMAP flag
         if($mails[$start_message]->flagged)
@@ -66,31 +86,61 @@
                 $flags.='<span id="set_td_'.$num.'"><a href="javascript:void(0);" onclick="runEmailCommand(\'set_flag\','.$num.');"><img src="modules/Webmails/images/plus.gif" border="0" width="11" height="11" id="set_flag_img_'.$num.'"></a></span>';
 
 
+
         $tmp=imap_mime_header_decode($mails[$start_message]->from);
         $from = $tmp[0]->text;
         $listview_entries[$num] = array();
 
         $listview_entries[$num][] = $flags."</td>";
 
-        if ($mails[$start_message]->deleted) {
-                $listview_entries[$num][] = '<td width="20%" nowrap align="left" id="deleted_subject_'.$num.'"><s><a href="javascript:;" onclick="load_webmail(\''.$num.'\');">'.substr($mails[$start_message]->subject,0,50).'</a></s></td>';
-                $listview_entries[$num][] = '<td width="10%" nowrap align="left" nowrap id="deleted_date_'.$num.'"><s>'.substr($mails[$start_message]->date,0,30).'</s></td>';
-                $listview_entries[$num][] = '<td width="10%" nowrap align="left" id="deleted_from_'.$num.'"><s>'.substr($from,0,20).'</s></td>';
-        } elseif(!$mails[$start_message]->seen || $mails[$start_message]->recent) {
-                $listview_entries[$num][] = '<td width="20%" nowrap align="left" ><a href="javascript:;" onclick="load_webmail(\''.$num.'\');" id="ndeleted_subject_'.$num.'">'.substr($mails[$start_message]->subject,0,50).'</a></td>';
-                $listview_entries[$num][] = '<td width="10%" nowrap align="left" nowrap id="ndeleted_date_'.$num.'" >'.substr($mails[$start_message]->date,0,30).' &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;</td>';
-                $listview_entries[$num][] = '<td  width="10%" nowrap align="left" id="ndeleted_from_'.$num.'">'.substr($from,0,20).'</td>';
-        } else {
-                $listview_entries[$num][] = '<td width="20%" nowrap align="left" ><a href="javascript:;" onclick="load_webmail(\''.$num.'\');" id="ndeleted_subject_'.$num.'">'.substr($mails[$start_message]->subject,0,50).'</a></td>';
-                $listview_entries[$num][] = '<td width="10%" npwrap align="left" nowrap id="ndeleted_date_'.$num.'">'.substr($mails[$start_message]->date,0,30).'</td>';
-                $listview_entries[$num][] = '<td width="10%" nowrap align="left" id="ndeleted_from_'.$num.'">'.substr($from,0,20).'</td>';
-        }
+	if ($mails[$start_message]->deleted)
+	{
+		$listview_entries[$num][] = '<td width="20%" nowrap align="left" id="deleted_subject_'.$num.'"><s><a href="javascript:;" onclick="load_webmail(\''.$num.'\');">'.substr($mails[$start_message]->subject,0,50).'</a></s></td>';
+		$listview_entries[$num][] = '<td width="10%" nowrap align="left" nowrap id="deleted_date_'.$num.'"><s>'.substr($mails[$start_message]->date,0,30).'</s></td>';
+		$listview_entries[$num][] = '<td width="10%" nowrap align="left" id="deleted_from_'.$num.'"><s>'.substr($from,0,20).'</s></td>';
+	}
+	elseif(!$mails[$start_message]->seen || $mails[$start_message]->recent)
+	{
+		$listview_entries[$num][] = '<td width="20%" nowrap align="left" ><a href="javascript:;" onclick="load_webmail(\''.$num.'\');" id="ndeleted_subject_'.$num.'">'.substr($mails[$start_message]->subject,0,50).'</a></td>';
+		$listview_entries[$num][] = '<td width="10%" nowrap align="left" nowrap id="ndeleted_date_'.$num.'" >'.substr($mails[$start_message]->date,0,30).' &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;</td>';
+		$listview_entries[$num][] = '<td  width="10%" nowrap align="left" id="ndeleted_from_'.$num.'">'.substr($from,0,20).'</td>';
+	}
+	else
+	{
+		//IMPORTANT - This UTF-8 conversion has been done in ListView.php so no need to do again here
+		//Added to shown the original UTF-8 characters - Mickie - 30-11-06 - Starts
+		//we can use the option 1 or option 2
+		//Option 1 - Starts
+		/*
+		$translated_subject = imap_mime_header_decode($mails[$start_message]->subject);
+		for($i=0;$i<count($translated_subject);$i++)
+		{
+			if($translated_subject[$i]->charset != 'default')
+			{
+				$tmp .= $translated_subject[$i]->text;
+				$mails[$start_message]->subject = utf8_decode($tmp);//$tmp;
+			}
+		}
+		//Option 1 - Ends
+		*/
+		//Option 2 - Starts
+		//$mails[$start_message]->subject = utf8_decode(imap_utf8($mails[$start_message]->subject));//imap_utf8($mails[$start_message]->subject);
+		//Option 2 - Ends
+		//Added to shown the original UTF-8 characters - Mickie - 30-11-06 - Ends
 
+		$listview_entries[$num][] = '<td width="20%" nowrap align="left" ><a href="javascript:;" onclick="load_webmail(\''.$num.'\');" id="ndeleted_subject_'.$num.'">'.substr($mails[$start_message]->subject,0,50).'</a></td>';
+		$listview_entries[$num][] = '<td width="10%" npwrap align="left" nowrap id="ndeleted_date_'.$num.'">'.substr($mails[$start_message]->date,0,30).'</td>';
+		$listview_entries[$num][] = '<td width="10%" nowrap align="left" id="ndeleted_from_'.$num.'">'.substr($from,0,20).'</td>';
+	}
+
+
+	
         if($mails[$start_message]->deleted)
                 $listview_entries[$num][] = '<td nowrap align="center" id="deleted_td_'.$num.'"><span id="del_link_'.$num.'"><a href="javascript:void(0);" onclick="runEmailCommand(\'undelete_msg\','.$num.');"><img src="modules/Webmails/images/gnome-fs-trash-empty.png" border="0" width="14" height="14" alt="del"></a></span></td></tr>';
         else
                 $listview_entries[$num][] = '<td nowrap align="center" id="ndeleted_td_'.$num.'"><span id="del_link_'.$num.'"><a href="javascript:void(0);" onclick="runEmailCommand(\'delete_msg\','.$num.');"><img src="modules/Webmails/images/gnome-fs-trash-empty.png" border="0" width="14" height="14" alt="del"></a></span></td></tr>';
 
+
         return $listview_entries[$num];
 }
 

Modified: vtigercrm/branches/5.0.3/modules/Webmails/Webmail.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Webmails/Webmail.php (original)
+++ vtigercrm/branches/5.0.3/modules/Webmails/Webmail.php Mon Dec  4 23:08:02 2006
@@ -145,7 +145,7 @@
     	return $ret = Array("theader"=>$mailHeader);
     }
 
-    private function get_attachments() {
+    function get_attachments() {
        $struct = @imap_fetchstructure($this->mbox, $this->mailid);
        $parts = $struct->parts;
 
@@ -192,7 +192,7 @@
         return false;
     }
 
-    private function find_relationships() {
+    function find_relationships() {
 	// leads search
 	$sql = "SELECT * from vtiger_leaddetails left join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_leaddetails.leadid where vtiger_leaddetails.email = '".trim($this->from)."' AND vtiger_crmentity.deleted='0'";
 	$res = $this->db->query($sql,true,"Error: "."<BR>$query");
@@ -218,7 +218,7 @@
     }
 
     
-	private function dl_inline()
+	function dl_inline()
 	{
 		$struct = imap_fetchstructure($this->mbox, $this->mailid);
 		$parts = $struct->parts;
@@ -264,7 +264,10 @@
 							$filedata = $this->mail_fetchpart($partstring);
 						else
 							$filedata = imap_fetchbody($this->mbox, $this->mailid, $partstring);
-						
+
+						//Added to get the UTF-8 string - 30-11-06 - Mickie
+						$parts[$i]->dparameters[0]->value = utf8_decode(imap_utf8($parts[$i]->dparameters[0]->value));
+
 						$inline[] = array("filename" => $parts[$i]->dparameters[0]->value,"filedata"=>$filedata,"subtype"=>$parts[$i]->subtype,"filesize"=>$parts[$i]->bytes);
 					}
 				}
@@ -283,7 +286,7 @@
 		return $inline;
 	}
 
-	private function dl_attachments()
+	function dl_attachments()
 	{
 
 		$struct = imap_fetchstructure($this->mbox, $this->mailid);
@@ -345,7 +348,7 @@
 	}
 
 
-	private function load_mail()
+	function load_mail()
 	{
 		// parse the message
 		$struct = imap_fetchstructure($this->mbox, $this->mailid);

Modified: vtigercrm/branches/5.0.3/modules/Webmails/body.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Webmails/body.php (original)
+++ vtigercrm/branches/5.0.3/modules/Webmails/body.php Mon Dec  4 23:08:02 2006
@@ -34,6 +34,10 @@
 <?php
 
 $email->loadMail();
+
+//Added to get the UTF-8 string - 30-11-06 - Mickie
+$email->body = utf8_decode(imap_utf8($email->body));
+
 echo $email->body;
 echo "<br><br>";
 



From vtigercrm-commits at vtiger.fosslabs.com  Mon Dec  4 22:36:36 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 05 Dec 2006 06:36:36 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9933 -
 /vtigercrm/branches/5.0.3/themes/bluelagoon/style.css
Message-ID: <20061205063636.AB361788BB9@vtiger.fosslabs.com>

Author: richie
Date: Mon Dec  4 23:36:32 2006
New Revision: 9933

Log:
unwanted class removed

Modified:
    vtigercrm/branches/5.0.3/themes/bluelagoon/style.css

Modified: vtigercrm/branches/5.0.3/themes/bluelagoon/style.css
==============================================================================
--- vtigercrm/branches/5.0.3/themes/bluelagoon/style.css (original)
+++ vtigercrm/branches/5.0.3/themes/bluelagoon/style.css Mon Dec  4 23:36:32 2006
@@ -1753,6 +1753,8 @@
 	font-weight:bold;
 
 }
+
+/*
 .cellLabel {
 	background-color:#eaebd9;
 	border-top:1px solid #efefef;
@@ -1764,6 +1766,7 @@
 	color:#333333;
 	border-bottom:1px solid #dadada;
 }
+*/
 
 .listTable{
 	border-left:1px solid #cccccc;



From vtigercrm-commits at vtiger.fosslabs.com  Tue Dec  5 01:22:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 05 Dec 2006 09:22:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9934 - in
 /vtigercrm/branches/5.0.3/themes/woodspice/images:
 actionGenPurchaseOrder.gif actionGenerateInvoice.gif actionGeneratePDF.gif
 actionGenerateQuote.gif actionGenerateSalesOrder.gif actionPrintNow.gif
Message-ID: <20061205092250.1D50278948F@vtiger.fosslabs.com>

Author: richie
Date: Tue Dec  5 02:22:38 2006
New Revision: 9934

Log:
added action icons

Added:
    vtigercrm/branches/5.0.3/themes/woodspice/images/actionGenPurchaseOrder.gif   (with props)
    vtigercrm/branches/5.0.3/themes/woodspice/images/actionGenerateInvoice.gif   (with props)
    vtigercrm/branches/5.0.3/themes/woodspice/images/actionGeneratePDF.gif   (with props)
    vtigercrm/branches/5.0.3/themes/woodspice/images/actionGenerateQuote.gif   (with props)
    vtigercrm/branches/5.0.3/themes/woodspice/images/actionGenerateSalesOrder.gif   (with props)
    vtigercrm/branches/5.0.3/themes/woodspice/images/actionPrintNow.gif   (with props)



From vtigercrm-commits at vtiger.fosslabs.com  Tue Dec  5 01:25:05 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 05 Dec 2006 09:25:05 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9935 - in
 /vtigercrm/branches/5.0.3/themes: alphagrey/images/ bluelagoon/images/
Message-ID: <20061205092505.9B21C789051@vtiger.fosslabs.com>

Author: richie
Date: Tue Dec  5 02:24:46 2006
New Revision: 9935

Log:
added action icons

Added:
    vtigercrm/branches/5.0.3/themes/alphagrey/images/actionGenPurchaseOrder.gif   (with props)
    vtigercrm/branches/5.0.3/themes/alphagrey/images/actionGenerateInvoice.gif   (with props)
    vtigercrm/branches/5.0.3/themes/alphagrey/images/actionGeneratePDF.gif   (with props)
    vtigercrm/branches/5.0.3/themes/alphagrey/images/actionGenerateQuote.gif   (with props)
    vtigercrm/branches/5.0.3/themes/alphagrey/images/actionGenerateSalesOrder.gif   (with props)
    vtigercrm/branches/5.0.3/themes/alphagrey/images/actionPrintNow.gif   (with props)
    vtigercrm/branches/5.0.3/themes/bluelagoon/images/actionGenPurchaseOrder.gif   (with props)
    vtigercrm/branches/5.0.3/themes/bluelagoon/images/actionGenerateInvoice.gif   (with props)
    vtigercrm/branches/5.0.3/themes/bluelagoon/images/actionGeneratePDF.gif   (with props)
    vtigercrm/branches/5.0.3/themes/bluelagoon/images/actionGenerateQuote.gif   (with props)
    vtigercrm/branches/5.0.3/themes/bluelagoon/images/actionGenerateSalesOrder.gif   (with props)
    vtigercrm/branches/5.0.3/themes/bluelagoon/images/actionPrintNow.gif   (with props)



From vtigercrm-commits at vtiger.fosslabs.com  Tue Dec  5 01:29:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 05 Dec 2006 09:29:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9936 -
 /vtigercrm/branches/5.0.3/Smarty/templates/Inventory/InventoryActions.tpl
Message-ID: <20061205092937.03429789717@vtiger.fosslabs.com>

Author: richie
Date: Tue Dec  5 02:29:33 2006
New Revision: 9936

Log:
added action icons with links

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/Inventory/InventoryActions.tpl

Modified: vtigercrm/branches/5.0.3/Smarty/templates/Inventory/InventoryActions.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/Inventory/InventoryActions.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/Inventory/InventoryActions.tpl Tue Dec  5 02:29:33 2006
@@ -34,27 +34,28 @@
 	<!-- Module based actions starts -->
 	{if $MODULE eq 'Products'}
 	   <!-- Product Actions starts -->
-	   <tr>
-		<td align="left" style="padding-left:10px;">
-			<img src="{$IMAGE_PATH}pointer.gif" hspace="5" align="absmiddle"/>
+
+	   <tr>
+		<td align="left" style="padding-left:5px;">
+	<a href="javascript: document.DetailView.module.value='Quotes'; document.DetailView.action.value='EditView'; document.DetailView.return_module.value='Products'; document.DetailView.return_action.value='DetailView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.parent_id.value='{$ID}'; document.DetailView.product_id.value='{$ID}'; document.DetailView.record.value=''; document.DetailView.submit();" class="webMnu"><img src="{$IMAGE_PATH}actionGenerateQuote.gif" hspace="2" align="absmiddle" border="0"/></a>
 			<a href="javascript: document.DetailView.module.value='Quotes'; document.DetailView.action.value='EditView'; document.DetailView.return_module.value='Products'; document.DetailView.return_action.value='DetailView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.parent_id.value='{$ID}'; document.DetailView.product_id.value='{$ID}'; document.DetailView.record.value=''; document.DetailView.submit();" class="webMnu">{$APP.LBL_CREATE_BUTTON_LABEL} {$APP.Quote}</a> 
 		</td>
 	   </tr>
 	   <tr>
-		<td align="left" style="padding-left:10px;">
-			<img src="{$IMAGE_PATH}pointer.gif" hspace="5" align="absmiddle"/>
+		<td align="left" style="padding-left:5px;">
+			<a href="javascript: document.DetailView.module.value='Invoice'; document.DetailView.action.value='EditView'; document.DetailView.return_module.value='Products'; document.DetailView.return_action.value='DetailView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.parent_id.value='{$ID}'; document.DetailView.product_id.value='{$ID}'; document.DetailView.record.value=''; document.DetailView.submit();" class="webMnu"><img src="{$IMAGE_PATH}actionGenerateInvoice.gif" hspace="2" align="absmiddle" border="0"/></a>
 			<a href="javascript: document.DetailView.module.value='Invoice'; document.DetailView.action.value='EditView'; document.DetailView.return_module.value='Products'; document.DetailView.return_action.value='DetailView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.parent_id.value='{$ID}'; document.DetailView.product_id.value='{$ID}'; document.DetailView.record.value=''; document.DetailView.submit();" class="webMnu">{$APP.LBL_CREATE_BUTTON_LABEL} {$APP.Invoice}</a> 
 		</td>
 	   </tr>
 	   <tr>
-		<td align="left" style="padding-left:10px;">
-			<img src="{$IMAGE_PATH}pointer.gif" hspace="5" align="absmiddle"/>
+		<td align="left" style="padding-left:5px;">
+<a href="javascript: document.DetailView.module.value='SalesOrder'; document.DetailView.action.value='EditView'; document.DetailView.return_module.value='Products'; document.DetailView.return_action.value='DetailView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.parent_id.value='{$ID}'; document.DetailView.product_id.value='{$ID}'; document.DetailView.record.value=''; document.DetailView.submit();" class="webMnu"><img src="{$IMAGE_PATH}actionGenerateSalesOrder.gif" hspace="2" align="absmiddle" border="0"/></a>
 			<a href="javascript: document.DetailView.module.value='SalesOrder'; document.DetailView.action.value='EditView'; document.DetailView.return_module.value='Products'; document.DetailView.return_action.value='DetailView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.parent_id.value='{$ID}'; document.DetailView.product_id.value='{$ID}'; document.DetailView.record.value=''; document.DetailView.submit();" class="webMnu">{$APP.LBL_CREATE_BUTTON_LABEL} {$APP.SalesOrder}</a> 
 		</td>
 	   </tr>
 	   <tr>
-		<td align="left" style="padding-left:10px;">
-			<img src="{$IMAGE_PATH}pointer.gif" hspace="5" align="absmiddle"/>
+		<td align="left" style="padding-left:5px;">
+			<a href="javascript: document.DetailView.module.value='PurchaseOrder'; document.DetailView.action.value='EditView'; document.DetailView.return_module.value='Products'; document.DetailView.return_action.value='DetailView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.parent_id.value='{$ID}'; document.DetailView.product_id.value='{$ID}'; document.DetailView.record.value=''; document.DetailView.submit();" class="webMnu"><img src="{$IMAGE_PATH}actionGenPurchaseOrder.gif" hspace="2" align="absmiddle" border="0"/></a>
 			<a href="javascript: document.DetailView.module.value='PurchaseOrder'; document.DetailView.action.value='EditView'; document.DetailView.return_module.value='Products'; document.DetailView.return_action.value='DetailView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.parent_id.value='{$ID}'; document.DetailView.product_id.value='{$ID}'; document.DetailView.record.value=''; document.DetailView.submit();" class="webMnu">{$APP.LBL_CREATE_BUTTON_LABEL} {$APP.PurchaseOrder}</a> 
 		</td>
 	   </tr>
@@ -90,7 +91,7 @@
 	   <!-- Vendors Actions starts -->
 	   <tr>
 		<td align="left" style="padding-left:10px;">
-			<img src="{$IMAGE_PATH}pointer.gif" hspace="5" align="absmiddle"/>
+<a href="javascript: document.DetailView.module.value='PurchaseOrder'; document.DetailView.action.value='EditView'; document.DetailView.return_module.value='Vendors'; document.DetailView.return_action.value='DetailView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.parent_id.value='{$ID}'; document.DetailView.vendor_id.value='{$ID}'; document.DetailView.record.value=''; document.DetailView.submit();" class="webMnu">	<img src="{$IMAGE_PATH}actionGenPurchaseOrder.gif" hspace="5" align="absmiddle" border="0"/></a>
 			<a href="javascript: document.DetailView.module.value='PurchaseOrder'; document.DetailView.action.value='EditView'; document.DetailView.return_module.value='Vendors'; document.DetailView.return_action.value='DetailView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.parent_id.value='{$ID}'; document.DetailView.vendor_id.value='{$ID}'; document.DetailView.record.value=''; document.DetailView.submit();" class="webMnu">{$APP.LBL_CREATE_BUTTON_LABEL} {$APP.PurchaseOrder}</a> 
 		</td>
 	   </tr>
@@ -120,7 +121,7 @@
 	   <!-- SO Actions starts -->
 	   <tr>
 		<td align="left" style="padding-left:10px;">
-			<img src="{$IMAGE_PATH}pointer.gif" hspace="5" align="absmiddle"/>
+			<a href="javascript: document.DetailView.module.value='Invoice'; document.DetailView.action.value='EditView'; document.DetailView.return_module.value='SalesOrder'; document.DetailView.return_action.value='DetailView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.record.value='{$ID}'; document.DetailView.convertmode.value='sotoinvoice'; document.DetailView.submit();" class="webMnu"><img src="{$IMAGE_PATH}actionGenerateInvoice.gif" hspace="5" align="absmiddle" border="0"/></a>
 			<a href="javascript: document.DetailView.module.value='Invoice'; document.DetailView.action.value='EditView'; document.DetailView.return_module.value='SalesOrder'; document.DetailView.return_action.value='DetailView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.record.value='{$ID}'; document.DetailView.convertmode.value='sotoinvoice'; document.DetailView.submit();" class="webMnu">{$APP.LBL_CREATE_BUTTON_LABEL} {$APP.Invoice}</a> 
 		</td>
 	   </tr>
@@ -144,13 +145,14 @@
 	   <!-- Quotes Actions starts -->
 	   <tr>
 		<td align="left" style="padding-left:10px;">
-			<img src="{$IMAGE_PATH}pointer.gif" hspace="5" align="absmiddle"/> 
-			<a href="javascript: document.DetailView.return_module.value='{$MODULE}'; document.DetailView.return_action.value='DetailView'; document.DetailView.convertmode.value='{$CONVERTMODE}'; document.DetailView.module.value='Invoice'; document.DetailView.action.value='EditView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.submit();" class="webMnu">{$APP.LBL_GENERATE} {$APP.Invoice}</a> 
-		</td>
-	   </tr>
+<a href="javascript: document.DetailView.return_module.value='{$MODULE}'; document.DetailView.return_action.value='DetailView'; document.DetailView.convertmode.value='{$CONVERTMODE}'; document.DetailView.module.value='Invoice'; document.DetailView.action.value='EditView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.submit();" class="webMnu"><img src="{$IMAGE_PATH}actionGenerateInvoice.gif" hspace="5" align="absmiddle" border="0"/></a> 
+		<a href="javascript: document.DetailView.return_module.value='{$MODULE}'; document.DetailView.return_action.value='DetailView'; document.DetailView.convertmode.value='{$CONVERTMODE}'; document.DetailView.module.value='Invoice'; document.DetailView.action.value='EditView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.submit();" class="webMnu">{$APP.LBL_GENERATE} {$APP.Invoice}</a> 
+		</td>
+	   </tr>
+
 	   <tr>
 		<td align="left" style="padding-left:10px;border-bottom:1px dotted #CCCCCC;">
-			<img src="{$IMAGE_PATH}pointer.gif" hspace="5" align="absmiddle"/>
+			<a href="javascript: document.DetailView.return_module.value='{$MODULE}'; document.DetailView.return_action.value='DetailView'; document.DetailView.convertmode.value='quotetoso'; document.DetailView.module.value='SalesOrder'; document.DetailView.action.value='EditView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.submit();" class="webMnu"><img src="{$IMAGE_PATH}actionGenerateSalesOrder.gif" hspace="5" align="absmiddle" border="0"/></a>
 			<a href="javascript: document.DetailView.return_module.value='{$MODULE}'; document.DetailView.return_action.value='DetailView'; document.DetailView.convertmode.value='quotetoso'; document.DetailView.module.value='SalesOrder'; document.DetailView.action.value='EditView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.submit();" class="webMnu">{$APP.LBL_GENERATE} {$APP.SalesOrder}</a> 
 		</td>
 	   </tr>
@@ -198,7 +200,8 @@
 
    <tr>
 	<td align="left" style="padding-left:10px;">
-		<img src="{$IMAGE_PATH}pointer.gif" hspace="5" align="absmiddle"/>
+		<a href="javascript: document.DetailView.return_module.value='{$MODULE}'; document.DetailView.return_action.value='DetailView'; document.DetailView.module.value='{$MODULE}'; document.DetailView.action.value='{$export_pdf_action}'; document.DetailView.record.value='{$ID}'; document.DetailView.return_id.value='{$ID}'; document.DetailView.submit();" class="
+webMnu"><img src="{$IMAGE_PATH}actionGeneratePDF.gif" hspace="5" align="absmiddle" border="0"/></a>
 		<a href="javascript: document.DetailView.return_module.value='{$MODULE}'; document.DetailView.return_action.value='DetailView'; document.DetailView.module.value='{$MODULE}'; document.DetailView.action.value='{$export_pdf_action}'; document.DetailView.record.value='{$ID}'; document.DetailView.return_id.value='{$ID}'; document.DetailView.submit();" class="webMnu">{$APP.LBL_EXPORT_TO_PDF}</a> 
 	</td>
    </tr>



From vtigercrm-commits at vtiger.fosslabs.com  Tue Dec  5 01:41:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 05 Dec 2006 09:41:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9937 -
 /vtigercrm/branches/5.0.3/modules/SalesOrder/SalesOrder.php
Message-ID: <20061205094126.EC31F78993F@vtiger.fosslabs.com>

Author: richie
Date: Tue Dec  5 02:41:23 2006
New Revision: 9937

Log:
assignedto add in invoice related list

Modified:
    vtigercrm/branches/5.0.3/modules/SalesOrder/SalesOrder.php

Modified: vtigercrm/branches/5.0.3/modules/SalesOrder/SalesOrder.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/SalesOrder/SalesOrder.php (original)
+++ vtigercrm/branches/5.0.3/modules/SalesOrder/SalesOrder.php Tue Dec  5 02:41:23 2006
@@ -267,8 +267,16 @@
 		else
 			$returnset = '&return_module=SalesOrder&return_action=CallRelatedList&return_id='.$id;
 
-
-		$query = "select vtiger_crmentity.*, vtiger_invoice.*, vtiger_account.accountname, vtiger_salesorder.subject as salessubject from vtiger_invoice inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_invoice.invoiceid left outer join vtiger_account on vtiger_account.accountid=vtiger_invoice.accountid inner join vtiger_salesorder on vtiger_salesorder.salesorderid=vtiger_invoice.salesorderid left join vtiger_invoicegrouprelation on vtiger_invoice.invoiceid=vtiger_invoicegrouprelation.invoiceid left join vtiger_groups on vtiger_groups.groupname=vtiger_invoicegrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_salesorder.salesorderid=".$id;
+			$query = "select vtiger_crmentity.*, vtiger_invoice.*, vtiger_account.accountname, vtiger_salesorder.subject as salessubject, vtiger_users.user_name
+				from vtiger_invoice 
+				inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_invoice.invoiceid 
+				left outer join vtiger_account on vtiger_account.accountid=vtiger_invoice.accountid 
+				inner join vtiger_salesorder on vtiger_salesorder.salesorderid=vtiger_invoice.salesorderid 
+				left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid
+				left join vtiger_invoicegrouprelation on vtiger_invoice.invoiceid=vtiger_invoicegrouprelation.invoiceid 
+				left join vtiger_groups on vtiger_groups.groupname=vtiger_invoicegrouprelation.groupname 
+				where vtiger_crmentity.deleted=0 and vtiger_salesorder.salesorderid=".$id;
+
 		$log->debug("Exiting get_invoices method ...");
 		return GetRelatedList('SalesOrder','Invoice',$focus,$query,$button,$returnset);
 	



From vtigercrm-commits at vtiger.fosslabs.com  Tue Dec  5 01:50:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 05 Dec 2006 09:50:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9938 -
 /vtigercrm/branches/5.0.3/modules/Reports/Reports.php
Message-ID: <20061205095041.E6E1C789944@vtiger.fosslabs.com>

Author: richie
Date: Tue Dec  5 02:50:35 2006
New Revision: 9938

Log:
activity type not displyed in report module - fixed

Modified:
    vtigercrm/branches/5.0.3/modules/Reports/Reports.php

Modified: vtigercrm/branches/5.0.3/modules/Reports/Reports.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Reports/Reports.php (original)
+++ vtigercrm/branches/5.0.3/modules/Reports/Reports.php Tue Dec  5 02:50:35 2006
@@ -320,6 +320,12 @@
 			$profileList = getCurrentUserProfileList();
 			$sql = "select * from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.uitype != 50 and vtiger_field.tabid=".$tabid." and vtiger_field.block in (".$block .") and vtiger_field.displaytype in (1,2) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by sequence";
 		}
+		//Added to include vtiger_activity type for Reports Module
+		if($module == 'Calendar' && $block == 19)
+		{
+			 $module_columnlist['vtiger_activity:activitytype:Calendar_Activity_Type:activitytype:C'] = 'Activity Type';
+		}
+
 		$result = $adb->query($sql);
 		$noofrows = $adb->num_rows($result);
 		for($i=0; $i<$noofrows; $i++)



From vtigercrm-commits at vtiger.fosslabs.com  Tue Dec  5 02:02:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 05 Dec 2006 10:02:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9939 -
	/vtigercrm/branches/5.0.3/data/CRMEntity.php
Message-ID: <20061205100241.751C478993F@vtiger.fosslabs.com>

Author: richie
Date: Tue Dec  5 03:02:37 2006
New Revision: 9939

Log:
Error while saving an event in edit mode

Modified:
    vtigercrm/branches/5.0.3/data/CRMEntity.php

Modified: vtigercrm/branches/5.0.3/data/CRMEntity.php
==============================================================================
--- vtigercrm/branches/5.0.3/data/CRMEntity.php (original)
+++ vtigercrm/branches/5.0.3/data/CRMEntity.php Tue Dec  5 03:02:37 2006
@@ -892,6 +892,12 @@
 
 	function insertIntoGroupTable($module)
 	{
+		global $log;
+
+		if($module == 'Events')
+		{
+			$module = 'Calendar';
+		}
 		if($this->mode=='edit')
 		{
 						
@@ -900,12 +906,14 @@
 		  	{	  
 			  	if($_REQUEST['assigntype'] == 'T')
 			  	{
-				  	$groupname = $_REQUEST['assigned_group_name'];
+					$groupname = $_REQUEST['assigned_group_name'];
+
+
 					updateModuleGroupRelation($module,$this->id,$groupname);
 
 			  	}
 			  	else
-			  	{
+				{
 					  updateModuleGroupRelation($module,$this->id,'');
 				  
 			  	}
@@ -913,8 +921,6 @@
       		}
 		else
 		{
-				
-			
 			$groupname = $_REQUEST['assigned_group_name'];
 		 	if($_REQUEST['assigntype'] == 'T')
 		  	{



From vtigercrm-commits at vtiger.fosslabs.com  Tue Dec  5 02:18:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 05 Dec 2006 10:18:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9940 - in
 /vtigercrm/branches/5.0.3/modules: Settings/language/en_us.lang.php
 Users/language/en_us.lang.php
Message-ID: <20061205101840.082FA78993F@vtiger.fosslabs.com>

Author: richie
Date: Tue Dec  5 03:18:33 2006
New Revision: 9940

Log:
* language entry of LBL_MAIL_SERVER_SETTINGS has been moved from users to setting which is used only in settings

Modified:
    vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php
    vtigercrm/branches/5.0.3/modules/Users/language/en_us.lang.php

Modified: vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php Tue Dec  5 03:18:33 2006
@@ -510,6 +510,7 @@
 
 'LBL_RSS_CATEGORY'=>'Rss Category',
 
+'LBL_MAIL_SERVER_SETTINGS'=>'Outgoing Server',
 'LBL_USAGEUNIT'=>'Usage Unit',
 'LBL_GLACCT'=>'GL Account',
 'LBL_QUOTE_STAGE'=>'Quote Stage',

Modified: vtigercrm/branches/5.0.3/modules/Users/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Users/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Users/language/en_us.lang.php Tue Dec  5 03:18:33 2006
@@ -622,7 +622,6 @@
 'LBL_MAIL_PROTOCOL'=>'Mail Protocol',
 'LBL_LIST_PASSWORD'=>'Password',
 'LBL_MAIL_SERVER_NAME'=>'Mail Server Name or IP',
-'LBL_MAIL_SERVER_SETTINGS'=>'Outgoing Server',
 'LBL_INCOME_SERVER_SETTINGS'=>'Incoming Server',
 'LBL_TEST_SETTINGS'=>'Test my account setting immediately',
 'LBL_TEST_BUTTON_TITLE'=>'Test my account now! [Alt+T]',



From vtigercrm-commits at vtiger.fosslabs.com  Tue Dec  5 22:40:31 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 06 Dec 2006 06:40:31 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9941 -
 /vtigercrm/branches/5.0.3/user_privileges/default_module_view.php
Message-ID: <20061206064031.99831789433@vtiger.fosslabs.com>

Author: richie
Date: Tue Dec  5 23:40:27 2006
New Revision: 9941

Log:
control M characters removed

Modified:
    vtigercrm/branches/5.0.3/user_privileges/default_module_view.php

Modified: vtigercrm/branches/5.0.3/user_privileges/default_module_view.php
==============================================================================
--- vtigercrm/branches/5.0.3/user_privileges/default_module_view.php (original)
+++ vtigercrm/branches/5.0.3/user_privileges/default_module_view.php Tue Dec  5 23:40:27 2006
@@ -1,14 +1,14 @@
-<?php
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("License"); You may not use this file except in compliance with the License
-   * The Original Code is:  vtiger CRM Open Source
-   * The Initial Developer of the Original Code is vtiger.
-   * Portions created by vtiger are Copyright (C) vtiger.
-   * All Rights Reserved.
-  *
-  ********************************************************************************/
-
+<?php
+/*********************************************************************************
+  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+   * ("License"); You may not use this file except in compliance with the License
+   * The Original Code is:  vtiger CRM Open Source
+   * The Initial Developer of the Original Code is vtiger.
+   * Portions created by vtiger are Copyright (C) vtiger.
+   * All Rights Reserved.
+  *
+  ********************************************************************************/
+
 $singlepane_view = 'false';
-
-?>
+
+?>



From vtigercrm-commits at vtiger.fosslabs.com  Wed Dec  6 05:56:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 06 Dec 2006 13:56:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9942 -
 /vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php
Message-ID: <20061206135640.13B50789977@vtiger.fosslabs.com>

Author: richie
Date: Wed Dec  6 06:56:35 2006
New Revision: 9942

Log:
activity type added in reports

Modified:
    vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php

Modified: vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php (original)
+++ vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php Wed Dec  6 06:56:35 2006
@@ -333,7 +333,11 @@
 					}
 					$advorsqls = implode(" or ",$advorsql);
 					$fieldvalue = " (".$advorsqls.") ";
-				}else
+				}elseif($selectedfields[1] == 'status')
+				{
+					$fieldvalue = "(case when (vtiger_activity.status not like '') then vtiger_activity.status else vtiger_activity.eventstatus end)".$this->getAdvComparator($comparator,trim($value),$datatype);
+				}
+				else
 				{
 					$fieldvalue = $selectedfields[0].".".$selectedfields[1].$this->getAdvComparator($comparator,trim($value),$datatype);
 				}



From vtigercrm-commits at vtiger.fosslabs.com  Wed Dec  6 21:52:56 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 07 Dec 2006 05:52:56 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9943 - in
 /vtigercrm/branches/5.0.3: include/utils/CommonUtils.php
 include/utils/ListViewUtils.php modules/CustomView/CustomView.php
 modules/Reports/ReportRun.php modules/Reports/Reports.php
Message-ID: <20061207055256.0C051788C9D@vtiger.fosslabs.com>

Author: richie
Date: Wed Dec  6 22:52:47 2006
New Revision: 9943

Log:
modifed customview column headers for activities

Modified:
    vtigercrm/branches/5.0.3/include/utils/CommonUtils.php
    vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php
    vtigercrm/branches/5.0.3/modules/CustomView/CustomView.php
    vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php
    vtigercrm/branches/5.0.3/modules/Reports/Reports.php

Modified: vtigercrm/branches/5.0.3/include/utils/CommonUtils.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/utils/CommonUtils.php (original)
+++ vtigercrm/branches/5.0.3/include/utils/CommonUtils.php Wed Dec  6 22:52:47 2006
@@ -329,6 +329,27 @@
 	return $tabid;
 
 }
+/**
+ * Function to get the CustomViewName
+ * Takes the input as $cvid - customviewid
+ * returns the cvname string fromat
+ */
+
+function getCVname($cvid)
+{
+        global $log;
+        $log->debug("Entering getCVname method ...");
+
+        global $adb;
+        $sql = "select viewname from vtiger_customview where cvid=".$cvid;
+        $result = $adb->query($sql);
+        $cvname =  $adb->query_result($result,0,"viewname");
+
+        $log->debug("Exiting getCVname method ...");
+        return $cvname;
+
+}
+
 
 
 /**
@@ -2053,7 +2074,7 @@
 }
 function getUserslist()
 {
-	global $log;
+	global $log,$current_user;
 	$log->debug("Entering getUserslist() method ...");
 	global $adb;
 	$result=$adb->query("select * from vtiger_users");
@@ -2062,7 +2083,7 @@
 	       $useridlist[$i]=$adb->query_result($result,$i,'id');
 	       $usernamelist[$useridlist[$i]]=$adb->query_result($result,$i,'user_name');
 	}
-	$change_owner = get_select_options_with_id($usernamelist,'admin');
+	$change_owner = get_select_options_with_id($usernamelist,$current_user->user_name);
 	$log->debug("Exiting getUserslist method ...");
 	return $change_owner;
 }

Modified: vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php (original)
+++ vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Wed Dec  6 22:52:47 2006
@@ -984,8 +984,11 @@
 	global $log;
 	$log->debug("Entering getValue(".$field_result.",". $list_result.",".$fieldname.",".$focus.",".$module.",".$entity_id.",".$list_result_count.",".$mode.",".$popuptype.",".$returnset.",".$viewid.") method ...");
 	global $adb,$current_user;
+	
+	$viewname = getCVname($viewid);
 	require('user_privileges/user_privileges_'.$current_user->id.'.php');
 	$tabname = getParentTab();
+	$tabid = getTabid($module);
 	$uicolarr=$field_result[$fieldname];
 	foreach($uicolarr as $key=>$value)
 	{
@@ -1020,6 +1023,12 @@
 		else
 		{
 			$value = $temp_val;
+		}
+		//Added to get both start date & time
+		if(($tabid == 9 || $tabid == 16) && $uitype == 6 && $viewname != 'All')
+		{
+			$timestart = $adb->query_result($list_result,$list_result_count,'time_start');
+			$value = $value .'&nbsp;&nbsp;&nbsp;'.$timestart;
 		}
 		
 	}
@@ -2542,6 +2551,7 @@
 	//code added by raju ends
 	$log->debug("Exiting getRelatedTo method ...");
         return $parent_value;
+	
 
 
 }

Modified: vtigercrm/branches/5.0.3/modules/CustomView/CustomView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/CustomView/CustomView.php (original)
+++ vtigercrm/branches/5.0.3/modules/CustomView/CustomView.php Wed Dec  6 22:52:47 2006
@@ -184,6 +184,8 @@
 	{
 		global $adb;
 		$tabid = getTabid($module);
+		if($tabid == 9)
+			$tabid ="9,16";
 		global $current_user;
 	        require('user_privileges/user_privileges_'.$current_user->id.'.php');
 		if($tabid == 4 || $tabid ==7)
@@ -197,7 +199,7 @@
 		if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0)
 		{
 			$sql = "select * from vtiger_field ";
-			$sql.= " where vtiger_field.tabid=".$tabid." and vtiger_field.block in (".$block.") and";
+			$sql.= " where vtiger_field.tabid in (".$tabid.") and vtiger_field.block in (".$block.") and";
 			$sql.= $display_type;
 			$sql.= " order by sequence";
 		}
@@ -206,13 +208,12 @@
 
 			$profileList = getCurrentUserProfileList();
 			$sql = "select * from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid ";
-			$sql.= " where vtiger_field.tabid=".$tabid." and vtiger_field.block in (".$block.") and";
+			$sql.= " where vtiger_field.tabid in (".$tabid.") and vtiger_field.block in (".$block.") and";
 			$sql.= "$display_type and vtiger_profile2field.visible=0";
-			$sql.= " and vtiger_def_org_field.visible=0  and vtiger_profile2field.profileid in ".$profileList." order by sequence";
+			$sql.= " and vtiger_def_org_field.visible=0  and vtiger_profile2field.profileid in ".$profileList." order by sequence group by columnname";
 		}	
-
-
-
+		if($tabid == '9,16')
+                        $tabid ="9";
 		$result = $adb->query($sql);
 		$noofrows = $adb->num_rows($result);
 		//Added on 14-10-2005 -- added ticket id in list
@@ -287,6 +288,7 @@
 		foreach($this->module_list[$module] as $key=>$value)
 		{
 			$columnlist = $this->getColumnsListbyBlock($module,$value);
+			
 			if(isset($columnlist))
 			{
 				$ret_module_list[$module][$key] = $columnlist;
@@ -1429,6 +1431,7 @@
 	{
 		if($viewid != "" && $listquery != "")
 		{
+			
 			$listviewquery = substr($listquery, strpos($listquery,'FROM'),strlen($listquery));
 			if($module == "Calendar" || $module == "Emails")
 			{
@@ -1539,8 +1542,14 @@
 		global $current_language;
 		$current_mod_strings = return_specified_module_language($current_language, $module); 
 		$block_info = Array();
-		$Sql = "select distinct block,vtiger_field.tabid,name,blocklabel from vtiger_field inner join vtiger_blocks on vtiger_blocks.blockid=vtiger_field.block inner join vtiger_tab on vtiger_tab.tabid=vtiger_field.tabid where displaytype != 3 and vtiger_field.block not in(40,6,75,35,30,54,60,66,72) and vtiger_tab.name='$module' order by block";
+		if($module == "Calendar")
+			$module = "Calendar','Events";
+
+		$Sql = "select distinct block,vtiger_field.tabid,name,blocklabel from vtiger_field inner join vtiger_blocks on vtiger_blocks.blockid=vtiger_field.block inner join vtiger_tab on vtiger_tab.tabid=vtiger_field.tabid where displaytype != 3 and vtiger_field.block not in(40,6,75,35,30,54,60,66,72) and vtiger_tab.name in ('".$module."') order by block";
 		$result = $adb->query($Sql);
+		if($module == "Calendar','Events")
+			$module = "Calendar";
+
 		while($block_result = $adb->fetch_array($result))
 		{
 			$block_label = $block_result['blocklabel'];

Modified: vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php (original)
+++ vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php Wed Dec  6 22:52:47 2006
@@ -1081,6 +1081,29 @@
 		}
 		if($module == "Calendar")
 		{
+			//Added Leads,Accounts,Potentials as secondarymodule for Calendar
+
+			if($secmodule == "Leads")
+			{
+				$query = "left join vtiger_leaddetails on vtiger_leaddetails.leadid = vtiger_seactivityrel.crmid 
+					left join vtiger_crmentity as vtiger_crmentityLeads on vtiger_crmentityLeads.crmid = vtiger_leaddetails.leadid 
+					left join vtiger_leadaddress on vtiger_leaddetails.leadid = vtiger_leadaddress.leadaddressid 
+					left join vtiger_leadsubdetails on vtiger_leadsubdetails.leadsubscriptionid = vtiger_leaddetails.leadid 
+					left join vtiger_leadscf on vtiger_leadscf.leadid = vtiger_leaddetails.leadid 
+					left join vtiger_users as vtiger_usersLeads on vtiger_usersLeads.id = vtiger_crmentityLeads.smownerid ";
+	
+			}
+			if($secmodule == "Accounts")
+			{
+				$query = "left join vtiger_account on vtiger_account.accountid = vtiger_seactivityrel.crmid
+					left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid
+					left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid
+					left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid
+					left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid
+					left join vtiger_account as vtiger_accountAccounts on vtiger_accountAccounts.accountid = vtiger_account.parentid
+					left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid ";
+
+			}
 			if($secmodule == "Contacts")
 			{
 				$query = "left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid 
@@ -1093,6 +1116,14 @@
 					left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid
 					left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid ";
 			}
+			if($secmodule == "Potentials")
+                        {
+				$query = "left join vtiger_potential on vtiger_potential.potentialid = vtiger_seactivityrel.crmid 
+                                        left join vtiger_crmentity as vtiger_crmentityPotentials on vtiger_crmentityPotentials.crmid=vtiger_potential.potentialid
+                                        left join vtiger_potentialscf on vtiger_potentialscf.potentialid = vtiger_potential.potentialid
+                                        left join vtiger_users as vtiger_usersPotentials on vtiger_usersPotentials.id = vtiger_crmentityPotentials.smownerid ";
+
+                        }
 		}
 		if($module == 'Campaigns')
 		{

Modified: vtigercrm/branches/5.0.3/modules/Reports/Reports.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Reports/Reports.php (original)
+++ vtigercrm/branches/5.0.3/modules/Reports/Reports.php Wed Dec  6 22:52:47 2006
@@ -41,7 +41,7 @@
 			 'Accounts'=>Array('Potentials','Contacts','Products','Quotes','Invoice'),
 			 'Contacts'=>Array('Accounts','Potentials','Quotes','PurchaseOrder'),
 			 'Potentials'=>Array('Accounts','Contacts','Quotes'),
-			 'Calendar'=>Array('Contacts'),
+			 'Calendar'=>Array('Leads','Accounts','Contacts','Potentials'),
 			 'Products'=>Array('Accounts','Contacts'),
 			 'HelpDesk'=>Array('Products'),
 			 'Quotes'=>Array('Accounts','Contacts','Potentials'),



From vtigercrm-commits at vtiger.fosslabs.com  Thu Dec  7 06:22:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 07 Dec 2006 14:22:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9944 - in
 /vtigercrm/branches/5.0.3/modules: Calendar/language/en_us.lang.php
 CustomView/EditView.php
Message-ID: <20061207142250.08618789A61@vtiger.fosslabs.com>

Author: richie
Date: Thu Dec  7 07:22:45 2006
New Revision: 9944

Log:
renamed task/event information in customview column header to calendar information

Modified:
    vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php
    vtigercrm/branches/5.0.3/modules/CustomView/EditView.php

Modified: vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php Thu Dec  7 07:22:45 2006
@@ -263,6 +263,7 @@
 'LBL_NEW_FORM_TITLE'=>'New Activity',
 'LBL_TASK_INFORMATION'=>'Task Information',
 'LBL_EVENT_INFORMATION'=>'Event Information',
+'LBL_CALENDAR_INFORMATION'=>'Calendar Information',
 
 'LBL_NAME'=>'Subject:',
 'LBL_ACTIVITY_STRING'=>'There is an activity',

Modified: vtigercrm/branches/5.0.3/modules/CustomView/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/CustomView/EditView.php (original)
+++ vtigercrm/branches/5.0.3/modules/CustomView/EditView.php Thu Dec  7 07:22:45 2006
@@ -54,7 +54,7 @@
 	$log->info('CustomView :: Successfully got StandardFilter for the module'.$cv_module);
 	$stdfiltercolhtml = getStdFilterHTML($cv_module);
 	$stdfilterjs = $oCustomView->getCriteriaJS();
-	$smarty->assign("MOD",$mod_strings);
+
 	//step4
 	$advfilterhtml = getAdvCriteriaHTML();
 	for($i=1;$i<10;$i++)
@@ -72,7 +72,7 @@
 	$smarty->assign("STDFILTERCRITERIA",$stdfilterhtml);
 	$smarty->assign("STDFILTER_JAVASCRIPT",$stdfilterjs);
 
-	$smarty->assign("MANDATORYCHECK",implode(",",$oCustomView->mandatoryvalues));
+	$smarty->assign("MANDATORYCHECK",implode(",",array_unique($oCustomView->mandatoryvalues)));
 	$smarty->assign("SHOWVALUES",implode(",",$oCustomView->showvalues));
 }
 else
@@ -82,6 +82,7 @@
 	$customviewdtls = $oCustomView->getCustomViewByCvid($recordid);
 	$log->info('CustomView :: Successfully got ViewDetails for the Viewid'.$recordid);
 	$modulecollist = $oCustomView->getModuleColumnsList($cv_module);
+
 	$selectedcolumnslist = $oCustomView->getColumnsListByCvid($recordid);
 	$log->info('CustomView :: Successfully got ColumnsList for the Viewid'.$recordid);
 
@@ -128,7 +129,7 @@
 	$smarty->assign("STDFILTERCRITERIA",$stdfilterhtml);
 	$smarty->assign("STDFILTER_JAVASCRIPT",$stdfilterjs);
 
-	$smarty->assign("MANDATORYCHECK",implode(",",$oCustomView->mandatoryvalues));
+	$smarty->assign("MANDATORYCHECK",implode(",",array_unique($oCustomView->mandatoryvalues)));
 	$smarty->assign("SHOWVALUES",implode(",",$oCustomView->showvalues));
 
 	$cactionhtml = "<input name='customaction' class='button' type='button' value='Create Custom Action' onclick=goto_CustomAction('".$cv_module."');>";
@@ -216,8 +217,9 @@
 	global $oCustomView;
 	global $app_list_strings;
 	$advfilter = array();
-	$mod_strings = return_module_language($current_language,$module);
-
+	$mod_strings = return_specified_module_language($current_language,$module);
+	
+	$check_dup = Array();
 	foreach($oCustomView->module_list[$module] as $key=>$value)
 	{
 		$advfilter = array();			
@@ -226,37 +228,67 @@
 		{
 			foreach($columnslist[$module][$key] as $field=>$fieldlabel)
 			{
-				if(isset($mod_strings[$fieldlabel]))
-				{
-					if($selected == $field)
+				if(!in_array($fieldlabel,$check_dup))
+				{
+					if(isset($mod_strings[$fieldlabel]))
 					{
-						$advfilter_option['value'] = $field;
-						$advfilter_option['text'] = $mod_strings[$fieldlabel];
-						$advfilter_option['selected'] = "selected";
+						if($selected == $field)
+						{
+							$advfilter_option['value'] = $field;
+							$advfilter_option['text'] = $mod_strings[$fieldlabel];
+							$advfilter_option['selected'] = "selected";
+						}else
+						{
+							$advfilter_option['value'] = $field;
+							$advfilter_option['text'] = $mod_strings[$fieldlabel];
+							$advfilter_option['selected'] = "";
+						}
 					}else
 					{
-						$advfilter_option['value'] = $field;
-						$advfilter_option['text'] = $mod_strings[$fieldlabel];
-						$advfilter_option['selected'] = "";
+						if($selected == $field)
+						{
+							$advfilter_option['value'] = $field;
+							$advfilter_option['text'] = $fieldlabel;
+							$advfilter_option['selected'] = "selected";
+						}else
+						{
+							$advfilter_option['value'] = $field;
+							$advfilter_option['text'] = $fieldlabel;
+							$advfilter_option['selected'] = "";
+						}
 					}
-				}else
-				{
-					if($selected == $field)
-					{
-						$advfilter_option['value'] = $field;
-						$advfilter_option['text'] = $fieldlabel;
-						$advfilter_option['selected'] = "selected";
-					}else
-					{
-						$advfilter_option['value'] = $field;
-						$advfilter_option['text'] = $fieldlabel;
-						$advfilter_option['selected'] = "";
-					}
+					$advfilter[] = $advfilter_option;
+					$check_dup [] = $fieldlabel;
 				}
-				$advfilter[] = $advfilter_option;
 			}
 			$advfilter_out[$label]= $advfilter;
 		}
+	}
+	
+	$finalfield = Array();
+	foreach($advfilter_out as $header=>$value)
+	{
+		if($header == $mod_strings['LBL_TASK_INFORMATION'])
+		{
+			$newLabel = $mod_strings['LBL_CALENDAR_INFORMATION'];
+		    	$finalfield[$newLabel] = $advfilter_out[$header];
+		    	
+		}
+		elseif($header == $mod_strings['LBL_EVENT_INFORMATION'])
+		{
+			$index = count($finalfield[$newLabel]);
+			foreach($value as $key=>$result)
+			{
+				$finalfield[$newLabel][$index]=$result;
+				$index++;
+			}
+		}
+		else
+		{
+			$finalfield = $advfilter_out;
+		}
+
+		$advfilter_out=$finalfield;
 	}
 	return $advfilter_out;
 }



From vtigercrm-commits at vtiger.fosslabs.com  Thu Dec  7 06:46:10 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 07 Dec 2006 14:46:10 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9945 -
 /vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php
Message-ID: <20061207144610.D4B0F789A7C@vtiger.fosslabs.com>

Author: richie
Date: Thu Dec  7 07:46:07 2006
New Revision: 9945

Log:
Start Date and Time added in report columns

Modified:
    vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php

Modified: vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php (original)
+++ vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php Thu Dec  7 07:46:07 2006
@@ -97,6 +97,10 @@
 					if($selectedfields[0] == 'vtiger_activity' && $selectedfields[1] == 'status')
 					{
 						$columnslist[$fieldcolname] = " case when (vtiger_activity.status not like '') then vtiger_activity.status else vtiger_activity.eventstatus end as Calendar_Status";
+					}
+					elseif($selectedfields[0] == 'vtiger_activity' && $selectedfields[1] == 'date_start')
+					{
+						$columnslist[$fieldcolname] = "concat(vtiger_activity.date_start,'  ',vtiger_activity.time_start) as Calendar_Start_Date_and_Time";
 					}
 					else
 					{



From vtigercrm-commits at vtiger.fosslabs.com  Thu Dec  7 07:04:34 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 07 Dec 2006 15:04:34 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9946 - in
 /vtigercrm/branches/5.0.3: include/utils/DetailViewUtils.php
 include/utils/ListViewUtils.php include/utils/UserInfoUtil.php
 modules/Settings/language/en_us.lang.php
Message-ID: <20061207150434.6F687789A7C@vtiger.fosslabs.com>

Author: richie
Date: Thu Dec  7 08:04:25 2006
New Revision: 9946

Log:
Roles moved to settings- issues fixed

Modified:
    vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php
    vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php
    vtigercrm/branches/5.0.3/include/utils/UserInfoUtil.php
    vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php

Modified: vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php (original)
+++ vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php Thu Dec  7 08:04:25 2006
@@ -931,7 +931,7 @@
 	{
 	 	$label_fld[] =$mod_strings[$fieldlabel];
 		if(is_admin($current_user))
-			$label_fld[] = '<a href="index.php?module=Users&action=RoleDetailView&roleid='.$col_fields[$fieldname].'">'.getRoleName($col_fields[$fieldname]).'</a>';
+			$label_fld[] = '<a href="index.php?module=Settings&action=RoleDetailView&roleid='.$col_fields[$fieldname].'">'.getRoleName($col_fields[$fieldname]).'</a>';
 		else
 			$label_fld[] = getRoleName($col_fields[$fieldname]);
 	}elseif($uitype == 85) //Added for Skype by Minnie

Modified: vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php (original)
+++ vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Thu Dec  7 08:04:25 2006
@@ -1299,7 +1299,7 @@
         }
 	elseif($uitype == 98)
 	{
-		$value = '<a href="index.php?action=RoleDetailView&module=Users&parenttab=Settings&roleid='.$temp_val.'">'.getRoleName($temp_val).'</a>';  
+		$value = '<a href="index.php?action=RoleDetailView&module=Settings&parenttab=Settings&roleid='.$temp_val.'">'.getRoleName($temp_val).'</a>';  
 	}
 	else
 	{

Modified: vtigercrm/branches/5.0.3/include/utils/UserInfoUtil.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/utils/UserInfoUtil.php (original)
+++ vtigercrm/branches/5.0.3/include/utils/UserInfoUtil.php Thu Dec  7 08:04:25 2006
@@ -3794,12 +3794,12 @@
 	elseif($entityType == 'roles')
 	{
 		$roleName=getRoleName($entityid);	
-		$display_out = "<a href='index.php?module=Users&action=RoleDetailView&returnaction=OrgSharingDetailView&roleid=".$entityid."'>Role::".$roleName. "</a>";			
+		$display_out = "<a href='index.php?module=Settings&action=RoleDetailView&returnaction=OrgSharingDetailView&roleid=".$entityid."'>Role::".$roleName. "</a>";			
 	}
 	elseif($entityType == 'rs')
 	{
 		$roleName=getRoleName($entityid);	
-		$display_out = "<a href='index.php?module=Users&action=RoleDetailView&returnaction=OrgSharingDetailView&roleid=".$entityid."'>RoleAndSubordinate::".$roleName. "</a>";			
+		$display_out = "<a href='index.php?module=Settings&action=RoleDetailView&returnaction=OrgSharingDetailView&roleid=".$entityid."'>RoleAndSubordinate::".$roleName. "</a>";			
 	}
 	$log->debug("Exiting getEntityDisplayLink method ...");
 	return $display_out;

Modified: vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php Thu Dec  7 08:04:25 2006
@@ -693,6 +693,8 @@
 'LBL_DELETE_ROLE'=>'Delete Role',
 'LBL_ROLE_TO_BE_DELETED'=>'Role to be Deleted',
 'LBL_TRANSFER_USER_ROLE'=>'Transfer Users to Role',
+'LBL_ASSOCIATED_PROFILES'=>'Associated Profiles :',
+'LBL_ASSOCIATED_USERS'=>'Associated Users :',
 );
 
 



From vtigercrm-commits at vtiger.fosslabs.com  Thu Dec  7 20:59:35 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 08 Dec 2006 04:59:35 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9947 -
	/vtigercrm/branches/5.0.3/modules/uploads/upload.php
Message-ID: <20061208045935.CD6D5788CB2@vtiger.fosslabs.com>

Author: richie
Date: Thu Dec  7 21:59:29 2006
New Revision: 9947

Log:
* Modified the hardcoded file size to configurable from config.inc.php file, Fixes #2714

Modified:
    vtigercrm/branches/5.0.3/modules/uploads/upload.php

Modified: vtigercrm/branches/5.0.3/modules/uploads/upload.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/uploads/upload.php (original)
+++ vtigercrm/branches/5.0.3/modules/uploads/upload.php Thu Dec  7 21:59:29 2006
@@ -25,7 +25,7 @@
 
 ?>
 
-<INPUT TYPE="hidden" NAME="MAX_FILE_SIZE" VALUE="1000000">
+<INPUT TYPE="hidden" NAME="MAX_FILE_SIZE" VALUE="<?php echo $upload_maxsize; ?>">
 <INPUT TYPE="hidden" NAME="return_module" VALUE="<?php echo $ret_module ?>">
 <INPUT TYPE="hidden" NAME="return_action" VALUE="<?php echo $ret_action ?>">
 <INPUT TYPE="hidden" NAME="return_id" VALUE="<?php echo $ret_id ?>">



From vtigercrm-commits at vtiger.fosslabs.com  Thu Dec  7 22:56:16 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 08 Dec 2006 06:56:16 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9948 - in
 /vtigercrm/branches/4.2: install/5createTables.inc.php
 modules/Users/Authenticate.php schema/DatabaseSchema.xml update.php
 updates/ updates/vtiger/ updates/vtiger/9816.php vtigerversion.php
Message-ID: <20061208065616.8AFC6789408@vtiger.fosslabs.com>

Author: allanbush
Date: Thu Dec  7 23:56:10 2006
New Revision: 9948

Log:
Added SVN revision controlled incremental database update system.  Refs #2720.

Added:
    vtigercrm/branches/4.2/update.php
    vtigercrm/branches/4.2/updates/
    vtigercrm/branches/4.2/updates/vtiger/
    vtigercrm/branches/4.2/updates/vtiger/9816.php
Modified:
    vtigercrm/branches/4.2/install/5createTables.inc.php
    vtigercrm/branches/4.2/modules/Users/Authenticate.php
    vtigercrm/branches/4.2/schema/DatabaseSchema.xml
    vtigercrm/branches/4.2/vtigerversion.php

Modified: vtigercrm/branches/4.2/install/5createTables.inc.php
==============================================================================
--- vtigercrm/branches/4.2/install/5createTables.inc.php (original)
+++ vtigercrm/branches/4.2/install/5createTables.inc.php Thu Dec  7 23:56:10 2006
@@ -285,6 +285,14 @@
 }
 eecho ("Done.");
 
+// insert database version control 
+include 'vtigerversion.php'; 
+foreach($svn_revision as $project=>$version) { 
+	$sql = "INSERT INTO vtigerversion (project, revision) 
+		VALUES (".$db->quote($project).", ".$version.")"; 
+	$db->query($sql); 
+} 
+
 /*
 if ($new_tables)
         create_default_users();

Modified: vtigercrm/branches/4.2/modules/Users/Authenticate.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Users/Authenticate.php (original)
+++ vtigercrm/branches/4.2/modules/Users/Authenticate.php Thu Dec  7 23:56:10 2006
@@ -33,6 +33,8 @@
 // Add in defensive code here.
 $focus->user_name = to_html($_REQUEST['user_name']);
 $user_password = $_REQUEST['user_password'];
+
+include 'update.php';
 
 $focus->load_user($user_password);
 

Modified: vtigercrm/branches/4.2/schema/DatabaseSchema.xml
==============================================================================
--- vtigercrm/branches/4.2/schema/DatabaseSchema.xml (original)
+++ vtigercrm/branches/4.2/schema/DatabaseSchema.xml Thu Dec  7 23:56:10 2006
@@ -3813,4 +3813,13 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
+	<table name="vtigerversion">
+		<field name="id" type="I" size="19">
+			<key />
+			<autoincrement />
+		</field>
+		<field name="project" type="C" size="50" />
+		<field name="revision" type="I" size="19" />
+	</table>
+
 </schema>

Modified: vtigercrm/branches/4.2/vtigerversion.php
==============================================================================
--- vtigercrm/branches/4.2/vtigerversion.php (original)
+++ vtigercrm/branches/4.2/vtigerversion.php Thu Dec  7 23:56:10 2006
@@ -12,5 +12,6 @@
 $patch_version = '';
 $modified_database = '';
 $vtiger_version = '4.2.4';
+$svn_revision['vtiger'] = 9947;
 $release_date = '1 June 2006';
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Thu Dec  7 23:43:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 08 Dec 2006 07:43:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9949 -
 /vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php
Message-ID: <20061208074338.9BB7C788CB4@vtiger.fosslabs.com>

Author: richie
Date: Fri Dec  8 00:43:32 2006
New Revision: 9949

Log:
problem selecting related to in todo fixed

Modified:
    vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php

Modified: vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php (original)
+++ vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Fri Dec  8 00:43:32 2006
@@ -985,7 +985,10 @@
 	$log->debug("Entering getValue(".$field_result.",". $list_result.",".$fieldname.",".$focus.",".$module.",".$entity_id.",".$list_result_count.",".$mode.",".$popuptype.",".$returnset.",".$viewid.") method ...");
 	global $adb,$current_user;
 	
-	$viewname = getCVname($viewid);
+	if($viewid != '')
+	{
+		$viewname = getCVname($viewid);
+	}
 	require('user_privileges/user_privileges_'.$current_user->id.'.php');
 	$tabname = getParentTab();
 	$tabid = getTabid($module);



From vtigercrm-commits at vtiger.fosslabs.com  Fri Dec  8 01:42:29 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 08 Dec 2006 09:42:29 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9950 -
 /vtigercrm/branches/5.0.3/Smarty/templates/QuickCreate.tpl
Message-ID: <20061208094229.A2841789971@vtiger.fosslabs.com>

Author: richie
Date: Fri Dec  8 02:42:25 2006
New Revision: 9950

Log:
changes made for i18N support

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/QuickCreate.tpl

Modified: vtigercrm/branches/5.0.3/Smarty/templates/QuickCreate.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/QuickCreate.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/QuickCreate.tpl Fri Dec  8 02:42:25 2006
@@ -69,7 +69,11 @@
 					<select name="{$fldname}">
 					{foreach item=arr from=$fldvalue}
 						{foreach key=sel_value item=value from=$arr}
+							{if $MOD.$sel_value neq ''}
+							<option value="{$sel_value}" {$value}>{$MOD.$sel_value}</option>
+							{else}
 							<option value="{$sel_value}" {$value}>{$sel_value}</option>
+							{/if}
 						{/foreach}
 					{/foreach}
 					</select>



From vtigercrm-commits at vtiger.fosslabs.com  Fri Dec  8 11:19:13 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 08 Dec 2006 19:19:13 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9951 -
 /vtigercrm/branches/5.0.3/include/utils/CommonUtils.php
Message-ID: <20061208191914.2927B788AA0@vtiger.fosslabs.com>

Author: richie
Date: Fri Dec  8 12:19:09 2006
New Revision: 9951

Log:
Security check for changowner added

Modified:
    vtigercrm/branches/5.0.3/include/utils/CommonUtils.php

Modified: vtigercrm/branches/5.0.3/include/utils/CommonUtils.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/utils/CommonUtils.php (original)
+++ vtigercrm/branches/5.0.3/include/utils/CommonUtils.php Fri Dec  8 12:19:09 2006
@@ -2074,16 +2074,28 @@
 }
 function getUserslist()
 {
-	global $log,$current_user;
+	global $log,$current_user,$module,$adb,$assigned_user_id;
 	$log->debug("Entering getUserslist() method ...");
-	global $adb;
-	$result=$adb->query("select * from vtiger_users");
-	for($i=0;$i<$adb->num_rows($result);$i++)
-	{
-	       $useridlist[$i]=$adb->query_result($result,$i,'id');
-	       $usernamelist[$useridlist[$i]]=$adb->query_result($result,$i,'user_name');
-	}
-	$change_owner = get_select_options_with_id($usernamelist,$current_user->user_name);
+	require('user_privileges/user_privileges_'.$current_user->id.'.php');
+	require('user_privileges/sharing_privileges_'.$current_user->id.'.php');
+	
+	if($is_admin==false && $profileGlobalPermission[2] == 1 && ($defaultOrgSharingPermission[getTabid($module)] == 3 or $defaultOrgSharingPermission[getTabid($module)] == 0))
+	{
+		$users_combo = get_select_options_array(get_user_array(FALSE, "Active", $current_user->id,'private'), $current_user->id);
+	}
+	else
+	{
+		$users_combo = get_select_options_array(get_user_array(FALSE, "Active", $current_user->id),$current_user->id);
+	}
+	foreach($users_combo as $userid=>$value)	
+	{
+
+		foreach($value as $username=>$selected)
+		{
+			$change_owner .= "<option value=$userid $selected>".$username."</option>";
+		}
+	}
+	
 	$log->debug("Exiting getUserslist method ...");
 	return $change_owner;
 }
@@ -2091,20 +2103,40 @@
 
 function getGroupslist()
 {
-	global $log;
+	global $log,$adb,$module,$current_user;
 	$log->debug("Entering getGroupslist() method ...");
-	global $adb;
-	$result=$adb->query("select * from vtiger_groups");
-	
-	for($i=0;$i<$adb->num_rows($result);$i++)
-	{
-	       $groupidlist[$i]=$adb->query_result($result,$i,'groupid');
-	       $groupnamelist[$groupidlist[$i]]=$adb->query_result($result,$i,'groupname');
-	       
-	}
-	$change_groups_owner = get_select_options_with_id($groupnamelist,'');
+	require('user_privileges/user_privileges_'.$current_user->id.'.php');
+	require('user_privileges/sharing_privileges_'.$current_user->id.'.php');
+	if($is_admin==false && $profileGlobalPermission[2] == 1 && ($defaultOrgSharingPermission[getTabid($module)] == 3 or $defaultOrgSharingPermission[getTabid($module)] == 0))
+	{
+		$result=get_current_user_access_groups($module);
+	}
+	else
+	{
+		$result = get_group_options();
+	}
+	$groupArray = $adb->fetch_array($result);
+
+	do{
+		$groupname=$groupArray["groupname"];
+		$group_id=$groupArray["groupid"];
+		$selected = '';
+		if($groupname == $selected_groupname[0])
+		{
+			$selected = "selected";
+		}
+		if($groupname != '')
+			$group_option[$group_id] = array($groupname=>$selected);
+          }while($groupArray = $adb->fetch_array($result));
+
+	foreach($group_option as $groupid=>$value)  
+	{ 
+		foreach($value as $groupname=>$selected) 
+		{
+			$change_groups_owner .= "<option value=$groupid $selected >".$groupname."</option>";  
+		} 
+	}
 	$log->debug("Exiting getGroupslist method ...");
-
 	return $change_groups_owner;
 }
 



From vtigercrm-commits at vtiger.fosslabs.com  Mon Dec 11 01:39:06 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 11 Dec 2006 09:39:06 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9952 - in
 /vtigercrm/branches/5.0.3: Smarty/templates/ Smarty/templates/Inventory/
 themes/alphagrey/ themes/bluelagoon/ themes/woodspice/
Message-ID: <20061211093906.677A1788A1B@vtiger.fosslabs.com>

Author: richie
Date: Mon Dec 11 02:38:54 2006
New Revision: 9952

Log:
Changes made to wrap the contents in the description field

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/DetailViewFields.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/Inventory/InventoryDetailView.tpl
    vtigercrm/branches/5.0.3/themes/alphagrey/style.css
    vtigercrm/branches/5.0.3/themes/bluelagoon/style.css
    vtigercrm/branches/5.0.3/themes/woodspice/style.css

Modified: vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl Mon Dec 11 02:38:54 2006
@@ -288,13 +288,12 @@
 				{else}
 					<td class="dvtCellLabel" align=right width=25%><input type="hidden" id="hdtxt_IsAdmin" value={$keyadmin}></input>{$label}</td>
 				{/if}  
-{if $EDIT_PERMISSION eq 'yes'}							{include file="DetailViewUI.tpl"}
-{else}										{include file="DetailViewFields.tpl"}
-{/if}
-						   {else} 
-                                          <td class="dvtCellLabel" align=right>&nbsp;</td>
-                                           <td class="dvtCellInfo" align=left >&nbsp;</td>
-							   {/if}
+				{if $EDIT_PERMISSION eq 'yes'}
+					{include file="DetailViewUI.tpl"}
+				{else}
+					{include file="DetailViewFields.tpl"}
+				{/if}
+			   {/if}
                                    {/foreach}
 						      </tr>	
 						   {/foreach}	

Modified: vtigercrm/branches/5.0.3/Smarty/templates/DetailViewFields.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/DetailViewFields.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/DetailViewFields.tpl Mon Dec 11 02:38:54 2006
@@ -32,7 +32,7 @@
                                                   <td width=25% class="dvtCellInfo" align="left">&nbsp;<a href="http://{$keyval}" target="_blank">{$keyval}</a>
                                                   </td>
                                              {elseif $keyid eq '19' || $keyid eq '20'} <!--TextArea/Description-->
-                                                  <td width=25% class="dvtCellInfo" align="left">&nbsp;{$keyval}                   
+                                                  <td width=100% class="dvtCellInfo" align="left">&nbsp;{$keyval}                   
                                                   </td>
                                              {elseif $keyid eq '21' || $keyid eq '24' || $keyid eq '22'} <!--TextArea/Street-->
                                                   <td width=25% class="dvtCellInfo" align="left">&nbsp;{$keyval}

Modified: vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl Mon Dec 11 02:38:54 2006
@@ -133,7 +133,7 @@
 						{/if}
 							<!--{assign var="DESCRIPTION_SEPARATOR_STRING" value=" "}  {* Separates Description *}-->
 							<!--{assign var="DESCRIPTION_WORDWRAP_WIDTH" value="70"} {* No. of chars for word wrapping long lines of Description *}-->
-                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">
+                                                  <td width=100% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">
 							{$keyval}<!--|replace:$DESCRIPTION_SEPARATOR_STRING:"\x1"|replace:" ":"\x0"|replace:"\x1":$DESCRIPTION_SEPARATOR_STRING|wordwrap:$DESCRIPTION_WORDWRAP_WIDTH:"<br>&nbsp;"|replace:"\x0":"&nbsp;"}-->
 							</span>
                                               		<div id="editarea_{$label}" style="display:none;">

Modified: vtigercrm/branches/5.0.3/Smarty/templates/Inventory/InventoryDetailView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/Inventory/InventoryDetailView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/Inventory/InventoryDetailView.tpl Mon Dec 11 02:38:54 2006
@@ -204,9 +204,6 @@
 					{else}
 						{include file="DetailViewFields.tpl"}
 					{/if}
-				{else} 
-					<td class="dvtCellLabel" align=right>&nbsp;</td>
-					<td class="dvtCellInfo" align=left >&nbsp;</td>
 				{/if}
 		{/foreach}
 	   </tr>	

Modified: vtigercrm/branches/5.0.3/themes/alphagrey/style.css
==============================================================================
--- vtigercrm/branches/5.0.3/themes/alphagrey/style.css (original)
+++ vtigercrm/branches/5.0.3/themes/alphagrey/style.css Mon Dec 11 02:38:54 2006
@@ -320,7 +320,6 @@
 	padding-left:10px;
 	padding-right:10px;
 	border-bottom:1px dotted #efefef;
-	white-space:nowrap;
 }
 
 .rightMailMerge {

Modified: vtigercrm/branches/5.0.3/themes/bluelagoon/style.css
==============================================================================
--- vtigercrm/branches/5.0.3/themes/bluelagoon/style.css (original)
+++ vtigercrm/branches/5.0.3/themes/bluelagoon/style.css Mon Dec 11 02:38:54 2006
@@ -321,7 +321,6 @@
 	padding-left:10px;
 	padding-right:10px;
 	border-bottom:1px solid #efefef;
-	white-space:nowrap;
 }
 
 .rightMailMerge {

Modified: vtigercrm/branches/5.0.3/themes/woodspice/style.css
==============================================================================
--- vtigercrm/branches/5.0.3/themes/woodspice/style.css (original)
+++ vtigercrm/branches/5.0.3/themes/woodspice/style.css Mon Dec 11 02:38:54 2006
@@ -311,7 +311,6 @@
 	padding-left:10px;
 	padding-right:10px;
 	border-bottom:1px solid #999;
-	white-space:nowrap;
 }
 
 .rightMailMerge {



From vtigercrm-commits at vtiger.fosslabs.com  Mon Dec 11 02:05:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 11 Dec 2006 10:05:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9953 - in
 /vtigercrm/branches/5.0.3: Smarty/templates/EmailDetailView.tpl
 modules/Emails/language/en_us.lang.php
Message-ID: <20061211100526.A596078967D@vtiger.fosslabs.com>

Author: richie
Date: Mon Dec 11 03:05:18 2006
New Revision: 9953

Log:
added proper theme image

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/EmailDetailView.tpl
    vtigercrm/branches/5.0.3/modules/Emails/language/en_us.lang.php

Modified: vtigercrm/branches/5.0.3/Smarty/templates/EmailDetailView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/EmailDetailView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/EmailDetailView.tpl Mon Dec 11 03:05:18 2006
@@ -24,12 +24,12 @@
 <tbody>
    <tr>
 	<td colspan="3">
-		<table width="100%" border="0" cellpadding="0" cellspacing="0">
-		   <tr>
-			<td background="{$IMAGE_PATH}mailHdr.jpg" style="background-repeat:repeat-x;" width="100%">&nbsp;</td>
-			<td width="86"><img src="{$IMAGE_PATH}mailTitle.jpg"></td>
-		   </tr>
-		</table>	
+		<table border=0 cellspacing=0 cellpadding=0 width=100% class="mailClientWriteEmailHeader">
+		<tr>
+		<td >{$MOD.LBL_DETAILVIEW_EMAIL}</td>
+		</tr>
+		</table>
+
 	</td>
    </tr> 
    {foreach item=row from=$BLOCKS}

Modified: vtigercrm/branches/5.0.3/modules/Emails/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Emails/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Emails/language/en_us.lang.php Mon Dec 11 03:05:18 2006
@@ -43,7 +43,8 @@
 'LBL_SUBJECT'=>'Subject:',
 'LBL_BODY'=>'Body:',
 'LBL_CONTACT_NAME'=>' Contact Name: ',
-'LBL_EMAIL'=>'Email:',  
+'LBL_EMAIL'=>'Email:', 
+'LBL_DETAILVIEW_EMAIL'=>'E-Mail', 
 'LBL_COLON'=>':',
 'LBL_CHK_MAIL'=>'Check Mail',
 'LBL_COMPOSE'=>'Compose',



From vtigercrm-commits at vtiger.fosslabs.com  Mon Dec 11 03:26:01 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 11 Dec 2006 11:26:01 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9954 - in
 /vtigercrm/branches/5.0.3: Smarty/templates/SetMenu.tpl
 Smarty/templates/Settings.tpl Smarty/templates/Settings/InventoryNotify.tpl
 modules/Settings/language/en_us.lang.php
Message-ID: <20061211112601.50810788A1B@vtiger.fosslabs.com>

Author: richie
Date: Mon Dec 11 04:25:45 2006
New Revision: 9954

Log:
Inventory notification moved to settings

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/Settings.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/Settings/InventoryNotify.tpl
    vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php

Modified: vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl Mon Dec 11 04:25:45 2006
@@ -87,27 +87,27 @@
 		<tr><td class="settingsTabHeader" nowrap>{$MOD.LBL_COMMUNICATION_TEMPLATES}</td></tr>
 
 		{if $smarty.request.action eq 'listemailtemplates' || $smarty.request.action eq 'detailviewemailtemplate' || $smarty.request.action eq 'editemailtemplate' || $smarty.request.action eq 'saveemailtemplate' || $smarty.request.action eq 'deleteemailtemplate' || $smarty.request.action eq 'createemailtemplate'}
-		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings">{$MOD.EMAILTEMPLATES}</a></td></tr>
+		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Settings&action=listemailtemplates&parenttab=Settings">{$MOD.EMAILTEMPLATES}</a></td></tr>
 		{else}
-		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings">{$MOD.EMAILTEMPLATES}</a></td></tr>
+		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=listemailtemplates&parenttab=Settings">{$MOD.EMAILTEMPLATES}</a></td></tr>
 		{/if}
 
-		{if $smarty.request.action eq 'listwordtemplates' || $smarty.request.action eq 'add2db' || $smarty.request.action eq 'deletewordtemplate' || $smarty.request.action eq 'upload'}
-		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings">{$MOD.WORDINTEGRATION}</a></td></tr>
+		{if $smarty.request.action eq 'listwordtemplates' || $smarty.request.action eq 'savewordtemplate' || $smarty.request.action eq 'deletewordtemplate' || $smarty.request.action eq 'upload'}
+		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Settings&action=listwordtemplates&parenttab=Settings">{$MOD.WORDINTEGRATION}</a></td></tr>
 		{else}	
-		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings">{$MOD.WORDINTEGRATION}</a></td></tr>
+		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=listwordtemplates&parenttab=Settings">{$MOD.WORDINTEGRATION}</a></td></tr>
 		{/if}
 
-		{if $smarty.request.action eq 'listnotificationschedulers' || $smarty.request.action eq 'UsersAjax'}
-		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Users&action=listnotificationschedulers&parenttab=Settings">{$MOD.NOTIFICATIONSCHEDULERS}</a></td></tr>
+		{if $smarty.request.action eq 'listnotificationschedulers' || $smarty.request.action eq 'SettingsAjax'}
+		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Settings&action=listnotificationschedulers&parenttab=Settings">{$MOD.NOTIFICATIONSCHEDULERS}</a></td></tr>
 		{else}
-		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listnotificationschedulers&parenttab=Settings">{$MOD.NOTIFICATIONSCHEDULERS}</a></td></tr>
+		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=listnotificationschedulers&parenttab=Settings">{$MOD.NOTIFICATIONSCHEDULERS}</a></td></tr>
 		{/if}
 				
 		{if $smarty.request.action eq 'listinventorynotifications' || $smarty.request.action eq 'UsersAjax'}
-		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Users&action=listinventorynotifications&parenttab=Settings">{$MOD.INVENTORYNOTIFICATION}</a></td></tr>
+		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Settings&action=listinventorynotifications&parenttab=Settings">{$MOD.INVENTORYNOTIFICATION}</a></td></tr>
 		{else}	
-		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listinventorynotifications&parenttab=Settings">{$MOD.INVENTORYNOTIFICATION}</a></td></tr>
+		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=listinventorynotifications&parenttab=Settings">{$MOD.INVENTORYNOTIFICATION}</a></td></tr>
 		{/if} 	
 
 		

Modified: vtigercrm/branches/5.0.3/Smarty/templates/Settings.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/Settings.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/Settings.tpl Mon Dec 11 04:25:45 2006
@@ -192,8 +192,8 @@
 						<table border=0 cellspacing=0 cellpadding=5 width=100%>
 						<tr>
 
-							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=PickList&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}picklist.gif" alt="{$MOD.LBL_PICKLIST_EDITOR}" title="{$MOD.LBL_PICKLIST_EDITOR}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Settings&action=PickList&parenttab=Settings">{$MOD.LBL_PICKLIST_EDITOR}</a></td>
+							<td rowspan=2 valign=top><a href="index.php?module=Users&action=PickList&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}picklist.gif" alt="{$MOD.LBL_PICKLIST_EDITOR}" title="{$MOD.LBL_PICKLIST_EDITOR}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Users&action=PickList&parenttab=Settings">{$MOD.LBL_PICKLIST_EDITOR}</a></td>
 						</tr>
 						<tr>
 							<td class="small" valign=top>{$MOD.LBL_PICKLIST_DESCRIPTION}</td>	
@@ -254,8 +254,8 @@
 					<!-- icon 11-->
 						<table border=0 cellspacing=0 cellpadding=5 width=100%>
 						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}ViewTemplate.gif" alt="{$MOD.EMAILTEMPLATES}" title="{$MOD.EMAILTEMPLATES}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings">{$MOD.EMAILTEMPLATES}</a></td>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=listemailtemplates&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}ViewTemplate.gif" alt="{$MOD.EMAILTEMPLATES}" title="{$MOD.EMAILTEMPLATES}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=listemailtemplates&parenttab=Settings">{$MOD.EMAILTEMPLATES}</a></td>
 
 						</tr>
 						<tr>
@@ -268,8 +268,8 @@
 
 						<table border=0 cellspacing=0 cellpadding=5 width=100%>
 						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}mailmarge.gif" alt="{$MOD.LBL_MAIL_MERGE}" title="{$MOD.LBL_MAIL_MERGE}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings">{$MOD.WORDINTEGRATION}</a></td>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=listwordtemplates&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}mailmarge.gif" alt="{$MOD.LBL_MAIL_MERGE}" title="{$MOD.LBL_MAIL_MERGE}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=listwordtemplates&parenttab=Settings">{$MOD.WORDINTEGRATION}</a></td>
 						</tr>
 						<tr>
 							<td class="small" valign=top>{$MOD.LBL_MAIL_MERGE_DESCRIPTION}</td>
@@ -281,8 +281,8 @@
 					<!-- icon 13-->
 						<table border=0 cellspacing=0 cellpadding=5 width=100%>
 						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Users&action=listnotificationschedulers&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}notification.gif" alt="{$MOD.NOTIFICATIONSCHEDULERS}" title="{$MOD.NOTIFICATIONSCHEDULERS}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Users&action=listnotificationschedulers&parenttab=Settings">{$MOD.NOTIFICATIONSCHEDULERS}</a></td>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=listnotificationschedulers&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}notification.gif" alt="{$MOD.NOTIFICATIONSCHEDULERS}" title="{$MOD.NOTIFICATIONSCHEDULERS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=listnotificationschedulers&parenttab=Settings">{$MOD.NOTIFICATIONSCHEDULERS}</a></td>
 
 						</tr>
 						<tr>
@@ -295,8 +295,8 @@
 
 						<table border=0 cellspacing=0 cellpadding=5 width=100%>
 						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Users&action=listinventorynotifications&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}inventory.gif" alt="{$MOD.INVENTORYNOTIFICATION}" title="{$MOD.INVENTORYNOTIFICATION}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Users&action=listinventorynotifications&parenttab=Settings">{$MOD.INVENTORYNOTIFICATION}</a></td>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=listinventorynotifications&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}inventory.gif" alt="{$MOD.INVENTORYNOTIFICATION}" title="{$MOD.INVENTORYNOTIFICATION}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=listinventorynotifications&parenttab=Settings">{$MOD.INVENTORYNOTIFICATION}</a></td>
 						</tr>
 						<tr>
 							<td class="small" valign=top>{$MOD.LBL_INV_NOTIF_DESCRIPTION}</td>

Modified: vtigercrm/branches/5.0.3/Smarty/templates/Settings/InventoryNotify.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/Settings/InventoryNotify.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/Settings/InventoryNotify.tpl Mon Dec 11 04:25:45 2006
@@ -104,7 +104,7 @@
                 'index.php',
                 {queue: {position: 'end', scope: 'command'},
                         method: 'post',
-                        postBody: 'action=UsersAjax&module=Users&file=SaveInventoryNotification&notifysubject='+subject+'&notifybody='+body+'&record='+id,
+                        postBody: 'action=SettingsAjax&module=Settings&file=SaveInventoryNotification&notifysubject='+subject+'&notifybody='+body+'&record='+id,
                         onComplete: function(response) {
                                 $("status").style.display="none";
                         }
@@ -119,7 +119,7 @@
                 'index.php',
                 {queue: {position: 'end', scope: 'command'},
                         method: 'post',
-                        postBody: 'action=UsersAjax&module=Users&file=EditInventoryNotification&record='+id,
+                        postBody: 'action=SettingsAjax&module=Settings&file=EditInventoryNotification&record='+id,
                         onComplete: function(response) {
                                 $("status").style.display="none";
 				$("editdiv").innerHTML=response.responseText;

Modified: vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php Mon Dec 11 04:25:45 2006
@@ -510,12 +510,58 @@
 
 'LBL_RSS_CATEGORY'=>'Rss Category',
 
+//Added for Web based Email client integration (post 4.0.1 release)
+
+'LBL_ADD_MAIL_ACCOUNT'=>'Add Mail Account',
+'LBL_NEW_MAIL_ACCOUNT_TITLE'=>'New Mail Account [Alt+M]',
+'LBL_NEW_MAIL_ACCOUNT_KEY'=>'M',
+'LBL_NEW_MAIL_ACCOUNT_LABEL'=>'New Mail Account',
+'LBL_GENERAL_INFO'=>'General Information',
+'LBL_DISPLAY_NAME'=>'Display Name',
+'LBL_MAIL_PROTOCOL'=>'Mail Protocol',
+'LBL_LIST_PASSWORD'=>'Password',
+'LBL_MAIL_SERVER_NAME'=>'Mail Server Name or IP',
 'LBL_MAIL_SERVER_SETTINGS'=>'Outgoing Server',
+'LBL_INCOME_SERVER_SETTINGS'=>'Incoming Server',
+'LBL_TEST_SETTINGS'=>'Test my account setting immediately',
+'LBL_TEST_BUTTON_TITLE'=>'Test my account now! [Alt+T]',
+'LBL_TEST_BUTTON_KEY'=>'T',
+'LBL_TEST_BUTTON_LABEL'=>'Test my account now!',
+'LBL_DEFAULT'=>'Default',
+'LBL_IMAP2'=>'IMAP2',
+'LBL_IMAP4'=>'IMAP4',
+'LBL_POP'=>'POP',
+'LBL_IMAP'=>'IMAP',
+'LBL_MAIL_DISCLAIM'=>'Items marked with <font color="red">*</font> are required<br>Items marked with <font color="red">* *</font> are not fully supported',
+'LBL_SSL_OPTIONS'=>'SSL Options',
+'LBL_TLS'=>'TLS',
+'LBL_NO_TLS'=>'No TLS',
+'LBL_CERT_VAL'=>'Certificate Validations',
+'LBL_INT_MAILER'=>'Use Internal Mailer?',
+'LBL_INT_MAILER_USE'=>'Yes',
+'LBL_INT_MAILER_NOUSE'=>'No',
+'LBL_VAL_SSL_CERT'=>'Validate SSL Cert',
+'LBL_DONOT_VAL_SSL_CERT'=>'Do Not Validate SSL Cert',
+'LBL_WEB_MAIL_CONFIG'=>'Web Mail Configuration',
+'LBL_CONFIGURE_WEB_MAIL'=>' - Configure Web Mail',
+'LBL_LIST_MAIL_ACCOUNT'=>'  List Mail Account',
 'LBL_USAGEUNIT'=>'Usage Unit',
 'LBL_GLACCT'=>'GL Account',
 'LBL_QUOTE_STAGE'=>'Quote Stage',
 'LBL_CARRIER'=>'Carrier',
 'LBL_TAXCLASS'=>'Tax Class',
+'LBL_MY_DETAILS'=>'My Details',
+'LBL_MY_MAIL_SERVER_DET'=>'My Incoming Mail Server Details',
+'LBL_EMAIL_ID'=>'Email ID',
+'LBL_NAME_EXAMPLE'=>'(example : John Fenner)',
+'LBL_EMAIL_EXAMPLE'=>'(example : johnfenner at xyz.com)',
+'LBL_REFRESH_TIMEOUT'=>'Refresh Timeout',
+'LBL_1_MIN'=>'1 minute',
+'LBL_2_MIN'=>'2 minutes',
+'LBL_3_MIN'=>'3 minutes',
+'LBL_4_MIN'=>'4 minutes',
+'LBL_5_MIN'=>'5 minutes',
+'LBL_EMAILS_PER_PAGE'=>'Emails per Page',
 
 //Added for Organization Details (4.2 release)
 'LBL_ORGANIZATION_NAME'=>'Company Name',
@@ -695,6 +741,53 @@
 'LBL_TRANSFER_USER_ROLE'=>'Transfer Users to Role',
 'LBL_ASSOCIATED_PROFILES'=>'Associated Profiles :',
 'LBL_ASSOCIATED_USERS'=>'Associated Users :',
+//Added while moving email templates from Users to Settings
+'LBL_EMAIL_TEMPLATES'=>'Email Templates',
+'LBL_EMAIL_TEMPLATE_DESC'=>'Manage email templates used for Campaigns and Mass mailing',
+'LBL_LIST_SELECT'=>'Select',
+'LBL_EMAIL_TEMPLATE'=>'Email Template',
+'LBL_TEMPLATE_TOOLS'=>'Tools',
+'LBL_DELETE' => 'Delete',
+'LBL_NEW_TEMPLATE' =>'New Template',
+'LBL_FOLDER'=>'Folder',
+'LBL_NAME'=>'Name',
+'LBL_PERSONAL'=>'Personal',
+'LBL_PUBLIC'=>'Public',
+'LBL_ACCOUNT_FIELDS'=>'Account Fields',
+'LBL_CONTACT_FIELDS'=>'Contact Fields',
+'LBL_LEAD_FIELDS'=>'Lead Fields',
+'LBL_USER_FIELDS'=>'User Fields',
+'LNK_SAMPLE_EMAIL'=>'View Sample Email',
+//Added while moving Mail Merge templates from Users to Settings
+'LBL_TEMPLATE_FILE'=>'Template File',
+'LBL_MODULENAMES'=>'Module',
+'LBL_LIST_TOOLS'=>'Tools',
+'LBL_DOWNLOAD'=>'Download',
+'LBL_ADD_TEMPLATE'=>'Add Template',
+'LBL_WORD_TEMPLATES'=>'Mail Merge Templates',
+//Added while moving Notification Schedulers from Users to Settings
+'LBL_TASK_NOTIFICATION'=>'Delayed Task Notification',
+'LBL_BIG_DEAL'=>'Big Deal Notification',
+'LBL_PENDING_TICKETS'=>'Pending Tickets Notification',
+'LBL_MANY_TICKETS'=>'Too many tickets  Notification',
+'LBL_START_NOTIFICATION'=>'Support Start Notification',
+'LBL_SUPPORT_NOTICIATION'=>'Support End Notification',
+'LBL_ACTIVITY_NOTIFICATION'=>'Event Reminder Notification',
+
+'LBL_TASK_NOTIFICATION_DESCRITPION'=>'Notify when a task is delayed beyond 24 hrs',
+'LBL_BIG_DEAL_DESCRIPTION'=>'Notify on completion of big deal',
+'LBL_TICKETS_DESCRIPTION'=>'Notify for getting attention to status of tickets which are pending',
+'LBL_MANY_TICKETS_DESCRIPTION'=>'Notify when a particular entity is allocated too many tickets, might reflect Service Level commitments',
+'LBL_START_DESCRIPTION'=>'Notifiy stating the start of support/service',
+'LBL_SUPPORT_DESCRIPTION'=>'Notify when support is about to end',
+'LBL_ACTIVITY_REMINDER_DESCRIPTION'=>'Notify before an event to occur based on the reminder set',
+//Added while moving Inventory Notifications from Users to Settings
+'QuoteNotificationDescription'=>'During quote generation if the product stock in warehouse is lesser than the  quantity mentioned in quote then this notification will be sent to the product handler',
+'SalesOrderNotificationDescription'=>'During sales order generation if the product stock in warehouse is lesser than the quantity mentioned in sales order then this notification will be sent to the product handler',
+'Tools'=>'Tools',
+'QuoteNotification'=>'Product Stock Notification during Quote Generation',
+'SalesOrderNotification'=>'Product Stock Notification during Sales Order Generation',
+'LBL_NOTE_DO_NOT_REMOVE_INFO'=>'Note: Donot remove or alter the values within {  }',
 );
 
 



From vtigercrm-commits at vtiger.fosslabs.com  Mon Dec 11 03:28:15 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 11 Dec 2006 11:28:15 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9955 - in
 /vtigercrm/branches/5.0.3/modules/Settings: EditInventoryNotification.php
 SaveInventoryNotification.php listinventorynotifications.php
Message-ID: <20061211112815.886B0788A1B@vtiger.fosslabs.com>

Author: richie
Date: Mon Dec 11 04:28:06 2006
New Revision: 9955

Log:
Inventory notification moved to settings

Added:
    vtigercrm/branches/5.0.3/modules/Settings/EditInventoryNotification.php   (with props)
    vtigercrm/branches/5.0.3/modules/Settings/SaveInventoryNotification.php   (with props)
    vtigercrm/branches/5.0.3/modules/Settings/listinventorynotifications.php   (with props)



From vtigercrm-commits at vtiger.fosslabs.com  Tue Dec 12 00:01:54 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Dec 2006 08:01:54 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9956 - in
 /vtigercrm/branches/5.0.3: Smarty/templates/Settings/ modules/Settings/
 modules/Users/
Message-ID: <20061212080154.88399788D0F@vtiger.fosslabs.com>

Author: richie
Date: Tue Dec 12 01:01:41 2006
New Revision: 9956

Log:
Notification Scheduler moved to Settings module

Added:
    vtigercrm/branches/5.0.3/modules/Settings/CreateSharingRule.php   (with props)
    vtigercrm/branches/5.0.3/modules/Settings/EditNotification.php
    vtigercrm/branches/5.0.3/modules/Settings/SaveNotification.php   (with props)
    vtigercrm/branches/5.0.3/modules/Settings/listnotificationschedulers.php
Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/Settings/EmailNotification.tpl
    vtigercrm/branches/5.0.3/modules/Settings/SettingsAjax.php
    vtigercrm/branches/5.0.3/modules/Users/UsersAjax.php

Modified: vtigercrm/branches/5.0.3/Smarty/templates/Settings/EmailNotification.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/Settings/EmailNotification.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/Settings/EmailNotification.tpl Tue Dec 12 01:01:41 2006
@@ -47,7 +47,7 @@
 			<!-- DISPLAY -->
 			<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
 			<tr>
-				<td width="50" rowspan="2" valign="top"><img src="{$IMAGE_PATH}notification.gif" alt="Users" width="48" height="48" border=0 title="Users"></td>
+				<td width="50" rowspan="2" valign="top"><img src="{$IMAGE_PATH}notification.gif" alt="Settings" width="48" height="48" border=0 title="Settings"></td>
 				<td colspan="2" class="heading2" valign=bottom align="left"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > {$MOD.NOTIFICATIONSCHEDULERS} </b></td>
 				<td rowspan=2 class="small" align=right>&nbsp;</td>
 			</tr>
@@ -110,7 +110,7 @@
                 'index.php',
                 {queue: {position: 'end', scope: 'command'},
                         method: 'post',
-                        postBody: 'action=UsersAjax&module=Users&file=SaveNotification&active='+active+'&notifysubject='+subject+'&notifybody='+body+'&record='+id,
+                        postBody: 'action=SettingsAjax&module=Settings&file=SaveNotification&active='+active+'&notifysubject='+subject+'&notifybody='+body+'&record='+id,
                         onComplete: function(response) {
                                 $("status").style.display="none";
 				$("notifycontents").innerHTML=response.responseText;
@@ -126,7 +126,7 @@
                 'index.php',
                 {queue: {position: 'end', scope: 'command'},
                         method: 'post',
-                        postBody:'action=UsersAjax&module=Users&file=EditNotification&record='+id,
+                        postBody:'action=SettingsAjax&module=Settings&file=EditNotification&record='+id,
                         onComplete: function(response) {
                                 $("status").style.display="none";
                                 $("editdiv").innerHTML=response.responseText;

Modified: vtigercrm/branches/5.0.3/modules/Settings/SettingsAjax.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Settings/SettingsAjax.php (original)
+++ vtigercrm/branches/5.0.3/modules/Settings/SettingsAjax.php Tue Dec 12 01:01:41 2006
@@ -13,5 +13,22 @@
 {
 	require_once('modules/Settings/'.$_REQUEST['file'].'.php');
 }
-
+if(isset($_REQUEST['orgajax']) && ($_REQUEST['orgajax'] !=''))
+{
+        require_once('modules/Settings/CreateSharingRule.php');
+}
+elseif(isset($_REQUEST['announce_save']) && ($_REQUEST['announce_save'] != ''))
+{
+        $date_var = date('YmdHis');
+        $announcement = $_REQUEST['announcement'];
+        $title = $_REQUEST['title_announcement'];
+        $sql="select * from vtiger_announcement where creatorid=".$current_user->id;
+        $is_announce=$adb->query($sql);
+        if($adb->num_rows($is_announce) > 0)
+                $query="update vtiger_announcement set announcement=".$adb->formatString("vtiger_announcement","announcement",$announcement).",time=".$adb->formatString("vtiger_announcement","time",$date_var).",title='announcement' where creatorid=".$current_user->id;
+        else
+                $query="insert into vtiger_announcement values (".$current_user->id.",".$adb->formatString("vtiger_announcement","announcement",$announcement).",'announcement',".$adb->formatString("vtiger_announcement","time",$date_var).")";
+        $result=$adb->query($query);
+        echo $announcement;
+}
 ?>

Modified: vtigercrm/branches/5.0.3/modules/Users/UsersAjax.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Users/UsersAjax.php (original)
+++ vtigercrm/branches/5.0.3/modules/Users/UsersAjax.php Tue Dec 12 01:01:41 2006
@@ -11,27 +11,8 @@
 
 global $current_user;
 global $adb;
-
 if(isset($_REQUEST['file']) && ($_REQUEST['file'] !=''))
 {
 	require_once('modules/Users/'.$_REQUEST['file'].'.php');
 }
-if(isset($_REQUEST['orgajax']) && ($_REQUEST['orgajax'] !=''))
-{
-	require_once('modules/Users/CreateSharingRule.php');	
-}
-elseif(isset($_REQUEST['announce_save']) && ($_REQUEST['announce_save'] != ''))
-{
-	$date_var = date('YmdHis');
-	$announcement = $_REQUEST['announcement'];
-	$title = $_REQUEST['title_announcement'];
-	$sql="select * from vtiger_announcement where creatorid=".$current_user->id;
-	$is_announce=$adb->query($sql);
-	if($adb->num_rows($is_announce) > 0)
-		$query="update vtiger_announcement set announcement=".$adb->formatString("vtiger_announcement","announcement",$announcement).",time=".$adb->formatString("vtiger_announcement","time",$date_var).",title='announcement' where creatorid=".$current_user->id;
-	else
-		$query="insert into vtiger_announcement values (".$current_user->id.",".$adb->formatString("vtiger_announcement","announcement",$announcement).",'announcement',".$adb->formatString("vtiger_announcement","time",$date_var).")";
-	$result=$adb->query($query);
-	echo $announcement;
-}
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Tue Dec 12 02:20:12 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Dec 2006 10:20:12 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9957 - in
 /vtigercrm/branches/5.0.3: ./ Smarty/templates/ modules/Settings/
Message-ID: <20061212102012.02E2978972D@vtiger.fosslabs.com>

Author: richie
Date: Tue Dec 12 03:19:59 2006
New Revision: 9957

Log:
Mail Merge templates moved to settings module

Added:
    vtigercrm/branches/5.0.3/modules/Settings/deletewordtemplate.php   (with props)
    vtigercrm/branches/5.0.3/modules/Settings/listwordtemplates.php
    vtigercrm/branches/5.0.3/modules/Settings/mailmergedownloadfile.php   (with props)
    vtigercrm/branches/5.0.3/modules/Settings/savewordtemplate.php   (with props)
    vtigercrm/branches/5.0.3/modules/Settings/upload.php   (with props)
Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/CreateWordTemplate.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/Settings.tpl
    vtigercrm/branches/5.0.3/index.php

Modified: vtigercrm/branches/5.0.3/Smarty/templates/CreateWordTemplate.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/CreateWordTemplate.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/CreateWordTemplate.tpl Tue Dec 12 03:19:59 2006
@@ -22,14 +22,14 @@
 
 				<!-- DISPLAY -->
 				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
-				<form action="index.php?module=Users&action=add2db" method="post" enctype="multipart/form-data">
+				<form action="index.php?module=Settings&action=savewordtemplate" method="post" enctype="multipart/form-data">
 				<input type="hidden" name="return_module" value="Settings">
 				<input type="hidden" name="parenttab" value="{$PARENTTAB}">
 				<input type="hidden" name="MAX_FILE_SIZE" value="{$MAX_FILE_SIZE}">
 				<input type="hidden" name="action">
 				<tr>
-					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}mailmarge.gif" alt="Users" width="48" height="48" border=0 title="Users"></td>
-					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings">{$UMOD.LBL_WORD_TEMPLATES}</a> > {$UMOD.LBL_NEW_TEMPLATE} </b></td>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}mailmarge.gif" alt="Settings" width="48" height="48" border=0 title="Settings"></td>
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Settings&action=listwordtemplates&parenttab=Settings">{$UMOD.LBL_WORD_TEMPLATES}</a> > {$UMOD.LBL_NEW_TEMPLATE} </b></td>
 				</tr>
 				<tr>
 					<td valign=top class="small">{$MOD.LBL_MAIL_MERGE_DESC}</td>
@@ -45,7 +45,7 @@
 					<tr>
 						<td class="big"><strong>{$UMOD.LBL_NEW_TEMPLATE}</strong><br>{$ERRORFLAG}</br></td>
 						<td class="small" align=right>
-							<input title="{$APP.LBL_SAVE_BUTTON_LABEL}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" type="submit" tabindex="4" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}" onclick="this.form.action.value='add2db'; this.form.parenttab.value='Settings'" class="crmButton small save" />&nbsp;
+							<input title="{$APP.LBL_SAVE_BUTTON_LABEL}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" type="submit" tabindex="4" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}" onclick="this.form.action.value='savewordtemplate'; this.form.parenttab.value='Settings'" class="crmButton small save" />&nbsp;
 							&nbsp;<input title="{$APP.LBL_CANCEL_BUTTON_LABEL}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" tabindex="5"  onclick="window.history.back()" type="button" name="button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" class="crmButton small cancel" />
 						</td>
 					</tr>
@@ -66,10 +66,10 @@
 						<td valign=top class="small cellLabel"><strong>{$UMOD.LBL_MODULENAMES}</strong></td>
 						<td class="cellText small" valign=top>
 						<select name="target_module" size=1 class="small" tabindex="3">
-							<option value="Leads">{$APP.COMBO_LEADS}</option>	
-							<option value="Accounts">{$APP.COMBO_ACCOUNTS}</option>	
-							<option value="Contacts">{$APP.COMBO_CONTACTS}</option>	
-							<option value="HelpDesk">{$APP.COMBO_HELPDESK}</option>	
+						<option value="Leads" {$LEADS_SELECTED}>{$APP.COMBO_LEADS}</option>
+						<option value="Accounts" {$ACCOUNTS_SELECTED}>{$APP.COMBO_ACCOUNTS}</option>
+						<option value="Contacts" {$CONTACTS_SELECTED}>{$APP.COMBO_CONTACTS}</option>
+						<option value="HelpDesk" {$HELPDESK_SELECTED}>{$APP.COMBO_HELPDESK}</option>
 			                      </select>
 						</td>
 					  </tr>

Modified: vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl Tue Dec 12 03:19:59 2006
@@ -104,7 +104,7 @@
 		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=listnotificationschedulers&parenttab=Settings">{$MOD.NOTIFICATIONSCHEDULERS}</a></td></tr>
 		{/if}
 				
-		{if $smarty.request.action eq 'listinventorynotifications' || $smarty.request.action eq 'UsersAjax'}
+		{if $smarty.request.action eq 'listinventorynotifications' || $smarty.request.action eq 'SettingsAjax'}
 		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Settings&action=listinventorynotifications&parenttab=Settings">{$MOD.INVENTORYNOTIFICATION}</a></td></tr>
 		{else}	
 		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=listinventorynotifications&parenttab=Settings">{$MOD.INVENTORYNOTIFICATION}</a></td></tr>
@@ -161,7 +161,7 @@
 		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=ProxyServerConfig&parenttab=Settings">{$MOD.LBL_PROXY_SETTINGS}</a></td></tr>
 		{/if}
 
-		{if  $smarty.request.action eq 'Announcements' ||  $smarty.request.action eq 'UsersAjax' }
+		{if  $smarty.request.action eq 'Announcements' ||  $smarty.request.action eq 'SettingsAjax' }
 		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Settings&action=Announcements&parenttab=Settings">{$MOD.LBL_ANNOUNCEMENT}</a></td></tr>		
 		{else}
 		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=Announcements&parenttab=Settings">{$MOD.LBL_ANNOUNCEMENT}</a></td></tr>

Modified: vtigercrm/branches/5.0.3/Smarty/templates/Settings.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/Settings.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/Settings.tpl Tue Dec 12 03:19:59 2006
@@ -68,8 +68,8 @@
 					<!-- icon 3-->
 						<table border=0 cellspacing=0 cellpadding=5 width=100%>
 						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Users&action=ListProfiles&parenttab=Settings"><img src="{$IMAGE_PATH}ico-profile.gif" alt="{$MOD.LBL_PROFILES}" width="48" height="48" border=0 title="{$MOD.LBL_PROFILES}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Users&action=ListProfiles&parenttab=Settings">{$MOD.LBL_PROFILES}</a></td>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=ListProfiles&parenttab=Settings"><img src="{$IMAGE_PATH}ico-profile.gif" alt="{$MOD.LBL_PROFILES}" width="48" height="48" border=0 title="{$MOD.LBL_PROFILES}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=ListProfiles&parenttab=Settings">{$MOD.LBL_PROFILES}</a></td>
 						</tr>
 
 						<tr>
@@ -82,8 +82,8 @@
 						<table border=0 cellspacing=0 cellpadding=5 width=100%>
 
 						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Users&action=listgroups&parenttab=Settings"><img src="{$IMAGE_PATH}ico-groups.gif" alt="{$MOD.USERGROUPLIST}" width="48" height="48" border=0 title="{$MOD.USERGROUPLIST}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Users&action=listgroups&parenttab=Settings">{$MOD.USERGROUPLIST}</a></td>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=listgroups&parenttab=Settings"><img src="{$IMAGE_PATH}ico-groups.gif" alt="{$MOD.USERGROUPLIST}" width="48" height="48" border=0 title="{$MOD.USERGROUPLIST}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=listgroups&parenttab=Settings">{$MOD.USERGROUPLIST}</a></td>
 						</tr>
 						<tr>
 							<td class="small" valign=top>{$MOD.LBL_GROUP_DESCRIPTION}</td>
@@ -98,9 +98,9 @@
 					<!-- icon 5-->
 						<table border=0 cellspacing=0 cellpadding=5 width=100%>
 						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Users&action=OrgSharingDetailView&parenttab=Settings"><img src="{$IMAGE_PATH}shareaccess.gif" alt="{$MOD.LBL_SHARING_ACCESS}" width="48" height="48" border=0 title="{$MOD.LBL_SHARING_ACCESS}"></a></td>
-
-							<td class=big valign=top><a href="index.php?module=Users&action=OrgSharingDetailView&parenttab=Settings">{$MOD.LBL_SHARING_ACCESS}</a></td>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=OrgSharingDetailView&parenttab=Settings"><img src="{$IMAGE_PATH}shareaccess.gif" alt="{$MOD.LBL_SHARING_ACCESS}" width="48" height="48" border=0 title="{$MOD.LBL_SHARING_ACCESS}"></a></td>
+
+							<td class=big valign=top><a href="index.php?module=Settings&action=OrgSharingDetailView&parenttab=Settings">{$MOD.LBL_SHARING_ACCESS}</a></td>
 						</tr>
 						<tr>
 							<td class="small" valign=top>{$MOD.LBL_SHARING_ACCESS_DESCRIPTION}</td>
@@ -112,8 +112,8 @@
 					<!-- icon 6 -->
 						<table border=0 cellspacing=0 cellpadding=5 width=100%>
 						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Users&action=DefaultFieldPermissions&parenttab=Settings"><img src="{$IMAGE_PATH}orgshar.gif" alt="Fields to be shown" width="48" height="48" border=0 title="Fields to be shown"></a></td>
-							<td class=big valign=top><a href="index.php?module=Users&action=DefaultFieldPermissions&parenttab=Settings">{$MOD.LBL_FIELDS_ACCESS}</a></td>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=DefaultFieldPermissions&parenttab=Settings"><img src="{$IMAGE_PATH}orgshar.gif" alt="Fields to be shown" width="48" height="48" border=0 title="Fields to be shown"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=DefaultFieldPermissions&parenttab=Settings">{$MOD.LBL_FIELDS_ACCESS}</a></td>
 						</tr>
 						<tr>
 							<td class="small" valign=top>{$MOD.LBL_SHARING_FIELDS_DESCRIPTION}</td>
@@ -125,8 +125,8 @@
 					<!-- icon 7-->
 						<table border=0 cellspacing=0 cellpadding=5 width=100%>
 						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Users&action=AuditTrailList&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}audit.gif" alt="{$MOD.LBL_AUDIT_TRAIL}" title="{$MOD.LBL_AUDIT_TRAIL}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Users&action=AuditTrailList&parenttab=Settings">{$MOD.LBL_AUDIT_TRAIL}</a></td>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=AuditTrailList&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}audit.gif" alt="{$MOD.LBL_AUDIT_TRAIL}" title="{$MOD.LBL_AUDIT_TRAIL}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=AuditTrailList&parenttab=Settings">{$MOD.LBL_AUDIT_TRAIL}</a></td>
 						</tr>
 
 						<tr>
@@ -140,8 +140,8 @@
 					<!-- icon 8-->	
 						<table border=0 cellspacing=0 cellpadding=5 width=100%>
 						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Users&action=ListLoginHistory&parenttab=Settings"><img src="{$IMAGE_PATH}set-IcoLoginHistory.gif" alt="{$MOD.LBL_LOGIN_HISTORY_DETAILS}" width="48" height="48" border=0 title="{$MOD.LBL_LOGIN_HISTORY_DETAILS}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Users&action=ListLoginHistory&parenttab=Settings">{$MOD.LBL_LOGIN_HISTORY_DETAILS}</a></td>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=ListLoginHistory&parenttab=Settings"><img src="{$IMAGE_PATH}set-IcoLoginHistory.gif" alt="{$MOD.LBL_LOGIN_HISTORY_DETAILS}" width="48" height="48" border=0 title="{$MOD.LBL_LOGIN_HISTORY_DETAILS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=ListLoginHistory&parenttab=Settings">{$MOD.LBL_LOGIN_HISTORY_DETAILS}</a></td>
 						</tr>
 						<tr>
 							<td class="small" valign=top>{$MOD.LBL_LOGIN_HISTORY_DESCRIPTION}</td>
@@ -192,8 +192,8 @@
 						<table border=0 cellspacing=0 cellpadding=5 width=100%>
 						<tr>
 
-							<td rowspan=2 valign=top><a href="index.php?module=Users&action=PickList&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}picklist.gif" alt="{$MOD.LBL_PICKLIST_EDITOR}" title="{$MOD.LBL_PICKLIST_EDITOR}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Users&action=PickList&parenttab=Settings">{$MOD.LBL_PICKLIST_EDITOR}</a></td>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=PickList&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}picklist.gif" alt="{$MOD.LBL_PICKLIST_EDITOR}" title="{$MOD.LBL_PICKLIST_EDITOR}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=PickList&parenttab=Settings">{$MOD.LBL_PICKLIST_EDITOR}</a></td>
 						</tr>
 						<tr>
 							<td class="small" valign=top>{$MOD.LBL_PICKLIST_DESCRIPTION}</td>	
@@ -455,8 +455,8 @@
 					<!-- icon 9-->	
 					<table border=0 cellspacing=0 cellpadding=5 width=100%>
 					<tr>
-						<td rowspan=2 valign=top><a href="index.php?module=Users&action=DefModuleView&parenttab=Settings"><img src="{$IMAGE_PATH}set-IcoTwoTabConfig.gif" alt="{$MOD.LBL_DEFAULT_MODULE_VIEW}" width="48" height="48" border=0 title="{$MOD.LBL_DEFAULT_MODULE_VIEW}"></a></td>
-						<td class=big valign=top><a href="index.php?module=Users&action=DefModuleView&parenttab=Settings">{$MOD.LBL_DEFAULT_MODULE_VIEW}</a></td>
+						<td rowspan=2 valign=top><a href="index.php?module=Settings&action=DefModuleView&parenttab=Settings"><img src="{$IMAGE_PATH}set-IcoTwoTabConfig.gif" alt="{$MOD.LBL_DEFAULT_MODULE_VIEW}" width="48" height="48" border=0 title="{$MOD.LBL_DEFAULT_MODULE_VIEW}"></a></td>
+						<td class=big valign=top><a href="index.php?module=Settings&action=DefModuleView&parenttab=Settings">{$MOD.LBL_DEFAULT_MODULE_VIEW}</a></td>
 					</tr>
 					<tr>
 						<td class="small" valign=top>{$MOD.LBL_DEFAULT_MODULE_VIEW_DESC}</td>
@@ -478,8 +478,8 @@
 			<table border=0 cellspacing=0 cellpadding=5 width=100%>
 			<tr>
 
-			<td rowspan=2 valign=top><a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}terms.gif" alt="{$MOD.INVENTORYTERMSANDCONDITIONS}" title="{$MOD.INVENTORYTERMSANDCONDITIONS}"></a></td>
-			<td class=big valign=top><a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings">{$MOD.LBL_INVENTORY_TANDC}</a></td>
+			<td rowspan=2 valign=top><a href="index.php?module=Settings&action=OrganizationTermsandConditions&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}terms.gif" alt="{$MOD.INVENTORYTERMSANDCONDITIONS}" title="{$MOD.INVENTORYTERMSANDCONDITIONS}"></a></td>
+			<td class=big valign=top><a href="index.php?module=Settings&action=OrganizationTermsandConditions&parenttab=Settings">{$MOD.LBL_INVENTORY_TANDC}</a></td>
 			</tr>
 			<tr>
 			<td class="small" valign=top>{$MOD.LBL_INV_TANDC_DESCRIPTION}</td>

Modified: vtigercrm/branches/5.0.3/index.php
==============================================================================
--- vtigercrm/branches/5.0.3/index.php (original)
+++ vtigercrm/branches/5.0.3/index.php Tue Dec 12 03:19:59 2006
@@ -280,7 +280,10 @@
 		ereg("^RecalculateSharingRules",$action) ||
 		(ereg("^body",$action) && ereg("^Webmails",$module)) ||
 		(ereg("^dlAttachments",$action) && ereg("^Webmails",$module)) ||
-		(ereg("^DetailView",$action) &&	ereg("^Webmails",$module) ))
+		(ereg("^DetailView",$action) &&	ereg("^Webmails",$module) ) ||
+		ereg("^savewordtemplate",$action))
+	
+		
 	{
 		$skipHeaders=true;
 		//skip headers for all these invocations as they are mostly popups



From vtigercrm-commits at vtiger.fosslabs.com  Tue Dec 12 04:15:00 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Dec 2006 12:15:00 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9958 - in
 /vtigercrm/branches/5.0.3: Smarty/templates/ modules/Settings/
Message-ID: <20061212121500.5535D789BA3@vtiger.fosslabs.com>

Author: richie
Date: Tue Dec 12 05:14:47 2006
New Revision: 9958

Log:
Email templates moved to settings module

Added:
    vtigercrm/branches/5.0.3/modules/Settings/createemailtemplate.php
    vtigercrm/branches/5.0.3/modules/Settings/deleteemailtemplate.php   (with props)
    vtigercrm/branches/5.0.3/modules/Settings/detailviewemailtemplate.php
    vtigercrm/branches/5.0.3/modules/Settings/editemailtemplate.php
    vtigercrm/branches/5.0.3/modules/Settings/listemailtemplates.php
    vtigercrm/branches/5.0.3/modules/Settings/saveemailtemplate.php   (with props)
Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/CreateEmailTemplate.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/DetailViewEmailTemplate.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/ListEmailTemplates.tpl

Modified: vtigercrm/branches/5.0.3/Smarty/templates/CreateEmailTemplate.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/CreateEmailTemplate.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/CreateEmailTemplate.tpl Tue Dec 12 05:14:47 2006
@@ -135,15 +135,15 @@
 				<form action="index.php" method="post" name="templatecreate" onsubmit="return check4null(templatecreate);">  
 				<input type="hidden" name="action">
 				<input type="hidden" name="mode" value="{$EMODE}">
-				<input type="hidden" name="module" value="Users">
+				<input type="hidden" name="module" value="Settings">
 				<input type="hidden" name="templateid" value="{$TEMPLATEID}">
 				<input type="hidden" name="parenttab" value="PARENTTAB}">
 				<tr>
-					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}ViewTemplate.gif" alt="Users" width="45" height="60" border=0 title="Users"></td>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}ViewTemplate.gif" alt="Settings" width="45" height="60" border=0 title="Settings"></td>
 				{if $EMODE eq 'edit'}
-					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings">{$UMOD.LBL_EMAIL_TEMPLATES}</a> &gt; {$MOD.LBL_EDIT} &quot;{$TEMPLATENAME}&quot; </b></td>
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Settings&action=listemailtemplates&parenttab=Settings">{$UMOD.LBL_EMAIL_TEMPLATES}</a> &gt; {$MOD.LBL_EDIT} &quot;{$TEMPLATENAME}&quot; </b></td>
 				{else}
-					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings">{$UMOD.LBL_EMAIL_TEMPLATES}</a> &gt; {$MOD.LBL_CREATE_EMAIL_TEMPLATES} </b></td>
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Settings&action=listemailtemplates&parenttab=Settings">{$UMOD.LBL_EMAIL_TEMPLATES}</a> &gt; {$MOD.LBL_CREATE_EMAIL_TEMPLATES} </b></td>
 				{/if}
 					
 				</tr>

Modified: vtigercrm/branches/5.0.3/Smarty/templates/DetailViewEmailTemplate.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/DetailViewEmailTemplate.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/DetailViewEmailTemplate.tpl Tue Dec 12 05:14:47 2006
@@ -24,14 +24,14 @@
 				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
 		    		<form method="post" action="index.php" name="etemplatedetailview">  
 				<input type="hidden" name="action" value="editemailtemplate">
-				<input type="hidden" name="module" value="Users">
+				<input type="hidden" name="module" value="Settings">
 				<input type="hidden" name="templatename" value="{$TEMPLATENAME}">
 				<input type="hidden" name="templateid" value="{$TEMPLATEID}">
 				<input type="hidden" name="foldername" value="{$FOLDERNAME}">
 				<input type="hidden" name="parenttab" value="{$PARENTTAB}">
 				<tr>
 					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}ViewTemplate.gif" width="45" height="60" border=0 ></td>
-					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings">{$UMOD.LBL_EMAIL_TEMPLATES}</a> &gt; {$MOD.LBL_VIEWING} &quot;{$TEMPLATENAME}&quot; </b></td>
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Settings&action=listemailtemplates&parenttab=Settings">{$UMOD.LBL_EMAIL_TEMPLATES}</a> &gt; {$MOD.LBL_VIEWING} &quot;{$TEMPLATENAME}&quot; </b></td>
 				</tr>
 				<tr>
 					<td valign=top class="small">{$UMOD.LBL_EMAIL_TEMPLATE_DESC}</td>

Modified: vtigercrm/branches/5.0.3/Smarty/templates/ListEmailTemplates.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/ListEmailTemplates.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/ListEmailTemplates.tpl Tue Dec 12 05:14:47 2006
@@ -90,7 +90,7 @@
        {rdelim}
 		if(confirm("Are you sure you want to delete the selected "+xx+" records ?"))
 		{ldelim}
-	        document.massdelete.action="index.php?module=Users&action=deleteemailtemplate&return_module=Users&return_action=listemailtemplates";
+	        document.massdelete.action="index.php?module=Settings&action=deleteemailtemplate&return_module=Settings&return_action=listemailtemplates";
 		{rdelim}
 		else
 		{ldelim}
@@ -113,7 +113,7 @@
 				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
 				<form  name="massdelete" method="POST">
 	    			<input name="idlist" type="hidden">
-    				<input name="module" type="hidden" value="Users">
+    				<input name="module" type="hidden" value="Settings">
     				<input name="action" type="hidden" value="deleteemailtemplate">
 				<tr>
 					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}ViewTemplate.gif" width="45" height="60" border=0></td>
@@ -156,11 +156,11 @@
 						<td class="listTableRow small" valign=top>{$smarty.foreach.emailtemplate.iteration}</td>
 						<td class="listTableRow small" valign=top><input type="checkbox" name="selected_id" value="{$template.templateid}" onClick="ifselected(); " class=small></td>
 						<td class="listTableRow small" valign=top>
-							<a href="index.php?module=Users&action=detailviewemailtemplate&parenttab=Settings&templateid={$template.templateid}" ><b>{$template.templatename}</b></a>
+							<a href="index.php?module=Settings&action=detailviewemailtemplate&parenttab=Settings&templateid={$template.templateid}" ><b>{$template.templatename}</b></a>
 						</td>
 						<td class="listTableRow small" valign=top>{$template.description}&nbsp;</td>
 					        <td class="listTableRow small" valign=top>
-							<a href="index.php?module=Users&action=detailviewemailtemplate&parenttab=Settings&templateid={$template.templateid}">{$UMOD.LNK_SAMPLE_EMAIL}</a>
+							<a href="index.php?module=Settings&action=detailviewemailtemplate&parenttab=Settings&templateid={$template.templateid}">{$UMOD.LNK_SAMPLE_EMAIL}</a>
 						</td>
 					</tr>
 					{/foreach}	



From vtigercrm-commits at vtiger.fosslabs.com  Tue Dec 12 06:44:20 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Dec 2006 14:44:20 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9959 - in
 /vtigercrm/branches/5.0.3: Smarty/templates/DetailViewUI.tpl
 include/utils/EditViewUtils.php
Message-ID: <20061212144420.7DEE5788CE6@vtiger.fosslabs.com>

Author: richie
Date: Tue Dec 12 07:44:13 2006
New Revision: 9959

Log:
ajax edit broken for other languages

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl
    vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php

Modified: vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl Tue Dec 12 07:44:13 2006
@@ -1,286 +1,286 @@
-{*<!--
-
-/*********************************************************************************
-** The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
-*
- ********************************************************************************/
-
--->*}
-
-<!-- This file is used to display the fields based on the ui type in detailview -->
-		{if $keyid eq '1' || $keyid eq 2 || $keyid eq '11' || $keyid eq '7' || $keyid eq '9' || $keyid eq '55' || $keyid eq '71' || $keyid eq '72' || $keyid eq '103'} <!--TextBox-->
-                                         		<td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">
-                                         		      {if $keyid eq '55'}<!--SalutationSymbol-->
-                                         		            {$keysalut}
-                                         		      {*elseif $keyid eq '71' || $keyid eq '72'}  <!--CurrencySymbol-->
-                                         		            {$keycursymb*}
-                                                        {/if}
-                                                       &nbsp;&nbsp;<span id="dtlview_{$label}">{$keyval}</span>
-                                              		<div id="editarea_{$label}" style="display:none;">
-                                              		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="{$keyfldname}" maxlength='100' value="{$keyval}"></input>
-                                              		  <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
-                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
-                                                       </div>
-                                                  </td>
-                                             {elseif $keyid eq '13' || $keyid eq '104'} <!--Email-->
-                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="mailto:{$keyval}" target="_blank">{$keyval}</a></span>
-                                              		<div id="editarea_{$label}" style="display:none;">
-                                              		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="{$keyfldname}" maxlength='100' value="{$keyval}"></input>
-                                              		  <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
-                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
-                                                       </div>
-                                                  </td>
-						<!-- uitype 111 added for noneditable existing picklist values - ahmed -->
-                                             {elseif $keyid eq '15' || $keyid eq '16' || $keyid eq '111'} <!--ComboBox-->
-               							<td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}</span>
-                                              		<div id="editarea_{$label}" style="display:none;">
-                    							   <select id="txtbox_{$label}" name="{$keyfldname}">
-                    								{foreach item=arr from=$keyoptions}
-                    									{foreach key=sel_value item=value from=$arr}
-                    										<option value="{$sel_value}" {$value}>{if $APP.$sel_value}{$APP.$sel_value}{else}{$sel_value}{/if}</option>
-                    									
-                    									{/foreach}
-                    								{/foreach}
-                    							   </select>
-                    							   <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
-                                              		   <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
-                    							</div>
-               							</td>
-                                          {elseif $keyid eq '33'}<!--Multi Select Combo box-->
-						<!--code given by Neil start Ref:http://forums.vtiger.com/viewtopic.php?p=31096#31096-->
-						{assign var="MULTISELECT_COMBO_BOX_ITEM_SEPARATOR_STRING" value=", "}  {* Separates Multi-Select Combo Box items *}
-						{assign var="DETAILVIEW_WORDWRAP_WIDTH" value="70"} {* No. of chars for word wrapping long lines of Multi-Select Combo Box items *}
-                                          <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">
-						{$keyval|replace:$MULTISELECT_COMBO_BOX_ITEM_SEPARATOR_STRING:"\x1"|replace:" ":"\x0"|replace:"\x1":$MULTISELECT_COMBO_BOX_ITEM_SEPARATOR_STRING|wordwrap:$DETAILVIEW_WORDWRAP_WIDTH:"<br>&nbsp;"|replace:"\x0":"&nbsp;"}
-						</span>
-						<!--code given by Neil End-->
-                                          <div id="editarea_{$label}" style="display:none;">
-                                          <select MULTIPLE id="txtbox_{$label}" name="{$keyfldname}" size="4" style="width:160px;">
-				                                    {foreach item=arr from=$keyoptions}
-					                                     {foreach key=sel_value item=value from=$arr}
-						                                      <option value="{$sel_value}" {$value}>{$sel_value}</option>
-					                                     {/foreach}
-				                                    {/foreach}
-			                                   </select>
-			                                   <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
-                                              		   <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
-                    							</div>
-               							</td>
-						{elseif $keyid eq '115'} <!--ComboBox Status edit only for admin Users-->
-								{if $keyadmin eq 1}
-               							<td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}</span>
-                                              		<div id="editarea_{$label}" style="display:none;">
-                    							   <select id="txtbox_{$label}" name="{$keyfldname}">
-                    								{foreach item=arr from=$keyoptions}
-                    									{foreach key=sel_value item=value from=$arr}
-                    										<option value="{$sel_value}" {$value}>{$sel_value}</option>
-                    									{/foreach}
-                    								{/foreach}
-                    							   </select>
-                    							   <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
-                                              		   <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
-                    							</div>
-								{else}
-               							<td width=25% class="dvtCellInfo" align="left">{$keyval}
-								{/if}	
-								
-               							</td>
-						{elseif $keyid eq '116'} <!--ComboBox currency id edit only for admin Users-->
-								{if $keyadmin eq 1}
-               							<td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}</span>
-								<div id="editarea_{$label}" style="display:none;">
-                    							   <select id="txtbox_{$label}" name="{$keyfldname}">
-									{foreach item=arr key=uivalueid from=$keyoptions}
-									{foreach key=sel_value item=value from=$arr}
-										<option value="{$uivalueid}" {$value}>{$sel_value}</option>	
-									{/foreach}
-									{/foreach}
-                    							   </select>
-                    							   <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
-                                              		   <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
-                    							</div>
-								{else}
-               							<td width=25% class="dvtCellInfo" align="left">{$keyval}
-								{/if}	
-
-                                        		
-               							</td>
-                                             {elseif $keyid eq '17'} <!--WebSite-->
-                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="http://{$keyval}" target="_blank">{$keyval}</a></span>
-                                              		<div id="editarea_{$label}" style="display:none;">
-                                              		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="{$keyfldname}" maxlength='100' value="{$keyval}"></input>
-                                              		  <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
-                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
-                                                       </div>
-                                                  </td>
-					     {elseif $keyid eq '85'}<!--Skype-->
-                                                <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<img src="{$IMAGE_PATH}skype.gif" alt="Skype" title="Skype" LANGUAGE=javascript align="absmiddle"></img><span id="dtlview_{$label}"><a href="skype:{$keyval}?call">{$keyval}</a></span>
-                                                        <div id="editarea_{$label}" style="display:none;">
-                                                          <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="{$keyfldname}" maxlength='100' value="{$keyval}"></input>
-                                                          <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
-                                                          <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
-                                                       </div>
-                                                  </td>	
-                                             {elseif $keyid eq '19' || $keyid eq '20'} <!--TextArea/Description-->
-						<!-- we will empty the value of ticket and faq comment -->
-						{if $label eq $MOD.LBL_ADD_COMMENT}
-							{assign var=keyval value=''}
-						{/if}
-							<!--{assign var="DESCRIPTION_SEPARATOR_STRING" value=" "}  {* Separates Description *}-->
-							<!--{assign var="DESCRIPTION_WORDWRAP_WIDTH" value="70"} {* No. of chars for word wrapping long lines of Description *}-->
-                                                  <td width=100% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">
-							{$keyval}<!--|replace:$DESCRIPTION_SEPARATOR_STRING:"\x1"|replace:" ":"\x0"|replace:"\x1":$DESCRIPTION_SEPARATOR_STRING|wordwrap:$DESCRIPTION_WORDWRAP_WIDTH:"<br>&nbsp;"|replace:"\x0":"&nbsp;"}-->
-							</span>
-                                              		<div id="editarea_{$label}" style="display:none;">
-                                              		  <textarea id="txtbox_{$label}" name="{$keyfldname}"  class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'"onBlur="this.className='detailedViewTextBox'" cols="90" rows="8">{$keyval}</textarea>                                            		  
-                                              		  <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
-                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
-                                                       </div>
-                                                  </td>
-                                             {elseif $keyid eq '21' || $keyid eq '24' || $keyid eq '22'} <!--TextArea/Street-->
-                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}</span>
-                                              		<div id="editarea_{$label}" style="display:none;">
-                                              		  <textarea id="txtbox_{$label}" name="{$keyfldname}"  class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'"onBlur="this.className='detailedViewTextBox'" rows=2>{$keyval}</textarea>                                            		  
-                                              		  <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
-                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
-                                                       </div>
-                                                  </td>
-                                             {elseif $keyid eq '50' || $keyid eq '73' || $keyid eq '51'} <!--AccountPopup-->
-                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}">&nbsp;<a href="{$keyseclink}">{$keyval}</a>
-                                                  </td>
-                                             {elseif $keyid eq '57'} <!--ContactPopup-->
-                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
-                                              		<div id="editarea_{$label}" style="display:none;">                                              		  
-                                                         <input id="popuptxt_{$label}" name="contact_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=602,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.contact_id.value=''; this.form.contact_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
-                                                         <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
-                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
-                                                       </div>
-                                                  </td>                                                  
-                                             {elseif $keyid eq '59'} <!--ProductPopup-->
-                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
-                                              		<div id="editarea_{$label}" style="display:none;">                                              		  
-                                                         <input id="popuptxt_{$label}" name="product_name" readonly type="text" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Products&action=Popup&html=Popup_picker&form=HelpDeskEditView&popuptype=specific","test","width=600,height=602,resizable=1,scrollbars=1,top=150,left=200");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.product_id.value=''; this.form.product_name.value=''; return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
-                                                         <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
-                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
-                                                       </div>
-                                                  </td>
-                                             {elseif $keyid eq '75' || $keyid eq '81'} <!--VendorPopup-->
-                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}">&nbsp;<a href="{$keyseclink}">{$keyval}</a>
-                                                  </td>
-                                             {elseif $keyid eq 76} <!--PotentialPopup-->
-                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}">&nbsp;<a href="{$keyseclink}">{$keyval}</a>
-                                                  </td>
-                                             {elseif $keyid eq 78} <!--QuotePopup-->
-                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}">&nbsp;<a href="{$keyseclink}">{$keyval}</a>
-                                                  </td>
-                                             {elseif $keyid eq 82} <!--Email Body-->
-                                                  <td colspan="3" width=100% class="dvtCellInfo" align="left"><div id="dtlview_{$label}" style="width:100%;height:200px;overflow:hidden;border:1px solid gray" class="detailedViewTextBox" onmouseover="this.className='detailedViewTextBoxOn'" onmouseout="this.className='detailedViewTextBox'">{$keyval}</div>
-                                                  </td>
-                                             {elseif $keyid eq 80} <!--SalesOrderPopup-->
-                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}">&nbsp;<a href="{$keyseclink}">{$keyval}</a>
-                                                  </td>
-					     {elseif $keyid eq '53'} <!--Assigned To-->
-                    				  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">
-                    				{if $keyoptions.0 eq 'User' && $keyadmin eq 1}
-			                        	<a href="{$keyseclink.0}">{$keyval}</a>         
-			                        {elseif $keyoptions.0 eq 'Group' && $keyadmin eq 1}
-                        				<a href="{$keyseclink.1}">{$keyval}</a>         
-						{else}	
-                        				{$keyval}
-                    				{/if}
-					&nbsp;</span>
-                    				<div id="editarea_{$label}" style="display:none;">
-			                   	<input type="hidden" id="hdtxt_{$label}" value="{$keyval}"></input>
-						{if $keyoptions.0 eq 'User'}
-							<input name="assigntype" id="assigntype" checked="checked" value="U" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;{$APP.LBL_USER}
-							{if $keyoptions.2 neq ''}
-								<input name="assigntype" id="assigntype" value="T" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;{$APP.LBL_GROUP_NAME}
-							{/if}
-							<span id="assign_user" style="display: block;">
-						{else}
-							<input name="assigntype" id="assigntype" value="U" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;{$APP.LBL_USER}
-							<input name="assigntype" checked="checked" id="assigntype" value="T" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;{$APP.LBL_GROUP_NAME}
-							<span id="assign_user" style="display: none;">
-						{/if}
-                   				<select id="txtbox_U{$label}" onchange="setSelectValue('{$label}')" name="{$keyfldname}">
-				                    {foreach item=arr key=id from=$keyoptions.1}
-				                    	{foreach key=sel_value item=value from=$arr}
-                       						 <option value="{$id}" {$value}>{$sel_value}</option>
-				                        {/foreach}
-				                    {/foreach}
-			                    	</select>
-						</span>
-					{if $keyoptions.0 eq 'Group'}
-						<span id="assign_team" style="display: block;">
-					{else}
-						<span id="assign_team" style="display: none;">
-					{/if}
-                   	<select id="txtbox_G{$label}" onchange="setSelectValue('{$label}')" name="{$keyfldname}">
-                    {foreach item=arr key=id from=$keyoptions.2}
-                    	{foreach key=sel_value item=value from=$arr}
-                       		 <option value="{$id}" {$value}>{$sel_value}</option>
-                        {/foreach}
-                    {/foreach}
-                    </select>
-					</span>
-
-                    <br>
-                    <input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> {$APP.LBL_OR}
-                    <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
-                    </div>
-                    </td>
-						{elseif $keyid eq '99'}<!-- Password Field-->
-						<td width=25% class="dvtCellInfo" align="left">{$CHANGE_PW_BUTTON}</td>	
-					    {elseif $keyid eq '56'} <!--CheckBox--> 
-                      <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onMouseOver="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}&nbsp;</span>
-                    	<div id="editarea_{$label}" style="display:none;">
-                        {if $keyval eq 'yes'}                                              		  
-                            <input id="txtbox_{$label}" name="{$keyfldname}" type="checkbox" style="border:1px solid #bababa;" checked value="1">
-                        {else}
-                          <input id="txtbox_{$label}" type="checkbox" name="{$keyfldname}" style="border:1px solid #bababa;" value="0">
-                       	{/if}
-                         <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> {$APP.LBL_OR}
-                          <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
-                        </div>
-                        </td>    
-			{elseif $keyid eq '156'} <!--CheckBox for is admin-->
-			{if $smarty.request.record neq $CURRENT_USERID && $keyadmin eq 1} 
-                      <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onMouseOver="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}&nbsp;</span>
-                    	<div id="editarea_{$label}" style="display:none;">
-                        {if $keyval eq 'on'}                                              		  
-                            <input id="txtbox_{$label}" name="{$keyfldname}" type="checkbox" style="border:1px solid #bababa;" checked value="1">
-                        {else}
-                          <input id="txtbox_{$label}" type="checkbox" name="{$keyfldname}" style="border:1px solid #bababa;" value="0">
-                       	{/if}
-                         <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> {$APP.LBL_OR}
-                          <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
-                        </div>
-			{else}
-				 <td width=25% class="dvtCellInfo" align="left">{$keyval}
-			{/if}
-                        </td>    
-			 
-						{elseif $keyid eq 83}<!-- Handle the Tax in Inventory -->
-							{foreach item=tax key=count from=$TAX_DETAILS}
-								<td align="right" class="dvtCellLabel">
-									{$tax.taxlabel} {$APP.COVERED_PERCENTAGE}
-							
-								</td>
-								<td class="dvtCellInfo" align="left">
-									{$tax.percentage}
-								</td>
-								<td colspan="2" class="dvtCellInfo">&nbsp;</td>
-							   </tr>
-							{/foreach}
-
-
-				{elseif $keyid eq 69}<!-- for Image Reflection -->
-                                                  	<td align="left" width=25%">&nbsp;{$keyval}</td>
-				{else}									
-                                                  	<td class="dvtCellInfo" align="left" width=25%">&nbsp;{$keyval}</td>
-				{/if}
+{*<!--
+
+/*********************************************************************************
+** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+ * ("License"); You may not use this file except in compliance with the License
+ * The Original Code is:  vtiger CRM Open Source
+ * The Initial Developer of the Original Code is vtiger.
+ * Portions created by vtiger are Copyright (C) vtiger.
+ * All Rights Reserved.
+*
+ ********************************************************************************/
+
+-->*}
+
+<!-- This file is used to display the fields based on the ui type in detailview -->
+		{if $keyid eq '1' || $keyid eq 2 || $keyid eq '11' || $keyid eq '7' || $keyid eq '9' || $keyid eq '55' || $keyid eq '71' || $keyid eq '72' || $keyid eq '103'} <!--TextBox-->
+                                         		<td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label|escape:'quotes'}');" onmouseout="fnhide('crmspanid');">
+                                         		      {if $keyid eq '55'}<!--SalutationSymbol-->
+                                         		            {$keysalut}
+                                         		      {*elseif $keyid eq '71' || $keyid eq '72'}  <!--CurrencySymbol-->
+                                         		            {$keycursymb*}
+                                                        {/if}
+                                                       &nbsp;&nbsp;<span id="dtlview_{$label}">{$keyval}</span>
+                                              		<div id="editarea_{$label}" style="display:none;">
+                                              		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="{$keyfldname}" maxlength='100' value="{$keyval}"></input>
+                                              		  <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label|escape:'quotes'}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label|escape:'quotes'}','editarea_{$label|escape:'quotes'}','{$label|escape:'quotes'}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
+                                                       </div>
+                                                  </td>
+                                             {elseif $keyid eq '13' || $keyid eq '104'} <!--Email-->
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label|escape:'quotes'}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="mailto:{$keyval}" target="_blank">{$keyval}</a></span>
+                                              		<div id="editarea_{$label}" style="display:none;">
+                                              		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="{$keyfldname}" maxlength='100' value="{$keyval}"></input>
+                                              		  <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label|escape:'quotes'}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label|escape:'quotes'}','editarea_{$label|escape:'quotes'}','{$label|escape:'quotes'}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
+                                                       </div>
+                                                  </td>
+						<!-- uitype 111 added for noneditable existing picklist values - ahmed -->
+                                             {elseif $keyid eq '15' || $keyid eq '16' || $keyid eq '111'} <!--ComboBox-->
+               							<td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label|escape:'quotes'}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}</span>
+                                              		<div id="editarea_{$label}" style="display:none;">
+                    							   <select id="txtbox_{$label}" name="{$keyfldname}">
+                    								{foreach item=arr from=$keyoptions}
+                    									{foreach key=sel_value item=value from=$arr}
+                    										<option value="{$sel_value}" {$value}>{if $APP.$sel_value}{$APP.$sel_value}{else}{$sel_value}{/if}</option>
+                    									
+                    									{/foreach}
+                    								{/foreach}
+                    							   </select>
+                    							   <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label|escape:'quotes'}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
+                                              		   <a href="javascript:;" onclick="hndCancel('dtlview_{$label|escape:'quotes'}','editarea_{$label|escape:'quotes'}','{$label|escape:'quotes'}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
+                    							</div>
+               							</td>
+                                          {elseif $keyid eq '33'}<!--Multi Select Combo box-->
+						<!--code given by Neil start Ref:http://forums.vtiger.com/viewtopic.php?p=31096#31096-->
+						{assign var="MULTISELECT_COMBO_BOX_ITEM_SEPARATOR_STRING" value=", "}  {* Separates Multi-Select Combo Box items *}
+						{assign var="DETAILVIEW_WORDWRAP_WIDTH" value="70"} {* No. of chars for word wrapping long lines of Multi-Select Combo Box items *}
+                                          <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label|escape:'quotes'}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">
+						{$keyval|replace:$MULTISELECT_COMBO_BOX_ITEM_SEPARATOR_STRING:"\x1"|replace:" ":"\x0"|replace:"\x1":$MULTISELECT_COMBO_BOX_ITEM_SEPARATOR_STRING|wordwrap:$DETAILVIEW_WORDWRAP_WIDTH:"<br>&nbsp;"|replace:"\x0":"&nbsp;"}
+						</span>
+						<!--code given by Neil End-->
+                                          <div id="editarea_{$label}" style="display:none;">
+                                          <select MULTIPLE id="txtbox_{$label}" name="{$keyfldname}" size="4" style="width:160px;">
+				                                    {foreach item=arr from=$keyoptions}
+					                                     {foreach key=sel_value item=value from=$arr}
+						                                      <option value="{$sel_value}" {$value}>{$sel_value}</option>
+					                                     {/foreach}
+				                                    {/foreach}
+			                                   </select>
+			                                   <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label|escape:'quotes'}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
+                                              		   <a href="javascript:;" onclick="hndCancel('dtlview_{$label|escape:'quotes'}','editarea_{$label|escape:'quotes'}','{$label|escape:'quotes'}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
+                    							</div>
+               							</td>
+						{elseif $keyid eq '115'} <!--ComboBox Status edit only for admin Users-->
+								{if $keyadmin eq 1}
+               							<td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label|escape:'quotes'}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}</span>
+                                              		<div id="editarea_{$label}" style="display:none;">
+                    							   <select id="txtbox_{$label}" name="{$keyfldname}">
+                    								{foreach item=arr from=$keyoptions}
+                    									{foreach key=sel_value item=value from=$arr}
+                    										<option value="{$sel_value}" {$value}>{$sel_value}</option>
+                    									{/foreach}
+                    								{/foreach}
+                    							   </select>
+                    							   <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label|escape:'quotes'}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
+                                              		   <a href="javascript:;" onclick="hndCancel('dtlview_{$label|escape:'quotes'}','editarea_{$label|escape:'quotes'}','{$label|escape:'quotes'}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
+                    							</div>
+								{else}
+               							<td width=25% class="dvtCellInfo" align="left">{$keyval}
+								{/if}	
+								
+               							</td>
+						{elseif $keyid eq '116'} <!--ComboBox currency id edit only for admin Users-->
+								{if $keyadmin eq 1}
+               							<td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label|escape:'quotes'}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}</span>
+								<div id="editarea_{$label}" style="display:none;">
+                    							   <select id="txtbox_{$label}" name="{$keyfldname}">
+									{foreach item=arr key=uivalueid from=$keyoptions}
+									{foreach key=sel_value item=value from=$arr}
+										<option value="{$uivalueid}" {$value}>{$sel_value}</option>	
+									{/foreach}
+									{/foreach}
+                    							   </select>
+                    							   <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label|escape:'quotes'}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
+                                              		   <a href="javascript:;" onclick="hndCancel('dtlview_{$label|escape:'quotes'}','editarea_{$label|escape:'quotes'}','{$label|escape:'quotes'}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
+                    							</div>
+								{else}
+               							<td width=25% class="dvtCellInfo" align="left">{$keyval}
+								{/if}	
+
+                                        		
+               							</td>
+                                             {elseif $keyid eq '17'} <!--WebSite-->
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label|escape:'quotes'}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="http://{$keyval}" target="_blank">{$keyval}</a></span>
+                                              		<div id="editarea_{$label}" style="display:none;">
+                                              		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="{$keyfldname}" maxlength='100' value="{$keyval}"></input>
+                                              		  <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label|escape:'quotes'}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label|escape:'quotes'}','editarea_{$label|escape:'quotes'}','{$label|escape:'quotes'}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
+                                                       </div>
+                                                  </td>
+					     {elseif $keyid eq '85'}<!--Skype-->
+                                                <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label|escape:'quotes'}');" onmouseout="fnhide('crmspanid');">&nbsp;<img src="{$IMAGE_PATH}skype.gif" alt="Skype" title="Skype" LANGUAGE=javascript align="absmiddle"></img><span id="dtlview_{$label}"><a href="skype:{$keyval}?call">{$keyval}</a></span>
+                                                        <div id="editarea_{$label}" style="display:none;">
+                                                          <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="{$keyfldname}" maxlength='100' value="{$keyval}"></input>
+                                                          <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label|escape:'quotes'}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
+                                                          <a href="javascript:;" onclick="hndCancel('dtlview_{$label|escape:'quotes'}','editarea_{$label|escape:'quotes'}','{$label|escape:'quotes'}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
+                                                       </div>
+                                                  </td>	
+                                             {elseif $keyid eq '19' || $keyid eq '20'} <!--TextArea/Description-->
+						<!-- we will empty the value of ticket and faq comment -->
+						{if $label eq $MOD.LBL_ADD_COMMENT}
+							{assign var=keyval value=''}
+						{/if}
+							<!--{assign var="DESCRIPTION_SEPARATOR_STRING" value=" "}  {* Separates Description *}-->
+							<!--{assign var="DESCRIPTION_WORDWRAP_WIDTH" value="70"} {* No. of chars for word wrapping long lines of Description *}-->
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label|escape:'quotes'}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">
+							{$keyval}<!--|replace:$DESCRIPTION_SEPARATOR_STRING:"\x1"|replace:" ":"\x0"|replace:"\x1":$DESCRIPTION_SEPARATOR_STRING|wordwrap:$DESCRIPTION_WORDWRAP_WIDTH:"<br>&nbsp;"|replace:"\x0":"&nbsp;"}-->
+							</span>
+                                              		<div id="editarea_{$label}" style="display:none;">
+                                              		  <textarea id="txtbox_{$label}" name="{$keyfldname}"  class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'"onBlur="this.className='detailedViewTextBox'" cols="90" rows="8">{$keyval}</textarea>                                            		  
+                                              		  <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label|escape:'quotes'}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label|escape:'quotes'}','editarea_{$label|escape:'quotes'}','{$label|escape:'quotes'}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
+                                                       </div>
+                                                  </td>
+                                             {elseif $keyid eq '21' || $keyid eq '24' || $keyid eq '22'} <!--TextArea/Street-->
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label|escape:'quotes'}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}</span>
+                                              		<div id="editarea_{$label}" style="display:none;">
+                                              		  <textarea id="txtbox_{$label}" name="{$keyfldname}"  class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'"onBlur="this.className='detailedViewTextBox'" rows=2>{$keyval}</textarea>                                            		  
+                                              		  <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label|escape:'quotes'}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label|escape:'quotes'}','editarea_{$label|escape:'quotes'}','{$label|escape:'quotes'}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
+                                                       </div>
+                                                  </td>
+                                             {elseif $keyid eq '50' || $keyid eq '73' || $keyid eq '51'} <!--AccountPopup-->
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}">&nbsp;<a href="{$keyseclink}">{$keyval}</a>
+                                                  </td>
+                                             {elseif $keyid eq '57'} <!--ContactPopup-->
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label|escape:'quotes'}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
+                                              		<div id="editarea_{$label}" style="display:none;">                                              		  
+                                                         <input id="popuptxt_{$label}" name="contact_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=602,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.contact_id.value=''; this.form.contact_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
+                                                         <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label|escape:'quotes'}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label|escape:'quotes'}','editarea_{$label|escape:'quotes'}','{$label|escape:'quotes'}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
+                                                       </div>
+                                                  </td>                                                  
+                                             {elseif $keyid eq '59'} <!--ProductPopup-->
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label|escape:'quotes'}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
+                                              		<div id="editarea_{$label}" style="display:none;">                                              		  
+                                                         <input id="popuptxt_{$label}" name="product_name" readonly type="text" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Products&action=Popup&html=Popup_picker&form=HelpDeskEditView&popuptype=specific","test","width=600,height=602,resizable=1,scrollbars=1,top=150,left=200");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.product_id.value=''; this.form.product_name.value=''; return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
+                                                         <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label|escape:'quotes'}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label|escape:'quotes'}','editarea_{$label|escape:'quotes'}','{$label|escape:'quotes'}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
+                                                       </div>
+                                                  </td>
+                                             {elseif $keyid eq '75' || $keyid eq '81'} <!--VendorPopup-->
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}">&nbsp;<a href="{$keyseclink}">{$keyval}</a>
+                                                  </td>
+                                             {elseif $keyid eq 76} <!--PotentialPopup-->
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}">&nbsp;<a href="{$keyseclink}">{$keyval}</a>
+                                                  </td>
+                                             {elseif $keyid eq 78} <!--QuotePopup-->
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}">&nbsp;<a href="{$keyseclink}">{$keyval}</a>
+                                                  </td>
+                                             {elseif $keyid eq 82} <!--Email Body-->
+                                                  <td colspan="3" width=100% class="dvtCellInfo" align="left"><div id="dtlview_{$label}" style="width:100%;height:200px;overflow:hidden;border:1px solid gray" class="detailedViewTextBox" onmouseover="this.className='detailedViewTextBoxOn'" onmouseout="this.className='detailedViewTextBox'">{$keyval}</div>
+                                                  </td>
+                                             {elseif $keyid eq 80} <!--SalesOrderPopup-->
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}">&nbsp;<a href="{$keyseclink}">{$keyval}</a>
+                                                  </td>
+					     {elseif $keyid eq '53'} <!--Assigned To-->
+                    				  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label|escape:'quotes'}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">
+                    				{if $keyoptions.0 eq 'User' && $keyadmin eq 1}
+			                        	<a href="{$keyseclink.0}">{$keyval}</a>         
+			                        {elseif $keyoptions.0 eq 'Group' && $keyadmin eq 1}
+                        				<a href="{$keyseclink.1}">{$keyval}</a>         
+						{else}	
+                        				{$keyval}
+                    				{/if}
+					&nbsp;</span>
+                    				<div id="editarea_{$label}" style="display:none;">
+			                   	<input type="hidden" id="hdtxt_{$label}" value="{$keyval}"></input>
+						{if $keyoptions.0 eq 'User'}
+							<input name="assigntype" id="assigntype" checked="checked" value="U" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;{$APP.LBL_USER}
+							{if $keyoptions.2 neq ''}
+								<input name="assigntype" id="assigntype" value="T" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;{$APP.LBL_GROUP_NAME}
+							{/if}
+							<span id="assign_user" style="display: block;">
+						{else}
+							<input name="assigntype" id="assigntype" value="U" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;{$APP.LBL_USER}
+							<input name="assigntype" checked="checked" id="assigntype" value="T" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;{$APP.LBL_GROUP_NAME}
+							<span id="assign_user" style="display: none;">
+						{/if}
+                   				<select id="txtbox_U{$label}" onchange="setSelectValue('{$label}')" name="{$keyfldname}">
+				                    {foreach item=arr key=id from=$keyoptions.1}
+				                    	{foreach key=sel_value item=value from=$arr}
+                       						 <option value="{$id}" {$value}>{$sel_value}</option>
+				                        {/foreach}
+				                    {/foreach}
+			                    	</select>
+						</span>
+					{if $keyoptions.0 eq 'Group'}
+						<span id="assign_team" style="display: block;">
+					{else}
+						<span id="assign_team" style="display: none;">
+					{/if}
+                   	<select id="txtbox_G{$label}" onchange="setSelectValue('{$label}')" name="{$keyfldname}">
+                    {foreach item=arr key=id from=$keyoptions.2}
+                    	{foreach key=sel_value item=value from=$arr}
+                       		 <option value="{$id}" {$value}>{$sel_value}</option>
+                        {/foreach}
+                    {/foreach}
+                    </select>
+					</span>
+
+                    <br>
+                    <input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label|escape:'quotes'}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> {$APP.LBL_OR}
+                    <a href="javascript:;" onclick="hndCancel('dtlview_{$label|escape:'quotes'}','editarea_{$label|escape:'quotes'}','{$label|escape:'quotes'}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
+                    </div>
+                    </td>
+						{elseif $keyid eq '99'}<!-- Password Field-->
+						<td width=25% class="dvtCellInfo" align="left">{$CHANGE_PW_BUTTON}</td>	
+					    {elseif $keyid eq '56'} <!--CheckBox--> 
+                      <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onMouseOver="hndMouseOver({$keyid},'{$label|escape:'quotes'}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}&nbsp;</span>
+                    	<div id="editarea_{$label}" style="display:none;">
+                        {if $keyval eq 'yes'}                                              		  
+                            <input id="txtbox_{$label}" name="{$keyfldname}" type="checkbox" style="border:1px solid #bababa;" checked value="1">
+                        {else}
+                          <input id="txtbox_{$label}" type="checkbox" name="{$keyfldname}" style="border:1px solid #bababa;" value="0">
+                       	{/if}
+                         <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label|escape:'quotes'}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> {$APP.LBL_OR}
+                          <a href="javascript:;" onclick="hndCancel('dtlview_{$label|escape:'quotes'}','editarea_{$label|escape:'quotes'}','{$label|escape:'quotes'}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
+                        </div>
+                        </td>    
+			{elseif $keyid eq '156'} <!--CheckBox for is admin-->
+			{if $smarty.request.record neq $CURRENT_USERID && $keyadmin eq 1} 
+                      <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onMouseOver="hndMouseOver({$keyid},'{$label|escape:'quotes'}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}&nbsp;</span>
+                    	<div id="editarea_{$label}" style="display:none;">
+                        {if $keyval eq 'on'}                                              		  
+                            <input id="txtbox_{$label}" name="{$keyfldname}" type="checkbox" style="border:1px solid #bababa;" checked value="1">
+                        {else}
+                          <input id="txtbox_{$label}" type="checkbox" name="{$keyfldname}" style="border:1px solid #bababa;" value="0">
+                       	{/if}
+                         <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label|escape:'quotes'}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> {$APP.LBL_OR}
+                          <a href="javascript:;" onclick="hndCancel('dtlview_{$label|escape:'quotes'}','editarea_{$label|escape:'quotes'}','{$label|escape:'quotes'}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
+                        </div>
+			{else}
+				 <td width=25% class="dvtCellInfo" align="left">{$keyval}
+			{/if}
+                        </td>    
+			 
+						{elseif $keyid eq 83}<!-- Handle the Tax in Inventory -->
+							{foreach item=tax key=count from=$TAX_DETAILS}
+								<td align="right" class="dvtCellLabel">
+									{$tax.taxlabel} {$APP.COVERED_PERCENTAGE}
+							
+								</td>
+								<td class="dvtCellInfo" align="left">
+									{$tax.percentage}
+								</td>
+								<td colspan="2" class="dvtCellInfo">&nbsp;</td>
+							   </tr>
+							{/foreach}
+
+
+				{elseif $keyid eq 69}<!-- for Image Reflection -->
+                                                  	<td align="left" width=25%">&nbsp;{$keyval}</td>
+				{else}									
+                                                  	<td class="dvtCellInfo" align="left" width=25%">&nbsp;{$keyval}</td>
+				{/if}

Modified: vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php (original)
+++ vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php Tue Dec 12 07:44:13 2006
@@ -1789,7 +1789,6 @@
 * Return type array 
 */
 
-
 function split_validationdataArray($validationData)
 {
 	global $log;
@@ -1812,11 +1811,11 @@
 		{
 			if($fieldLabel == '')
 			{
-				$fieldLabel = "'".$fldLabel ."'";
+				$fieldLabel = "'".addslashes($fldLabel)."'";
 			}
 			else
 			{
-				$fieldLabel .= ",'".$fldLabel ."'";
+				$fieldLabel .= ",'".addslashes($fldLabel)."'";
 			}
 			if($fldDataType == '')
 			{



From vtigercrm-commits at vtiger.fosslabs.com  Tue Dec 12 08:00:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Dec 2006 16:00:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9960 - in
 /vtigercrm/branches/5.0.3: Smarty/templates/ modules/Settings/language/
 modules/Users/
Message-ID: <20061212160051.242EC788DE9@vtiger.fosslabs.com>

Author: richie
Date: Tue Dec 12 09:00:39 2006
New Revision: 9960

Log:
Profiles moved to settings module

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/CreateProfile.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/EditProfile.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/ProfileDetailView.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/UserProfileList.tpl
    vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php
    vtigercrm/branches/5.0.3/modules/Users/DeleteProfile.php
    vtigercrm/branches/5.0.3/modules/Users/SaveProfile.php
    vtigercrm/branches/5.0.3/modules/Users/UpdateProfileChanges.php

Modified: vtigercrm/branches/5.0.3/Smarty/templates/CreateProfile.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/CreateProfile.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/CreateProfile.tpl Tue Dec 12 09:00:39 2006
@@ -21,7 +21,7 @@
 	<div align=center>
 				{include file='SetMenu.tpl'}
 				<form action="index.php" method="post" name="profileform" id="form">
-                                <input type="hidden" name="module" value="Users">
+                                <input type="hidden" name="module" value="Settings">
                                 <input type="hidden" name="mode" value="{$MODE}">
                                 <input type="hidden" name="action" value="profilePrivileges">
                                 <input type="hidden" name="parenttab" value="Settings">
@@ -32,7 +32,7 @@
 				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
 				<tr>
 					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}ico-profile.gif" alt="{$MOD.LBL_PROFILES}" width="48" height="48" border=0 title="{$MOD.LBL_PROFILES}"></td>
-					<td class=heading2 valign=bottom><b> <a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=ListProfiles&parenttab=Settings">{$CMOD.LBL_PROFILE_PRIVILEGES}</a></b></td>
+					<td class=heading2 valign=bottom><b> <a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Settings&action=ListProfiles&parenttab=Settings">{$CMOD.LBL_PROFILE_PRIVILEGES}</a></b></td>
 				</tr>
 				<tr>
 					<td valign=top class="small">{$MOD.LBL_PROFILE_DESCRIPTION}</td>

Modified: vtigercrm/branches/5.0.3/Smarty/templates/EditProfile.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/EditProfile.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/EditProfile.tpl Tue Dec 12 09:00:39 2006
@@ -45,7 +45,7 @@
 				<table class="settingsSelUITopLine" border="0" cellpadding="5" cellspacing="0" width="100%">
 				<tbody><tr>
 					<td rowspan="2" valign="top" width="50"><img src="{$IMAGE_PATH}ico-profile.gif" alt="{$MOD.LBL_PROFILES}" title="{$MOD.LBL_PROFILES}" border="0" height="48" width="48"></td>
-					<td class="heading2" valign="bottom"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=ListProfiles&parenttab=Settings">{$CMOD.LBL_PROFILE_PRIVILEGES}</a> &gt; {$CMOD.LBL_VIEWING} &quot;{$PROFILE_NAME}&quot;</b></td>
+					<td class="heading2" valign="bottom"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Settings&action=ListProfiles&parenttab=Settings">{$CMOD.LBL_PROFILE_PRIVILEGES}</a> &gt; {$CMOD.LBL_VIEWING} &quot;{$PROFILE_NAME}&quot;</b></td>
 				</tr>
 				<tr>
 					<td class="small" valign="top">{$CMOD.LBL_PROFILE_MESG} &quot;{$PROFILE_NAME}&quot; </td>

Modified: vtigercrm/branches/5.0.3/Smarty/templates/ProfileDetailView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/ProfileDetailView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/ProfileDetailView.tpl Tue Dec 12 09:00:39 2006
@@ -70,7 +70,7 @@
 			{include file='SetMenu.tpl'}
 			
 				<form  method="post" name="new" id="form">
-			        <input type="hidden" name="module" value="Users">
+			        <input type="hidden" name="module" value="Settings">
 			        <input type="hidden" name="action" value="profilePrivileges">
 			        <input type="hidden" name="parenttab" value="Settings">
 			        <input type="hidden" name="return_action" value="profilePrivileges">
@@ -81,7 +81,7 @@
 				<table class="settingsSelUITopLine" border="0" cellpadding="5" cellspacing="0" width="100%">
 				<tbody><tr>
 					<td rowspan="2" valign="top" width="50"><img src="{$IMAGE_PATH}ico-profile.gif" alt="{$MOD.LBL_PROFILES}" title="{$MOD.LBL_PROFILES}" border="0" height="48" width="48"></td>
-					<td class="heading2" valign="bottom"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=ListProfiles&parenttab=Settings">{$CMOD.LBL_PROFILE_PRIVILEGES}</a> &gt; {$CMOD.LBL_VIEWING} &quot;{$PROFILE_NAME}&quot;</b></td>
+					<td class="heading2" valign="bottom"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Settings&action=ListProfiles&parenttab=Settings">{$CMOD.LBL_PROFILE_PRIVILEGES}</a> &gt; {$CMOD.LBL_VIEWING} &quot;{$PROFILE_NAME}&quot;</b></td>
 				</tr>
 				<tr>
 					<td class="small" valign="top">{$CMOD.LBL_PROFILE_MESG} &quot;{$PROFILE_NAME}&quot; </td>

Modified: vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl Tue Dec 12 09:00:39 2006
@@ -36,39 +36,39 @@
 		{/if}
 
 		{if $smarty.request.action eq 'ListProfiles' || $smarty.request.action eq 'profilePrivileges' ||  $smarty.request.action eq 'CreateProfile' ||  $smarty.request.action eq 'SaveProfile' || $smarty.request.action eq 'UpdateProfileChanges' }
-		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Users&action=ListProfiles&parenttab=Settings">{$MOD.LBL_PROFILES}</a></td></tr>
+		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Settings&action=ListProfiles&parenttab=Settings">{$MOD.LBL_PROFILES}</a></td></tr>
 		{else}
-		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=ListProfiles&parenttab=Settings">{$MOD.LBL_PROFILES}</a></td></tr>
+		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=ListProfiles&parenttab=Settings">{$MOD.LBL_PROFILES}</a></td></tr>
 		{/if}
 
 		{if $smarty.request.action eq 'listgroups' || $smarty.request.action eq 'GroupDetailView' || $smarty.request.action eq 'createnewgroup' || $smarty.request.action eq 'SaveGroup'}
-		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Users&action=listgroups&parenttab=Settings">{$MOD.USERGROUPLIST}</a></td></tr>   	
+		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Settings&action=listgroups&parenttab=Settings">{$MOD.USERGROUPLIST}</a></td></tr>   	
 		{else}
-		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listgroups&parenttab=Settings">{$MOD.USERGROUPLIST}</a></td></tr>
+		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=listgroups&parenttab=Settings">{$MOD.USERGROUPLIST}</a></td></tr>
 		{/if}
 
 		{if  $smarty.request.action eq 'OrgSharingEditView' || $smarty.request.action eq 'OrgSharingDetailView' || $smarty.request.action eq 'SaveOrgSharing'}
-		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Users&action=OrgSharingDetailView&parenttab=Settings">{$MOD.LBL_SHARING_ACCESS}</a></td></tr>  	
+		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Settings&action=OrgSharingDetailView&parenttab=Settings">{$MOD.LBL_SHARING_ACCESS}</a></td></tr>  	
 		{else}
-		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=OrgSharingDetailView&parenttab=Settings">{$MOD.LBL_SHARING_ACCESS}</a></td></tr>
+		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=OrgSharingDetailView&parenttab=Settings">{$MOD.LBL_SHARING_ACCESS}</a></td></tr>
 		{/if}
 			
 		{if $smarty.request.action eq 'DefaultFieldPermissions' || $smarty.request.action eq 'UpdateDefaultFieldLevelAccess' || $smarty.request.action eq 'EditDefOrgFieldLevelAccess' }
-		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Users&action=DefaultFieldPermissions&parenttab=Settings">{$MOD.LBL_FIELDS_ACCESS}</a></td></tr>
+		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Settings&action=DefaultFieldPermissions&parenttab=Settings">{$MOD.LBL_FIELDS_ACCESS}</a></td></tr>
 		{else}
-		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=DefaultFieldPermissions&parenttab=Settings">{$MOD.LBL_FIELDS_ACCESS}</a></td></tr>
+		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=DefaultFieldPermissions&parenttab=Settings">{$MOD.LBL_FIELDS_ACCESS}</a></td></tr>
 		{/if}
 			
 		{if $smarty.request.action eq 'AuditTrailList'}
-		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Users&action=AuditTrailList&parenttab=Settings">{$MOD.LBL_AUDIT_TRAIL}</a></td></tr>
+		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Settings&action=AuditTrailList&parenttab=Settings">{$MOD.LBL_AUDIT_TRAIL}</a></td></tr>
         {else}
-        <tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=AuditTrailList&parenttab=Settings">{$MOD.LBL_AUDIT_TRAIL}</a></td></tr>
+        <tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=AuditTrailList&parenttab=Settings">{$MOD.LBL_AUDIT_TRAIL}</a></td></tr>
         {/if}
 
 		{if $smarty.request.action eq 'ListLoginHistory'}
-		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Users&action=ListLoginHistory&parenttab=Settings">{$MOD.LBL_LOGIN_HISTORY_DETAILS}</a></td></tr>
+		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Settings&action=ListLoginHistory&parenttab=Settings">{$MOD.LBL_LOGIN_HISTORY_DETAILS}</a></td></tr>
 		{else}
-		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=ListLoginHistory&parenttab=Settings">{$MOD.LBL_LOGIN_HISTORY_DETAILS}</a></td></tr>
+		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=ListLoginHistory&parenttab=Settings">{$MOD.LBL_LOGIN_HISTORY_DETAILS}</a></td></tr>
 		{/if}
 
 		
@@ -168,17 +168,17 @@
 		{/if}
 		
 		{if $smarty.request.action eq 'DefModuleView'}
-		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Users&action=DefModuleView&parenttab=Settings">{$MOD.LBL_DEFAULT_MODULE_VIEW}</a></td></tr>
+		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Settings&action=DefModuleView&parenttab=Settings">{$MOD.LBL_DEFAULT_MODULE_VIEW}</a></td></tr>
 		{else}
-		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=DefModuleView&parenttab=Settings">{$MOD.LBL_DEFAULT_MODULE_VIEW}</a></td></tr>
+		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=DefModuleView&parenttab=Settings">{$MOD.LBL_DEFAULT_MODULE_VIEW}</a></td></tr>
 		{/if}
 	
 		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Migration&action=MigrationStep1&parenttab=Settings">{$MOD.LBL_MIGRATION}</a></td></tr>
 
 		{if $smarty.request.action eq 'OrganizationTermsandConditions' || $smarty.request.action eq 'savetermsandconditions'}
-		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings">{$MOD.LBL_INVENTORY_TANDC}</a></td></tr>
+		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Settings&action=OrganizationTermsandConditions&parenttab=Settings">{$MOD.LBL_INVENTORY_TANDC}</a></td></tr>
 		{else}
-		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings">{$MOD.LBL_INVENTORY_TANDC}</a></td></tr>
+		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=OrganizationTermsandConditions&parenttab=Settings">{$MOD.LBL_INVENTORY_TANDC}</a></td></tr>
 		{/if}
 
 		</table>

Modified: vtigercrm/branches/5.0.3/Smarty/templates/UserProfileList.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/UserProfileList.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/UserProfileList.tpl Tue Dec 12 09:00:39 2006
@@ -69,7 +69,7 @@
 					<tr>
 						<td class="listTableRow small" valign=top>{$smarty.foreach.profilelist.iteration}</td>
 						<td class="listTableRow small" valign=top nowrap>
-							<a href="index.php?module=Users&action=profilePrivileges&return_action=ListProfiles&parenttab=Settings&mode=edit&profileid={$listvalues.profileid}"><img src="{$IMAGE_PATH}editfield.gif" alt="Edit" title="Edit" border="0" align="absmiddle"></a>
+							<a href="index.php?module=Settings&action=profilePrivileges&return_action=ListProfiles&parenttab=Settings&mode=edit&profileid={$listvalues.profileid}"><img src="{$IMAGE_PATH}editfield.gif" alt="Edit" title="Edit" border="0" align="absmiddle"></a>
 	                                                {if $listvalues.del_permission eq 'yes'}
         	                                                &nbsp;|&nbsp;
                 	                                <a href="#"><img src="{$IMAGE_PATH}delete.gif" border="0" height="15" width="15" onclick="DeleteProfile(this,'{$listvalues.profileid}')" align="absmiddle"></a>
@@ -77,7 +77,7 @@
                                                 	{/if}
 
 						</td>
-						<td class="listTableRow small" valign=top><a href="index.php?module=Users&action=profilePrivileges&mode=view&parenttab=Settings&profileid={$listvalues.profileid}"><b>{$listvalues.profilename}</b></a></td>
+						<td class="listTableRow small" valign=top><a href="index.php?module=Settings&action=profilePrivileges&mode=view&parenttab=Settings&profileid={$listvalues.profileid}"><b>{$listvalues.profilename}</b></a></td>
 						<td class="listTableRow small" valign=top>{$listvalues.description}</td>
 					  </tr>
 					{/foreach}		

Modified: vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php Tue Dec 12 09:00:39 2006
@@ -788,6 +788,35 @@
 'QuoteNotification'=>'Product Stock Notification during Quote Generation',
 'SalesOrderNotification'=>'Product Stock Notification during Sales Order Generation',
 'LBL_NOTE_DO_NOT_REMOVE_INFO'=>'Note: Donot remove or alter the values within {  }',
+
+//Added while moving Profile file from User to Setting Module
+'LBL_TOTAL'=>'Total :',
+'LBL_NEW_PROFILE'=>'New Profile',
+'LBL_LIST_NO'=>'#',
+'LBL_NEW_PROFILE_NAME'=>'Profile Name',
+'LBL_LIST_TOOLS'=>'Tools',
+'LBL_PROFILE_MESG'=>'Viewing access privileges for',
+'LBL_PROFILE_PRIVILEGES'=>'Profile Privileges',
+'LBL_DEFINE_PRIV_FOR'=>' Define Privileges for ',
+'LBL_USE_OPTION_TO_SET_PRIV'=>'Use the options below to set privileges',
+'LBL_SUPER_USER_PRIV'=>'Global Privileges',
+'LBL_SET_PRIV_FOR_EACH_MODULE'=>'Set Privileges for each Module ',
+'LBL_FIELDS_AND_TOOLS_SETTINGS'=>'Fields & Tools Settings',
+'LBL_VIEW_ALL'=>'View all',
+'LBL_EDIT_ALL'=>'Edit all',
+'LBL_ALLOW'=>'Allows',
+'LBL_MESG_VIEW'=>'to view all information / modules of vtiger CRM',
+'LBL_MESG_EDIT'=>'to edit all information / modules of vtiger CRM',
+'LBL_TAB_MESG_OPTION'=>'modules to be shown',
+'LBL_EDIT_PERMISSIONS'=>'Edit Permissions',
+'LBL_CREATE_EDIT'=>'Create/Edit',
+'LBL_VIEW'=>'View',
+'LBL_MANDATORY_MSG'=>'Mandatory Fields',
+'LBL_DISABLE_FIELD_MSG'=>'Fields Disabled from Global Field Access Settings',
+'LBL_DELETE'=>'Delete',
+
+'LBL_STEP_2_2'=>'Step 2 of 2',
+'LBL_FINISH_BUTTON'=>'Finish',
 );
 
 

Modified: vtigercrm/branches/5.0.3/modules/Users/DeleteProfile.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Users/DeleteProfile.php (original)
+++ vtigercrm/branches/5.0.3/modules/Users/DeleteProfile.php Tue Dec 12 09:00:39 2006
@@ -14,5 +14,5 @@
 $tran_id = $_REQUEST['transfer_prof_id'];
 //Deleting the Profile
 deleteProfile($del_id,$tran_id);
-header("Location: index.php?module=Users&action=ListProfiles&parenttab=Settings");
+header("Location: index.php?module=Settings&action=ListProfiles&parenttab=Settings");
 ?>

Modified: vtigercrm/branches/5.0.3/modules/Users/SaveProfile.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Users/SaveProfile.php (original)
+++ vtigercrm/branches/5.0.3/modules/Users/SaveProfile.php Tue Dec 12 09:00:39 2006
@@ -180,7 +180,7 @@
                 $adb->query($sql11);
 	}
 }
-	$loc = "Location: index.php?action=ListProfiles&module=Users&mode=view&parenttab=Settings&profileid=".$profileid."&selected_tab=".$def_tab."&selected_module=".$def_module;
+	$loc = "Location: index.php?action=ListProfiles&module=Settings&mode=view&parenttab=Settings&profileid=".$profileid."&selected_tab=".$def_tab."&selected_module=".$def_module;
 	header($loc);
 
 

Modified: vtigercrm/branches/5.0.3/modules/Users/UpdateProfileChanges.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Users/UpdateProfileChanges.php (original)
+++ vtigercrm/branches/5.0.3/modules/Users/UpdateProfileChanges.php Tue Dec 12 09:00:39 2006
@@ -172,7 +172,14 @@
 
 	}
 }
-	$loc = "Location: index.php?action=".$return_action."&module=Users&mode=view&parenttab=Settings&profileid=".$profileid."&selected_tab=".$def_tab."&selected_module=".$def_module;
+	if($return_action == 'profilePrivileges' || $return_action == 'ListProfiles')
+	{
+		$loc = "Location: index.php?action=".$return_action."&module=Settings&mode=view&parenttab=Settings&profileid=".$profileid."&selected_tab=".$def_tab."&selected_module=".$def_module;
+	}
+	else
+	{
+		$loc = "Location: index.php?action=".$return_action."&module=Users&mode=view&parenttab=Settings&profileid=".$profileid."&selected_tab=".$def_tab."&selected_module=".$def_module;
+	}
 	header($loc);
 
  /** returns value 0 if request permission is on else returns value 1



From vtigercrm-commits at vtiger.fosslabs.com  Tue Dec 12 23:06:36 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Dec 2006 07:06:36 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9961 -
 /vtigercrm/branches/5.0.3/modules/Settings/ListProfiles.php
Message-ID: <20061213070636.0528C7896E4@vtiger.fosslabs.com>

Author: richie
Date: Wed Dec 13 00:06:31 2006
New Revision: 9961

Log:
Added to move profiles to settings

Added:
    vtigercrm/branches/5.0.3/modules/Settings/ListProfiles.php



From vtigercrm-commits at vtiger.fosslabs.com  Wed Dec 13 01:48:11 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Dec 2006 09:48:11 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9962 - in
 /vtigercrm/branches/5.0.3: Smarty/templates/ include/js/ include/utils/
 modules/Settings/ modules/Settings/language/ modules/Users/
Message-ID: <20061213094812.5336D789BB7@vtiger.fosslabs.com>

Author: richie
Date: Wed Dec 13 02:47:57 2006
New Revision: 9962

Log:
Groups moved to settings

Added:
    vtigercrm/branches/5.0.3/modules/Settings/GroupDetailView.php
    vtigercrm/branches/5.0.3/modules/Settings/createnewgroup.php
    vtigercrm/branches/5.0.3/modules/Settings/listgroups.php
Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/GroupDetailview.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/GroupEditView.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/ListGroup.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/UserGroups.tpl
    vtigercrm/branches/5.0.3/include/js/dtlviewajax.js
    vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php
    vtigercrm/branches/5.0.3/include/utils/UserInfoUtil.php
    vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php
    vtigercrm/branches/5.0.3/modules/Users/DeleteGroup.php

Modified: vtigercrm/branches/5.0.3/Smarty/templates/GroupDetailview.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/GroupDetailview.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/GroupDetailview.tpl Wed Dec 13 02:47:57 2006
@@ -23,14 +23,14 @@
 				<!-- DISPLAY -->
 				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
 				<form action="index.php" method="post" name="new" id="form">
-				<input type="hidden" name="module" value="Users">
+				<input type="hidden" name="module" value="Settings">
 				<input type="hidden" name="action" value="createnewgroup">
 				<input type="hidden" name="groupId" value="{$GROUPID}">
 				<input type="hidden" name="mode" value="edit">
 				<input type="hidden" name="parenttab" value="Settings">
 				<tr>
 					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}ico-groups.gif" width="48" height="48" border=0 ></td>
-					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=listgroups&parenttab=Settings">{$CMOD.LBL_GROUPS}</a> &gt; {$CMOD.LBL_VIEWING} &quot;{$GROUPINFO.0.groupname}&quot; </b></td>
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Settings&action=listgroups&parenttab=Settings">{$CMOD.LBL_GROUPS}</a> &gt; {$CMOD.LBL_VIEWING} &quot;{$GROUPINFO.0.groupname}&quot; </b></td>
 				</tr>
 				<tr>
 					<td valign=top class="small">{$CMOD.LBL_VIEWING} {$CMOD.LBL_PROPERTIES} &quot;{$GROUPINFO.0.groupname}`&quot; {$CMOD.LBL_GROUP_NAME} </td>
@@ -92,7 +92,15 @@
                             <td width="16"><div align="center"></div></td>
                             <td>
 					{foreach item=element from=$details}
+						{if $element.memberaction == "GroupDetailView"}
+						<a href="index.php?module=Settings&action={$element.memberaction}&{$element.actionparameter}={$element.memberid}">{$element.membername}</a><br />
+						{/if}
+						{if $element.memberaction == "RoleDetailView"}	
+						<a href="index.php?module=Settings&action={$element.memberaction}&{$element.actionparameter}={$element.memberid}">{$element.membername}</a><br />
+						{/if}
+						{if $element.memberaction == "DetailView"}	
 						<a href="index.php?module=Users&action={$element.memberaction}&{$element.actionparameter}={$element.memberid}">{$element.membername}</a><br />
+						{/if}
 					{/foreach}
 			    </td>  	 
                           </tr>

Modified: vtigercrm/branches/5.0.3/Smarty/templates/GroupEditView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/GroupEditView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/GroupEditView.tpl Wed Dec 13 02:47:57 2006
@@ -172,9 +172,9 @@
 				<tr>
 					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}ico-groups.gif" alt="Groups" width="48" height="48" border=0 title="Roles"></td>
 					{if $MODE eq 'edit'}
-					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=listgroups&parenttab=Settings">{$CMOD.LBL_GROUPS}</a> &gt; {$MOD.LBL_EDIT} &quot;{$GROUPNAME}&quot; </b></td>
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Settings&action=listgroups&parenttab=Settings">{$CMOD.LBL_GROUPS}</a> &gt; {$MOD.LBL_EDIT} &quot;{$GROUPNAME}&quot; </b></td>
 					{else}	
-					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=listgroups&parenttab=Settings">{$CMOD.LBL_GROUPS}</a> &gt; {$CMOD.LBL_CREATE_NEW_GROUP}</b></td>
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Settings&action=listgroups&parenttab=Settings">{$CMOD.LBL_GROUPS}</a> &gt; {$CMOD.LBL_CREATE_NEW_GROUP}</b></td>
 					{/if}
 				</tr>
 				<tr>

Modified: vtigercrm/branches/5.0.3/Smarty/templates/ListGroup.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/ListGroup.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/ListGroup.tpl Wed Dec 13 02:47:57 2006
@@ -23,7 +23,7 @@
 				<!-- DISPLAY -->
 				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
 				<form action="index.php" method="post" name="new" id="form">
-				<input type="hidden" name="module" value="Users">
+				<input type="hidden" name="module" value="Settings">
 				<input type="hidden" name="action" value="createnewgroup">
 				<input type="hidden" name="mode" value="create">
 				<input type="hidden" name="parenttab" value="Settings">
@@ -67,11 +67,11 @@
 					  <tr>
 						<td class="listTableRow small" valign=top>{$smarty.foreach.grouplist.iteration}</td>
 						<td class="listTableRow small" valign=top nowrap>
-							  	<a href="index.php?module=Users&action=createnewgroup&returnaction=listgroups&parenttab=Settings&mode=edit&groupId={$groupvalues.groupid}"><img src="{$IMAGE_PATH}editfield.gif" alt="{$APP.LNK_EDIT}" title="{$APP.LNK_EDIT}" border="0" align="absmiddle"></a>&nbsp;|	
+							  	<a href="index.php?module=Settings&action=createnewgroup&returnaction=listgroups&parenttab=Settings&mode=edit&groupId={$groupvalues.groupid}"><img src="{$IMAGE_PATH}editfield.gif" alt="{$APP.LNK_EDIT}" title="{$APP.LNK_EDIT}" border="0" align="absmiddle"></a>&nbsp;|	
 								<a href="#" onClick="deletegroup(this,'{$groupvalues.groupid}')";><img src="{$IMAGE_PATH}delete.gif" alt="{$LNK_DELETE}" title="{$APP.LNK_DELETE}" border="0" align="absmiddle"></a>
 						</td>
 						<td class="listTableRow small" valign=top><strong>
-                              				<a href="index.php?module=Users&action=GroupDetailView&parenttab=Settings&groupId={$groupvalues.groupid}">{$groupvalues.groupname}</a></strong>
+                              				<a href="index.php?module=Settings&action=GroupDetailView&parenttab=Settings&groupId={$groupvalues.groupid}">{$groupvalues.groupname}</a></strong>
 						</td>
 						<td class="listTableRow small" valign=top>{$groupvalues.description}</td>
 					  </tr>

Modified: vtigercrm/branches/5.0.3/Smarty/templates/UserGroups.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/UserGroups.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/UserGroups.tpl Wed Dec 13 02:47:57 2006
@@ -19,7 +19,7 @@
 <tr>
 <td class="listTableRow small" valign="top" width="5%">{$smarty.foreach.groupiter.iteration}</td>
 {if $IS_ADMIN}
-<td class="listTableRow small" valign="top"><a href="index.php?module=Users&action=GroupDetailView&parenttab=Settings&groupId={$id}">{$groupname.1}</a></td>
+<td class="listTableRow small" valign="top"><a href="index.php?module=Settings&action=GroupDetailView&parenttab=Settings&groupId={$id}">{$groupname.1}</a></td>
 {else}
 <td class="listTableRow small" valign="top">{$groupname.1}</td>
 {/if}

Modified: vtigercrm/branches/5.0.3/include/js/dtlviewajax.js
==============================================================================
--- vtigercrm/branches/5.0.3/include/js/dtlviewajax.js (original)
+++ vtigercrm/branches/5.0.3/include/js/dtlviewajax.js Wed Dec 13 02:47:57 2006
@@ -238,7 +238,7 @@
 			getObj(dtlView).innerHTML = "<a href=\"index.php?module=Users&action=DetailView&record="+tagValue+"\">"+hdObj.value+"&nbsp;</a>";
 		}else if(isAdmin == "1" && assign_type_G == true)
 		{
-			getObj(dtlView).innerHTML = "<a href=\"index.php?module=Users&action=GroupDetailView&groupId="+tagValue+"\">"+hdObj.value+"&nbsp;</a>";
+			getObj(dtlView).innerHTML = "<a href=\"index.php?module=Settings&action=GroupDetailView&groupId="+tagValue+"\">"+hdObj.value+"&nbsp;</a>";
 		}
 	}else if(uitype == '56')
 	{

Modified: vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php (original)
+++ vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php Wed Dec 13 02:47:57 2006
@@ -222,7 +222,7 @@
 			$label_fld["secid"][] = $user_id;
 			$label_fld["link"][] = "index.php?module=Users&action=DetailView&record=".$user_id;
 			$label_fld["secid"][] = $groupid;
-			$label_fld["link"][] = "index.php?module=Users&action=GroupDetailView&groupId=".$groupid;
+			$label_fld["link"][] = "index.php?module=Settings&action=GroupDetailView&groupId=".$groupid;
 		}
 		//Security Checks
 		if($fieldlabel == 'Assigned To' && $is_admin==false && $profileGlobalPermission[2] == 1 && ($defaultOrgSharingPermission[getTabid($module)] == 3 or $defaultOrgSharingPermission[getTabid($module)] == 0))

Modified: vtigercrm/branches/5.0.3/include/utils/UserInfoUtil.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/utils/UserInfoUtil.php (original)
+++ vtigercrm/branches/5.0.3/include/utils/UserInfoUtil.php Wed Dec 13 02:47:57 2006
@@ -613,7 +613,7 @@
 	$sql = "insert into vtiger_groups(name,description) values('" .$groupName ."','". $groupDescription ."')";
 	$result = $adb->query($sql); 
 	$log->debug("Exiting createNewGroup method ...");
-	header("Location: index.php?module=Users&action=listgroups");
+	header("Location: index.php?module=Settings&action=listgroups");
 	
 }
 
@@ -3789,7 +3789,7 @@
 	if($entityType == 'groups')
 	{
 		$groupNameArr = getGroupInfo($entityid); 
-		$display_out = "<a href='index.php?module=Users&action=GroupDetailView&returnaction=OrgSharingDetailView&groupId=".$entityid."'>Group::". $groupNameArr[0]." </a>";			
+		$display_out = "<a href='index.php?module=Settings&action=GroupDetailView&returnaction=OrgSharingDetailView&groupId=".$entityid."'>Group::". $groupNameArr[0]." </a>";			
 	}
 	elseif($entityType == 'roles')
 	{

Modified: vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php Wed Dec 13 02:47:57 2006
@@ -817,6 +817,17 @@
 
 'LBL_STEP_2_2'=>'Step 2 of 2',
 'LBL_FINISH_BUTTON'=>'Finish',
+
+//Added while moving Groups file from User to Setting Module
+'LBL_NEW_GROUP'=>'New Group',
+'LBL_GROUPS'=>'Groups',
+'LBL_GROUP_NAME'=>'Group Name',
+'LBL_ROLES_SUBORDINATES'=>'Roles and Subordinates',
+'LBL_MEMBER_AVLBL'=>'Available Entities & Members',
+'LBL_MEMBER_SELECTED'=>'Selected Members',
+'LBL_ENTITY'=>'Entity',
+'LBL_OF'=>'of',
+
 );
 
 

Modified: vtigercrm/branches/5.0.3/modules/Users/DeleteGroup.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Users/DeleteGroup.php (original)
+++ vtigercrm/branches/5.0.3/modules/Users/DeleteGroup.php Wed Dec 13 02:47:57 2006
@@ -33,5 +33,5 @@
 deleteGroup($del_id,$transferId,$transferType);
 
 
-header("Location: index.php?action=listgroups&module=Users&parenttab=Settings");
+header("Location: index.php?action=listgroups&module=Settings&parenttab=Settings");
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Wed Dec 13 02:15:46 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Dec 2006 10:15:46 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9963 -
 /vtigercrm/branches/5.0.3/modules/Users/LoginHistory.php
Message-ID: <20061213101546.A1839788B5B@vtiger.fosslabs.com>

Author: richie
Date: Wed Dec 13 03:15:40 2006
New Revision: 9963

Log:
added again

Added:
    vtigercrm/branches/5.0.3/modules/Users/LoginHistory.php   (with props)



From vtigercrm-commits at vtiger.fosslabs.com  Wed Dec 13 02:17:17 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Dec 2006 10:17:17 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9964 - in
 /vtigercrm/branches/5.0.3/modules/Settings: ListLoginHistory.php
 language/en_us.lang.php
Message-ID: <20061213101717.499A0788B5B@vtiger.fosslabs.com>

Author: richie
Date: Wed Dec 13 03:17:11 2006
New Revision: 9964

Log:
LoginHistory moved to settings

Added:
    vtigercrm/branches/5.0.3/modules/Settings/ListLoginHistory.php
Modified:
    vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php

Modified: vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php Wed Dec 13 03:17:11 2006
@@ -828,6 +828,46 @@
 'LBL_ENTITY'=>'Entity',
 'LBL_OF'=>'of',
 
+//Sharing
+'LBL_GLOBAL_ACCESS_PRIVILEGES'=>'Organization-level Sharing Rules',
+'LBL_RECALCULATE_BUTTON'=>'Recalculate',
+'LBL_CHANGE'=>'Change',
+'LBL_PRIVILEGES'=>'Privileges',
+'LBL_CUSTOM_ACCESS_PRIVILEGES'=>'Custom Sharing Rules',
+'LBL_ADD_PRIVILEGES_BUTTON'=>'Add Privileges',
+'LBL_RULE_NO'=>'Rule No.',
+'LBL_CAN_BE_ACCESSED'=>'can be accessed by',
+'LBL_CUSTOM_ACCESS_MESG'=>'No Custom Access Rules defined .',
+'LNK_CLICK_HERE'=>'Click here',
+'LBL_CREATE_RULE_MESG'=>'to create a new Rule',
+'LBL_RECALC_MSG'=>'Are you sure, you wish to Recalculate Sharing Access?',
+'LBL_YES'=>'Yes',
+'LBL_NO'=>'No',
+'LBL_IN_PERMISSION'=>'in the permission',
+'LBL_RELATED_MODULE_RIGHTS'=>'Related Module Rights',
+'LBL_USR_CAN_ACCESS'=>'Users can ',
+'LBL_USR_OTHERS'=>' other users ',
+'LBL_USR_CANNOT_ACCESS'=>'Users cannot access other users ',
+ 
+'LBL_ORG_SHARING_PRIVILEGES'=>'Organisation Sharing  Privileges',
+'LBL_EDIT_PERMISSIONS'=>'Edit Permissions',
+'LBL_SAVE_PERMISSIONS'=>'Save Permissions',
+'LBL_READ_ONLY'=>'Public: Read Only',
+'LBL_EDIT_CREATE_ONLY'=>'Public: Read, Create/Edit',
+'LBL_READ_CREATE_EDIT_DEL'=>'Public: Read, Create/Edit, Delete',
+'LBL_PRIVATE'=>'Private',
+ 
+'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',
+
+//Added for User Login History While moving from User to Settings
+'LBL_LOGIN_HISTORY'=>'Login History',
 );
 
 



From vtigercrm-commits at vtiger.fosslabs.com  Wed Dec 13 02:45:00 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Dec 2006 10:45:00 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9965 -
 /vtigercrm/branches/5.0.3/modules/Calendar/DetailView.php
Message-ID: <20061213104500.8251D788B5B@vtiger.fosslabs.com>

Author: richie
Date: Wed Dec 13 03:44:56 2006
New Revision: 9965

Log:
i18n support for calendar combo

Modified:
    vtigercrm/branches/5.0.3/modules/Calendar/DetailView.php

Modified: vtigercrm/branches/5.0.3/modules/Calendar/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Calendar/DetailView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Calendar/DetailView.php Wed Dec 13 03:44:56 2006
@@ -136,21 +136,30 @@
 $data['date_start'] = $stdate;
 $data['due_date'] = $enddate;
 $data['assigned_user_id'] = $finaldata['assigned_user_id'];
-$data['taskpriority'] = $mod_strings[$finaldata['taskpriority']];
+if($mod_strings[$finaldata['taskpriority']] != '')
+	$data['taskpriority'] = $mod_strings[$finaldata['taskpriority']];
+else
+	$data['taskpriority'] = $finaldata['taskpriority'];
 $data['modifiedtime'] = $finaldata['modifiedtime'];
 $data['createdtime'] = $finaldata['createdtime'];
 $data['parent_name'] = $finaldata['parent_id'];
 $data['description'] = $finaldata['description'];
 if($activity_mode == 'Task')
 {
-	$data['taskstatus'] = $mod_strings[$finaldata['taskstatus']];
+	if($mod_strings[$finaldata['taskstatus']] != '')
+		$data['taskstatus'] = $mod_strings[$finaldata['taskstatus']];
+	else
+		$data['taskstatus'] = $finaldata['taskstatus'];
 	$data['activitytype'] = $activity_mode;
 	$data['contact_id'] = $finaldata['contact_id'];
 }
 elseif($activity_mode == 'Events')
 {
 	$data['visibility'] = $finaldata['visibility'];
-	$data['eventstatus'] = $mod_strings[$finaldata['eventstatus']];
+	if($mod_strings[$finaldata['taskstatus']] != '')
+		$data['eventstatus'] = $mod_strings[$finaldata['eventstatus']];
+	else
+		$data['eventstatus'] = $finaldata['eventstatus'];
 	$data['activitytype'] = $finaldata['activitytype'];
 	$data['location'] = $finaldata['location'];
 	//Calculating reminder time



From vtigercrm-commits at vtiger.fosslabs.com  Wed Dec 13 04:37:46 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Dec 2006 12:37:46 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9966 - in
 /vtigercrm/branches/5.0.3: include/fpdf/fpdf.php
 modules/Reports/CreatePDF.php
Message-ID: <20061213123747.1EC7A7895F9@vtiger.fosslabs.com>

Author: richie
Date: Wed Dec 13 05:37:39 2006
New Revision: 9966

Log:
Pdf truncated . Fixes #2255

Modified:
    vtigercrm/branches/5.0.3/include/fpdf/fpdf.php
    vtigercrm/branches/5.0.3/modules/Reports/CreatePDF.php

Modified: vtigercrm/branches/5.0.3/include/fpdf/fpdf.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/fpdf/fpdf.php (original)
+++ vtigercrm/branches/5.0.3/include/fpdf/fpdf.php Wed Dec 13 05:37:39 2006
@@ -122,7 +122,9 @@
 	if(is_string($format))
 	{
 		$format=strtolower($format);
-		if($format=='a3')
+		if($format=='a1')
+			$format=array(2500,3000);
+		elseif($format=='a3')
 			$format=array(841.89,1190.55);
 		elseif($format=='a4')
 			$format=array(595.28,841.89);

Modified: vtigercrm/branches/5.0.3/modules/Reports/CreatePDF.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Reports/CreatePDF.php (original)
+++ vtigercrm/branches/5.0.3/modules/Reports/CreatePDF.php Wed Dec 13 05:37:39 2006
@@ -52,6 +52,7 @@
 
 function Html2PDF($orientation='P',$unit='mm',$format='A4')
 {
+//echo '<pre>';print_r($format);echo '</pre>';	
     //Call parent constructor
     $this->FPDF($orientation,$unit,$format);
     //Initialization
@@ -295,35 +296,6 @@
 $filterlist = $oReportRun->RunTimeFilter($filtercolumn,$filter,$_REQUEST["startdate"],$_REQUEST["enddate"]);
 
 $arr_val = $oReportRun->GenerateReport("PDF",$filterlist);
-
-if(isset($arr_val))
-{
-        $columnlength = count($arr_val[0]);
-}
-
-if($columnlength > 0 && $columnlength <= 4)
-{
-        $pdf = new Html2PDF('P','mm','A4');
-}elseif($columnlength >= 5 && $columnlength < 8)
-{
-        $pdf = new Html2PDF('L','mm','A4');
-}elseif($columnlength >= 8 && $columnlength <= 12)
-{
-        $pdf = new Html2PDF('P','mm','A3');
-}elseif($columnlength > 12)
-{
-        $pdf = new Html2PDF('L','mm','A3');
-}
-
-$pdf->AddPage();
-
-$pdf->SetFillColor(224,235,255);
-$pdf->SetTextColor(0);
-$pdf->SetFont('Arial','B',14);
-$pdf->Cell(($pdf->columnlength*50),10,$oReport->reportname,0,0,'C',0);
-$pdf->Ln();
-
-$pdf->SetFont('Arial','',10);
 
 if(isset($arr_val))
 {
@@ -396,6 +368,35 @@
 '.$dataHTML.'
 </table>';
 
+if(isset($arr_val))
+{
+	$columnlength = array_sum($col_width);
+}
+
+if($columnlength <= 420 )
+{
+        $pdf = new Html2PDF('P','mm','A5');
+}elseif($columnlength >= 421 && $columnlength <= 600)
+{
+        $pdf = new Html2PDF('L','mm','A4');
+}elseif($columnlength >=601 && $columnlength <= 850)
+{
+        $pdf = new Html2PDF('P','mm','A3');
+}elseif($columnlength >=851 )
+{
+        $pdf = new Html2PDF('L','mm','A1');
+}
+//echo '<pre>';print_r($columnlength);echo '</pre>';
+$pdf->AddPage();
+
+$pdf->SetFillColor(224,235,255);
+$pdf->SetTextColor(0);
+$pdf->SetFont('Arial','B',14);
+$pdf->Cell(($pdf->columnlength*50),10,$oReport->reportname,0,0,'C',0);
+$pdf->Ln();
+
+$pdf->SetFont('Arial','',10);
+
 $pdf->WriteHTML($html);
 $pdf->Output('Reports.pdf','D');
 exit();



From vtigercrm-commits at vtiger.fosslabs.com  Wed Dec 13 06:05:25 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Dec 2006 14:05:25 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9967 - in
 /vtigercrm/branches/5.0.3: Smarty/templates/FieldAccess.tpl
 modules/Settings/DefaultFieldPermissions.php
 modules/Settings/EditDefOrgFieldLevelAccess.php
 modules/Settings/UpdateDefaultFieldLevelAccess.php
Message-ID: <20061213140525.A51CB789BF7@vtiger.fosslabs.com>

Author: richie
Date: Wed Dec 13 07:05:14 2006
New Revision: 9967

Log:
Field access moved to settings

Added:
    vtigercrm/branches/5.0.3/modules/Settings/DefaultFieldPermissions.php   (with props)
    vtigercrm/branches/5.0.3/modules/Settings/EditDefOrgFieldLevelAccess.php   (with props)
    vtigercrm/branches/5.0.3/modules/Settings/UpdateDefaultFieldLevelAccess.php   (with props)
Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/FieldAccess.tpl

Modified: vtigercrm/branches/5.0.3/Smarty/templates/FieldAccess.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/FieldAccess.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/FieldAccess.tpl Wed Dec 13 07:05:14 2006
@@ -23,7 +23,7 @@
 		<!-- DISPLAY -->
 		<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
 		<form action="index.php" method="post" name="new" id="form">
-		<input type="hidden" name="module" value="Users">
+		<input type="hidden" name="module" value="Settings">
 		<input type="hidden" name="parenttab" value="Settings">
 		<input type="hidden" name="fld_module" id="fld_module" value="{$DEF_MODULE}">
 		{if $MODE neq 'view'}
@@ -32,7 +32,7 @@
 			<input type="hidden" name="action" value="EditDefOrgFieldLevelAccess">
 		{/if}	
 		<tr>
-			<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}orgshar.gif" alt="Users" width="48" height="48" border=0 title="Users"></td>
+			<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}orgshar.gif" alt="Settings" width="48" height="48" border=0 title="Settings"></td>
 			<td colspan=2 class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > {$MOD.LBL_FIELDS_ACCESS} </b></td>
 			<td rowspan=2 class="small" align=right>&nbsp;</td>
 		</tr>



From vtigercrm-commits at vtiger.fosslabs.com  Wed Dec 13 06:31:04 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Dec 2006 14:31:04 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9968 - in
 /vtigercrm/branches/5.0.3: Smarty/templates/ modules/Settings/
 modules/Users/
Message-ID: <20061213143104.7A88F789BF0@vtiger.fosslabs.com>

Author: richie
Date: Wed Dec 13 07:30:54 2006
New Revision: 9968

Log:
Sharing access, Defaultmodule view moved to settings

Added:
    vtigercrm/branches/5.0.3/modules/Settings/DefModuleView.php
    vtigercrm/branches/5.0.3/modules/Settings/OrgSharingDetailView.php
    vtigercrm/branches/5.0.3/modules/Settings/SaveSharingRule.php
Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/OrgSharingDetailView.tpl
    vtigercrm/branches/5.0.3/modules/Users/DeleteSharingRule.php
    vtigercrm/branches/5.0.3/modules/Users/RecalculateSharingRules.php
    vtigercrm/branches/5.0.3/modules/Users/SaveOrgSharing.php

Modified: vtigercrm/branches/5.0.3/Smarty/templates/OrgSharingDetailView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/OrgSharingDetailView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/OrgSharingDetailView.tpl Wed Dec 13 07:30:54 2006
@@ -228,7 +228,7 @@
                 'index.php',
                 {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
                         method: 'post',
-                        postBody: 'module=Users&action=UsersAjax&orgajax=true&mode='+mode+'&sharing_module='+modulename+'&shareid='+id,
+                        postBody: 'module=Settings&action=SettingsAjax&orgajax=true&mode='+mode+'&sharing_module='+modulename+'&shareid='+id,
                         onComplete: function(response) {ldelim}
                                 $("status").style.display="none";
                                 $("tempdiv").innerHTML=response.responseText;

Modified: vtigercrm/branches/5.0.3/modules/Users/DeleteSharingRule.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Users/DeleteSharingRule.php (original)
+++ vtigercrm/branches/5.0.3/modules/Users/DeleteSharingRule.php Wed Dec 13 07:30:54 2006
@@ -13,5 +13,5 @@
 $shareid =  $_REQUEST['shareid'];
 deleteSharingRule($shareid);
 
-header("Location: index.php?module=Users&action=OrgSharingDetailView&parenttab=Settings");
+header("Location: index.php?module=Settings&action=OrgSharingDetailView&parenttab=Settings");
 ?>

Modified: vtigercrm/branches/5.0.3/modules/Users/RecalculateSharingRules.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Users/RecalculateSharingRules.php (original)
+++ vtigercrm/branches/5.0.3/modules/Users/RecalculateSharingRules.php Wed Dec 13 07:30:54 2006
@@ -11,7 +11,7 @@
 
 RecalculateSharingRules();
 
-header("Location: index.php?action=OrgSharingDetailView&parenttab=Settings&module=Users");
+header("Location: index.php?action=OrgSharingDetailView&parenttab=Settings&module=Settings");
 
 
 ?>

Modified: vtigercrm/branches/5.0.3/modules/Users/SaveOrgSharing.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Users/SaveOrgSharing.php (original)
+++ vtigercrm/branches/5.0.3/modules/Users/SaveOrgSharing.php Wed Dec 13 07:30:54 2006
@@ -39,6 +39,6 @@
 			
 		}
 }
-$loc = "Location: index.php?action=OrgSharingDetailView&module=Users&parenttab=Settings";
+$loc = "Location: index.php?action=OrgSharingDetailView&module=Settings&parenttab=Settings";
 header($loc);
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Wed Dec 13 06:46:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Dec 2006 14:46:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9969 - in
 /vtigercrm/branches/5.0.3: Smarty/templates/ modules/Settings/
Message-ID: <20061213144640.51442789BF6@vtiger.fosslabs.com>

Author: richie
Date: Wed Dec 13 07:46:28 2006
New Revision: 9969

Log:
Audit trial moved to settings

Added:
    vtigercrm/branches/5.0.3/modules/Settings/AuditTrail.php   (with props)
    vtigercrm/branches/5.0.3/modules/Settings/AuditTrailList.php   (with props)
    vtigercrm/branches/5.0.3/modules/Settings/SaveAuditTrail.php
    vtigercrm/branches/5.0.3/modules/Settings/ShowAuditTrail.php   (with props)
Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/AuditTrailList.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/ShowAuditTrail.tpl

Modified: vtigercrm/branches/5.0.3/Smarty/templates/AuditTrailList.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/AuditTrailList.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/AuditTrailList.tpl Wed Dec 13 07:46:28 2006
@@ -18,10 +18,10 @@
         <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
         <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
 <form action="index.php" method="post" name="AuditTrail" id="form">
-<input type='hidden' name='module' value='Users'>
+<input type='hidden' name='module' value='Settings'>
 <input type='hidden' name='action' value='AuditTrail'>
 <input type='hidden' name='return_action' value='ListView'>
-<input type='hidden' name='return_module' value='Users'>
+<input type='hidden' name='return_module' value='Settings'>
 <input type='hidden' name='parenttab' value='Settings'>
 
         <br>
@@ -135,7 +135,7 @@
                 'index.php',
                 {queue: {position: 'end', scope: 'command'},
                         method: 'post',
-                        postBody: 'module=Users&action=UsersAjax&file=SaveAuditTrail&ajax=true&audit_trail='+status,
+                        postBody: 'module=Settings&action=SettingsAjax&file=SaveAuditTrail&ajax=true&audit_trail='+status,
                         onComplete: function(response) {
                                 $("status").style.display="none";
                         }
@@ -149,7 +149,7 @@
 {
 	
 	var userid = $('user_list').options[$('user_list').selectedIndex].value;
-	window.open("index.php?module=Users&action=UsersAjax&file=ShowAuditTrail&userid="+userid,"","width=645,height=750,resizable=0,scrollbars=1,left=100");
+	window.open("index.php?module=Settings&action=SettingsAjax&file=ShowAuditTrail&userid="+userid,"","width=645,height=750,resizable=0,scrollbars=1,left=100");
 	
 
 }

Modified: vtigercrm/branches/5.0.3/Smarty/templates/ShowAuditTrail.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/ShowAuditTrail.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/ShowAuditTrail.tpl Wed Dec 13 07:46:28 2006
@@ -14,7 +14,7 @@
 <body class="small" marginwidth=0 marginheight=0 leftmargin=0 topmargin=0 bottommargin=0 rigthmargin=0>
 
 <form action="index.php" method="post" id="form">
-<input type='hidden' name='module' value='Users'>
+<input type='hidden' name='module' value='Settings'>
 <input type='hidden' id='userid' name='userid' value='{$USERID}'>
 
 <table  width="100%" border="0" cellspacing="0" cellpadding="0" class="mailClient mailClientBg">
@@ -50,7 +50,7 @@
                 'index.php',
                 {queue: {position: 'end', scope: 'command'},
                         method: 'post',
-                        postBody: 'module=Users&action=UsersAjax&file=ShowAuditTrail&ajax=true&'+url+'&userid='+userid,
+                        postBody: 'module=Settings&action=SettingsAjax&file=ShowAuditTrail&ajax=true&'+url+'&userid='+userid,
                         onComplete: function(response) {
                                 $("AuditTrailContents").innerHTML= response.responseText;
                         }



From vtigercrm-commits at vtiger.fosslabs.com  Wed Dec 13 07:06:58 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Dec 2006 15:06:58 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9970 - in
 /vtigercrm/branches/5.0.3: Smarty/templates/Settings/InventoryTerms.tpl
 modules/Settings/OrganizationTermsandConditions.php
 modules/Settings/savetermsandconditions.php
Message-ID: <20061213150658.29EAC789C08@vtiger.fosslabs.com>

Author: richie
Date: Wed Dec 13 08:06:51 2006
New Revision: 9970

Log:
inventory terms and condition moved to settings

Added:
    vtigercrm/branches/5.0.3/modules/Settings/OrganizationTermsandConditions.php
    vtigercrm/branches/5.0.3/modules/Settings/savetermsandconditions.php
Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/Settings/InventoryTerms.tpl

Modified: vtigercrm/branches/5.0.3/Smarty/templates/Settings/InventoryTerms.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/Settings/InventoryTerms.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/Settings/InventoryTerms.tpl Wed Dec 13 08:06:51 2006
@@ -18,7 +18,7 @@
         <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
 <br>
 <form action="index.php" method="post" name="tandc">
-<input type="hidden" name="module" value="Users">
+<input type="hidden" name="module" value="Settings">
 <input type="hidden" name="action">
 <input type="hidden" name="inv_terms_mode">
 <input type="hidden" name="parenttab" value="Settings">



From vtigercrm-commits at vtiger.fosslabs.com  Thu Dec 14 02:09:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 14 Dec 2006 10:09:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9971 -
 /vtigercrm/branches/5.0.3/modules/PurchaseOrder/Save.php
Message-ID: <20061214100939.ECCFA789AAD@vtiger.fosslabs.com>

Author: richie
Date: Thu Dec 14 03:09:35 2006
New Revision: 9971

Log:
* Modified to update the stock when PO status is Received Shipment when it is created also, Fixes #2741

Modified:
    vtigercrm/branches/5.0.3/modules/PurchaseOrder/Save.php

Modified: vtigercrm/branches/5.0.3/modules/PurchaseOrder/Save.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/PurchaseOrder/Save.php (original)
+++ vtigercrm/branches/5.0.3/modules/PurchaseOrder/Save.php Thu Dec 14 03:09:35 2006
@@ -33,13 +33,18 @@
 
 //Added code for auto product stock updation on receiving goods
 $focus->update_prod_stock='';
-if($focus->column_fields['postatus'] == 'Received Shipment' && $focus->mode == 'edit')
+if($focus->column_fields['postatus'] == 'Received Shipment')
 {
-        $prev_postatus=getPoStatus($focus->id);
-        if($focus->column_fields['postatus'] != $prev_postatus)
-        {
-                $focus->update_prod_stock='true';
-        }
+	if($focus->mode != 'edit')
+		$focus->update_prod_stock='true';
+	else
+	{
+        	$prev_postatus=getPoStatus($focus->id);
+        	if($focus->column_fields['postatus'] != $prev_postatus)
+        	{
+        	        $focus->update_prod_stock='true';
+        	}
+	}
 
 }
 



From vtigercrm-commits at vtiger.fosslabs.com  Thu Dec 14 02:23:29 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 14 Dec 2006 10:23:29 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9972 - in
 /vtigercrm/branches/5.0.3: ./ modules/Accounts/ modules/Calendar/
 modules/Contacts/ modules/HelpDesk/ modules/Leads/
 modules/Settings/language/
Message-ID: <20061214102329.35C6D789AAD@vtiger.fosslabs.com>

Author: richie
Date: Thu Dec 14 03:23:15 2006
New Revision: 9972

Log:
mailmerge template option will be hidden if no template is present

Modified:
    vtigercrm/branches/5.0.3/modules/Accounts/ListView.php
    vtigercrm/branches/5.0.3/modules/Calendar/OpenListView.php
    vtigercrm/branches/5.0.3/modules/Contacts/ListView.php
    vtigercrm/branches/5.0.3/modules/HelpDesk/ListView.php
    vtigercrm/branches/5.0.3/modules/Leads/ListView.php
    vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php
    vtigercrm/branches/5.0.3/vtigerversion.php

Modified: vtigercrm/branches/5.0.3/modules/Accounts/ListView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Accounts/ListView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Accounts/ListView.php Thu Dec 14 03:23:15 2006
@@ -226,7 +226,6 @@
 }
 if(isPermitted("Accounts","Merge") == 'yes') 
 {
-	$smarty->assign("MERGEBUTTON","<td><input title=\"$app_strings[LBL_MERGE_BUTTON_TITLE]\" accessKey=\"$app_strings[LBL_MERGE_BUTTON_KEY]\" class=\"crmbutton small create\" onclick=\"return massMerge('Accounts')\" type=\"submit\" name=\"Merge\" value=\" $app_strings[LBL_MERGE_BUTTON_LABEL]\"></td>");
 	$wordTemplateResult = fetchWordTemplateList("Accounts");
 	$tempCount = $adb->num_rows($wordTemplateResult);
 	$tempVal = $adb->fetch_array($wordTemplateResult);
@@ -235,8 +234,22 @@
 		$optionString .="<option value=\"".$tempVal["templateid"]."\">" .$tempVal["filename"] ."</option>";
 		$tempVal = $adb->fetch_array($wordTemplateResult);
 	}
-	$smarty->assign("WORDTEMPLATEOPTIONS","<td>".$app_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']."</td><td style=\"padding-left:5px;padding-right:5px\"><select class=\"small\" name=\"mergefile\">".$optionString."</select></td>");
-}
+	if($tempCount > 0)
+	{
+		$smarty->assign("WORDTEMPLATEOPTIONS","<td>".$app_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']."</td><td style=\"padding-left:5px;padding-right:5px\"><select class=\"small\" name=\"mergefile\">".$optionString."</select></td>");
+
+		$smarty->assign("MERGEBUTTON","<td><input title=\"$app_strings[LBL_MERGE_BUTTON_TITLE]\" accessKey=\"$app_strings[LBL_MERGE_BUTTON_KEY]\" class=\"crmbutton small create\" onclick=\"return massMerge('Accounts')\" type=\"submit\" name=\"Merge\" value=\" $app_strings[LBL_MERGE_BUTTON_LABEL]\"></td>");
+	}
+	else
+        {
+                require("user_privileges/user_privileges_1.php");
+                if($is_admin == true)
+                {
+		$smarty->assign("MERGEBUTTON",'<td><a href=index.php?module=Settings&action=upload&tempModule='.$currentModule.'>'. $app_strings["LBL_CREATE_MERGE_TEMPLATE"].'</td>');
+                }
+        }
+}
+
 //mass merge for word templates
 
 $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows;
@@ -268,7 +281,7 @@
 $smarty->assign("NAVIGATION", $navigationOutput);
 $smarty->assign("RECORD_COUNTS", $record_string);
 
-$check_button = Button_Check($module);
+$check_button = Button_Check($module); 
 $smarty->assign("CHECK", $check_button);
 
 if(isset($_REQUEST['ajax']) && $_REQUEST['ajax'] != '')

Modified: vtigercrm/branches/5.0.3/modules/Calendar/OpenListView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Calendar/OpenListView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Calendar/OpenListView.php Thu Dec 14 03:23:15 2006
@@ -75,7 +75,7 @@
 	{
 		//for upcoming avtivities
 		$list_query = " select vtiger_crmentity.crmid,vtiger_crmentity.smownerid,vtiger_crmentity.setype, vtiger_activity.*, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_account.accountid, vtiger_account.accountname, vtiger_recurringevents.recurringtype,vtiger_recurringevents.recurringdate from vtiger_activity inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid LEFT JOIN vtiger_activitygrouprelation ON vtiger_activitygrouprelation.activityid = vtiger_crmentity.crmid LEFT JOIN vtiger_groups ON vtiger_groups.groupname = vtiger_activitygrouprelation.groupname left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid left join vtiger_seactivityrel on vtiger_seactivityrel.activityid = vtiger_activity.activityid left outer join vtiger_account on vtiger_account.accountid = vtiger_contactdetails.accountid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid WHERE vtiger_crmentity.deleted=0 and (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task') AND ( vtiger_activity.status is NULL OR vtiger_activity.status != 'Completed' ) and ( vtiger_activity.status is NULL OR vtiger_activity.status != 'Deferred') and  (  vtiger_activity.eventstatus is NULL OR  vtiger_activity.eventstatus != 'Held') and (vtiger_activity.eventstatus is NULL OR  vtiger_activity.eventstatus != 'Not Held' ) ".$upcoming_condition." AND vtiger_crmentity.smownerid !=0 AND vtiger_salesmanactivityrel.smid ='$current_user->id'";
-		if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[9] == 3)
+		if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[16] == 3)
 		{
 			$sec_parameter=getListViewSecurityParameter('Calendar');
 			$list_query .= $sec_parameter;
@@ -87,7 +87,7 @@
 	{
 		//for pending activities
 		$list_query = " select vtiger_crmentity.crmid,vtiger_crmentity.smownerid,vtiger_crmentity.setype, vtiger_activity.*, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_account.accountid, vtiger_account.accountname, vtiger_recurringevents.recurringtype,vtiger_recurringevents.recurringdate from vtiger_activity inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid  LEFT JOIN vtiger_activitygrouprelation ON vtiger_activitygrouprelation.activityid = vtiger_crmentity.crmid LEFT JOIN vtiger_groups ON vtiger_groups.groupname = vtiger_activitygrouprelation.groupname left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid left join vtiger_seactivityrel on vtiger_seactivityrel.activityid = vtiger_activity.activityid left outer join vtiger_account on vtiger_account.accountid = vtiger_contactdetails.accountid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid WHERE vtiger_crmentity.deleted=0 and (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task') AND ( vtiger_activity.status is NULL OR vtiger_activity.status != 'Completed' ) and ( vtiger_activity.status is NULL OR vtiger_activity.status != 'Deferred') and (  vtiger_activity.eventstatus is NULL OR  vtiger_activity.eventstatus != 'Held') and (vtiger_activity.eventstatus is NULL OR  vtiger_activity.eventstatus != 'Not Held' ) ".$pending_condition." AND vtiger_crmentity.smownerid !=0 AND vtiger_salesmanactivityrel.smid ='$current_user->id'";
-		if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[9] == 3)                   
+		if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[16] == 3)                   
                 {
 			$sec_parameter=getListViewSecurityParameter('Calendar'); 
 	                $list_query .= $sec_parameter; 

Modified: vtigercrm/branches/5.0.3/modules/Contacts/ListView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Contacts/ListView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Contacts/ListView.php Thu Dec 14 03:23:15 2006
@@ -234,7 +234,6 @@
 }
 if(isPermitted("Contacts","Merge") == 'yes') 
 {
-	$smarty->assign("MERGEBUTTON","<td><input title=\"$app_strings[LBL_MERGE_BUTTON_TITLE]\" accessKey=\"$app_strings[LBL_MERGE_BUTTON_KEY]\" class=\"crmbutton small create\" onclick=\"return massMerge('Contacts')\" type=\"submit\" name=\"Merge\" value=\" $app_strings[LBL_MERGE_BUTTON_LABEL]\"></td>");
 	$wordTemplateResult = fetchWordTemplateList("Contacts");
 	$tempCount = $adb->num_rows($wordTemplateResult);
 	$tempVal = $adb->fetch_array($wordTemplateResult);
@@ -243,7 +242,20 @@
 		$optionString .="<option value=\"".$tempVal["templateid"]."\">" .$tempVal["filename"] ."</option>";
 		$tempVal = $adb->fetch_array($wordTemplateResult);
 	}
-	$smarty->assign("WORDTEMPLATEOPTIONS","<td>".$app_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']."</td><td style=\"padding-left:5px;padding-right:5px\"><select class=\"small\" name=\"mergefile\">".$optionString."</select></td>");
+	if($tempCount > 0)
+	{
+		$smarty->assign("WORDTEMPLATEOPTIONS","<td>".$app_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']."</td><td style=\"padding-left:5px;padding-right:5px\"><select class=\"small\" name=\"mergefile\">".$optionString."</select></td>");
+	
+		$smarty->assign("MERGEBUTTON","<td><input title=\"$app_strings[LBL_MERGE_BUTTON_TITLE]\" accessKey=\"$app_strings[LBL_MERGE_BUTTON_KEY]\" class=\"crmbutton small create\" onclick=\"return massMerge('Contacts')\" type=\"submit\" name=\"Merge\" value=\" $app_strings[LBL_MERGE_BUTTON_LABEL]\"></td>");
+	}
+	else
+	{ 
+		require("user_privileges/user_privileges_1.php");
+		if($is_admin == true)
+		{
+			$smarty->assign("MERGEBUTTON","<td><a href=index.php?module=Settings&action=upload&tempModule=".$currentModule.">". $app_strings['LBL_CREATE_MERGE_TEMPLATE']."</td>");
+		}
+	}
 }
 //mass merge for word templates
 

Modified: vtigercrm/branches/5.0.3/modules/HelpDesk/ListView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/HelpDesk/ListView.php (original)
+++ vtigercrm/branches/5.0.3/modules/HelpDesk/ListView.php Thu Dec 14 03:23:15 2006
@@ -204,7 +204,6 @@
 }
 if(isPermitted("HelpDesk","Merge") == 'yes') 
 {
-	$smarty->assign("MERGEBUTTON","<td><input title=\"$app_strings[LBL_MERGE_BUTTON_TITLE]\" accessKey=\"$app_strings[LBL_MERGE_BUTTON_KEY]\" class=\"crmbutton small create\" onclick=\"return massMerge('HelpDesk')\" type=\"submit\" name=\"Merge\" value=\" $app_strings[LBL_MERGE_BUTTON_LABEL]\"></td>");
 	$wordTemplateResult = fetchWordTemplateList("HelpDesk");
 	$tempCount = $adb->num_rows($wordTemplateResult);
 	$tempVal = $adb->fetch_array($wordTemplateResult);
@@ -213,7 +212,21 @@
 		$optionString .="<option value=\"".$tempVal["templateid"]."\">" .$tempVal["filename"] ."</option>";
 		$tempVal = $adb->fetch_array($wordTemplateResult);
 	}
-	$smarty->assign("WORDTEMPLATEOPTIONS","<td>".$app_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']."</td><td style=\"padding-left:5px;padding-right:5px\"><select class=\"small\" name=\"mergefile\">".$optionString."</select></td>");
+	if($tempCount > 0)
+	{
+		$smarty->assign("WORDTEMPLATEOPTIONS","<td>".$app_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']."</td><td style=\"padding-left:5px;padding-right:5px\"><select class=\"small\" name=\"mergefile\">".$optionString."</select></td>");
+
+		$smarty->assign("MERGEBUTTON","<td><input title=\"$app_strings[LBL_MERGE_BUTTON_TITLE]\" accessKey=\"$app_strings[LBL_MERGE_BUTTON_KEY]\" class=\"crmbutton small create\" onclick=\"return massMerge('HelpDesk')\" type=\"submit\" name=\"Merge\" value=\" $app_strings[LBL_MERGE_BUTTON_LABEL]\"></td>");
+	}
+	else
+        {
+                require("user_privileges/user_privileges_1.php");
+                if($is_admin == true)
+                {
+			$smarty->assign("MERGEBUTTON",'<td><a href=index.php?module=Settings&action=upload&tempModule='.$currentModule.'>'. $app_strings["LBL_CREATE_MERGE_TEMPLATE"].'</td>');
+                }
+        }
+
 }
 //mass merge for word templates
 

Modified: vtigercrm/branches/5.0.3/modules/Leads/ListView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Leads/ListView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Leads/ListView.php Thu Dec 14 03:23:15 2006
@@ -221,7 +221,6 @@
 }
 if(isPermitted("Leads","Merge") == 'yes') 
 {
-	$smarty->assign("MERGEBUTTON","<td><input title=\"$app_strings[LBL_MERGE_BUTTON_TITLE]\" accessKey=\"$app_strings[LBL_MERGE_BUTTON_KEY]\" class=\"crmbutton small create\" onclick=\"return massMerge('Leads')\" type=\"submit\" name=\"Merge\" value=\" $app_strings[LBL_MERGE_BUTTON_LABEL]\"></td>");
 	$wordTemplateResult = fetchWordTemplateList("Leads");
 	$tempCount = $adb->num_rows($wordTemplateResult);
 	$tempVal = $adb->fetch_array($wordTemplateResult);
@@ -230,7 +229,22 @@
 		$optionString .="<option value=\"".$tempVal["templateid"]."\">" .$tempVal["filename"] ."</option>";
 		$tempVal = $adb->fetch_array($wordTemplateResult);
 	}
-	$smarty->assign("WORDTEMPLATEOPTIONS","<td>".$mod_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']."</td><td style=\"padding-left:5px;padding-right:5px\"><select class=\"small\" name=\"mergefile\">".$optionString."</select></td>");
+	if($tempCount > 0)
+	{
+		$smarty->assign("WORDTEMPLATEOPTIONS","<td>".$mod_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']."</td><td style=\"padding-left:5px;padding-right:5px\"><select class=\"small\" name=\"mergefile\">".$optionString."</select></td>");
+
+		$smarty->assign("MERGEBUTTON","<td><input title=\"$app_strings[LBL_MERGE_BUTTON_TITLE]\" accessKey=\"$app_strings[LBL_MERGE_BUTTON_KEY]\" class=\"crmbutton small create\" onclick=\"return massMerge('Leads')\" type=\"submit\" name=\"Merge\" value=\" $app_strings[LBL_MERGE_BUTTON_LABEL]\"></td>");
+	}
+	else
+        {
+                require("user_privileges/user_privileges_1.php");
+                if($is_admin == true)
+                {
+			$smarty->assign("MERGEBUTTON",'<td><a href=index.php?module=Settings&action=upload&tempModule='.$currentModule.'>'. $app_strings["LBL_CREATE_MERGE_TEMPLATE"].'</td>');
+                }
+        }
+
+
 }
 //mass merge for word templates
 

Modified: vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php Thu Dec 14 03:23:15 2006
@@ -827,8 +827,13 @@
 'LBL_MEMBER_SELECTED'=>'Selected Members',
 'LBL_ENTITY'=>'Entity',
 'LBL_OF'=>'of',
-
-//Sharing
+'LBL_CREATE_NEW_GROUP'=>'Create New Group',
+'LBL_ADD_GROUP_BUTTON'=>'Add Group',
+'LBL_GROUP_MESG1'=>'Groups are a flexible way to assign access rights, when complex access rights has to be defined. You can combine multiple entities like Roles, Users, profiles etc into a single group.',
+'LBL_GROUP_MESG2'=>'To add, select the Entity members from left and click the ">>" button.',
+'LBL_GROUP_MESG3'=>'To remove, select the group members from the right and click the "<<" button.',
+
+//Sharing Privileges
 'LBL_GLOBAL_ACCESS_PRIVILEGES'=>'Organization-level Sharing Rules',
 'LBL_RECALCULATE_BUTTON'=>'Recalculate',
 'LBL_CHANGE'=>'Change',
@@ -868,6 +873,12 @@
 
 //Added for User Login History While moving from User to Settings
 'LBL_LOGIN_HISTORY'=>'Login History',
+//Sharing Access module moved to Setting
+'Read/Write'=>'Read/Write',
+'Read Only '=>'Read Only ',
+'LBL_GROUP'=>'Group',
+'LBL_ACCESS_RIGHTS_FOR_MODULES'=>'Access rights for relative modules',
+'LBL_ADD_RULE'=>'Add Rule',
 );
 
 

Modified: vtigercrm/branches/5.0.3/vtigerversion.php
==============================================================================
--- vtigercrm/branches/5.0.3/vtigerversion.php (original)
+++ vtigercrm/branches/5.0.3/vtigerversion.php Thu Dec 14 03:23:15 2006
@@ -10,5 +10,5 @@
  ********************************************************************************/
 $patch_version = '';
 $modified_database = '';
-$vtiger_current_version = '5.0.2';
+$vtiger_current_version = '5.0.3';
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Thu Dec 14 03:02:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 14 Dec 2006 11:02:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9973 - in
 /vtigercrm/branches/5.0.3: Smarty/templates/ActivityDetailView.tpl
 modules/Calendar/DetailView.php
Message-ID: <20061214110230.39EF6789BF4@vtiger.fosslabs.com>

Author: richie
Date: Thu Dec 14 04:02:23 2006
New Revision: 9973

Log:
cannot see invited users in detailview

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/ActivityDetailView.tpl
    vtigercrm/branches/5.0.3/modules/Calendar/DetailView.php

Modified: vtigercrm/branches/5.0.3/Smarty/templates/ActivityDetailView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/ActivityDetailView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/ActivityDetailView.tpl Thu Dec 14 04:02:23 2006
@@ -203,7 +203,7 @@
                                                                                         <td width="30%" valign="top" align=right><b>{$MOD.LBL_USERS}</b></td>
                                                                                         <td width="70%" align=left valign="top" >
 												{foreach item=username key=userid from=$INVITEDUSERS}
-                                                                                        	        {$username.3}<br>
+                                                                                        	        {$username}<br>
                                                                                                 {/foreach}
 											</td>
                                                                                 </tr>

Modified: vtigercrm/branches/5.0.3/modules/Calendar/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Calendar/DetailView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Calendar/DetailView.php Thu Dec 14 04:02:23 2006
@@ -28,7 +28,7 @@
 require_once('include/utils/utils.php');
 require_once('modules/Calendar/calendarLayout.php');
 include_once 'modules/Calendar/header.php';
-global $mod_strings, $currentModule;
+global $mod_strings, $currentModule,$adb;
 if( $_SESSION['mail_send_error']!="")
 {
 	echo '<b><font color=red>'. $mod_strings{"LBL_NOTIFICATION_ERROR"}.'</font></b><br>';
@@ -247,8 +247,18 @@
 		$data['recurringcheck'] = 'No';
 		$data['repeat_month_str'] = '';
 	}
+	$sql = 'select vtiger_users.user_name,vtiger_invitees.* from vtiger_invitees left join vtiger_users on vtiger_invitees.inviteeid=vtiger_users.id where activityid='.$focus->id;
+	$result = $adb->query($sql);
+	$num_rows=$adb->num_rows($result);
+	$invited_users=Array();
+	for($i=0;$i<$num_rows;$i++)
+	{
+		$userid=$adb->query_result($result,$i,'inviteeid');
+		$username=$adb->query_result($result,$i,'user_name');
+		$invited_users[$userid]=$username;
+	}
+	$smarty->assign("INVITEDUSERS",$invited_users);
 	$related_array = getRelatedLists("Calendar", $focus);
-	$smarty->assign("INVITEDUSERS",$related_array['Users']['entries']);
 	$smarty->assign("CONTACTS",$related_array['Contacts']['entries']);
 
 



From vtigercrm-commits at vtiger.fosslabs.com  Thu Dec 14 03:30:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 14 Dec 2006 11:30:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9974 -
 /vtigercrm/branches/5.0.3/Smarty/templates/ActivityEditView.tpl
Message-ID: <20061214113050.8245F78915E@vtiger.fosslabs.com>

Author: richie
Date: Thu Dec 14 04:30:46 2006
New Revision: 9974

Log:
contact list display arranged properly

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/ActivityEditView.tpl

Modified: vtigercrm/branches/5.0.3/Smarty/templates/ActivityEditView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/ActivityEditView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/ActivityEditView.tpl Thu Dec 14 04:30:46 2006
@@ -562,9 +562,7 @@
 								<td><b>{$APP.Contacts}</b></td>
 								<td colspan="2">
 									<input name="contactidlist" id="contactidlist" value="{$CONTACTSID}" type="hidden">
-									<textarea rows="5" name="contactlist" readonly="readonly" class="calTxt">
-									{$CONTACTSNAME}
-									</textarea>&nbsp;
+									<textarea rows="5" name="contactlist" readonly="readonly" class="calTxt">{$CONTACTSNAME}</textarea>&nbsp;
 									<input type="button" onclick="return window.open('index.php?module=Contacts&action=Popup&return_module=Calendar&popuptype=detailview&select=enable&form=EditView&form_submit=false','test','width=640,height=602,resizable=0,scrollbars=0');" class="crmButton small edit" name="selectcnt" value="Select Contacts">
 								</td>
 							</tr>



From vtigercrm-commits at vtiger.fosslabs.com  Thu Dec 14 05:45:08 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 14 Dec 2006 13:45:08 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9975 - in
 /vtigercrm/branches/5.0.3/modules: Contacts/Contacts.php Leads/Leads.php
 Potentials/Potentials.php Quotes/Quotes.php
Message-ID: <20061214134508.3A761789C34@vtiger.fosslabs.com>

Author: richie
Date: Thu Dec 14 06:44:57 2006
New Revision: 9975

Log:
Start and end date not visible in activity history . Fixes #2723

Modified:
    vtigercrm/branches/5.0.3/modules/Contacts/Contacts.php
    vtigercrm/branches/5.0.3/modules/Leads/Leads.php
    vtigercrm/branches/5.0.3/modules/Potentials/Potentials.php
    vtigercrm/branches/5.0.3/modules/Quotes/Quotes.php

Modified: vtigercrm/branches/5.0.3/modules/Contacts/Contacts.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Contacts/Contacts.php (original)
+++ vtigercrm/branches/5.0.3/modules/Contacts/Contacts.php Thu Dec 14 06:44:57 2006
@@ -398,7 +398,7 @@
 		global $log;
 		$log->debug("Entering get_history(".$id.") method ...");
 		$query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status, vtiger_activity.eventstatus,
-		vtiger_activity.activitytype, vtiger_contactdetails.contactid, vtiger_contactdetails.firstname,
+		vtiger_activity.activitytype, vtiger_activity.date_start, vtiger_activity.due_date,vtiger_contactdetails.contactid, vtiger_contactdetails.firstname,
 		vtiger_contactdetails.lastname, vtiger_crmentity.modifiedtime,
 		vtiger_crmentity.createdtime, vtiger_crmentity.description, vtiger_users.user_name
 				from vtiger_activity

Modified: vtigercrm/branches/5.0.3/modules/Leads/Leads.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Leads/Leads.php (original)
+++ vtigercrm/branches/5.0.3/modules/Leads/Leads.php Thu Dec 14 06:44:57 2006
@@ -291,8 +291,9 @@
 	global $log;
 	$log->debug("Entering get_history(".$id.") method ...");
 	$query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status,
-	vtiger_activity.eventstatus, vtiger_activity.activitytype, vtiger_crmentity.modifiedtime,
-	vtiger_crmentity.createdtime, vtiger_crmentity.description, vtiger_users.user_name,vtiger_activitygrouprelation.groupname
+		vtiger_activity.eventstatus, vtiger_activity.activitytype,vtiger_activity.date_start, 
+		vtiger_activity.due_date, vtiger_crmentity.modifiedtime,vtiger_crmentity.createdtime,
+		vtiger_crmentity.description, vtiger_users.user_name,vtiger_activitygrouprelation.groupname
 			from vtiger_activity
 			inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid
 			inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid

Modified: vtigercrm/branches/5.0.3/modules/Potentials/Potentials.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Potentials/Potentials.php (original)
+++ vtigercrm/branches/5.0.3/modules/Potentials/Potentials.php Thu Dec 14 06:44:57 2006
@@ -373,8 +373,9 @@
 			global $log;
 			$log->debug("Entering get_history(".$id.") method ...");
 			$query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status,
-		vtiger_activity.eventstatus, vtiger_activity.activitytype, vtiger_crmentity.modifiedtime,
-		vtiger_crmentity.createdtime, vtiger_crmentity.description, vtiger_users.user_name
+		vtiger_activity.eventstatus, vtiger_activity.activitytype,vtiger_activity.date_start, 
+		vtiger_activity.due_date, vtiger_crmentity.modifiedtime, vtiger_crmentity.createdtime, 
+		vtiger_crmentity.description, vtiger_users.user_name
 				from vtiger_activity
 				inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid
 				inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid

Modified: vtigercrm/branches/5.0.3/modules/Quotes/Quotes.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Quotes/Quotes.php (original)
+++ vtigercrm/branches/5.0.3/modules/Quotes/Quotes.php Thu Dec 14 06:44:57 2006
@@ -206,7 +206,8 @@
 		global $log;
 		$log->debug("Entering get_history(".$id.") method ...");
 		$query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status,
-			vtiger_activity.eventstatus, vtiger_activity.activitytype, vtiger_contactdetails.contactid,
+			vtiger_activity.eventstatus, vtiger_activity.activitytype,vtiger_activity.date_start, 
+			vtiger_activity.due_date, vtiger_contactdetails.contactid,
 			vtiger_contactdetails.firstname,vtiger_contactdetails.lastname, vtiger_crmentity.modifiedtime,
 			vtiger_crmentity.createdtime, vtiger_crmentity.description, vtiger_users.user_name
 			from vtiger_activity



From vtigercrm-commits at vtiger.fosslabs.com  Thu Dec 14 06:26:13 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 14 Dec 2006 14:26:13 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9976 -
 /vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl
Message-ID: <20061214142613.402D8789C0F@vtiger.fosslabs.com>

Author: richie
Date: Thu Dec 14 07:26:07 2006
New Revision: 9976

Log:
Textarea size increased to fix nowarp issue. Fixes 2676

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl

Modified: vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl Thu Dec 14 07:26:07 2006
@@ -133,7 +133,7 @@
 						{/if}
 							<!--{assign var="DESCRIPTION_SEPARATOR_STRING" value=" "}  {* Separates Description *}-->
 							<!--{assign var="DESCRIPTION_WORDWRAP_WIDTH" value="70"} {* No. of chars for word wrapping long lines of Description *}-->
-                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label|escape:'quotes'}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">
+                                                  <td width="100%" class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label|escape:'quotes'}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">
 							{$keyval}<!--|replace:$DESCRIPTION_SEPARATOR_STRING:"\x1"|replace:" ":"\x0"|replace:"\x1":$DESCRIPTION_SEPARATOR_STRING|wordwrap:$DESCRIPTION_WORDWRAP_WIDTH:"<br>&nbsp;"|replace:"\x0":"&nbsp;"}-->
 							</span>
                                               		<div id="editarea_{$label}" style="display:none;">



From vtigercrm-commits at vtiger.fosslabs.com  Fri Dec 15 04:02:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 15 Dec 2006 12:02:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9977 -
 /vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl
Message-ID: <20061215120226.33290789AA1@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Fri Dec 15 05:02:09 2006
New Revision: 9977

Log:
Tag cloud validate has been fixed--Jeri

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl

Modified: vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl Fri Dec 15 05:02:09 2006
@@ -46,7 +46,7 @@
 
 function tagvalidate()
 {ldelim}
-	if(document.getElementById('txtbox_tagfields').value != '')
+	if(trim(document.getElementById('txtbox_tagfields').value) != '')
 		SaveTag('txtbox_tagfields','{$ID}','{$MODULE}');	
 	else
 	{ldelim}



From vtigercrm-commits at vtiger.fosslabs.com  Fri Dec 15 05:25:22 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 15 Dec 2006 13:25:22 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9978 -
 /vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php
Message-ID: <20061215132522.76DD5788A8F@vtiger.fosslabs.com>

Author: richie
Date: Fri Dec 15 06:25:15 2006
New Revision: 9978

Log:
missing labels added

Modified:
    vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php

Modified: vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php Fri Dec 15 06:25:15 2006
@@ -879,7 +879,12 @@
 'LBL_GROUP'=>'Group',
 'LBL_ACCESS_RIGHTS_FOR_MODULES'=>'Access rights for relative modules',
 'LBL_ADD_RULE'=>'Add Rule',
+'LBL_ADD_CUSTOM_RULE'=>'Add Custom Privilege Rule',
+'LBL_RULE_CONSTRUCTION'=>'Rule Construction Display',
+'LBL_STEP'=>'Step',
+'LBL_SELECT_ENTITY'=>'Select an entity below',
+'LBL_CAN_BE_ACCESSED_BY'=>'Can be accessed by',
+'LBL_PERMISSIONS'=>'Permissions',
+
 );
-
-
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Fri Dec 15 05:39:16 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 15 Dec 2006 13:39:16 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9979 - in
 /vtigercrm/branches/5.0.3: include/utils/ListViewUtils.php
 modules/Campaigns/Campaigns.php
Message-ID: <20061215133916.B922A789893@vtiger.fosslabs.com>

Author: richie
Date: Fri Dec 15 06:39:10 2006
New Revision: 9979

Log:
changes made to show accountname in campaings related to

Modified:
    vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php
    vtigercrm/branches/5.0.3/modules/Campaigns/Campaigns.php

Modified: vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php (original)
+++ vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Fri Dec 15 06:39:10 2006
@@ -2335,7 +2335,7 @@
 {
 	global $log;
 	$log->debug("Entering getRelatedToEntity(".$module.",".$list_result.",".$rset.") method ...");
-
+	
 	global $adb;
 	$seid = $adb->query_result($list_result,$rset,"relatedto");
 	$action = "DetailView";
@@ -2462,8 +2462,10 @@
         $evt_result = $adb->query($evt_query);
 		$numrows= $adb->num_rows($evt_result);
 		
-		$parent_module = $adb->query_result($evt_result,0,'setype');
+	$parent_module = $adb->query_result($evt_result,0,'setype');
         $parent_id = $adb->query_result($evt_result,0,'crmid');
+
+
 		
 		if ($numrows>1){
 		$parent_module ='Multiple';
@@ -2541,6 +2543,16 @@
 			$parent_name = substr($parent_name,0,25).'...';
 		}
 	}
+	if($parent_module == 'Campaigns')
+	{
+		$parent_query = "SELECT campaignname FROM vtiger_campaign WHERE campaignid=".$parent_id;
+		$parent_result = $adb->query($parent_query);
+		$parent_name = $adb->query_result($parent_result,0,"campaignname");
+		if(strlen($parent_name) > 25)
+		{
+			$parent_name = substr($parent_name,0,25).'...';
+		}
+	}
 
 	//added by rdhital for better emails - Raju
 	if ($parent_module == 'Multiple')

Modified: vtigercrm/branches/5.0.3/modules/Campaigns/Campaigns.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Campaigns/Campaigns.php (original)
+++ vtigercrm/branches/5.0.3/modules/Campaigns/Campaigns.php Fri Dec 15 06:39:10 2006
@@ -187,7 +187,7 @@
 		else
 			$returnset = '&return_module=Campaigns&return_action=CallRelatedList&return_id='.$id;
 
-		$query = 'select vtiger_users.user_name,vtiger_groups.groupname, vtiger_potential.potentialid, vtiger_potential.potentialname, vtiger_potential.potentialtype, vtiger_potential.sales_stage, vtiger_potential.amount, vtiger_potential.closingdate, vtiger_crmentity.crmid, vtiger_crmentity.smownerid from vtiger_campaign inner join vtiger_potential on vtiger_campaign.campaignid = vtiger_potential.campaignid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_potential.potentialid left join vtiger_potentialgrouprelation on vtiger_potential.potentialid=vtiger_potentialgrouprelation.potentialid left join vtiger_groups on vtiger_groups.groupname=vtiger_potentialgrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_campaign.campaignid = '.$id.' and vtiger_crmentity.deleted=0';
+		$query = 'select vtiger_users.user_name,vtiger_groups.groupname, vtiger_potential.accountid, vtiger_potential.potentialid, vtiger_potential.potentialname, vtiger_potential.potentialtype, vtiger_potential.sales_stage, vtiger_potential.amount, vtiger_potential.closingdate, vtiger_crmentity.crmid, vtiger_crmentity.smownerid from vtiger_campaign inner join vtiger_potential on vtiger_campaign.campaignid = vtiger_potential.campaignid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_potential.potentialid left join vtiger_potentialgrouprelation on vtiger_potential.potentialid=vtiger_potentialgrouprelation.potentialid left join vtiger_groups on vtiger_groups.groupname=vtiger_potentialgrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_campaign.campaignid = '.$id.' and vtiger_crmentity.deleted=0';
 		if($this->column_fields['account_id'] != 0)
 		$log->debug("Exiting get_opportunities method ...");
 		return GetRelatedList('Campaigns','Potentials',$focus,$query,$button,$returnset);
@@ -248,6 +248,7 @@
 				OR activitytype = 'Meeting')";
 		$log->debug("Exiting get_activities method ...");
 		return GetRelatedList('Campaigns','Calendar',$focus,$query,$button,$returnset);
+	
 	}
 
 }



From vtigercrm-commits at vtiger.fosslabs.com  Fri Dec 15 05:41:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 15 Dec 2006 13:41:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9980 -
 /vtigercrm/branches/5.0.3/Smarty/templates/DisplayFields.tpl
Message-ID: <20061215134145.2C1D6789893@vtiger.fosslabs.com>

Author: richie
Date: Fri Dec 15 06:41:40 2006
New Revision: 9980

Log:
textfield size modified in firstname and website

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/DisplayFields.tpl

Modified: vtigercrm/branches/5.0.3/Smarty/templates/DisplayFields.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/DisplayFields.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/DisplayFields.tpl Fri Dec 15 06:41:40 2006
@@ -270,8 +270,8 @@
 				{$fldlabel}
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
-				&nbsp;&nbsp;http://&nbsp;
-				<input type="text" tabindex="{$vt_tab}" name="{$fldname}" style="border:1px solid #bababa;" size="27" onFocus="this.className='detailedViewTextBoxOn'"onBlur="this.className='detailedViewTextBox'" value="{$fldvalue}">
+				&nbsp;&nbsp;http://
+			<input style="width:74%;" class = 'detailedViewTextBoxOn' type="text" tabindex="{$vt_tab}" name="{$fldname}" style="border:1px solid #bababa;" size="27" onFocus="this.className='detailedViewTextBoxOn'"onBlur="this.className='detailedViewTextBox'"  value="{$fldvalue}">
 			</td>
 
 		{elseif $uitype eq 85}
@@ -423,7 +423,7 @@
 						{/foreach}
 					{/foreach}
 				</select>
-				<input type="text" name="{$fldname}" tabindex="{$vt_tab}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" value= "{$secondvalue}">
+			<input type="text" name="{$fldname}" tabindex="{$vt_tab}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" style="width:58%;" value= "{$secondvalue}" >
 			</td>
 
 		{elseif $uitype eq 22}



From vtigercrm-commits at vtiger.fosslabs.com  Fri Dec 15 06:36:15 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 15 Dec 2006 14:36:15 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9981 - in
 /vtigercrm/branches/5.0.3: Smarty/templates/ Smarty/templates/Inventory/
 include/language/ modules/Accounts/ modules/Calendar/ modules/Campaigns/
 modules/Contacts/ modules/Faq/ modules/HelpDesk/ modules/Invoice/
 modules/Leads/ modules/Notes/ modules/PriceBooks/ modules/Products/
 modules/PurchaseOrder/ modules/Quotes/ modules/SalesOrder/ modules/Users/
 modules/Vendors/
Message-ID: <20061215143615.B3D2678916B@vtiger.fosslabs.com>

Author: richie
Date: Fri Dec 15 07:35:38 2006
New Revision: 9981

Log:
Text changed in header when a entity is duplicated

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/ActivityEditView.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/CreateView.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/Inventory/InventoryCreateView.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/UserEditView.tpl
    vtigercrm/branches/5.0.3/include/language/en_us.lang.php
    vtigercrm/branches/5.0.3/modules/Accounts/EditView.php
    vtigercrm/branches/5.0.3/modules/Calendar/EditView.php
    vtigercrm/branches/5.0.3/modules/Campaigns/EditView.php
    vtigercrm/branches/5.0.3/modules/Contacts/EditView.php
    vtigercrm/branches/5.0.3/modules/Faq/EditView.php
    vtigercrm/branches/5.0.3/modules/HelpDesk/EditView.php
    vtigercrm/branches/5.0.3/modules/Invoice/EditView.php
    vtigercrm/branches/5.0.3/modules/Leads/EditView.php
    vtigercrm/branches/5.0.3/modules/Notes/EditView.php
    vtigercrm/branches/5.0.3/modules/PriceBooks/EditView.php
    vtigercrm/branches/5.0.3/modules/Products/EditView.php
    vtigercrm/branches/5.0.3/modules/PurchaseOrder/EditView.php
    vtigercrm/branches/5.0.3/modules/Quotes/EditView.php
    vtigercrm/branches/5.0.3/modules/SalesOrder/EditView.php
    vtigercrm/branches/5.0.3/modules/Users/EditView.php
    vtigercrm/branches/5.0.3/modules/Vendors/EditView.php

Modified: vtigercrm/branches/5.0.3/Smarty/templates/ActivityEditView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/ActivityEditView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/ActivityEditView.tpl Fri Dec 15 07:35:38 2006
@@ -43,7 +43,11 @@
 					<span class="small">{$UPDATEINFO}	 </span> 
 				{/if}
 				{if $OP_MODE eq 'create_view'}
+					{if $DUPLICATE neq 'true'}
 					<span class="lvtHeaderText">{$APP.LBL_CREATING} {$SINGLE_MOD}</span> <br>
+					{else}
+					<span class="lvtHeaderText">{$APP.LBL_DUPLICATING} "{$NAME}"</span> <br>
+					{/if}
 				{/if}
 			</td></tr>
 		</table>

Modified: vtigercrm/branches/5.0.3/Smarty/templates/CreateView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/CreateView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/CreateView.tpl Fri Dec 15 07:35:38 2006
@@ -61,7 +61,11 @@
 			{$UPDATEINFO}	 
 		 {/if}
 		 {if $OP_MODE eq 'create_view'}
+			{if $DUPLICATE neq 'true'}
 			<span class="lvtHeaderText">{$APP.LBL_CREATING} {$APP.LBL_NEW} {$APP[$SINGLE_MOD]}</span> <br>
+			{else}
+			<span class="lvtHeaderText">{$APP.LBL_DUPLICATING} "{$NAME}" </span> <br>
+			{/if}
 		 {/if}
 
 		 <hr noshade size=1>

Modified: vtigercrm/branches/5.0.3/Smarty/templates/Inventory/InventoryCreateView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/Inventory/InventoryCreateView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/Inventory/InventoryCreateView.tpl Fri Dec 15 07:35:38 2006
@@ -65,7 +65,11 @@
 			{$UPDATEINFO}	 
 		 {/if}
 		 {if $OP_MODE eq 'create_view'}
+			{if $DUPLICATE neq 'true'}
 			<span class="lvtHeaderText">{$APP.LBL_CREATING} {$APP.LBL_NEW} {$MOD[$SINGLE_MOD]}</span> <br>
+			{else}
+			<span class="lvtHeaderText">{$APP.LBL_DUPLICATING} "{$NAME}" </span> <br>
+			{/if}
 		 {/if}
 
 		 <hr noshade size=1>

Modified: vtigercrm/branches/5.0.3/Smarty/templates/UserEditView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/UserEditView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/UserEditView.tpl Fri Dec 15 07:35:38 2006
@@ -90,7 +90,11 @@
 					{if $MODE eq 'edit'}
 						{$UMOD.LBL_EDITING} "{$USERNAME}" 
 					{else}
+						{if $DUPLICATE neq 'true'}
 						{$UMOD.LBL_CREATE_NEW_USER}
+						{else}
+						{$APP.LBL_DUPLICATING} "{$USERNAME}"
+						{/if}
 					{/if}
 					</b></span>
 				{else}
@@ -106,7 +110,9 @@
 			{if $MODE eq 'edit'}
 				<td><b class="small">{$UMOD.LBL_EDIT_VIEW} "{$USERNAME}"</b>
 			{else}
+				{if $DUPLICATE neq 'true'}
 				<td><b class="small">{$UMOD.LBL_CREATE_NEW_USER}</b>
+				{/if}
 			{/if}
 			</td>
                 </tr>

Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/include/language/en_us.lang.php Fri Dec 15 07:35:38 2006
@@ -424,6 +424,7 @@
 'LBL_MORE' => 'More',
 'LBL_BASIC' => 'Basic',
 'LBL_CREATING' => 'Creating',
+'LBL_DUPLICATING' => 'Duplicating',
 'LBL_EDITING' => 'Editing',
 'LBL_NEW' => 'New',
 'Lead' => 'Lead',

Modified: vtigercrm/branches/5.0.3/modules/Accounts/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Accounts/EditView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Accounts/EditView.php Fri Dec 15 07:35:38 2006
@@ -110,6 +110,7 @@
 
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
+$smarty->assign("DUPLICATE",$_REQUEST['isDuplicate'] );
  
 if ($focus->mode == 'edit')
 $smarty->display('salesEditView.tpl');

Modified: vtigercrm/branches/5.0.3/modules/Calendar/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Calendar/EditView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Calendar/EditView.php Fri Dec 15 07:35:38 2006
@@ -240,6 +240,7 @@
 
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
+$smarty->assign("DUPLICATE", $_REQUEST['isDuplicate']);
 
 $smarty->display("ActivityEditView.tpl");
 

Modified: vtigercrm/branches/5.0.3/modules/Campaigns/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Campaigns/EditView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Campaigns/EditView.php Fri Dec 15 07:35:38 2006
@@ -99,7 +99,7 @@
 
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
-
+$smarty->assign("DUPLICATE", $_REQUEST['isDuplicate']);
 if($focus->mode == 'edit')
 	$smarty->display("salesEditView.tpl");
 else

Modified: vtigercrm/branches/5.0.3/modules/Contacts/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Contacts/EditView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Contacts/EditView.php Fri Dec 15 07:35:38 2006
@@ -205,6 +205,7 @@
 
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
+$smarty->assign("DUPLICATE", $_REQUEST['isDuplicate']);
 
 if($focus->mode == 'edit')
 $smarty->display("salesEditView.tpl");

Modified: vtigercrm/branches/5.0.3/modules/Faq/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Faq/EditView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Faq/EditView.php Fri Dec 15 07:35:38 2006
@@ -111,7 +111,7 @@
 	//Added to display the Faq comments information
 	$smarty->assign("COMMENT_BLOCK",$focus->getFAQComments($_REQUEST['record']));
 }
-
+$smarty->assign("DUPLICATE", $_REQUEST['isDuplicate']);
 if($focus->mode == 'edit')
 	$smarty->display("salesEditView.tpl");
 else

Modified: vtigercrm/branches/5.0.3/modules/HelpDesk/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/HelpDesk/EditView.php (original)
+++ vtigercrm/branches/5.0.3/modules/HelpDesk/EditView.php Fri Dec 15 07:35:38 2006
@@ -111,7 +111,7 @@
 	//Added to display the ticket comments information
 	$smarty->assign("COMMENT_BLOCK",$focus->getCommentInformation($_REQUEST['record']));
 }
-
+$smarty->assign("DUPLICATE", $_REQUEST['isDuplicate']);
 if($focus->mode == 'edit')
 	$smarty->display("salesEditView.tpl");
 else

Modified: vtigercrm/branches/5.0.3/modules/Invoice/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Invoice/EditView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Invoice/EditView.php Fri Dec 15 07:35:38 2006
@@ -351,7 +351,7 @@
 
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
-
+$smarty->assign("DUPLICATE", $_REQUEST['isDuplicate']);
 if($focus->mode == 'edit')
 	$smarty->display("Inventory/InventoryEditView.tpl");
 else

Modified: vtigercrm/branches/5.0.3/modules/Leads/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Leads/EditView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Leads/EditView.php Fri Dec 15 07:35:38 2006
@@ -108,7 +108,7 @@
 
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
-
+$smarty->assign("DUPLICATE",$_REQUEST['isDuplicate']);
 if($focus->mode == 'edit')
 $smarty->display("salesEditView.tpl");
 else

Modified: vtigercrm/branches/5.0.3/modules/Notes/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Notes/EditView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Notes/EditView.php Fri Dec 15 07:35:38 2006
@@ -182,7 +182,7 @@
  $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);
  $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']);
  $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']);
-
+ $smarty->assign("DUPLICATE", $_REQUEST['isDuplicate']);
 if($focus->mode == 'edit')
 	$smarty->display("salesEditView.tpl");
 else

Modified: vtigercrm/branches/5.0.3/modules/PriceBooks/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/PriceBooks/EditView.php (original)
+++ vtigercrm/branches/5.0.3/modules/PriceBooks/EditView.php Fri Dec 15 07:35:38 2006
@@ -90,7 +90,7 @@
 
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
-
+$smarty->assign("DUPLICATE", $_REQUEST['isDuplicate']);
 if($focus->mode == 'edit')
 	$smarty->display('Inventory/InventoryEditView.tpl');
 else 

Modified: vtigercrm/branches/5.0.3/modules/Products/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Products/EditView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Products/EditView.php Fri Dec 15 07:35:38 2006
@@ -203,7 +203,7 @@
 
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
-
+$smarty->assign("DUPLICATE", $_REQUEST['isDuplicate']);
 if($focus->mode == 'edit')
 	$smarty->display('Inventory/InventoryEditView.tpl');
 else

Modified: vtigercrm/branches/5.0.3/modules/PurchaseOrder/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/PurchaseOrder/EditView.php (original)
+++ vtigercrm/branches/5.0.3/modules/PurchaseOrder/EditView.php Fri Dec 15 07:35:38 2006
@@ -199,6 +199,7 @@
 
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
+$smarty->assign("DUPLICATE", $_REQUEST['isDuplicate']);
 if($focus->mode == 'edit')
 	$smarty->display('Inventory/InventoryEditView.tpl');
 else

Modified: vtigercrm/branches/5.0.3/modules/Quotes/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Quotes/EditView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Quotes/EditView.php Fri Dec 15 07:35:38 2006
@@ -209,6 +209,7 @@
 
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
+$smarty->assign("DUPLICATE", $_REQUEST['isDuplicate']);
 if($focus->mode == 'edit')
 	$smarty->display("Inventory/InventoryEditView.tpl");
 else

Modified: vtigercrm/branches/5.0.3/modules/SalesOrder/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/SalesOrder/EditView.php (original)
+++ vtigercrm/branches/5.0.3/modules/SalesOrder/EditView.php Fri Dec 15 07:35:38 2006
@@ -307,6 +307,7 @@
 
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
+$smarty->assign("DUPLICATE", $_REQUEST['isDuplicate']);
 if($focus->mode == 'edit')
 	$smarty->display("Inventory/InventoryEditView.tpl");
 else

Modified: vtigercrm/branches/5.0.3/modules/Users/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Users/EditView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Users/EditView.php Fri Dec 15 07:35:38 2006
@@ -110,8 +110,7 @@
 }
 
 $smarty->assign("HOMEORDER",$focus->getHomeOrder($focus->id));
-
-
+$smarty->assign("DUPLICATE",$_REQUEST['isDuplicate']);
 
 $smarty->assign('PARENTTAB',$_REQUEST['parenttab']);
 

Modified: vtigercrm/branches/5.0.3/modules/Vendors/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Vendors/EditView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Vendors/EditView.php Fri Dec 15 07:35:38 2006
@@ -95,6 +95,7 @@
 
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
+$smarty->assign("DUPLICATE", $_REQUEST['isDuplicate']);
 
 if($focus->mode == 'edit')
 	$smarty->display('Inventory/InventoryEditView.tpl');



From vtigercrm-commits at vtiger.fosslabs.com  Fri Dec 15 06:42:04 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 15 Dec 2006 14:42:04 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9982 -
	/vtigercrm/branches/5.0.3/include/js/Mail.js
Message-ID: <20061215144204.77104789AA1@vtiger.fosslabs.com>

Author: richie
Date: Fri Dec 15 07:42:00 2006
New Revision: 9982

Log:
alert message changed

Modified:
    vtigercrm/branches/5.0.3/include/js/Mail.js

Modified: vtigercrm/branches/5.0.3/include/js/Mail.js
==============================================================================
--- vtigercrm/branches/5.0.3/include/js/Mail.js (original)
+++ vtigercrm/branches/5.0.3/include/js/Mail.js Fri Dec 15 07:42:00 2006
@@ -79,7 +79,7 @@
 		window.close();
 	}else
 	{
-		alert('The user "'+parentname+'" doesn\'t have an email id' );
+		alert('"'+parentname+'" doesn\'t have an Email Id' );
 		return false;
 	}
 }	



From vtigercrm-commits at vtiger.fosslabs.com  Fri Dec 15 22:31:19 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 16 Dec 2006 06:31:19 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9983 -
	/vtigercrm/branches/5.0.3/modules/Users/
Message-ID: <20061216063119.6D374789D16@vtiger.fosslabs.com>

Author: richie
Date: Fri Dec 15 23:31:01 2006
New Revision: 9983

Log:
files moved to settings

Removed:
    vtigercrm/branches/5.0.3/modules/Users/AuditTrail.php
    vtigercrm/branches/5.0.3/modules/Users/AuditTrailList.php
    vtigercrm/branches/5.0.3/modules/Users/CreateSharingRule.php
    vtigercrm/branches/5.0.3/modules/Users/DefModuleView.php
    vtigercrm/branches/5.0.3/modules/Users/DefaultFieldPermissions.php
    vtigercrm/branches/5.0.3/modules/Users/EditDefOrgFieldLevelAccess.php
    vtigercrm/branches/5.0.3/modules/Users/EditInventoryNotification.php
    vtigercrm/branches/5.0.3/modules/Users/EditNotification.php
    vtigercrm/branches/5.0.3/modules/Users/GroupDetailView.php
    vtigercrm/branches/5.0.3/modules/Users/ListLoginHistory.php
    vtigercrm/branches/5.0.3/modules/Users/ListProfiles.php
    vtigercrm/branches/5.0.3/modules/Users/OrgSharingDetailView.php
    vtigercrm/branches/5.0.3/modules/Users/OrganizationTermsandConditions.php
    vtigercrm/branches/5.0.3/modules/Users/RoleDeleteStep1.php
    vtigercrm/branches/5.0.3/modules/Users/RoleDetailView.php
    vtigercrm/branches/5.0.3/modules/Users/SaveAuditTrail.php
    vtigercrm/branches/5.0.3/modules/Users/SaveInventoryNotification.php
    vtigercrm/branches/5.0.3/modules/Users/SaveNotification.php
    vtigercrm/branches/5.0.3/modules/Users/SaveRole.php
    vtigercrm/branches/5.0.3/modules/Users/SaveSharingRule.php
    vtigercrm/branches/5.0.3/modules/Users/ShowAuditTrail.php
    vtigercrm/branches/5.0.3/modules/Users/UpdateDefaultFieldLevelAccess.php
    vtigercrm/branches/5.0.3/modules/Users/createemailtemplate.php
    vtigercrm/branches/5.0.3/modules/Users/createnewgroup.php
    vtigercrm/branches/5.0.3/modules/Users/createrole.php
    vtigercrm/branches/5.0.3/modules/Users/deleteemailtemplate.php
    vtigercrm/branches/5.0.3/modules/Users/detailviewemailtemplate.php
    vtigercrm/branches/5.0.3/modules/Users/editemailtemplate.php
    vtigercrm/branches/5.0.3/modules/Users/listemailtemplates.php
    vtigercrm/branches/5.0.3/modules/Users/listgroups.php
    vtigercrm/branches/5.0.3/modules/Users/listinventorynotifications.php
    vtigercrm/branches/5.0.3/modules/Users/listnotificationschedulers.php
    vtigercrm/branches/5.0.3/modules/Users/listroles.php
    vtigercrm/branches/5.0.3/modules/Users/listwordtemplates.php
    vtigercrm/branches/5.0.3/modules/Users/profilePrivileges.php
    vtigercrm/branches/5.0.3/modules/Users/saveemailtemplate.php
    vtigercrm/branches/5.0.3/modules/Users/savetermsandconditions.php
    vtigercrm/branches/5.0.3/modules/Users/upload.php



From vtigercrm-commits at vtiger.fosslabs.com  Sat Dec 16 00:24:03 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 16 Dec 2006 08:24:03 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9984 -
	/vtigercrm/branches/5.0.3/data/CRMEntity.php
Message-ID: <20061216082403.74C07789C18@vtiger.fosslabs.com>

Author: richie
Date: Sat Dec 16 01:23:58 2006
New Revision: 9984

Log:
* Added condition to avoid function call to getDBInsertDateValue in ajax save, Fixes #2731

Modified:
    vtigercrm/branches/5.0.3/data/CRMEntity.php

Modified: vtigercrm/branches/5.0.3/data/CRMEntity.php
==============================================================================
--- vtigercrm/branches/5.0.3/data/CRMEntity.php (original)
+++ vtigercrm/branches/5.0.3/data/CRMEntity.php Sat Dec 16 01:23:58 2006
@@ -420,7 +420,8 @@
 				  }
 				  else
 				  {
-					  $fldvalue = getDBInsertDateValue($this->column_fields[$fieldname]);
+					  //Added to avoid function call getDBInsertDateValue in ajax save
+					  $fldvalue = (($_REQUEST['ajxaction'] == 'DETAILVIEW')?$this->column_fields[$fieldname]:getDBInsertDateValue($this->column_fields[$fieldname]));
 				  }
 			  }
 			  elseif($uitype == 7)



From vtigercrm-commits at vtiger.fosslabs.com  Sat Dec 16 02:29:18 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 16 Dec 2006 10:29:18 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9985 -
 /vtigercrm/branches/5.0.3/themes/bluelagoon/style.css
Message-ID: <20061216102918.7525A789051@vtiger.fosslabs.com>

Author: richie
Date: Sat Dec 16 03:29:13 2006
New Revision: 9985

Log:
style modified

Modified:
    vtigercrm/branches/5.0.3/themes/bluelagoon/style.css

Modified: vtigercrm/branches/5.0.3/themes/bluelagoon/style.css
==============================================================================
--- vtigercrm/branches/5.0.3/themes/bluelagoon/style.css (original)
+++ vtigercrm/branches/5.0.3/themes/bluelagoon/style.css Sat Dec 16 03:29:13 2006
@@ -1753,9 +1753,8 @@
 
 }
 
-/*
 .cellLabel {
-	background-color:#eaebd9;
+	background-color:#f5f5ff;
 	border-top:1px solid #efefef;
 	border-bottom:1px solid #dadada;
 	color:#555555;
@@ -1765,7 +1764,6 @@
 	color:#333333;
 	border-bottom:1px solid #dadada;
 }
-*/
 
 .listTable{
 	border-left:1px solid #cccccc;



From vtigercrm-commits at vtiger.fosslabs.com  Sun Dec 17 23:20:51 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 18 Dec 2006 07:20:51 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9986 - in
 /vtigercrm/branches/5.0.3/Smarty/templates: CustomView.tpl DetailView.tpl
Message-ID: <20061218072051.B3EA7788B4B@vtiger.fosslabs.com>

Author: richie
Date: Mon Dec 18 00:20:47 2006
New Revision: 9986

Log:
UI issue fixed

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl

Modified: vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl Mon Dec 18 00:20:47 2006
@@ -568,6 +568,8 @@
   </td></tr>
   <tr><td colspan="4">&nbsp;</td></tr>
 </table>
+</table>
+</table>
 {$STDFILTER_JAVASCRIPT}
 {$JAVASCRIPT}
 <!-- to show the mandatory fields while creating new customview -->

Modified: vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl Mon Dec 18 00:20:47 2006
@@ -293,7 +293,10 @@
 				{else}
 					{include file="DetailViewFields.tpl"}
 				{/if}
-			   {/if}
+			{else}
+                                <td class="dvtCellLabel" align=right>&nbsp;</td>
+                                <td class="dvtCellInfo" align=left >&nbsp;</td>
+			{/if}
                                    {/foreach}
 						      </tr>	
 						   {/foreach}	



From vtigercrm-commits at vtiger.fosslabs.com  Sun Dec 17 23:42:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 18 Dec 2006 07:42:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9987 - in
 /vtigercrm/branches/5.0.3: Smarty/templates/DetailView.tpl
 modules/Accounts/DetailView.php modules/Contacts/DetailView.php
 modules/HelpDesk/DetailView.php modules/Leads/DetailView.php
Message-ID: <20061218074202.B8F14788CDB@vtiger.fosslabs.com>

Author: richie
Date: Mon Dec 18 00:41:49 2006
New Revision: 9987

Log:
mail merge template check added

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl
    vtigercrm/branches/5.0.3/modules/Accounts/DetailView.php
    vtigercrm/branches/5.0.3/modules/Contacts/DetailView.php
    vtigercrm/branches/5.0.3/modules/HelpDesk/DetailView.php
    vtigercrm/branches/5.0.3/modules/Leads/DetailView.php

Modified: vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl Mon Dec 18 00:41:49 2006
@@ -293,10 +293,10 @@
 				{else}
 					{include file="DetailViewFields.tpl"}
 				{/if}
-			{else}
-                                <td class="dvtCellLabel" align=right>&nbsp;</td>
-                                <td class="dvtCellInfo" align=left >&nbsp;</td>
-			{/if}
+			   {else}
+				<td class="dvtCellLabel" align=right>&nbsp;</td>
+				<td class="dvtCellInfo" align=left >&nbsp;</td>
+			   {/if}
                                    {/foreach}
 						      </tr>	
 						   {/foreach}	
@@ -416,10 +416,14 @@
       					   <td class="rightMailMergeHeader"><b>{$WORDTEMPLATEOPTIONS}</b></td>
       				</tr>
       				<tr style="height:25px">
-      						<td class="rightMailMergeContent">
-          						<select name="mergefile">{foreach key=templid item=tempflname from=$TOPTIONS}<option value="{$templid}">{$tempflname}</option>{/foreach}</select>
-          						<input class="crmbutton small create" value="{$APP.LBL_MERGE_BUTTON_LABEL}" onclick="this.form.action.value='Merge';" type="submit"></input>
-      					  </td>
+					<td class="rightMailMergeContent">
+						{if $TEMPLATECOUNT neq 0}
+						<select name="mergefile">{foreach key=templid item=tempflname from=$TOPTIONS}<option value="{$templid}">{$tempflname}</option>{/foreach}</select>
+                                                   <input class="crmbutton small create" value="{$APP.LBL_MERGE_BUTTON_LABEL}" onclick="this.form.action.value='Merge';" type="submit"></input> 
+						{else}
+						<a href=index.php?module=Settings&action=upload&tempModule={$MODULE}>{$APP.LBL_CREATE_MERGE_TEMPLATE}</a>
+						{/if}
+					</td>
       				</tr>
   				</table>
 				</form>

Modified: vtigercrm/branches/5.0.3/modules/Accounts/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Accounts/DetailView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Accounts/DetailView.php Mon Dec 18 00:41:49 2006
@@ -92,6 +92,7 @@
 		$optionString[$tempVal["templateid"]]=$tempVal["filename"];
 		$tempVal = $adb->fetch_array($wordTemplateResult);
 	}
+	$smarty->assign("TEMPLATECOUNT",$tempCount);
 	$smarty->assign("WORDTEMPLATEOPTIONS",$app_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']);
         $smarty->assign("TOPTIONS",$optionString);
 }

Modified: vtigercrm/branches/5.0.3/modules/Contacts/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Contacts/DetailView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Contacts/DetailView.php Mon Dec 18 00:41:49 2006
@@ -99,6 +99,7 @@
 		$optionString[$tempVal["templateid"]]=$tempVal["filename"];
 		$tempVal = $adb->fetch_array($wordTemplateResult);
 	}
+	 $smarty->assign("TEMPLATECOUNT",$tempCount);
 	$smarty->assign("WORDTEMPLATEOPTIONS",$app_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']);
         $smarty->assign("TOPTIONS",$optionString);
 }

Modified: vtigercrm/branches/5.0.3/modules/HelpDesk/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/HelpDesk/DetailView.php (original)
+++ vtigercrm/branches/5.0.3/modules/HelpDesk/DetailView.php Mon Dec 18 00:41:49 2006
@@ -85,6 +85,7 @@
                 $optionString[$tempVal["templateid"]]=$tempVal["filename"];
                 $tempVal = $adb->fetch_array($wordTemplateResult);
         }
+	 $smarty->assign("TEMPLATECOUNT",$tempCount);
 	$smarty->assign("WORDTEMPLATEOPTIONS",$app_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']);
         $smarty->assign("TOPTIONS",$optionString);
 }

Modified: vtigercrm/branches/5.0.3/modules/Leads/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Leads/DetailView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Leads/DetailView.php Mon Dec 18 00:41:49 2006
@@ -106,6 +106,7 @@
 		$optionString[$tempVal["templateid"]] =$tempVal["filename"];
 		$tempVal = $adb->fetch_array($wordTemplateResult);
 	}
+	 $smarty->assign("TEMPLATECOUNT",$tempCount);
 	$smarty->assign("WORDTEMPLATEOPTIONS",$app_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']);
         $smarty->assign("TOPTIONS",$optionString);
 }



From vtigercrm-commits at vtiger.fosslabs.com  Mon Dec 18 02:35:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 18 Dec 2006 10:35:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9988 - in
 /vtigercrm/branches/5.0.3/Smarty/templates: DetailView.tpl DetailViewUI.tpl
Message-ID: <20061218103509.0508E788CB5@vtiger.fosslabs.com>

Author: richie
Date: Mon Dec 18 03:35:05 2006
New Revision: 9988

Log:
changes made for description ui type

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl

Modified: vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl Mon Dec 18 03:35:05 2006
@@ -293,9 +293,6 @@
 				{else}
 					{include file="DetailViewFields.tpl"}
 				{/if}
-			   {else}
-				<td class="dvtCellLabel" align=right>&nbsp;</td>
-				<td class="dvtCellInfo" align=left >&nbsp;</td>
 			   {/if}
                                    {/foreach}
 						      </tr>	

Modified: vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl Mon Dec 18 03:35:05 2006
@@ -133,7 +133,7 @@
 						{/if}
 							<!--{assign var="DESCRIPTION_SEPARATOR_STRING" value=" "}  {* Separates Description *}-->
 							<!--{assign var="DESCRIPTION_WORDWRAP_WIDTH" value="70"} {* No. of chars for word wrapping long lines of Description *}-->
-                                                  <td width="100%" class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label|escape:'quotes'}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">
+                                                  <td width="100%" colspan="3" class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label|escape:'quotes'}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">
 							{$keyval}<!--|replace:$DESCRIPTION_SEPARATOR_STRING:"\x1"|replace:" ":"\x0"|replace:"\x1":$DESCRIPTION_SEPARATOR_STRING|wordwrap:$DESCRIPTION_WORDWRAP_WIDTH:"<br>&nbsp;"|replace:"\x0":"&nbsp;"}-->
 							</span>
                                               		<div id="editarea_{$label}" style="display:none;">



From vtigercrm-commits at vtiger.fosslabs.com  Tue Dec 19 06:11:22 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 19 Dec 2006 14:11:22 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9989 - in
 /vtigercrm/branches/5.0.3/soap: thunderbirdplugin.php vtigerolservice.php
Message-ID: <20061219141123.1CF8E789FC5@vtiger.fosslabs.com>

Author: richie
Date: Tue Dec 19 07:11:17 2006
New Revision: 9989

Log:
changes to fix assigned to problem from plugin

Modified:
    vtigercrm/branches/5.0.3/soap/thunderbirdplugin.php
    vtigercrm/branches/5.0.3/soap/vtigerolservice.php

Modified: vtigercrm/branches/5.0.3/soap/thunderbirdplugin.php
==============================================================================
--- vtigercrm/branches/5.0.3/soap/thunderbirdplugin.php (original)
+++ vtigercrm/branches/5.0.3/soap/thunderbirdplugin.php Tue Dec 19 07:11:17 2006
@@ -200,13 +200,15 @@
 
 function track_email($user_name, $contact_ids, $date_sent, $email_subject, $email_body)
 {
+	global $current_user;
 	global $adb;
+	global $log;
 	require_once('modules/Users/Users.php');
 	require_once('modules/Emails/Emails.php');
 
-	$seed_user = new Users();
-	$user_id = $seed_user->retrieve_user_id($user_name);
-
+	$current_user = new Users();
+	$user_id = $current_user->retrieve_user_id($user_name);
+	$current_user = $current_user->retrieveCurrentUserInfoFromFile($user_id);
 	$email = new Emails();
 	//$log->debug($msgdtls['contactid']);
 	$emailbody = str_replace("'", "''", $email_body);
@@ -220,7 +222,6 @@
 	$email->column_fields[activitytype] = 'Emails';
 	$email->plugin_save = true;
 	$email->save("Emails");
-
 	$email->set_emails_contact_invitee_relationship($email->id,$contact_ids);
 	$email->set_emails_se_invitee_relationship($email->id,$contact_ids);
 	$email->set_emails_user_invitee_relationship($email->id,$user_id);

Modified: vtigercrm/branches/5.0.3/soap/vtigerolservice.php
==============================================================================
--- vtigercrm/branches/5.0.3/soap/vtigerolservice.php (original)
+++ vtigercrm/branches/5.0.3/soap/vtigerolservice.php Tue Dec 19 07:11:17 2006
@@ -307,12 +307,14 @@
 
 function AddMessageToContact($username,$contactid,$msgdtls)
 {
+	global $current_user;
 	global $adb;
 	require_once('modules/Users/Users.php');
 	require_once('modules/Emails/Emails.php');
 	
-	$seed_user = new Users();
-	$user_id = $seed_user->retrieve_user_id($username);
+	$current_user = new Users();
+	$user_id = $current_user->retrieve_user_id($username);
+	$current_user = $current_user->retrieveCurrentUserInfoFromFile($user_id);
 	
 	foreach($msgdtls as $msgdtl)
 	{



From vtigercrm-commits at vtiger.fosslabs.com  Tue Dec 19 06:23:52 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 19 Dec 2006 14:23:52 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9990 -
 /vtigercrm/branches/5.0.3/modules/Users/SaveGroup.php
Message-ID: <20061219142352.5BFAE789FC5@vtiger.fosslabs.com>

Author: richie
Date: Tue Dec 19 07:23:47 2006
New Revision: 9990

Log:
error while saving groups

Modified:
    vtigercrm/branches/5.0.3/modules/Users/SaveGroup.php

Modified: vtigercrm/branches/5.0.3/modules/Users/SaveGroup.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Users/SaveGroup.php (original)
+++ vtigercrm/branches/5.0.3/modules/Users/SaveGroup.php Tue Dec 19 07:23:47 2006
@@ -112,7 +112,7 @@
 		$groupMemberArray=constructGroupMemberArray($member_array);
 		updateGroup($groupId,$groupName,$groupMemberArray,$description);
 
-		$loc = "Location: index.php?action=".$returnaction."&module=Users&parenttab=Settings&groupId=".$groupId;
+		$loc = "Location: index.php?action=".$returnaction."&module=Settings&parenttab=Settings&groupId=".$groupId;
 	}
 	elseif(isset($_REQUEST['mode']) && $_REQUEST['mode'] == 'create')
 	{
@@ -120,7 +120,7 @@
 		$member_array = explode(';',$selected_col_string);
 		$groupMemberArray=constructGroupMemberArray($member_array);
 		$groupId=createGroup($groupName,$groupMemberArray,$description);
-		$loc = "Location: index.php?action=".$returnaction."&parenttab=Settings&module=Users&groupId=".$groupId; 	 
+		$loc = "Location: index.php?action=".$returnaction."&parenttab=Settings&module=Settings&groupId=".$groupId; 	 
 
 	}
 



From vtigercrm-commits at vtiger.fosslabs.com  Wed Dec 20 04:40:00 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 20 Dec 2006 12:40:00 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9991 - in
 /vtigercrm/branches/5.0.3: include/fpdf/templates/body.php
 modules/Invoice/CreatePDF.php modules/PurchaseOrder/CreatePDF.php
 modules/Quotes/CreatePDF.php modules/SalesOrder/CreateSOPDF.php
Message-ID: <20061220124000.7B5AF789FBE@vtiger.fosslabs.com>

Author: richie
Date: Wed Dec 20 05:39:46 2006
New Revision: 9991

Log:
* Modified to show the final disocunt amount instead of percentage in pdf file and some alignments, Fixes #2760

Modified:
    vtigercrm/branches/5.0.3/include/fpdf/templates/body.php
    vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php
    vtigercrm/branches/5.0.3/modules/PurchaseOrder/CreatePDF.php
    vtigercrm/branches/5.0.3/modules/Quotes/CreatePDF.php
    vtigercrm/branches/5.0.3/modules/SalesOrder/CreateSOPDF.php

Modified: vtigercrm/branches/5.0.3/include/fpdf/templates/body.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/fpdf/templates/body.php (original)
+++ vtigercrm/branches/5.0.3/include/fpdf/templates/body.php Wed Dec 20 05:39:46 2006
@@ -82,28 +82,33 @@
 if($focus->column_fields["hdnTaxType"] != "individual") {
 	$lineData=array("105",$bottom+37,"94");
 	$pdf->drawLine($lineData);
-	$data= $app_strings['LBL_NET_TOTAL'].":                                                                   ".$price_subtotal."";
+	$data= $app_strings['LBL_NET_TOTAL'].":                                                                  ".$price_subtotal."";
 	$pdf->SetXY( 105 , 168 );
 	$pdf->SetFont( "Helvetica", "", 10);
 	$pdf->MultiCell(110, 4, $data);
 
 	$lineData=array("105",$bottom+43,"94");
 	$pdf->drawLine($lineData);
-	$data= $app_strings['LBL_DISCOUNT'].":                                                                      ".$price_discount."";
+
+	//For alignment
+	if($final_price_discount_percent != '')
+		$data= $app_strings['LBL_DISCOUNT'].":   $final_price_discount_percent                                                ".$price_discount."";
+	else
+		$data= $app_strings['LBL_DISCOUNT'].":                                                                  ".$price_discount."";
 	$pdf->SetXY( 105 , 174 );
 	$pdf->SetFont( "Helvetica", "", 10);
 	$pdf->MultiCell(110, 4, $data);
 
 	$lineData=array("105",$bottom+49,"94");
 	$pdf->drawLine($lineData);
-	$data= $app_strings['LBL_TAX'].":  ($group_total_tax_percent %)                                                               ".$price_salestax."";
+	$data= $app_strings['LBL_TAX'].":  ($group_total_tax_percent %)                                                                  ".$price_salestax."";
 	$pdf->SetXY( 105 , 180 );
 	$pdf->SetFont( "Helvetica", "", 10);
 	$pdf->MultiCell(110, 4, $data);
 
 	$lineData=array("105",$bottom+55,"94");
 	$pdf->drawLine($lineData);
-	$data = $app_strings['LBL_SHIPPING_AND_HANDLING_CHARGES'].":                                     ".$price_shipping;
+	$data = $app_strings['LBL_SHIPPING_AND_HANDLING_CHARGES'].":                                  ".$price_shipping;
 	$pdf->SetXY( 105 , 186 );
 	$pdf->SetFont( "Helvetica", "", 10);
 	$pdf->MultiCell(110, 4, $data);
@@ -111,21 +116,27 @@
 } else {
 	$lineData=array("105",$bottom+43,"94");
 	$pdf->drawLine($lineData);
-	$data= $app_strings['LBL_NET_TOTAL'].":                                                                   ".$price_subtotal."";
+	$data= $app_strings['LBL_NET_TOTAL'].":                                                                  ".$price_subtotal."";
 	$pdf->SetXY( 105 , 174 );
 	$pdf->SetFont( "Helvetica", "", 10);
 	$pdf->MultiCell(110, 4, $data);
 
 	$lineData=array("105",$bottom+49,"94");
 	$pdf->drawLine($lineData);
-	$data= $app_strings['LBL_DISCOUNT'].":                                                                      ".$price_discount."";
+
+	//For alignment
+	if($final_price_discount_percent != '')
+		$data= $app_strings['LBL_DISCOUNT'].":   $final_price_discount_percent                                                 ".$price_discount."";
+	else
+		$data= $app_strings['LBL_DISCOUNT'].":                                                                   ".$price_discount."";
+
 	$pdf->SetXY( 105 , 180 );
 	$pdf->SetFont( "Helvetica", "", 10);
 	$pdf->MultiCell(110, 4, $data);
 
 	$lineData=array("105",$bottom+55,"94");
 	$pdf->drawLine($lineData);
-	$data = $app_strings['LBL_SHIPPING_AND_HANDLING_CHARGES'].":                                   ".$price_shipping;
+	$data = $app_strings['LBL_SHIPPING_AND_HANDLING_CHARGES'].":                                  ".$price_shipping;
 	$pdf->SetXY( 105 , 186 );
 	$pdf->SetFont( "Helvetica", "", 10);
 	$pdf->MultiCell(110, 4, $data);
@@ -133,21 +144,21 @@
 
 $lineData=array("105",$bottom+61,"94");
 $pdf->drawLine($lineData);
-$data = $app_strings['LBL_TAX_FOR_SHIPPING_AND_HANDLING'].":  ($sh_tax_percent %)                      ".$price_shipping_tax;
+$data = $app_strings['LBL_TAX_FOR_SHIPPING_AND_HANDLING'].":  ($sh_tax_percent %)               ".$price_shipping_tax;
 $pdf->SetXY( 105 , 192 );
 $pdf->SetFont( "Helvetica", "", 10);
 $pdf->MultiCell(110, 4, $data);
 
 $lineData=array("105",$bottom+67,"94");
 $pdf->drawLine($lineData);
-$data = $app_strings['LBL_ADJUSTMENT'].":                                                                    ".$price_adjustment;
+$data = $app_strings['LBL_ADJUSTMENT'].":                                                                   ".$price_adjustment;
 $pdf->SetXY( 105 , 198 );
 $pdf->SetFont( "Helvetica", "", 10);
 $pdf->MultiCell(110, 4, $data);
 
 $lineData=array("105",$bottom+73,"94");
 $pdf->drawLine($lineData);
-$data = $app_strings['LBL_GRAND_TOTAL'].":(in $currency_symbol)                                                  ".$price_total;
+$data = $app_strings['LBL_GRAND_TOTAL'].":(in $currency_symbol)                                                    ".$price_total;
 $pdf->SetXY( 105 , 204 );
 $pdf->SetFont( "Helvetica", "", 10);
 $pdf->MultiCell(110, 4, $data);

Modified: vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php (original)
+++ vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php Wed Dec 20 05:39:46 2006
@@ -96,7 +96,11 @@
 if($discount_amount != "")
 	$price_discount = number_format($discount_amount,2,'.',',');
 else if($discount_percent != "")
-	$price_discount = $discount_percent."%";
+{
+	//This will be displayed near Discount label - used in include/fpdf/templates/body.php
+	$final_price_discount_percent = "(".number_format($discount_percent,2,'.',',')." %)";
+	$price_discount = number_format((($discount_percent*$focus->column_fields["hdnSubTotal"])/100),2,'.',',');
+}
 else
 	$price_discount = "0.00";
 

Modified: vtigercrm/branches/5.0.3/modules/PurchaseOrder/CreatePDF.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/PurchaseOrder/CreatePDF.php (original)
+++ vtigercrm/branches/5.0.3/modules/PurchaseOrder/CreatePDF.php Wed Dec 20 05:39:46 2006
@@ -95,7 +95,11 @@
 if($discount_amount != "")
 	$price_discount = number_format($discount_amount,2,'.',',');
 else if($discount_percent != "")
-	$price_discount = $discount_percent."%";
+{
+	//This will be displayed near Discount label - used in include/fpdf/templates/body.php
+	$final_price_discount_percent = "(".number_format($discount_percent,2,'.',',')." %)";
+	$price_discount = number_format((($discount_percent*$focus->column_fields["hdnSubTotal"])/100),2,'.',',');
+}
 else
 	$price_discount = "0.00";
 

Modified: vtigercrm/branches/5.0.3/modules/Quotes/CreatePDF.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Quotes/CreatePDF.php (original)
+++ vtigercrm/branches/5.0.3/modules/Quotes/CreatePDF.php Wed Dec 20 05:39:46 2006
@@ -96,7 +96,11 @@
 if($discount_amount != "")
 	$price_discount = number_format($discount_amount,2,'.',',');
 else if($discount_percent != "")
-	$price_discount = $discount_percent."%";
+{
+	//This will be displayed near Discount label - used in include/fpdf/templates/body.php
+	$final_price_discount_percent = "(".number_format($discount_percent,2,'.',',')." %)";
+	$price_discount = number_format((($discount_percent*$focus->column_fields["hdnSubTotal"])/100),2,'.',',');
+}
 else
 	$price_discount = "0.00";
 

Modified: vtigercrm/branches/5.0.3/modules/SalesOrder/CreateSOPDF.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/SalesOrder/CreateSOPDF.php (original)
+++ vtigercrm/branches/5.0.3/modules/SalesOrder/CreateSOPDF.php Wed Dec 20 05:39:46 2006
@@ -94,7 +94,11 @@
 if($discount_amount != "")
 	$price_discount = number_format($discount_amount,2,'.',',');
 else if($discount_percent != "")
-	$price_discount = $discount_percent."%";
+{
+	//This will be displayed near Discount label - used in include/fpdf/templates/body.php
+	$final_price_discount_percent = "(".number_format($discount_percent,2,'.',',')." %)";
+	$price_discount = number_format((($discount_percent*$focus->column_fields["hdnSubTotal"])/100),2,'.',',');
+}
 else
 	$price_discount = "0.00";
 



From vtigercrm-commits at vtiger.fosslabs.com  Wed Dec 20 05:18:21 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 20 Dec 2006 13:18:21 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9992 -
 /vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php
Message-ID: <20061220131821.D5652789FD8@vtiger.fosslabs.com>

Author: richie
Date: Wed Dec 20 06:18:13 2006
New Revision: 9992

Log:
* Modified to get the special character from from_html function, # Fixes 2759

Modified:
    vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php

Modified: vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php (original)
+++ vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php Wed Dec 20 06:18:13 2006
@@ -1449,7 +1449,7 @@
 		}
 
 		$product_Detail[$i]['hdnProductId'.$i] = $hdnProductId;
-		$product_Detail[$i]['productName'.$i]= $productname;
+		$product_Detail[$i]['productName'.$i]= from_html($productname);
 		$product_Detail[$i]['productDescription'.$i]= $productdescription;
 		$product_Detail[$i]['comment'.$i]= $comment;
 



From vtigercrm-commits at vtiger.fosslabs.com  Thu Dec 21 08:33:58 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 21 Dec 2006 16:33:58 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9993 - in
 /vtigercrm/branches/5.0.3/modules: Potentials/Potentials.php
 Products/Products.php Quotes/Quotes.php
Message-ID: <20061221163358.10103789427@vtiger.fosslabs.com>

Author: richie
Date: Thu Dec 21 09:33:46 2006
New Revision: 9993

Log:
Assigned to user missing in quotes and product related list

Modified:
    vtigercrm/branches/5.0.3/modules/Potentials/Potentials.php
    vtigercrm/branches/5.0.3/modules/Products/Products.php
    vtigercrm/branches/5.0.3/modules/Quotes/Quotes.php

Modified: vtigercrm/branches/5.0.3/modules/Potentials/Potentials.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Potentials/Potentials.php (original)
+++ vtigercrm/branches/5.0.3/modules/Potentials/Potentials.php Thu Dec 21 09:33:46 2006
@@ -494,7 +494,16 @@
 			$returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id;
 
 
-		$query = "select vtiger_crmentity.*, vtiger_salesorder.*, vtiger_quotes.subject as quotename, vtiger_account.accountname, vtiger_potential.potentialname from vtiger_salesorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid left outer join vtiger_quotes on vtiger_quotes.quoteid=vtiger_salesorder.quoteid left outer join vtiger_account on vtiger_account.accountid=vtiger_salesorder.accountid left outer join vtiger_potential on vtiger_potential.potentialid=vtiger_salesorder.potentialid left join vtiger_sogrouprelation on vtiger_salesorder.salesorderid=vtiger_sogrouprelation.salesorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_sogrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_potential.potentialid = ".$id;
+		$query = "select vtiger_crmentity.*, vtiger_salesorder.*, vtiger_quotes.subject as quotename, vtiger_account.accountname, vtiger_potential.potentialname,vtiger_users.user_name
+			from vtiger_salesorder 
+			inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid
+			left outer join vtiger_quotes on vtiger_quotes.quoteid=vtiger_salesorder.quoteid 
+			left outer join vtiger_account on vtiger_account.accountid=vtiger_salesorder.accountid 
+			left outer join vtiger_potential on vtiger_potential.potentialid=vtiger_salesorder.potentialid 
+			left join vtiger_sogrouprelation on vtiger_salesorder.salesorderid=vtiger_sogrouprelation.salesorderid 
+			left join vtiger_groups on vtiger_groups.groupname=vtiger_sogrouprelation.groupname
+			left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid
+			 where vtiger_crmentity.deleted=0 and vtiger_potential.potentialid = ".$id;
 		$log->debug("Exiting get_salesorder method ...");
 		return GetRelatedList('Potentials','SalesOrder',$focus,$query,$button,$returnset);
 

Modified: vtigercrm/branches/5.0.3/modules/Products/Products.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Products/Products.php (original)
+++ vtigercrm/branches/5.0.3/modules/Products/Products.php Thu Dec 21 09:33:46 2006
@@ -419,7 +419,8 @@
 			vtiger_quotes.*,
 			vtiger_potential.potentialname,
 			vtiger_account.accountname,
-			vtiger_inventoryproductrel.productid
+			vtiger_inventoryproductrel.productid,
+			vtiger_users.user_name
 			FROM vtiger_quotes
 			INNER JOIN vtiger_crmentity
 				ON vtiger_crmentity.crmid = vtiger_quotes.quoteid
@@ -433,6 +434,8 @@
 				ON vtiger_quotes.quoteid = vtiger_quotegrouprelation.quoteid
 			LEFT JOIN vtiger_groups
 				ON vtiger_groups.groupname = vtiger_quotegrouprelation.groupname
+			LEFT JOIN vtiger_users 
+				ON vtiger_users.id=vtiger_crmentity.smownerid
 			WHERE vtiger_crmentity.deleted = 0
 			AND vtiger_inventoryproductrel.productid = ".$id;
 		$log->debug("Exiting get_quotes method ...");
@@ -461,7 +464,8 @@
 		$query = "SELECT vtiger_crmentity.*,
 			vtiger_purchaseorder.*,
 			vtiger_products.productname,
-			vtiger_inventoryproductrel.productid
+			vtiger_inventoryproductrel.productid,
+			vtiger_users.user_name
 			FROM vtiger_purchaseorder
 			INNER JOIN vtiger_crmentity
 				ON vtiger_crmentity.crmid = vtiger_purchaseorder.purchaseorderid
@@ -473,6 +477,8 @@
 				ON vtiger_purchaseorder.purchaseorderid = vtiger_pogrouprelation.purchaseorderid
 			LEFT JOIN vtiger_groups
 				ON vtiger_groups.groupname = vtiger_pogrouprelation.groupname
+			LEFT JOIN vtiger_users
+				ON vtiger_users.id=vtiger_crmentity.smownerid
 			WHERE vtiger_crmentity.deleted = 0
 			AND vtiger_products.productid = ".$id;
 		$log->debug("Exiting get_purchase_orders method ...");
@@ -501,7 +507,8 @@
 		$query = "SELECT vtiger_crmentity.*,
 			vtiger_salesorder.*,
 			vtiger_products.productname AS productname,
-			vtiger_account.accountname
+			vtiger_account.accountname,
+			vtiger_users.user_name
 			FROM vtiger_salesorder
 			INNER JOIN vtiger_crmentity
 				ON vtiger_crmentity.crmid = vtiger_salesorder.salesorderid
@@ -515,6 +522,8 @@
 				ON vtiger_salesorder.salesorderid = vtiger_sogrouprelation.salesorderid
 			LEFT JOIN vtiger_groups
 				ON vtiger_groups.groupname = vtiger_sogrouprelation.groupname
+			LEFT JOIN vtiger_users 
+				ON vtiger_users.id=vtiger_crmentity.smownerid
 			WHERE vtiger_crmentity.deleted = 0
 			AND vtiger_products.productid = ".$id;
 		$log->debug("Exiting get_salesorder method ...");
@@ -543,7 +552,8 @@
 		$query = "SELECT vtiger_crmentity.*,
 			vtiger_invoice.*,
 			vtiger_inventoryproductrel.quantity,
-			vtiger_account.accountname
+			vtiger_account.accountname,
+			vtiger_users.user_name
 			FROM vtiger_invoice
 			INNER JOIN vtiger_crmentity
 				ON vtiger_crmentity.crmid = vtiger_invoice.invoiceid
@@ -555,6 +565,8 @@
 				ON vtiger_invoice.invoiceid = vtiger_invoicegrouprelation.invoiceid
 			LEFT JOIN vtiger_groups
 				ON vtiger_groups.groupname = vtiger_invoicegrouprelation.groupname
+			LEFT JOIN vtiger_users
+				ON  vtiger_users.id=vtiger_crmentity.smownerid
 			WHERE vtiger_crmentity.deleted = 0
 			AND vtiger_inventoryproductrel.productid = ".$id;
 		$log->debug("Exiting get_invoices method ...");

Modified: vtigercrm/branches/5.0.3/modules/Quotes/Quotes.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Quotes/Quotes.php (original)
+++ vtigercrm/branches/5.0.3/modules/Quotes/Quotes.php Thu Dec 21 09:33:46 2006
@@ -168,7 +168,15 @@
 		else
 			$returnset = '&return_module=Quotes&return_action=CallRelatedList&return_id='.$id;
 
-		$query = "select vtiger_crmentity.*, vtiger_salesorder.*, vtiger_quotes.subject as quotename, vtiger_account.accountname from vtiger_salesorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid left outer join vtiger_quotes on vtiger_quotes.quoteid=vtiger_salesorder.quoteid left outer join vtiger_account on vtiger_account.accountid=vtiger_salesorder.accountid left join vtiger_sogrouprelation on vtiger_salesorder.salesorderid=vtiger_sogrouprelation.salesorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_sogrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_salesorder.quoteid = ".$id;
+		$query = "select vtiger_crmentity.*, vtiger_salesorder.*, vtiger_quotes.subject as quotename, vtiger_account.accountname,vtiger_users.user_name 
+		from vtiger_salesorder
+		inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid
+		left outer join vtiger_quotes on vtiger_quotes.quoteid=vtiger_salesorder.quoteid 
+		left outer join vtiger_account on vtiger_account.accountid=vtiger_salesorder.accountid 
+		left join vtiger_sogrouprelation on vtiger_salesorder.salesorderid=vtiger_sogrouprelation.salesorderid 
+		left join vtiger_groups on vtiger_groups.groupname=vtiger_sogrouprelation.groupname 
+		left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid
+		where vtiger_crmentity.deleted=0 and vtiger_salesorder.quoteid = ".$id;
 		$log->debug("Exiting get_salesorder method ...");
 		return GetRelatedList('Quotes','SalesOrder',$focus,$query,$button,$returnset);
 	}



From vtigercrm-commits at vtiger.fosslabs.com  Thu Dec 21 08:39:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 21 Dec 2006 16:39:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9994 -
 /vtigercrm/branches/5.0.3/Smarty/templates/HomePage.tpl
Message-ID: <20061221163909.6B6D4789427@vtiger.fosslabs.com>

Author: richie
Date: Thu Dec 21 09:39:04 2006
New Revision: 9994

Log:
company name appended for 'my new lead'

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/HomePage.tpl

Modified: vtigercrm/branches/5.0.3/Smarty/templates/HomePage.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/HomePage.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/HomePage.tpl Thu Dec 21 09:39:04 2006
@@ -131,7 +131,11 @@
 												{foreach item=elements from=$tabledetail.Entries}
 													<tr>
 														{if $tabledetail.Title.2 neq 'home_mytopinv' && $tabledetail.Title.2 neq 'home_mytopso' && $tabledetail.Title.2 neq 'home_mytopquote' && $tabledetail.Title.2 neq 'home_metrics' &&  $tabledetail.Title.2 neq 'home_mytoppo' &&  $tabledetail.Title.2 neq 'home_myfaq'  }
-															<td colspan="2"><img src="{$IMAGE_PATH}bookMark.gif" align="absmiddle" /> {$elements.0}</td>
+															<td colspan="2"><img src="{$IMAGE_PATH}bookMark.gif" align="absmiddle" />{$elements.0} 
+															 	{if $modulename eq 'Leads'}
+																 - {$elements.1}	
+																{/if}
+															</td>
 														{elseif $tabledetail.Title.2 eq 'home_metrics'}
 															<td><img src="{$IMAGE_PATH}bookMark.gif" align="absmiddle" /> {$elements.0}</td>
 															<td align="absmiddle" /> {$elements.1}</td>



From vtigercrm-commits at vtiger.fosslabs.com  Thu Dec 21 08:53:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 21 Dec 2006 16:53:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9995 - in
 /vtigercrm/branches/5.0.3: Smarty/templates/CreateView.tpl
 Smarty/templates/QuickCreate.tpl include/js/general.js
 modules/Accounts/Save.php
Message-ID: <20061221165340.8B549789427@vtiger.fosslabs.com>

Author: richie
Date: Thu Dec 21 09:53:31 2006
New Revision: 9995

Log:
Changes made to avoid creating duplicate account

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/CreateView.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/QuickCreate.tpl
    vtigercrm/branches/5.0.3/include/js/general.js
    vtigercrm/branches/5.0.3/modules/Accounts/Save.php

Modified: vtigercrm/branches/5.0.3/Smarty/templates/CreateView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/CreateView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/CreateView.tpl Thu Dec 21 09:53:31 2006
@@ -1,280 +1,284 @@
-{*<!--
-
-/*********************************************************************************
-** The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
-*
- ********************************************************************************/
-
--->*}
-
-{*<!-- module header -->*}
-
-<link rel="stylesheet" type="text/css" media="all" href="jscalendar/calendar-win2k-cold-1.css">
-<script type="text/javascript" src="jscalendar/calendar.js"></script>
-<script type="text/javascript" src="jscalendar/lang/calendar-{$CALENDAR_LANG}.js"></script>
-<script type="text/javascript" src="jscalendar/calendar-setup.js"></script>
-<script type="text/javascript" src="modules/{$MODULE}/{$SINGLE_MOD}.js"></script>
-
-<script type="text/javascript">
-function sensex_info()
-{ldelim}
-        var Ticker = $('tickersymbol').value;
-        if(Ticker!='')
-        {ldelim}
-                $("vtbusy_info").style.display="inline";
-                new Ajax.Request(
-                      'index.php',
-                      {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
-                                method: 'post',
-                                postBody: 'module={$MODULE}&action=Tickerdetail&tickersymbol='+Ticker,
-                                onComplete: function(response) {ldelim}
-                                        $('autocom').innerHTML = response.responseText;
-                                        $('autocom').style.display="block";
-                                        $("vtbusy_info").style.display="none";
-                                {rdelim}
-                        {rdelim}
-                );
-        {rdelim}
-{rdelim}
-</script>
-
-		{include file='Buttons_List1.tpl'}
-
-{*<!-- Contents -->*}
-<table border=0 cellspacing=0 cellpadding=0 width=98% align=center>
-   <tr>
-	<td valign=top>
-		<img src="{$IMAGE_PATH}showPanelTopLeft.gif">
-	</td>
-
-	<td class="showPanelBg" valign=top width=100%>
-	     {*<!-- PUBLIC CONTENTS STARTS-->*}
-	     <div class="small" style="padding:20px">
-		
-		 {if $OP_MODE eq 'edit_view'}   
-			 <span class="lvtHeaderText"><font color="purple">[ {$ID} ] </font>{$NAME} -  {$APP.LBL_EDITING} {$APP[$SINGLE_MOD]} {$APP.LBL_INFORMATION}</span> <br>
-			{$UPDATEINFO}	 
-		 {/if}
-		 {if $OP_MODE eq 'create_view'}
-			{if $DUPLICATE neq 'true'}
-			<span class="lvtHeaderText">{$APP.LBL_CREATING} {$APP.LBL_NEW} {$APP[$SINGLE_MOD]}</span> <br>
-			{else}
-			<span class="lvtHeaderText">{$APP.LBL_DUPLICATING} "{$NAME}" </span> <br>
-			{/if}
-		 {/if}
-
-		 <hr noshade size=1>
-		 <br> 
-		
-		{include file='EditViewHidden.tpl'}
-
-		{*<!-- Account details tabs -->*}
-		<table border=0 cellspacing=0 cellpadding=0 width=95% align=center>
-		   <tr>
-			<td>
-				<table border=0 cellspacing=0 cellpadding=3 width=100% class="small">
-				   <tr>
-					<td class="dvtTabCache" style="width:10px" nowrap>&nbsp;</td>
-
-					{if $ADVBLOCKS neq ''}	
-						<td width=75 style="width:15%" align="center" nowrap class="dvtSelectedCell" id="bi" onclick="fnLoadValues('bi','mi','basicTab','moreTab','normal','{$MODULE}')"><b>{$APP.LBL_BASIC} {$APP.LBL_INFORMATION}</b></td>
-                    				<td class="dvtUnSelectedCell" style="width: 100px;" align="center" nowrap id="mi" onclick="fnLoadValues('mi','bi','moreTab','basicTab','normal','{$MODULE}')"><b>{$APP.LBL_MORE} {$APP.LBL_INFORMATION} </b></td>
-                   				<td class="dvtTabCache" style="width:65%" nowrap>&nbsp;</td>
-					{else}
-						<td class="dvtSelectedCell" align=center nowrap>{$APP.LBL_BASIC} {$APP.LBL_INFORMATION}</td>
-	                                        <td class="dvtTabCache" style="width:65%">&nbsp;</td>
-					{/if}
-				   <tr>
-				</table>
-			</td>
-		   </tr>
-		   <tr>
-			<td valign=top align=left >
-
-			    <!-- Basic Information Tab Opened -->
-			    <div id="basicTab">
-
-				<table border=0 cellspacing=0 cellpadding=3 width=100% class="dvtContentSpace">
-				   <tr>
-					<td align=left>
-					<!-- content cache -->
-					
-						<table border=0 cellspacing=0 cellpadding=0 width=100%>
-						   <tr>
-							<td id ="autocom"></td>
-						   </tr>
-						   <tr>
-							<td style="padding:10px">
-							<!-- General details -->
-								<table border=0 cellspacing=0 cellpadding=0 width=100% class="small">
-								   <tr>
-									<td  colspan=4 style="padding:5px">
-									   <div align="center">
-										<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="crmbutton small save" onclick="this.form.action.value='Save';  return formValidate()" type="submit" name="button" value="  {$APP.LBL_SAVE_BUTTON_LABEL}  " style="width:70px" >
-                                                                 		<input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="crmbutton small cancel" onclick="window.history.back()" type="button" name="button" value="  {$APP.LBL_CANCEL_BUTTON_LABEL}  " style="width:70px">
-									   </div>
-									</td>
-								   </tr>
-
-								   {foreach key=header item=data from=$BASBLOCKS}
-								   <tr>
-									{if $header== $MOD.LBL_ADDRESS_INFORMATION && ($MODULE == 'Accounts' || $MODULE == 'Quotes' || $MODULE == 'PurchaseOrder' || $MODULE == 'SalesOrder'|| $MODULE == 'Invoice')}
-                                                                        <td colspan=2 class="detailedViewHeader">
-                                                                        <b>{$header}</b></td>
-                                                                        <td class="detailedViewHeader">
-                                                                        <input name="cpy" onclick="return copyAddressLeft(EditView)" type="radio"><b>{$APP.LBL_RCPY_ADDRESS}</b></td>
-                                                                        <td class="detailedViewHeader">
-                                                                        <input name="cpy" onclick="return copyAddressRight(EditView)" type="radio"><b>{$APP.LBL_LCPY_ADDRESS}</b></td>
-
-									{elseif $header== $MOD.LBL_ADDRESS_INFORMATION && $MODULE == 'Contacts'}
-									<td colspan=2 class="detailedViewHeader">
-                                                                        <b>{$header}</b></td>
-                                                                        <td class="detailedViewHeader">
-                                                                        <input name="cpy" onclick="return copyAddressLeft(EditView)" type="radio"><b>{$APP.LBL_CPY_OTHER_ADDRESS}</b></td>
-                                                                        <td class="detailedViewHeader">
-                                                                        <input name="cpy" onclick="return copyAddressRight(EditView)" type="radio"><b>{$APP.LBL_CPY_MAILING_ADDRESS}</b></td>
-                                                                        {else}
-						         		<td colspan=4 class="detailedViewHeader">
-                                                	        		<b>{$header}</b>
-									{/if}
-							 		</td>
-		                                        	   </tr>
-
-								   <!-- Here we should include the uitype handlings-->
-								   {include file="DisplayFields.tpl"}							
-								   <tr style="height:25px"><td>&nbsp;</td></tr>
-								   {/foreach}
-
-								   <tr>
-									<td  colspan=4 style="padding:5px">
-									   <div align="center">
-										{if $MODULE eq 'Emails'}
-                                                                			<input title="{$APP.LBL_SELECTEMAILTEMPLATE_BUTTON_TITLE}" accessKey="{$APP.LBL_SELECTEMAILTEMPLATE_BUTTON_KEY}" class="crmbutton small create" onclick="window.open('index.php?module=Users&action=lookupemailtemplates&entityid={$ENTITY_ID}&entity={$ENTITY_TYPE}','emailtemplate','top=100,left=200,height=400,width=300,menubar=no,addressbar=no,status=yes')" type="button" name="button" value="{$APP.LBL_SELECTEMAILTEMPLATE_BUTTON_LABEL}">
-                                                                			<input title="{$MOD.LBL_SEND}" accessKey="{$MOD.LBL_SEND}" class="crmbutton small save" onclick="this.form.action.value='Save';this.form.send_mail.value='true'; return formValidate()" type="submit" name="button" value="  {$MOD.LBL_SEND}  " >
-                                                                		{/if}
-                                                                		<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="crmbutton small save" onclick="this.form.action.value='Save';  return formValidate()" type="submit" name="button" value="  {$APP.LBL_SAVE_BUTTON_LABEL}  " style="width:70px" >
-                                                                		<input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="crmbutton small cancel" onclick="window.history.back()" type="button" name="button" value="  {$APP.LBL_CANCEL_BUTTON_LABEL}  " style="width:70px">
-									   </div>
-									</td>
-								   </tr>
-								</table>
-							</td>
-						   </tr>
-						</table>
-					</td>
-				   </tr>
-				</table>
-					
-			    </div>
-			    <!-- Basic Information Tab Closed -->
-
-			    <!-- More Information Tab Opened -->
-			    <div id="moreTab">
-				<table border=0 cellspacing=0 cellpadding=3 width=100% class="dvtContentSpace">
-				   <tr>
-					<td align=left>
-					{*<!-- content cache -->*}
-					
-						<table border=0 cellspacing=0 cellpadding=0 width=100%>
-						   <tr>
-							<td id ="autocom"></td>
-						   </tr>
-						   <tr>
-							<td style="padding:10px">
-							<!-- General details -->
-								<table border=0 cellspacing=0 cellpadding=0 width=100% class="small">
-								   <tr>
-									<td  colspan=4 style="padding:5px">
-									   <div align="center">
-										<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="crmbutton small save" onclick="this.form.action.value='Save';  return formValidate()" type="submit" name="button" value="  {$APP.LBL_SAVE_BUTTON_LABEL}  " style="width:70px" >
-                                                                 		<input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="crmbutton small cancel" onclick="window.history.back()" type="button" name="button" value="  {$APP.LBL_CANCEL_BUTTON_LABEL}  " style="width:70px">
-									   </div>
-									</td>
-								   </tr>
-
-								   {foreach key=header item=data from=$ADVBLOCKS}
-								   <tr>
-						         		<td colspan=4 class="detailedViewHeader">
-                                                	        		<b>{$header}</b>
-                                                         		</td>
-                                                         	   </tr>
-
-								   <!-- Here we should include the uitype handlings-->
-                                                        	   {include file="DisplayFields.tpl"}
-
-							 	   <tr style="height:25px"><td>&nbsp;</td></tr>
-								   {/foreach}
-
-								   <tr>
-									<td  colspan=4 style="padding:5px">
-									   <div align="center">
-										{if $MODULE eq 'Emails'}
-                                                                			<input title="{$APP.LBL_SELECTEMAILTEMPLATE_BUTTON_TITLE}" accessKey="{$APP.LBL_SELECTEMAILTEMPLATE_BUTTON_KEY}" class="crmbutton small create" onclick="window.open('index.php?module=Users&action=lookupemailtemplates&entityid={$ENTITY_ID}&entity={$ENTITY_TYPE}','emailtemplate','top=100,left=200,height=400,width=300,menubar=no,addressbar=no,status=yes')" type="button" name="button" value="{$APP.LBL_SELECTEMAILTEMPLATE_BUTTON_LABEL}">
-                                                                			<input title="{$MOD.LBL_SEND}" accessKey="{$MOD.LBL_SEND}" class="crmbutton small save" onclick="this.form.action.value='Save';this.form.send_mail.value='true'; return formValidate()" type="submit" name="button" value="  {$MOD.LBL_SEND}  " >
-                                                                		{/if}
-
-										<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="crmbutton small save" onclick="this.form.action.value='Save';return formValidate()" type="submit" name="button" value="  {$APP.LBL_SAVE_BUTTON_LABEL}  " style="width:70px" >
-										<input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="crmbutton small cancel" onclick="window.history.back()" type="button" name="button" value="  {$APP.LBL_CANCEL_BUTTON_LABEL}  " style="width:70px">
-									   </div>
-									</td>
-								   </tr>
-								</table>
-							</td>
-						   </tr>
-						</table>
-					</td>
-				   </tr>
-				</table>
-			    </div>
-
-			</td>
-		   </tr>
-		</table>
-	     </div>
-	</td>
-	<td align=right valign=top><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
-   </tr>
-</table>
-</form>
-
-{if ($MODULE eq 'Emails' || 'Notes') and ($FCKEDITOR_DISPLAY eq 'true')}
-       <script type="text/javascript" src="include/fckeditor/fckeditor.js"></script>
-       <script type="text/javascript" defer="1">
-
-       var oFCKeditor = null;
-
-       {if $MODULE eq 'Notes'}
-               oFCKeditor = new FCKeditor( "notecontent" ) ;
-       {/if}
-
-       oFCKeditor.BasePath   = "include/fckeditor/" ;
-       oFCKeditor.ReplaceTextarea() ;
-
-       </script>
-{/if}
-{if $MODULE eq 'Accounts'}
-<script>
-	ScrollEffect.limit = 201;
-	ScrollEffect.closelimit= 200;
-</script>
-{/if}
-<script>
-
-
-
-        var fieldname = new Array({$VALIDATION_DATA_FIELDNAME})
-
-        var fieldlabel = new Array({$VALIDATION_DATA_FIELDLABEL})
-
-        var fielddatatype = new Array({$VALIDATION_DATA_FIELDDATATYPE})
-
-
-</script>
-
-
-
+{*<!--
+
+/*********************************************************************************
+** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+ * ("License"); You may not use this file except in compliance with the License
+ * The Original Code is:  vtiger CRM Open Source
+ * The Initial Developer of the Original Code is vtiger.
+ * Portions created by vtiger are Copyright (C) vtiger.
+ * All Rights Reserved.
+*
+ ********************************************************************************/
+
+-->*}
+
+{*<!-- module header -->*}
+
+<link rel="stylesheet" type="text/css" media="all" href="jscalendar/calendar-win2k-cold-1.css">
+<script type="text/javascript" src="jscalendar/calendar.js"></script>
+<script type="text/javascript" src="jscalendar/lang/calendar-{$CALENDAR_LANG}.js"></script>
+<script type="text/javascript" src="jscalendar/calendar-setup.js"></script>
+<script type="text/javascript" src="modules/{$MODULE}/{$SINGLE_MOD}.js"></script>
+
+<script type="text/javascript">
+function sensex_info()
+{ldelim}
+        var Ticker = $('tickersymbol').value;
+        if(Ticker!='')
+        {ldelim}
+                $("vtbusy_info").style.display="inline";
+                new Ajax.Request(
+                      'index.php',
+                      {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+                                method: 'post',
+                                postBody: 'module={$MODULE}&action=Tickerdetail&tickersymbol='+Ticker,
+                                onComplete: function(response) {ldelim}
+                                        $('autocom').innerHTML = response.responseText;
+                                        $('autocom').style.display="block";
+                                        $("vtbusy_info").style.display="none";
+                                {rdelim}
+                        {rdelim}
+                );
+        {rdelim}
+{rdelim}
+</script>
+
+		{include file='Buttons_List1.tpl'}
+
+{*<!-- Contents -->*}
+<table border=0 cellspacing=0 cellpadding=0 width=98% align=center>
+   <tr>
+	<td valign=top>
+		<img src="{$IMAGE_PATH}showPanelTopLeft.gif">
+	</td>
+
+	<td class="showPanelBg" valign=top width=100%>
+	     {*<!-- PUBLIC CONTENTS STARTS-->*}
+	     <div class="small" style="padding:20px">
+		
+		 {if $OP_MODE eq 'edit_view'}   
+			 <span class="lvtHeaderText"><font color="purple">[ {$ID} ] </font>{$NAME} -  {$APP.LBL_EDITING} {$APP[$SINGLE_MOD]} {$APP.LBL_INFORMATION}</span> <br>
+			{$UPDATEINFO}	 
+		 {/if}
+		 {if $OP_MODE eq 'create_view'}
+			{if $DUPLICATE neq 'true'}
+			<span class="lvtHeaderText">{$APP.LBL_CREATING} {$APP.LBL_NEW} {$APP[$SINGLE_MOD]}</span> <br>
+			{else}
+			<span class="lvtHeaderText">{$APP.LBL_DUPLICATING} "{$NAME}" </span> <br>
+			{/if}
+		 {/if}
+
+		 <hr noshade size=1>
+		 <br> 
+		
+		{include file='EditViewHidden.tpl'}
+
+		{*<!-- Account details tabs -->*}
+		<table border=0 cellspacing=0 cellpadding=0 width=95% align=center>
+		   <tr>
+			<td>
+				<table border=0 cellspacing=0 cellpadding=3 width=100% class="small">
+				   <tr>
+					<td class="dvtTabCache" style="width:10px" nowrap>&nbsp;</td>
+
+					{if $ADVBLOCKS neq ''}	
+						<td width=75 style="width:15%" align="center" nowrap class="dvtSelectedCell" id="bi" onclick="fnLoadValues('bi','mi','basicTab','moreTab','normal','{$MODULE}')"><b>{$APP.LBL_BASIC} {$APP.LBL_INFORMATION}</b></td>
+                    				<td class="dvtUnSelectedCell" style="width: 100px;" align="center" nowrap id="mi" onclick="fnLoadValues('mi','bi','moreTab','basicTab','normal','{$MODULE}')"><b>{$APP.LBL_MORE} {$APP.LBL_INFORMATION} </b></td>
+                   				<td class="dvtTabCache" style="width:65%" nowrap>&nbsp;</td>
+					{else}
+						<td class="dvtSelectedCell" align=center nowrap>{$APP.LBL_BASIC} {$APP.LBL_INFORMATION}</td>
+	                                        <td class="dvtTabCache" style="width:65%">&nbsp;</td>
+					{/if}
+				   <tr>
+				</table>
+			</td>
+		   </tr>
+		   <tr>
+			<td valign=top align=left >
+
+			    <!-- Basic Information Tab Opened -->
+			    <div id="basicTab">
+
+				<table border=0 cellspacing=0 cellpadding=3 width=100% class="dvtContentSpace">
+				   <tr>
+					<td align=left>
+					<!-- content cache -->
+					
+						<table border=0 cellspacing=0 cellpadding=0 width=100%>
+						   <tr>
+							<td id ="autocom"></td>
+						   </tr>
+						   <tr>
+							<td style="padding:10px">
+							<!-- General details -->
+								<table border=0 cellspacing=0 cellpadding=0 width=100% class="small">
+								   <tr>
+									<td  colspan=4 style="padding:5px">
+									   <div align="center">
+										{if $MODULE eq 'Accounts'}
+											<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="crmbutton small save" onclick="this.form.action.value='Save';  if(formValidate())AjaxDuplicateValidate('Accounts','accountname',this.form);" type="button" name="button" value="  {$APP.LBL_SAVE_BUTTON_LABEL}  " style="width:70px" >
+										{else}
+											<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="crmbutton small save" onclick="this.form.action.value='Save';  return formValidate()" type="submit" name="button" value="  {$APP.LBL_SAVE_BUTTON_LABEL}  " style="width:70px" >
+										{/if}
+                                                                 		<input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="crmbutton small cancel" onclick="window.history.back()" type="button" name="button" value="  {$APP.LBL_CANCEL_BUTTON_LABEL}  " style="width:70px">
+									   </div>
+									</td>
+								   </tr>
+
+								   {foreach key=header item=data from=$BASBLOCKS}
+								   <tr>
+									{if $header== $MOD.LBL_ADDRESS_INFORMATION && ($MODULE == 'Accounts' || $MODULE == 'Quotes' || $MODULE == 'PurchaseOrder' || $MODULE == 'SalesOrder'|| $MODULE == 'Invoice')}
+                                                                        <td colspan=2 class="detailedViewHeader">
+                                                                        <b>{$header}</b></td>
+                                                                        <td class="detailedViewHeader">
+                                                                        <input name="cpy" onclick="return copyAddressLeft(EditView)" type="radio"><b>{$APP.LBL_RCPY_ADDRESS}</b></td>
+                                                                        <td class="detailedViewHeader">
+                                                                        <input name="cpy" onclick="return copyAddressRight(EditView)" type="radio"><b>{$APP.LBL_LCPY_ADDRESS}</b></td>
+
+									{elseif $header== $MOD.LBL_ADDRESS_INFORMATION && $MODULE == 'Contacts'}
+									<td colspan=2 class="detailedViewHeader">
+                                                                        <b>{$header}</b></td>
+                                                                        <td class="detailedViewHeader">
+                                                                        <input name="cpy" onclick="return copyAddressLeft(EditView)" type="radio"><b>{$APP.LBL_CPY_OTHER_ADDRESS}</b></td>
+                                                                        <td class="detailedViewHeader">
+                                                                        <input name="cpy" onclick="return copyAddressRight(EditView)" type="radio"><b>{$APP.LBL_CPY_MAILING_ADDRESS}</b></td>
+                                                                        {else}
+						         		<td colspan=4 class="detailedViewHeader">
+                                                	        		<b>{$header}</b>
+									{/if}
+							 		</td>
+		                                        	   </tr>
+
+								   <!-- Here we should include the uitype handlings-->
+								   {include file="DisplayFields.tpl"}							
+								   <tr style="height:25px"><td>&nbsp;</td></tr>
+								   {/foreach}
+
+								   <tr>
+									<td  colspan=4 style="padding:5px">
+									   <div align="center">
+										{if $MODULE eq 'Emails'}
+                                                                			<input title="{$APP.LBL_SELECTEMAILTEMPLATE_BUTTON_TITLE}" accessKey="{$APP.LBL_SELECTEMAILTEMPLATE_BUTTON_KEY}" class="crmbutton small create" onclick="window.open('index.php?module=Users&action=lookupemailtemplates&entityid={$ENTITY_ID}&entity={$ENTITY_TYPE}','emailtemplate','top=100,left=200,height=400,width=300,menubar=no,addressbar=no,status=yes')" type="button" name="button" value="{$APP.LBL_SELECTEMAILTEMPLATE_BUTTON_LABEL}">
+                                                                			<input title="{$MOD.LBL_SEND}" accessKey="{$MOD.LBL_SEND}" class="crmbutton small save" onclick="this.form.action.value='Save';this.form.send_mail.value='true'; return formValidate()" type="submit" name="button" value="  {$MOD.LBL_SEND}  " >
+                                                                		{/if}
+                                                                		<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="crmbutton small save" onclick="this.form.action.value='Save';  return formValidate()" type="submit" name="button" value="  {$APP.LBL_SAVE_BUTTON_LABEL}  " style="width:70px" >
+                                                                		<input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="crmbutton small cancel" onclick="window.history.back()" type="button" name="button" value="  {$APP.LBL_CANCEL_BUTTON_LABEL}  " style="width:70px">
+									   </div>
+									</td>
+								   </tr>
+								</table>
+							</td>
+						   </tr>
+						</table>
+					</td>
+				   </tr>
+				</table>
+					
+			    </div>
+			    <!-- Basic Information Tab Closed -->
+
+			    <!-- More Information Tab Opened -->
+			    <div id="moreTab">
+				<table border=0 cellspacing=0 cellpadding=3 width=100% class="dvtContentSpace">
+				   <tr>
+					<td align=left>
+					{*<!-- content cache -->*}
+					
+						<table border=0 cellspacing=0 cellpadding=0 width=100%>
+						   <tr>
+							<td id ="autocom"></td>
+						   </tr>
+						   <tr>
+							<td style="padding:10px">
+							<!-- General details -->
+								<table border=0 cellspacing=0 cellpadding=0 width=100% class="small">
+								   <tr>
+									<td  colspan=4 style="padding:5px">
+									   <div align="center">
+										<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="crmbutton small save" onclick="this.form.action.value='Save';  return formValidate()" type="submit" name="button" value="  {$APP.LBL_SAVE_BUTTON_LABEL}  " style="width:70px" >
+                                                                 		<input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="crmbutton small cancel" onclick="window.history.back()" type="button" name="button" value="  {$APP.LBL_CANCEL_BUTTON_LABEL}  " style="width:70px">
+									   </div>
+									</td>
+								   </tr>
+
+								   {foreach key=header item=data from=$ADVBLOCKS}
+								   <tr>
+						         		<td colspan=4 class="detailedViewHeader">
+                                                	        		<b>{$header}</b>
+                                                         		</td>
+                                                         	   </tr>
+
+								   <!-- Here we should include the uitype handlings-->
+                                                        	   {include file="DisplayFields.tpl"}
+
+							 	   <tr style="height:25px"><td>&nbsp;</td></tr>
+								   {/foreach}
+
+								   <tr>
+									<td  colspan=4 style="padding:5px">
+									   <div align="center">
+										{if $MODULE eq 'Emails'}
+                                                                			<input title="{$APP.LBL_SELECTEMAILTEMPLATE_BUTTON_TITLE}" accessKey="{$APP.LBL_SELECTEMAILTEMPLATE_BUTTON_KEY}" class="crmbutton small create" onclick="window.open('index.php?module=Users&action=lookupemailtemplates&entityid={$ENTITY_ID}&entity={$ENTITY_TYPE}','emailtemplate','top=100,left=200,height=400,width=300,menubar=no,addressbar=no,status=yes')" type="button" name="button" value="{$APP.LBL_SELECTEMAILTEMPLATE_BUTTON_LABEL}">
+                                                                			<input title="{$MOD.LBL_SEND}" accessKey="{$MOD.LBL_SEND}" class="crmbutton small save" onclick="this.form.action.value='Save';this.form.send_mail.value='true'; return formValidate()" type="submit" name="button" value="  {$MOD.LBL_SEND}  " >
+                                                                		{/if}
+							{if $MODULE eq 'Accounts'}
+											<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="crmbutton small save" onclick="this.form.action.value='Save';  if(formValidate())AjaxDuplicateValidate('Accounts','accountname',this.form);" type="button" name="button" value="  {$APP.LBL_SAVE_BUTTON_LABEL}  " style="width:70px" >
+										{else}
+											<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="crmbutton small save" onclick="this.form.action.value='Save';  return formValidate()" type="submit" name="button" value="  {$APP.LBL_SAVE_BUTTON_LABEL}  " style="width:70px" >
+										{/if}
+										<input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="crmbutton small cancel" onclick="window.history.back()" type="button" name="button" value="  {$APP.LBL_CANCEL_BUTTON_LABEL}  " style="width:70px">
+									   </div>
+									</td>
+								   </tr>
+								</table>
+							</td>
+						   </tr>
+						</table>
+					</td>
+				   </tr>
+				</table>
+			    </div>
+
+			</td>
+		   </tr>
+		</table>
+	     </div>
+	</td>
+	<td align=right valign=top><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</table>
+</form>
+
+{if ($MODULE eq 'Emails' || 'Notes') and ($FCKEDITOR_DISPLAY eq 'true')}
+       <script type="text/javascript" src="include/fckeditor/fckeditor.js"></script>
+       <script type="text/javascript" defer="1">
+
+       var oFCKeditor = null;
+
+       {if $MODULE eq 'Notes'}
+               oFCKeditor = new FCKeditor( "notecontent" ) ;
+       {/if}
+
+       oFCKeditor.BasePath   = "include/fckeditor/" ;
+       oFCKeditor.ReplaceTextarea() ;
+
+       </script>
+{/if}
+{if $MODULE eq 'Accounts'}
+<script>
+	ScrollEffect.limit = 201;
+	ScrollEffect.closelimit= 200;
+</script>
+{/if}
+<script>
+
+
+
+        var fieldname = new Array({$VALIDATION_DATA_FIELDNAME})
+
+        var fieldlabel = new Array({$VALIDATION_DATA_FIELDLABEL})
+
+        var fielddatatype = new Array({$VALIDATION_DATA_FIELDDATATYPE})
+
+
+</script>

Modified: vtigercrm/branches/5.0.3/Smarty/templates/QuickCreate.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/QuickCreate.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/QuickCreate.tpl Thu Dec 21 09:53:31 2006
@@ -380,7 +380,14 @@
 		<!-- save cancel buttons -->
 		<table border=0 cellspacing=0 cellpadding=5 width=100% class=qcTransport>
 		<tr>
-			<td width=50% align=right><input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="crmbutton small save" type="submit" name="button" value="  {$APP.LBL_SAVE_BUTTON_LABEL}  " style="width:70px" ></td>
+
+										{if $MODULE eq 'Accounts'}
+									<td width=50% align=right><input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="crmbutton small save" onclick="this.form.action.value='Save';AjaxDuplicateValidate('Accounts','accountname',this.form);" type="button" name="button" value="  {$APP.LBL_SAVE_BUTTON_LABEL}  " style="width:70px" ></td>
+										{else}
+											<td width=50% align=right><input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="crmbutton small save" type="submit" name="button" value="  {$APP.LBL_SAVE_BUTTON_LABEL}" style="width:70px" ></td>
+										{/if}
+
+
 			<td width=50% align=left>
 				<input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="crmbutton small cancel" onclick="hide('qcform'); $('qccombo').options.selectedIndex=0;" type="button" name="button" value="  {$APP.LBL_CANCEL_BUTTON_LABEL}  " style="width:70px">
 			</td>

Modified: vtigercrm/branches/5.0.3/include/js/general.js
==============================================================================
--- vtigercrm/branches/5.0.3/include/js/general.js (original)
+++ vtigercrm/branches/5.0.3/include/js/general.js Thu Dec 21 09:53:31 2006
@@ -1717,4 +1717,26 @@
                 inputField : fieldid, ifFormat : dateformat, showsTime : false, button : imageid, singleClick : true, step : 1
         });
 }
-
+function AjaxDuplicateValidate(module,fieldname,oform)
+{
+	var fieldvalue = getObj(fieldname).value;
+	var url = "module="+module+"&action="+module+"Ajax&file=Save&"+fieldname+"="+fieldvalue+"&dup_check=true"
+	new Ajax.Request(
+          	  	      'index.php',
+			      	{queue: {position: 'end', scope: 'command'},
+		                        method: 'post',
+                		        postBody:url,
+		                        onComplete: function(response) {
+						var str = response.responseText
+						if(str.indexOf('SUCCESS') > -1)
+						{
+							oform.submit();	
+						}else
+						{
+							alert(str);
+						}
+		                        }
+              			 }
+       			);	
+
+}

Modified: vtigercrm/branches/5.0.3/modules/Accounts/Save.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Accounts/Save.php (original)
+++ vtigercrm/branches/5.0.3/modules/Accounts/Save.php Thu Dec 21 09:53:31 2006
@@ -26,6 +26,26 @@
 //require_once('database/DatabaseConnection.php');
 require_once('include/database/PearDatabase.php');
 
+if(isset($_REQUEST['dup_check']) && $_REQUEST['dup_check'] != '')
+{
+	//started
+	$value = $_REQUEST['accountname'];
+        $query = "SELECT accountname FROM vtiger_account WHERE accountname ='".$value."'";
+	$result = $adb->query($query);
+        if($adb->num_rows($result) > 0)
+	{
+		echo 'Account Name Already Exists!';
+	}
+	else
+	{
+		echo 'SUCCESS';
+	}
+	die;
+}
+//Ended
+
+
+
 $local_log =& LoggerManager::getLogger('index');
 global $log;
 $focus = new Accounts();
@@ -51,9 +71,7 @@
 	if(isset($_REQUEST[$fieldname]))
 	{
 		$value = $_REQUEST[$fieldname];
-		//echo '<BR>';
-		//echo $fieldname."         ".$value;
-		//echo '<BR>';
+		$log->DEBUG($fieldname."=Field Name &first& Value =".$value);
 		$focus->column_fields[$fieldname] = $value;
 	}
 	if(isset($_REQUEST['annual_revenue']))



From vtigercrm-commits at vtiger.fosslabs.com  Fri Dec 22 06:40:06 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 22 Dec 2006 14:40:06 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9996 - in
 /vtigercrm/branches/5.0.3: include/utils/DetailViewUtils.php
 modules/Users/DefaultDataPopulator.php
Message-ID: <20061222144006.603F5789AAB@vtiger.fosslabs.com>

Author: richie
Date: Fri Dec 22 07:40:00 2006
New Revision: 9996

Log:
related list sequence changed for account

Modified:
    vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php
    vtigercrm/branches/5.0.3/modules/Users/DefaultDataPopulator.php

Modified: vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php (original)
+++ vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php Fri Dec 22 07:40:00 2006
@@ -1299,7 +1299,7 @@
 	
 	$cur_tab_id = getTabid($module);
 
-	$sql1 = "select * from vtiger_relatedlists where tabid=".$cur_tab_id;
+	$sql1 = "select * from vtiger_relatedlists where tabid=".$cur_tab_id." order by sequence";
 	$result = $adb->query($sql1);
 	$num_row = $adb->num_rows($result);
 	for($i=0; $i<$num_row; $i++)

Modified: vtigercrm/branches/5.0.3/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/branches/5.0.3/modules/Users/DefaultDataPopulator.php Fri Dec 22 07:40:00 2006
@@ -1659,25 +1659,24 @@
 
 	//insert into related list vtiger_table
 	//Inserting for vtiger_account related lists
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Potentials").",'get_opportunities',1,'Potentials',0)");	
 		
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Contacts").",'get_contacts',2,'Contacts',0)");
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Calendar").",'get_activities',3,'Activities',0)");
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("HelpDesk").",'get_tickets',4,'HelpDesk',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Calendar").",'get_history',5,'Activity History',0)");
-
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",0,'get_attachments',6,'Attachments',0)");
-
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Quotes").",'get_quotes',7,'Quotes',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Invoice").",'get_invoices',8,'Invoice',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("SalesOrder").",'get_salesorder',9,'Sales Order',0)");
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Contacts").",'get_contacts',1,'Contacts',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Potentials").",'get_opportunities',2,'Potentials',0)");	
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Quotes").",'get_quotes',3,'Quotes',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("SalesOrder").",'get_salesorder',4,'Sales Order',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Invoice").",'get_invoices',5,'Invoice',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Calendar").",'get_activities',6,'Activities',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Calendar").",'get_history',7,'Activity History',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",0,'get_attachments',8,'Attachments',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("HelpDesk").",'get_tickets',9,'HelpDesk',0)");
 	
 	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Products").",'get_products',10,'Products',0)");
 



From vtigercrm-commits at vtiger.fosslabs.com  Fri Dec 22 06:41:33 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 22 Dec 2006 14:41:33 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9997 -
 /vtigercrm/branches/5.0.3/include/language/en_us.lang.php
Message-ID: <20061222144133.05751789AAB@vtiger.fosslabs.com>

Author: richie
Date: Fri Dec 22 07:41:25 2006
New Revision: 9997

Log:
text changed

Modified:
    vtigercrm/branches/5.0.3/include/language/en_us.lang.php

Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/include/language/en_us.lang.php Fri Dec 22 07:41:25 2006
@@ -25,7 +25,7 @@
 'LBL_MY_ACCOUNT' => 'My Account',
 'LBL_MY_PREFERENCES' => 'My Preferences',
 'LBL_ADMIN' => 'Admin',
-'LBL_LOGOUT' => 'Sign out',
+'LBL_LOGOUT' => 'Sign Out',
 'LBL_SEARCH' => 'Search',
 'LBL_LAST_VIEWED' => 'Last Viewed',
 'LBL_TODAY'=>'Today',
@@ -451,7 +451,7 @@
 'LBL_ADD_RSS_FEEDS' => 'Add New RSS Feed',
 'LNK_NEW_FAQ' => 'New FAQ',
 'Vendor Name' => 'Vendor Name',
-'LNK_WEARE' => 'About us',
+'LNK_WEARE' => 'About Us',
 'LBL_ABOUTUS_TITLE' => 'vtiger CRM - About Us',
 'LBL_DISCUSS' => 'Discuss with other users',
 'Quote Stage' => 'Quote Stage',



From vtigercrm-commits at vtiger.fosslabs.com  Wed Dec 27 07:43:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 27 Dec 2006 15:43:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9998 - in
 /vtigercrm/branches/5.0.3: include/fpdf/ include/fpdf/templates/
 modules/Invoice/ modules/Invoice/pdf_templates/ modules/PurchaseOrder/
 modules/PurchaseOrder/pdf_templates/ modules/Quotes/
 modules/Quotes/pdf_templates/ modules/SalesOrder/
 modules/SalesOrder/pdf_templates/
Message-ID: <20061227154359.ACA367896DE@vtiger.fosslabs.com>

Author: richie
Date: Wed Dec 27 08:43:45 2006
New Revision: 9998

Log:
* Modified to configure easily ie., change the bottom and top pixels and number of products  easily to avoid the description wrap

Added:
    vtigercrm/branches/5.0.3/include/fpdf/pdfconfig.php
Modified:
    vtigercrm/branches/5.0.3/include/fpdf/templates/body.php
    vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php
    vtigercrm/branches/5.0.3/modules/Invoice/pdf_templates/footer.php
    vtigercrm/branches/5.0.3/modules/PurchaseOrder/CreatePDF.php
    vtigercrm/branches/5.0.3/modules/PurchaseOrder/pdf_templates/footer.php
    vtigercrm/branches/5.0.3/modules/Quotes/CreatePDF.php
    vtigercrm/branches/5.0.3/modules/Quotes/pdf_templates/footer.php
    vtigercrm/branches/5.0.3/modules/SalesOrder/CreateSOPDF.php
    vtigercrm/branches/5.0.3/modules/SalesOrder/pdf_templates/footer.php

Modified: vtigercrm/branches/5.0.3/include/fpdf/templates/body.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/fpdf/templates/body.php (original)
+++ vtigercrm/branches/5.0.3/include/fpdf/templates/body.php Wed Dec 27 08:43:45 2006
@@ -6,10 +6,10 @@
 $waterMarkRotate=array("45","50","180");
 $pdf->watermark( $status, $waterMarkPositions, $waterMarkRotate );
 
-$bottom="130";
-$top="80";
+include("include/fpdf/pdfconfig.php");
+
 // blow a bubble around the table
-$Bubble=array("10",$top,"170","$bottom");
+$Bubble=array("10",$body_top,"170","$bottom");
 $pdf->tableWrapper($Bubble);
 
 /* ************ Begin Table Setup ********************** */
@@ -19,7 +19,9 @@
 // correctly
 $prodTable=array("10","60");
 
-if($focus->column_fields["hdnTaxType"] == "individual") {
+//if taxtype is individual
+if($focus->column_fields["hdnTaxType"] == "individual")
+{
 	$colsAlign["Product Name"] = "L";
 	$colsAlign["Description"] = "L";
 	$colsAlign["Qty"] = "R";
@@ -35,7 +37,10 @@
 	$cols["Discount"] = "15";
 	$cols["Tax"] = "20";
 	$cols["Total"] = "25";
-} else {
+}
+else
+{
+	//if taxtype is group
 	$colsAlign["Product Name"] = "L";
 	$colsAlign["Description"] = "L";
 	$colsAlign["Qty"] = "R";
@@ -61,8 +66,9 @@
 
 /* ************* Begin Product Population *************** */
 $ppad=3;
-$y    = $top+10;
-for($i=0;$i<count($product_name);$i++) {
+$y    = $body_top+10;
+for($i=0;$i<count($product_name);$i++)
+{
         $size = $pdf->addProductLine( $y, $line[$i] );
         $y   += $size+$ppad;
 }
@@ -73,17 +79,20 @@
 /* ************* Begin Totals ************************** */
 $t=$bottom+56;
 $pad=6;
-for($i=0;$i<count($total);$i++) {
+for($i=0;$i<count($total);$i++)
+{
         $size = $pdf->addProductLine( $t, $total[$i], $total[$i] );
         $t   += $pad;
 }
 
-
-if($focus->column_fields["hdnTaxType"] != "individual") {
+//Set the x and y positions to place the NetTotal, Discount, S&H charge
+//if taxtype is not individual ie., group tax
+if($focus->column_fields["hdnTaxType"] != "individual")
+{
 	$lineData=array("105",$bottom+37,"94");
 	$pdf->drawLine($lineData);
 	$data= $app_strings['LBL_NET_TOTAL'].":                                                                  ".$price_subtotal."";
-	$pdf->SetXY( 105 , 168 );
+	$pdf->SetXY( 105 , ($nettotal_y+(0*$next_y)) );
 	$pdf->SetFont( "Helvetica", "", 10);
 	$pdf->MultiCell(110, 4, $data);
 
@@ -95,29 +104,32 @@
 		$data= $app_strings['LBL_DISCOUNT'].":   $final_price_discount_percent                                                ".$price_discount."";
 	else
 		$data= $app_strings['LBL_DISCOUNT'].":                                                                  ".$price_discount."";
-	$pdf->SetXY( 105 , 174 );
+	$pdf->SetXY( 105 , ($nettotal_y+(1*$next_y)) );
 	$pdf->SetFont( "Helvetica", "", 10);
 	$pdf->MultiCell(110, 4, $data);
 
 	$lineData=array("105",$bottom+49,"94");
 	$pdf->drawLine($lineData);
 	$data= $app_strings['LBL_TAX'].":  ($group_total_tax_percent %)                                                                  ".$price_salestax."";
-	$pdf->SetXY( 105 , 180 );
+	$pdf->SetXY( 105 , ($nettotal_y+(2*$next_y)) );
 	$pdf->SetFont( "Helvetica", "", 10);
 	$pdf->MultiCell(110, 4, $data);
 
 	$lineData=array("105",$bottom+55,"94");
 	$pdf->drawLine($lineData);
 	$data = $app_strings['LBL_SHIPPING_AND_HANDLING_CHARGES'].":                                  ".$price_shipping;
-	$pdf->SetXY( 105 , 186 );
+	$pdf->SetXY( 105 , ($nettotal_y+(3*$next_y)) );
 	$pdf->SetFont( "Helvetica", "", 10);
 	$pdf->MultiCell(110, 4, $data);
 
-} else {
+}
+else
+{
+	//if taxtype is individual
 	$lineData=array("105",$bottom+43,"94");
 	$pdf->drawLine($lineData);
 	$data= $app_strings['LBL_NET_TOTAL'].":                                                                  ".$price_subtotal."";
-	$pdf->SetXY( 105 , 174 );
+	$pdf->SetXY( 105 , ($nettotal_y+(1*$next_y)) );
 	$pdf->SetFont( "Helvetica", "", 10);
 	$pdf->MultiCell(110, 4, $data);
 
@@ -130,36 +142,37 @@
 	else
 		$data= $app_strings['LBL_DISCOUNT'].":                                                                   ".$price_discount."";
 
-	$pdf->SetXY( 105 , 180 );
+	$pdf->SetXY( 105 , ($nettotal_y+(2*$next_y)) );
 	$pdf->SetFont( "Helvetica", "", 10);
 	$pdf->MultiCell(110, 4, $data);
 
 	$lineData=array("105",$bottom+55,"94");
 	$pdf->drawLine($lineData);
 	$data = $app_strings['LBL_SHIPPING_AND_HANDLING_CHARGES'].":                                  ".$price_shipping;
-	$pdf->SetXY( 105 , 186 );
+	$pdf->SetXY( 105 , ($nettotal_y+(3*$next_y)) );
 	$pdf->SetFont( "Helvetica", "", 10);
 	$pdf->MultiCell(110, 4, $data);
 }
 
+//Set the x and y positions to place the S&H Tax, Adjustment and Grand Total
 $lineData=array("105",$bottom+61,"94");
 $pdf->drawLine($lineData);
 $data = $app_strings['LBL_TAX_FOR_SHIPPING_AND_HANDLING'].":  ($sh_tax_percent %)               ".$price_shipping_tax;
-$pdf->SetXY( 105 , 192 );
+$pdf->SetXY( 105 , ($nettotal_y+(4*$next_y)) );
 $pdf->SetFont( "Helvetica", "", 10);
 $pdf->MultiCell(110, 4, $data);
 
 $lineData=array("105",$bottom+67,"94");
 $pdf->drawLine($lineData);
 $data = $app_strings['LBL_ADJUSTMENT'].":                                                                   ".$price_adjustment;
-$pdf->SetXY( 105 , 198 );
+$pdf->SetXY( 105 , ($nettotal_y+(5*$next_y)) );
 $pdf->SetFont( "Helvetica", "", 10);
 $pdf->MultiCell(110, 4, $data);
 
 $lineData=array("105",$bottom+73,"94");
 $pdf->drawLine($lineData);
 $data = $app_strings['LBL_GRAND_TOTAL'].":(in $currency_symbol)                                                    ".$price_total;
-$pdf->SetXY( 105 , 204 );
+$pdf->SetXY( 105 , ($nettotal_y+(6*$next_y)) );
 $pdf->SetFont( "Helvetica", "", 10);
 $pdf->MultiCell(110, 4, $data);
 

Modified: vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php (original)
+++ vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php Wed Dec 27 08:43:45 2006
@@ -11,17 +11,17 @@
 
 
 require_once('include/fpdf/pdf.php');
+require_once('include/fpdf/pdfconfig.php');
 require_once('modules/Invoice/Invoice.php');
 require_once('include/database/PearDatabase.php');
 
-global $adb,$app_strings,$products_per_page,$focus;
+global $adb,$app_strings,$focus;
 $sql="select currency_symbol from vtiger_currency_info";
 $result = $adb->query($sql);
 $currency_symbol = $adb->query_result($result,0,'currency_symbol');
 
 // would you like and end page?  1 for yes 0 for no
 $endpage="1";
-$products_per_page="6";
 
 $id = $_REQUEST['record'];
 
@@ -215,7 +215,14 @@
 	$pdf->AddPage();
 	include("pdf_templates/header.php");
 	include("include/fpdf/templates/body.php");
-	include("pdf_templates/footer.php");
+
+	//if bottom > 145 then we skip the Description and T&C in every page and display only in lastpage
+	//if you want to display the description and T&C in each page then set the display_desc_tc='true' and bottom <= 145 in pdfconfig.php
+	if($display_desc_tc == 'true')
+	if($bottom <= 145)
+	{
+		include("pdf_templates/footer.php");
+	}
 
 	$page_num++;
 

Modified: vtigercrm/branches/5.0.3/modules/Invoice/pdf_templates/footer.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Invoice/pdf_templates/footer.php (original)
+++ vtigercrm/branches/5.0.3/modules/Invoice/pdf_templates/footer.php Wed Dec 27 08:43:45 2006
@@ -12,8 +12,6 @@
 
 define('USD',"$");
 define('EURO', chr(128) );
-
-$top="215";
 
 $desc=explode("\n",$description);
 $cond=explode("\n",$conditions);

Modified: vtigercrm/branches/5.0.3/modules/PurchaseOrder/CreatePDF.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/PurchaseOrder/CreatePDF.php (original)
+++ vtigercrm/branches/5.0.3/modules/PurchaseOrder/CreatePDF.php Wed Dec 27 08:43:45 2006
@@ -10,6 +10,7 @@
  ********************************************************************************/
 
 require('include/fpdf/pdf.php');
+require_once('include/fpdf/pdfconfig.php');
 require_once('modules/PurchaseOrder/PurchaseOrder.php');
 require_once('include/database/PearDatabase.php');
 
@@ -21,8 +22,6 @@
 
 // would you like and end page?  1 for yes 0 for no
 $endpage="1";
-global $products_per_page;
-$products_per_page="6";
 
 $id = $_REQUEST['record'];
 //retreiving the vtiger_invoice info
@@ -217,7 +216,14 @@
 	$pdf->AddPage();
 	include("pdf_templates/header.php");
 	include("include/fpdf/templates/body.php");
-	include("pdf_templates/footer.php");
+
+	//if bottom > 145 then we skip the Description and T&C in every page and display only in lastpage
+	//if you want to display the description and T&C in each page then set the display_desc_tc='true' and bottom <= 145 in pdfconfig.php
+	if($display_desc_tc == 'true')
+	if($bottom <= 145)
+	{
+		include("pdf_templates/footer.php");
+	}
 
 	$page_num++;
 

Modified: vtigercrm/branches/5.0.3/modules/PurchaseOrder/pdf_templates/footer.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/PurchaseOrder/pdf_templates/footer.php (original)
+++ vtigercrm/branches/5.0.3/modules/PurchaseOrder/pdf_templates/footer.php Wed Dec 27 08:43:45 2006
@@ -12,8 +12,6 @@
 
 define('USD',"$");
 define('EURO', chr(128) );
-
-$top="215";
 
 $desc=explode("\n",$description);
 $cond=explode("\n",$conditions);

Modified: vtigercrm/branches/5.0.3/modules/Quotes/CreatePDF.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Quotes/CreatePDF.php (original)
+++ vtigercrm/branches/5.0.3/modules/Quotes/CreatePDF.php Wed Dec 27 08:43:45 2006
@@ -11,6 +11,7 @@
 
 
 require_once('include/fpdf/pdf.php');
+require_once('include/fpdf/pdfconfig.php');
 require_once('modules/Quotes/Quotes.php');
 require_once('include/database/PearDatabase.php');
 
@@ -22,8 +23,6 @@
 
 // would you like and end page?  1 for yes 0 for no
 $endpage="1";
-global $products_per_page;
-$products_per_page="6";
 
 $focus = new Quotes();
 $focus->retrieve_entity_info($_REQUEST['record'],"Quotes");
@@ -218,7 +217,14 @@
 	$pdf->AddPage();
 	include("pdf_templates/header.php");
 	include("include/fpdf/templates/body.php");
-	include("pdf_templates/footer.php");
+
+	//if bottom > 145 then we skip the Description and T&C in every page and display only in lastpage
+	//if you want to display the description and T&C in each page then set the display_desc_tc='true' and bottom <= 145 in pdfconfig.php
+	if($display_desc_tc == 'true')
+	if($bottom <= 145)
+	{
+		include("pdf_templates/footer.php");
+	}
 
 	$page_num++;
 

Modified: vtigercrm/branches/5.0.3/modules/Quotes/pdf_templates/footer.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Quotes/pdf_templates/footer.php (original)
+++ vtigercrm/branches/5.0.3/modules/Quotes/pdf_templates/footer.php Wed Dec 27 08:43:45 2006
@@ -9,9 +9,6 @@
  *
  ********************************************************************************/
 
-
-
-$top="215";
 
 $desc=explode("\n",$description);
 $cond=explode("\n",$conditions);

Modified: vtigercrm/branches/5.0.3/modules/SalesOrder/CreateSOPDF.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/SalesOrder/CreateSOPDF.php (original)
+++ vtigercrm/branches/5.0.3/modules/SalesOrder/CreateSOPDF.php Wed Dec 27 08:43:45 2006
@@ -11,10 +11,11 @@
 
 
 require('include/fpdf/pdf.php');
+require_once('include/fpdf/pdfconfig.php');
 require_once('modules/SalesOrder/SalesOrder.php');
 require_once('include/database/PearDatabase.php');
 
-global $adb,$app_strings,$products_per_page;
+global $adb,$app_strings;
 
 $sql="select currency_symbol from vtiger_currency_info";
 $result = $adb->query($sql);
@@ -22,7 +23,6 @@
 
 // would you like and end page?  1 for yes 0 for no
 $endpage="1";
-$products_per_page="6";
 
 $id = $_REQUEST['record'];
 //retreiving the vtiger_invoice info
@@ -216,7 +216,14 @@
 	$pdf->AddPage();
 	include("pdf_templates/header.php");
 	include("include/fpdf/templates/body.php");
-	include("pdf_templates/footer.php");
+
+	//if bottom > 145 then we skip the Description and T&C in every page and display only in lastpage
+	//if you want to display the description and T&C in each page then set the display_desc_tc='true' and bottom <= 145 in pdfconfig.php
+	if($display_desc_tc == 'true')
+	if($bottom <= 145)
+	{
+		include("pdf_templates/footer.php");
+	}
 
 	$page_num++;
 

Modified: vtigercrm/branches/5.0.3/modules/SalesOrder/pdf_templates/footer.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/SalesOrder/pdf_templates/footer.php (original)
+++ vtigercrm/branches/5.0.3/modules/SalesOrder/pdf_templates/footer.php Wed Dec 27 08:43:45 2006
@@ -12,8 +12,6 @@
 
 define('USD',"$");
 define('EURO', chr(128) );
-
-$top="215";
 
 $desc=explode("\n",$description);
 $cond=explode("\n",$conditions);



From vtigercrm-commits at vtiger.fosslabs.com  Thu Dec 28 00:30:00 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 28 Dec 2006 08:30:00 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9999 -
 /vtigercrm/branches/5.0.3/modules/Products/language/en_us.lang.php
Message-ID: <20061228083000.2548378A36C@vtiger.fosslabs.com>

Author: richie
Date: Thu Dec 28 01:29:54 2006
New Revision: 9999

Log:
* Fixed the i18n issue for Dozen

Modified:
    vtigercrm/branches/5.0.3/modules/Products/language/en_us.lang.php

Modified: vtigercrm/branches/5.0.3/modules/Products/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Products/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Products/language/en_us.lang.php Thu Dec 28 01:29:54 2006
@@ -197,7 +197,7 @@
 'Box'=>'Box',
 'Carton'=>'Carton',
 'Caton'=>'Caton',
-'Dozen'=>'Dazon',
+'Dozen'=>'Dozen',
 'Each'=>'Each',
 'Hours'=>'Hours',
 'Impressions'=>'Impressions',



From vtigercrm-commits at vtiger.fosslabs.com  Thu Dec 28 03:28:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 28 Dec 2006 11:28:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r10000 -
	/vtigercrm/branches/5.0.3/include/nusoap/nusoap.php
Message-ID: <20061228112810.3ACE6788CDB@vtiger.fosslabs.com>

Author: richie
Date: Thu Dec 28 04:28:06 2006
New Revision: 10000

Log:
* Changed the default encoding to avoid xml parsing error when the content have some special characters like Euro Symbol and German Umlaut characters in customerportal/outlook, etc., ie., in addons and plugins

Modified:
    vtigercrm/branches/5.0.3/include/nusoap/nusoap.php

Modified: vtigercrm/branches/5.0.3/include/nusoap/nusoap.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/nusoap/nusoap.php (original)
+++ vtigercrm/branches/5.0.3/include/nusoap/nusoap.php Thu Dec 28 04:28:06 2006
@@ -130,8 +130,8 @@
 	* @var      string
 	* @access   public
 	*/
-    	//var $soap_defencoding = 'ISO-8859-1';
-	var $soap_defencoding = 'UTF-8';
+    	var $soap_defencoding = 'ISO-8859-1';
+	//var $soap_defencoding = 'UTF-8';
 
 	/**
 	* namespaces in an array of prefix => uri



From vtigercrm-commits at vtiger.fosslabs.com  Fri Dec 29 01:04:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 29 Dec 2006 09:04:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r10001 - in
 /vtigercrm/branches/5.0.3/modules: Calendar/language/ Contacts/language/
 Emails/language/ HelpDesk/language/ Import/language/ Products/language/
 Quotes/language/ Reports/language/ Settings/language/ Users/language/
 Webmails/language/
Message-ID: <20061229090430.6BB5778A3E0@vtiger.fosslabs.com>

Author: richie
Date: Fri Dec 29 02:04:08 2006
New Revision: 10001

Log:
duplicate labels removed

Modified:
    vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php
    vtigercrm/branches/5.0.3/modules/Contacts/language/en_us.lang.php
    vtigercrm/branches/5.0.3/modules/Emails/language/en_us.lang.php
    vtigercrm/branches/5.0.3/modules/HelpDesk/language/en_us.lang.php
    vtigercrm/branches/5.0.3/modules/Import/language/en_us.lang.php
    vtigercrm/branches/5.0.3/modules/Products/language/en_us.lang.php
    vtigercrm/branches/5.0.3/modules/Quotes/language/en_us.lang.php
    vtigercrm/branches/5.0.3/modules/Reports/language/en_us.lang.php
    vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php
    vtigercrm/branches/5.0.3/modules/Users/language/en_us.lang.php
    vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php

Modified: vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php Fri Dec 29 02:04:08 2006
@@ -25,7 +25,6 @@
 'LBL_MODULE_TITLE'=>'Calendar: Home',
 'LBL_MODULE_APPOINTMENT'=>'Calendar: Appointment',
 'LBL_MODULE_APPOINTMENT_DETAIL'=>'Calendar: Appointment Detail',
-'LBL_CONTACT'=>'Contact:',
 'LBL_SAVE'=>'Save',
 'LBL_RESET'=>'Cancel',
 'LBL_LIST_USER_NAME'=>'User Name',
@@ -94,7 +93,6 @@
 'LBL_PREV_MON' => 'Previous Month',
 'LBL_NEXT_MON' => 'Next Month',
 
-'LBL_YEAR'=>'Year',
 'LBL_YEAR_BUTTON_KEY'=>'Y',
 'LBL_MON_BUTTON_TITLE'=>'Year [Alt+Y]',
 'LBL_PREV_YEAR'=>'Previous Year',
@@ -181,16 +179,8 @@
 'LBL_ADDCALL'=>'Call',
 'LBL_ADDMEETING'=>'Meeting',
 'LBL_ADDTODO'=>'To Do',
-'LBL_INVITE'=>'Invite',
-'LBL_REMINDER'=>'Reminder',
-'LBL_SENDREMINDER'=>'Send Reminder',
 'LBL_BEFOREEVENT'=>'before the event starts',
 'LBL_BEFORETASK'=>'before the task starts',
-'LBL_REPEAT'=>'Repeat',
-'LBL_EVENTTYPE'=>'Event Type',
-'LBL_EVENTNAME'=>'Event Name',
-'LBL_EVENTSTAT'=>'Event starts at',
-'LBL_EVENTEDAT'=>'Event ends on',
 'LBL_HRVIEW'=>'Hour View',
 'LBL_LISTVIEW'=>'List View',
 'LBL_WEEKVIEW'=>'Weekly Calendar View',
@@ -213,8 +203,6 @@
 'LBL_EVERYDAY'=>'Every Day',
 'LBL_EVERYWEEK'=>'Every Week',
 'LBL_EVERYMON'=>'Every Month',
-'LBL_REPEATEVENT'=>'Repeat once in every',
-'LBL_DAYS'=>'Day(s)',
 'LBL_WEEKS'=>'Week(s)',
 'LBL_MONTHS'=>'Month(s)',
 'LBL_YEAR'=>'Year',
@@ -230,7 +218,6 @@
 'LBL_ADD_BUTTON'=>'Add',
 'LBL_USERS'=>'Users',
 'LBL_RMV_BUTTON'=>'Remove',
-'LBL_RMD_ON'=>'Remind on',
 'LBL_SDRMD'=>'Send Reminder to',
 'LBL_ENABLE_REPEAT'=>'Enable Repeat',
 'LBL_REPEAT_ONCE'=>'Repeat once in every',

Modified: vtigercrm/branches/5.0.3/modules/Contacts/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Contacts/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Contacts/language/en_us.lang.php Fri Dec 29 02:04:08 2006
@@ -22,7 +22,6 @@
 
 $mod_strings = Array(
 // Mike Crowe Mod --------------------------------------------------------Added for general search
-'LBL_GENERAL_INFORMATION'=>'General Information',
 'LBL_MODULE_NAME'=>'Contacts',
 'LBL_INVITEE'=>'Direct Reports',
 'LBL_MODULE_TITLE'=>'Contacts: Home',
@@ -57,7 +56,6 @@
 'LBL_CREATED_CALL' => 'Created a new call',
 'LBL_CREATED_MEETING' => 'Created a new meeting',
 'LBL_ADDMORE_BUSINESSCARD' =>'Add another business card',
-'LBL_ADD_BUSINESSCARD' => 'Add Business Card',
 
 'LBL_BUSINESSCARD' => 'Business Card',
 

Modified: vtigercrm/branches/5.0.3/modules/Emails/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Emails/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Emails/language/en_us.lang.php Fri Dec 29 02:04:08 2006
@@ -35,8 +35,6 @@
 
 'ERR_DELETE_RECORD'=>"A record number must be specified to delete the vtiger_account.",
 'LBL_DATE_SENT'=>'Date Sent:',
-'LBL_SUBJECT'=>'Subject :',
-'LBL_BODY'=>'Body:',
 'LBL_DATE_AND_TIME'=>'Date & Time Sent:',
 'LBL_DATE'=>'Date Sent:',
 'LBL_TIME'=>'Time Sent:',
@@ -75,7 +73,6 @@
 // Contacts-SubPanelViewContactsAndUsers.php
 'LBL_BULK_MAILS'=>'Bulk Mails',
 'LBL_ATTACHMENT'=>'Attachment',
-'LBL_DESCRIPTION'=>'Description',
 'LBL_UPLOAD'=>'Upload',
 'LBL_FILE_NAME'=>'File Name',
 'LBL_SEND'=>'Send',

Modified: vtigercrm/branches/5.0.3/modules/HelpDesk/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/HelpDesk/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/HelpDesk/language/en_us.lang.php Fri Dec 29 02:04:08 2006
@@ -36,7 +36,6 @@
 'Accounts'=>'Account',
 'Contacts'=>'Contact',
 'Opportunities'=>'Opportunity',
-'LBL_TICKET_INFORMATION'=>'Ticket Information',
 'LBL_CUSTOM_INFORMATION'=>'Custom Information',
 'LBL_DESCRIPTION_INFORMATION'=>'Description Information',
 
@@ -57,7 +56,6 @@
 'LBL_PRIORITY'=>'Priority',
 'LBL_CATEGORY'=>'Category',
 
-'LBL_QUESTION'=>'Question',
 'LBL_ANSWER'=>'Answer',
 'LBL_COMMENTS'=>'Comments',
 

Modified: vtigercrm/branches/5.0.3/modules/Import/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Import/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Import/language/en_us.lang.php Fri Dec 29 02:04:08 2006
@@ -125,7 +125,6 @@
 'LBL_LEADS_NOTE_2'=>'Company Name must be mapped.',
 'LBL_IMPORT_NOW'=>'Import Now',
 'LBL_'=>'',
-'LBL_'=>'',
 'LBL_CANNOT_OPEN'=>'Cannot open the imported file for reading',
 'LBL_NOT_SAME_NUMBER'=>'There were not the same number of fields per line in your file',
 'LBL_NO_LINES'=>'There were no lines in your import file',
@@ -167,7 +166,6 @@
 );
 
 /*$mod_list_strings = Array(
-'contacts_import_fields' => Array(
 	"id"=>"Contact ID"
 	,"first_name"=>"First Name"
 	,"last_name"=>"Last Name"

Modified: vtigercrm/branches/5.0.3/modules/Products/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Products/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Products/language/en_us.lang.php Fri Dec 29 02:04:08 2006
@@ -63,7 +63,6 @@
 'LBL_COLON'=>':',
 
 'LBL_ATTACHMENTS'=>'Attachments',
-'LBL_NEW_ATTACHMENT'=>'New Attachment',
 'LBL_ATTACH_FILE'=>'File Attachment',
 'LBL_DESCRIPTION'=>'Description',
 'LBL_FILE'=>'File Name',
@@ -109,14 +108,12 @@
 'Sales End Date'=>'Sales End Date',
 'Created Time'=>'Created Time',
 'Modified Time'=>'Modified Time',
-'Description'=>'Description',
 'Related To'=>'Related To',
 'Usage Unit'=>'Usage Unit',
 'Handler'=>'Handler',
 'Contact Name'=>'Contact Name',
 'Currency'=>'Currency',
 'Reorder Level'=>'Reorder Level',
-'Website'=>'Website',
 'Tax Class'=>'Tax Class',
 'Mfr PartNo'=>'Mfr Part No',
 'Vendor PartNo'=>'Vendor Part No',
@@ -197,7 +194,7 @@
 'Box'=>'Box',
 'Carton'=>'Carton',
 'Caton'=>'Caton',
-'Dozen'=>'Dozen',
+'Dozen'=>'Dazon',
 'Each'=>'Each',
 'Hours'=>'Hours',
 'Impressions'=>'Impressions',

Modified: vtigercrm/branches/5.0.3/modules/Quotes/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Quotes/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Quotes/language/en_us.lang.php Fri Dec 29 02:04:08 2006
@@ -45,7 +45,6 @@
 //END DON'T CONVERT
 
 'LBL_ACCOUNT'=>'Account:',
-'LBL_ACCOUNT_NAME'=>'Account Name:',
 'LBL_PHONE'=>'Phone:',
 'LBL_WEBSITE'=>'Website:',
 'LBL_FAX'=>'Fax:',

Modified: vtigercrm/branches/5.0.3/modules/Reports/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Reports/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Reports/language/en_us.lang.php Fri Dec 29 02:04:08 2006
@@ -37,7 +37,6 @@
 'LBL_NEW_REP0_HDR4'=>'Report Module and related module once selected cannot be modified later',
 'LBL_CONTINUE_BUTTON'=>'Continue',
 'LBL_NEW_REP1_HDR1'=>'Provide the following report information',
-'LBL_REPORT_TYPE'=>'Report Type',
 'LBL_SELECT_COLUMNS'=>'Select Columns',
 'LBL_SPECIFY_GROUPING'=>'Specify Grouping',
 'LBL_COLUMNS_TO_TOTAL'=>'Choose Columns To Total',
@@ -96,7 +95,6 @@
 'LBL_CLICK_HERE'=>'Click Here',
 'LBL_TO_ADD_NEW_GROUP'=>'to add new folder',
 'LBL_CREATE_NEW'=>'Create New',
-'LBL_REPORT_DETAILS'=>'Report Details',
 'LBL_RELATIVE_MODULE'=>'Relative Module',
 'LBL_REPORT_TYPE'=>'Report Type',
 'LBL_REPORT_DETAILS'=>'Report Details',

Modified: vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php Fri Dec 29 02:04:08 2006
@@ -139,7 +139,6 @@
 
 //Settings/index.php
 
-'LBL_CUSTOM_FIELD_SETTINGS'=>'Custom Field Settings:',
 
 'LBL_PICKLIST_FIELD_SETTINGS'=>'Picklist Field Settings:',
 
@@ -193,7 +192,6 @@
 
 'PicklistFields'=>' Picklist Fields',
 
-'LBL_PICKLIST_EDITOR'=>'Picklist Editor',
 
 'Edit'=>'Edit',
 
@@ -340,8 +338,6 @@
 
 'LBL_CURRENCY_SETTINGS'=>'Currencies',
 
-'LBL_YES'=>'yes',
-'LBL_NO'=>'no',
 
 'LBL_USERNAME'=>'User Name',
 'LBL_PASWRD'=>'Password',
@@ -358,7 +354,6 @@
 
 'LBL_CREATE_AND_MANAGE_USERS'=>'- Create and Manage Users (e.g., admin)',
 
-'LBL_ROLES'=>'Roles',
 
 'LBL_CREATE_AND_MANAGE_USER_ROLES'=>'- Create and Manage user roles (e.g., Administrator, Standard User, etc.)',
 
@@ -761,7 +756,6 @@
 //Added while moving Mail Merge templates from Users to Settings
 'LBL_TEMPLATE_FILE'=>'Template File',
 'LBL_MODULENAMES'=>'Module',
-'LBL_LIST_TOOLS'=>'Tools',
 'LBL_DOWNLOAD'=>'Download',
 'LBL_ADD_TEMPLATE'=>'Add Template',
 'LBL_WORD_TEMPLATES'=>'Mail Merge Templates',
@@ -808,7 +802,6 @@
 'LBL_MESG_VIEW'=>'to view all information / modules of vtiger CRM',
 'LBL_MESG_EDIT'=>'to edit all information / modules of vtiger CRM',
 'LBL_TAB_MESG_OPTION'=>'modules to be shown',
-'LBL_EDIT_PERMISSIONS'=>'Edit Permissions',
 'LBL_CREATE_EDIT'=>'Create/Edit',
 'LBL_VIEW'=>'View',
 'LBL_MANDATORY_MSG'=>'Mandatory Fields',

Modified: vtigercrm/branches/5.0.3/modules/Users/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Users/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Users/language/en_us.lang.php Fri Dec 29 02:04:08 2006
@@ -24,7 +24,6 @@
 'LBL_LIST_FORM_TITLE'=>'User List',
 'LBL_NEW_FORM_TITLE'=>'New User',
 'LBL_CREATE_NEW_USER'=>'Create New User',
-'LBL_USER'=>'Users:',
 'LBL_LOGIN'=>'Login',
 'LBL_USER_ROLE'=>'Role',
 'LBL_LIST_NAME'=>'Name',
@@ -34,7 +33,6 @@
 'LBL_LIST_EMAIL'=>'E-Mail',
 'LBL_LIST_PRIMARY_PHONE'=>'Primary Phone',
 'LBL_LIST_ADMIN'=>'Admin',
-'LBL_LIST_PASSWORD'=>'Password',
 'LBL_LIST_CONFIRM_PASSWORD'=>'Confirm Password',
 'LBL_LIST_USER_NAME_ROLE'=>'User ID , Name & Role',
 'LBL_LIST_SELECT'=>'Select',
@@ -45,10 +43,7 @@
 'LBL_STD_USERS'=>'Standard Users',
 
 'UserName'=>'UserName',
-'Role'=>'Role',
-'Email'=>'Email',
 'Name'=>'Name',
-'Admin'=>'Admin',
 'Tools'=>'Tools',
 
 
@@ -68,16 +63,13 @@
 'LBL_FIRST_NAME'=>'First Name',
 'LBL_LAST_NAME'=>'Last Name',
 'LBL_YAHOO_ID'=>'Yahoo ID',
-'LBL_USER_SETTINGS'=>'User Settings',
 'LBL_THEME'=>'Color Theme',
 'LBL_LANGUAGE'=>'Language',
 'LBL_ADMIN'=>'Admin',
-'LBL_USER_INFORMATION'=>'User Information',
 'LBL_OFFICE_PHONE'=>'Office Phone',
 'LBL_REPORTS_TO'=>'Reports to',
 'LBL_OTHER_PHONE'=>'Other Phone',
 'LBL_OTHER_EMAIL'=>'Other Email',
-'LBL_NOTES'=>'Notes',
 'LBL_DEPARTMENT'=>'Department',
 'LBL_STATUS'=>'Status',
 'LBL_TITLE'=>'Title',
@@ -88,7 +80,6 @@
 'LBL_STATE'=>'State',
 'LBL_POSTAL_CODE'=>'Postal Code',
 'LBL_COUNTRY'=>'Country',
-'LBL_NAME'=>'Name:',
 'LBL_USER_SETTINGS'=>'User Settings',
 'LBL_USER_INFORMATION'=>'User Information',
 'LBL_MOBILE_PHONE'=>'Mobile',
@@ -137,8 +128,6 @@
 
 'LBL_ROLES'=>'Roles',
 'LBL_ROLES_SUBORDINATES'=>'Roles and Subordinates',
-'LBL_ROLE_NAME'=>'Role Name',
-'LBL_CREATE_NEW_ROLE'=>'Create New Role',
 
 'LBL_CREATE_NEW_ROLE'=>'Create New Role',
 'LBL_INDICATES_REQUIRED_FIELD'=>'Indicates Required Field',
@@ -150,7 +139,6 @@
 'LBL_ENTITY'=>'Entity',
 'LBL_CREATE_EDIT'=>'Create/Edit',
 'LBL_DELETE'=>'Delete',
-'LBL_VIEW'=>'View',
 'LBL_LEADS'=>'Leads',
 'LBL_ACCOUNTS'=>'Accounts',
 'LBL_CONTACTS'=>'Contacts',
@@ -174,12 +162,10 @@
 'LBL_UPLOAD'=>'Upload File',
 'LBL_ATTACH_FILE'=>'Attach Mail Merge Template',
 'LBL_EMAIL_TEMPLATES'=>'Email Templates',
-'LBL_TEMPLATE_NAME'=>'Template Name',
 'LBL_TEMPLATE_HEADER'=>'Template',
 'LBL_TEMPLATE_DETAILS'=>'Template Details',
 'LBL_EDIT_TEMPLATE'=>'Edit Template',
 'LBL_TEMPLATE_FILE'=>'Template File',
-'LBL_DESCRIPTION'=>'Description',
 'LBL_EMAIL_TEMPLATES_LIST'=>'Communication Templates > Email Templates',
 'LBL_MAILMERGE_TEMPLATES_LIST'=>' > Communication Templates > Mail Merge Templates',
 'LBL_MAILMERGE_TEMPLATES_ATTACHMENT' => '> Communication Templates > Attach Mail Merge Template',
@@ -514,7 +500,6 @@
 'LBL_MY_DEFAULTS'=>'My Defaults',
 'LBL_MY_DESG'=>'My Designation & Contact Details',
 'LBL_MY_ADDR'=>'My Postal Address',
-'LBL_MY_DETAILS'=>'My Details',
 'LBL_MY_PHOTO'=>'My Photo',
 'LBL_CHANGE_PHOTO'=>'Change Photo...',
 'LBL_CHANGE'=>'Change',

Modified: vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php Fri Dec 29 02:04:08 2006
@@ -75,7 +75,6 @@
 // Contacts-SubPanelViewContactsAndUsers.php
 'LBL_BULK_MAILS'=>'Bulk Mails',
 'LBL_ATTACHMENT'=>'Attachment',
-'LBL_DESCRIPTION'=>'Description',
 'LBL_UPLOAD'=>'Upload',
 'LBL_FILE_NAME'=>'File Name',
 'LBL_SEND'=>'Send',



From vtigercrm-commits at vtiger.fosslabs.com  Fri Dec 29 01:51:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 29 Dec 2006 09:51:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r10002 -
 /vtigercrm/branches/5.0.3/include/fpdf/templates/body.php
Message-ID: <20061229095126.D0022789EC9@vtiger.fosslabs.com>

Author: richie
Date: Fri Dec 29 02:51:22 2006
New Revision: 10002

Log:
proper alignment of data in pdf

Modified:
    vtigercrm/branches/5.0.3/include/fpdf/templates/body.php

Modified: vtigercrm/branches/5.0.3/include/fpdf/templates/body.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/fpdf/templates/body.php (original)
+++ vtigercrm/branches/5.0.3/include/fpdf/templates/body.php Fri Dec 29 02:51:22 2006
@@ -6,10 +6,10 @@
 $waterMarkRotate=array("45","50","180");
 $pdf->watermark( $status, $waterMarkPositions, $waterMarkRotate );
 
-include("include/fpdf/pdfconfig.php");
-
+$bottom="130";
+$top="80";
 // blow a bubble around the table
-$Bubble=array("10",$body_top,"170","$bottom");
+$Bubble=array("10",$top,"170","$bottom");
 $pdf->tableWrapper($Bubble);
 
 /* ************ Begin Table Setup ********************** */
@@ -19,9 +19,7 @@
 // correctly
 $prodTable=array("10","60");
 
-//if taxtype is individual
-if($focus->column_fields["hdnTaxType"] == "individual")
-{
+if($focus->column_fields["hdnTaxType"] == "individual") {
 	$colsAlign["Product Name"] = "L";
 	$colsAlign["Description"] = "L";
 	$colsAlign["Qty"] = "R";
@@ -37,10 +35,7 @@
 	$cols["Discount"] = "15";
 	$cols["Tax"] = "20";
 	$cols["Total"] = "25";
-}
-else
-{
-	//if taxtype is group
+} else {
 	$colsAlign["Product Name"] = "L";
 	$colsAlign["Description"] = "L";
 	$colsAlign["Qty"] = "R";
@@ -66,9 +61,8 @@
 
 /* ************* Begin Product Population *************** */
 $ppad=3;
-$y    = $body_top+10;
-for($i=0;$i<count($product_name);$i++)
-{
+$y    = $top+10;
+for($i=0;$i<count($product_name);$i++) {
         $size = $pdf->addProductLine( $y, $line[$i] );
         $y   += $size+$ppad;
 }
@@ -79,20 +73,17 @@
 /* ************* Begin Totals ************************** */
 $t=$bottom+56;
 $pad=6;
-for($i=0;$i<count($total);$i++)
-{
+for($i=0;$i<count($total);$i++) {
         $size = $pdf->addProductLine( $t, $total[$i], $total[$i] );
         $t   += $pad;
 }
 
-//Set the x and y positions to place the NetTotal, Discount, S&H charge
-//if taxtype is not individual ie., group tax
-if($focus->column_fields["hdnTaxType"] != "individual")
-{
+
+if($focus->column_fields["hdnTaxType"] != "individual") {
 	$lineData=array("105",$bottom+37,"94");
 	$pdf->drawLine($lineData);
-	$data= $app_strings['LBL_NET_TOTAL'].":                                                                  ".$price_subtotal."";
-	$pdf->SetXY( 105 , ($nettotal_y+(0*$next_y)) );
+	$data= $app_strings['LBL_NET_TOTAL'].":                                                               ".$price_subtotal."";
+	$pdf->SetXY( 105 , 168 );
 	$pdf->SetFont( "Helvetica", "", 10);
 	$pdf->MultiCell(110, 4, $data);
 
@@ -101,35 +92,33 @@
 
 	//For alignment
 	if($final_price_discount_percent != '')
-		$data= $app_strings['LBL_DISCOUNT'].":   $final_price_discount_percent                                                ".$price_discount."";
+		$data= $app_strings['LBL_DISCOUNT'].":                                                              $final_price_discount_percent                                                ".$price_discount."";
+
 	else
-		$data= $app_strings['LBL_DISCOUNT'].":                                                                  ".$price_discount."";
-	$pdf->SetXY( 105 , ($nettotal_y+(1*$next_y)) );
+		$data= $app_strings['LBL_DISCOUNT'].":                                                              ".$price_discount."";
+	$pdf->SetXY( 105 , 174 );
 	$pdf->SetFont( "Helvetica", "", 10);
 	$pdf->MultiCell(110, 4, $data);
 
 	$lineData=array("105",$bottom+49,"94");
 	$pdf->drawLine($lineData);
 	$data= $app_strings['LBL_TAX'].":  ($group_total_tax_percent %)                                                                  ".$price_salestax."";
-	$pdf->SetXY( 105 , ($nettotal_y+(2*$next_y)) );
+	$pdf->SetXY( 105 , 180 );
 	$pdf->SetFont( "Helvetica", "", 10);
 	$pdf->MultiCell(110, 4, $data);
 
 	$lineData=array("105",$bottom+55,"94");
 	$pdf->drawLine($lineData);
-	$data = $app_strings['LBL_SHIPPING_AND_HANDLING_CHARGES'].":                                  ".$price_shipping;
-	$pdf->SetXY( 105 , ($nettotal_y+(3*$next_y)) );
+	$data = $app_strings['LBL_SHIPPING_AND_HANDLING_CHARGES'].":                                                              ".$price_shipping;
+	$pdf->SetXY( 105 , 186 );
 	$pdf->SetFont( "Helvetica", "", 10);
 	$pdf->MultiCell(110, 4, $data);
 
-}
-else
-{
-	//if taxtype is individual
+} else {
 	$lineData=array("105",$bottom+43,"94");
 	$pdf->drawLine($lineData);
-	$data= $app_strings['LBL_NET_TOTAL'].":                                                                  ".$price_subtotal."";
-	$pdf->SetXY( 105 , ($nettotal_y+(1*$next_y)) );
+	$data= $app_strings['LBL_NET_TOTAL'].":                                                               ".$price_subtotal."";
+	$pdf->SetXY( 105 , 174 );
 	$pdf->SetFont( "Helvetica", "", 10);
 	$pdf->MultiCell(110, 4, $data);
 
@@ -138,41 +127,40 @@
 
 	//For alignment
 	if($final_price_discount_percent != '')
-		$data= $app_strings['LBL_DISCOUNT'].":   $final_price_discount_percent                                                 ".$price_discount."";
+		$data= $app_strings['LBL_DISCOUNT'].":   $final_price_discount_percent                                                                ".$price_discount."";
 	else
 		$data= $app_strings['LBL_DISCOUNT'].":                                                                   ".$price_discount."";
 
-	$pdf->SetXY( 105 , ($nettotal_y+(2*$next_y)) );
+	$pdf->SetXY( 105 , 180 );
 	$pdf->SetFont( "Helvetica", "", 10);
 	$pdf->MultiCell(110, 4, $data);
 
 	$lineData=array("105",$bottom+55,"94");
 	$pdf->drawLine($lineData);
-	$data = $app_strings['LBL_SHIPPING_AND_HANDLING_CHARGES'].":                                  ".$price_shipping;
-	$pdf->SetXY( 105 , ($nettotal_y+(3*$next_y)) );
+	$data = $app_strings['LBL_SHIPPING_AND_HANDLING_CHARGES'].":                                    ".$price_shipping;
+	$pdf->SetXY( 105 , 186 );
 	$pdf->SetFont( "Helvetica", "", 10);
 	$pdf->MultiCell(110, 4, $data);
 }
 
-//Set the x and y positions to place the S&H Tax, Adjustment and Grand Total
 $lineData=array("105",$bottom+61,"94");
 $pdf->drawLine($lineData);
-$data = $app_strings['LBL_TAX_FOR_SHIPPING_AND_HANDLING'].":  ($sh_tax_percent %)               ".$price_shipping_tax;
-$pdf->SetXY( 105 , ($nettotal_y+(4*$next_y)) );
+$data = $app_strings['LBL_TAX_FOR_SHIPPING_AND_HANDLING'].":  ($sh_tax_percent %)                     ".$price_shipping_tax;
+$pdf->SetXY( 105 , 192 );
 $pdf->SetFont( "Helvetica", "", 10);
 $pdf->MultiCell(110, 4, $data);
 
 $lineData=array("105",$bottom+67,"94");
 $pdf->drawLine($lineData);
-$data = $app_strings['LBL_ADJUSTMENT'].":                                                                   ".$price_adjustment;
-$pdf->SetXY( 105 , ($nettotal_y+(5*$next_y)) );
+$data = $app_strings['LBL_ADJUSTMENT'].":                                                               ".$price_adjustment;
+$pdf->SetXY( 105 , 198 );
 $pdf->SetFont( "Helvetica", "", 10);
 $pdf->MultiCell(110, 4, $data);
 
 $lineData=array("105",$bottom+73,"94");
 $pdf->drawLine($lineData);
-$data = $app_strings['LBL_GRAND_TOTAL'].":(in $currency_symbol)                                                    ".$price_total;
-$pdf->SetXY( 105 , ($nettotal_y+(6*$next_y)) );
+$data = $app_strings['LBL_GRAND_TOTAL'].":(in $currency_symbol)                                                ".$price_total;
+$pdf->SetXY( 105 , 204 );
 $pdf->SetFont( "Helvetica", "", 10);
 $pdf->MultiCell(110, 4, $data);
 



From vtigercrm-commits at vtiger.fosslabs.com  Fri Dec 29 05:01:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 29 Dec 2006 13:01:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r10003 -
 /vtigercrm/branches/5.0.3/Smarty/templates/ListWordTemplates.tpl
Message-ID: <20061229130145.6FD3D78A3EE@vtiger.fosslabs.com>

Author: richie
Date: Fri Dec 29 06:01:40 2006
New Revision: 10003

Log:
broken link fixed

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/ListWordTemplates.tpl

Modified: vtigercrm/branches/5.0.3/Smarty/templates/ListWordTemplates.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/ListWordTemplates.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/ListWordTemplates.tpl Fri Dec 29 06:01:40 2006
@@ -78,11 +78,11 @@
 				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
 	               		<form  name="massdelete" method="POST">
 	    			<input name="idlist" type="hidden">
-    				<input name="module" type="hidden" value="Users">
+    				<input name="module" type="hidden" value="Settings">
     				<input name="parenttab" type="hidden" value="Settings">
     				<input name="action" type="hidden">
 				<tr>
-					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}mailmarge.gif" alt="Users" width="48" height="48" border=0 title="Users"></td>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}mailmarge.gif" alt="Settings" width="48" height="48" border=0 title="Settings"></td>
 					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > {$UMOD.LBL_WORD_TEMPLATES} </b></td>
 				</tr>
 				<tr>
@@ -126,7 +126,7 @@
 						<td class="listTableRow small" valign=top><b>{$template.filename}</b></a></td>
 						<td class="listTableRow small" valign=top>{$template.description}&nbsp;</td>
 				        <td class="listTableRow small" valign=top>{$template.module}</td>
-				        <td class="listTableRow small" valign=top><a href="index.php?module=Users&action=downloadfile&record={$template.templateid}">{$UMOD.LBL_DOWNLOAD}</a></td>
+				        <td class="listTableRow small" valign=top><a href="index.php?module=Settings&action=downloadfile&record={$template.templateid}">{$UMOD.LBL_DOWNLOAD}</a></td>
 			          </tr>
 					{/foreach}
 					</table>



From vtigercrm-commits at vtiger.fosslabs.com  Fri Dec  1 06:41:56 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 01 Dec 2006 11:41:56 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9930 - in
 /vtigercrm/branches/5.0.3: Smarty/templates/CustomView.tpl
 modules/CustomView/EditView.php
Message-ID: <20061201114156.799FC788A9D@vtiger.fosslabs.com>

Author: richie
Date: Fri Dec  1 04:41:49 2006
New Revision: 9930

Log:
i18N support added for custom filter columns

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl
    vtigercrm/branches/5.0.3/modules/CustomView/EditView.php

Modified: vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl Fri Dec  1 04:41:49 2006
@@ -146,7 +146,18 @@
 			{foreach item=filteroption key=label from=$CHOOSECOLUMN1}
 				<optgroup label="{$label}" class=\"select\" style=\"border:none\">
 					{foreach item=text from=$filteroption}
-		   		         <option {$text.selected} value={$text.value}>{$text.text}</option>
+					 {assign var=option_values value=$text.text}
+		   		         <option {$text.selected} value={$text.value}>
+			{if $MOD.$option_values neq ''}
+				{$MOD.$option_values}
+
+			{elseif $APP.$option_values neq ''}
+				{$APP.$option_values}
+
+			{else}
+				{$option_values}
+			{/if}
+</option>
                     {/foreach}
 			{/foreach}
           	        {$CHOOSECOLUMN1}
@@ -156,7 +167,18 @@
                         {foreach item=filteroption key=label from=$CHOOSECOLUMN2}
                                 <optgroup label="{$label}" class=\"select\" style=\"border:none\">
                                 {foreach item=text from=$filteroption}
-                                     <option {$text.selected} value={$text.value}>{$text.text}</option>
+                              	 {assign var=option_values value=$text.text}
+		   		         <option {$text.selected} value={$text.value}>
+			{if $MOD.$option_values neq ''}
+				{$MOD.$option_values}
+
+			{elseif $APP.$option_values neq ''}
+				{$APP.$option_values}
+
+			{else}
+				{$option_values}
+			{/if}
+</option>
                                 {/foreach}
                         {/foreach}
                         {$CHOOSECOLUMN2}
@@ -166,7 +188,18 @@
                         {foreach item=filteroption key=label from=$CHOOSECOLUMN3}
                                 <optgroup label="{$label}" class=\"select\" style=\"border:none\">
                                 {foreach item=text from=$filteroption}
-                                     <option {$text.selected} value={$text.value}>{$text.text}</option>
+                                    	 {assign var=option_values value=$text.text}
+		   		         <option {$text.selected} value={$text.value}>
+			{if $MOD.$option_values neq ''}
+				{$MOD.$option_values}
+
+			{elseif $APP.$option_values neq ''}
+				{$APP.$option_values}
+
+			{else}
+				{$option_values}
+			{/if}
+</option>
                                 {/foreach}
                         {/foreach}
                         {$CHOOSECOLUMN3}
@@ -176,7 +209,18 @@
                         {foreach item=filteroption key=label from=$CHOOSECOLUMN4}
                                 <optgroup label="{$label}" class=\"select\" style=\"border:none\">
                                 {foreach item=text from=$filteroption}
-                                     <option {$text.selected} value={$text.value}>{$text.text}</option>
+                                    	 {assign var=option_values value=$text.text}
+		   		         <option {$text.selected} value={$text.value}>
+			{if $MOD.$option_values neq ''}
+				{$MOD.$option_values}
+
+			{elseif $APP.$option_values neq ''}
+				{$APP.$option_values}
+
+			{else}
+				{$option_values}
+			{/if}
+</option>
                                 {/foreach}
                         {/foreach}
                         {$CHOOSECOLUMN4}
@@ -189,7 +233,18 @@
                         {foreach item=filteroption key=label from=$CHOOSECOLUMN5}
                                 <optgroup label="{$label}" class=\"select\" style=\"border:none\">
                                 {foreach item=text from=$filteroption}
-                                     <option {$text.selected} value={$text.value}>{$text.text}</option>
+                                    	 {assign var=option_values value=$text.text}
+		   		         <option {$text.selected} value={$text.value}>
+			{if $MOD.$option_values neq ''}
+				{$MOD.$option_values}
+
+			{elseif $APP.$option_values neq ''}
+				{$APP.$option_values}
+
+			{else}
+				{$option_values}
+			{/if}
+</option>
                                 {/foreach}
                         {/foreach}
                         {$CHOOSECOLUMN5}
@@ -199,7 +254,18 @@
                         {foreach item=filteroption key=label from=$CHOOSECOLUMN6}
                                 <optgroup label="{$label}" class=\"select\" style=\"border:none\">
                                 {foreach item=text from=$filteroption}
-                                     <option {$text.selected} value={$text.value}>{$text.text}</option>
+                                   	 {assign var=option_values value=$text.text}
+		   		         <option {$text.selected} value={$text.value}>
+			{if $MOD.$option_values neq ''}
+				{$MOD.$option_values}
+
+			{elseif $APP.$option_values neq ''}
+				{$APP.$option_values}
+
+			{else}
+				{$option_values}
+			{/if}
+</option>
                                 {/foreach}
                         {/foreach}
                         {$CHOOSECOLUMN6}
@@ -209,7 +275,18 @@
                         {foreach item=filteroption key=label from=$CHOOSECOLUMN7}
                                 <optgroup label="{$label}" class=\"select\" style=\"border:none\">
                                 {foreach item=text from=$filteroption}
-                                     <option {$text.selected} value={$text.value}>{$text.text}</option>
+                                    	 {assign var=option_values value=$text.text}
+		   		         <option {$text.selected} value={$text.value}>
+			{if $MOD.$option_values neq ''}
+				{$MOD.$option_values}
+
+			{elseif $APP.$option_values neq ''}
+				{$APP.$option_values}
+
+			{else}
+				{$option_values}
+			{/if}
+</option>
                                 {/foreach}
                         {/foreach}
                         {$CHOOSECOLUMN7}
@@ -219,7 +296,18 @@
                         {foreach item=filteroption key=label from=$CHOOSECOLUMN8}
                                 <optgroup label="{$label}" class=\"select\" style=\"border:none\">
                                 {foreach item=text from=$filteroption}
-                                     <option {$text.selected} value={$text.value}>{$text.text}</option>
+                                    	 {assign var=option_values value=$text.text}
+		   		         <option {$text.selected} value={$text.value}>
+			{if $MOD.$option_values neq ''}
+				{$MOD.$option_values}
+
+			{elseif $APP.$option_values neq ''}
+				{$APP.$option_values}
+
+			{else}
+				{$option_values}
+			{/if}
+</option>
                                 {/foreach}
                         {/foreach}
                         {$CHOOSECOLUMN8}
@@ -231,7 +319,18 @@
                         {foreach item=filteroption key=label from=$CHOOSECOLUMN9}
                                 <optgroup label="{$label}" class=\"select\" style=\"border:none\">
                                 {foreach item=text from=$filteroption}
-                                     <option {$text.selected} value={$text.value}>{$text.text}</option>
+                                    	 {assign var=option_values value=$text.text}
+		   		         <option {$text.selected} value={$text.value}>
+			{if $MOD.$option_values neq ''}
+				{$MOD.$option_values}
+
+			{elseif $APP.$option_values neq ''}
+				{$APP.$option_values}
+
+			{else}
+				{$option_values}
+			{/if}
+</option>
                                 {/foreach}
                         {/foreach}
                         {$CHOOSECOLUMN9}

Modified: vtigercrm/branches/5.0.3/modules/CustomView/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/CustomView/EditView.php (original)
+++ vtigercrm/branches/5.0.3/modules/CustomView/EditView.php Fri Dec  1 04:41:49 2006
@@ -54,7 +54,7 @@
 	$log->info('CustomView :: Successfully got StandardFilter for the module'.$cv_module);
 	$stdfiltercolhtml = getStdFilterHTML($cv_module);
 	$stdfilterjs = $oCustomView->getCriteriaJS();
-
+	$smarty->assign("MOD",$mod_strings);
 	//step4
 	$advfilterhtml = getAdvCriteriaHTML();
 	for($i=1;$i<10;$i++)




From vtigercrm-commits at vtiger.fosslabs.com  Fri Dec  1 08:19:01 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 01 Dec 2006 13:19:01 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9931 - in
 /vtigercrm/branches/5.0.3: Smarty/templates/ modules/Settings/
 modules/Settings/language/ modules/Users/ modules/Users/language/
 modules/Webmails/
Message-ID: <20061201131901.5F0EC7896DF@vtiger.fosslabs.com>

Author: richie
Date: Fri Dec  1 06:18:44 2006
New Revision: 9931

Log:
* Non admin users are allowed to confifure their own incoming mail server by done these changes

Added:
    vtigercrm/branches/5.0.3/modules/Users/AddMailAccount.php
    vtigercrm/branches/5.0.3/modules/Users/SaveMailAccount.php
Removed:
    vtigercrm/branches/5.0.3/modules/Settings/AddMailAccount.php
    vtigercrm/branches/5.0.3/modules/Settings/SaveMailAccount.php
Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/AddMailAccount.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/Emails.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl
    vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php
    vtigercrm/branches/5.0.3/modules/Users/language/en_us.lang.php
    vtigercrm/branches/5.0.3/modules/Webmails/MailBox.php

Modified: vtigercrm/branches/5.0.3/Smarty/templates/AddMailAccount.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/AddMailAccount.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/AddMailAccount.tpl Fri Dec  1 06:18:44 2006
@@ -21,7 +21,7 @@
                         <hr noshade="noshade" size="1"><br>
 
   		<form action="index.php" method="post" name="EditView" id="form">
-			<input type="hidden" name="module" value="Settings">
+			<input type="hidden" name="module" value="Users">
 		  	<input type="hidden" name="action">
   			<input type="hidden" name="server_type" value="email">
 			<input type="hidden" name="record" value="{$ID}">

Modified: vtigercrm/branches/5.0.3/Smarty/templates/Emails.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/Emails.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/Emails.tpl Fri Dec  1 06:18:44 2006
@@ -66,7 +66,7 @@
 </script>
 		{include file='Buttons_List.tpl'}
 <script language="JavaScript" type="text/javascript" src="modules/Emails/Email.js"></script>
-<div id="mailconfchk" class="small" style="position:absolute;display:none;left:350px;top:160px;height:27px;white-space:nowrap;z-index:10000007px;"><font color='red'><b>{$MOD.LBL_CONFIGURE_MAIL_SETTINGS}.<br> {$APP.LBL_PLEASE_CLICK} <a href="index.php?module=Settings&action=AddMailAccount&record={$USERID}">{$APP.LBL_HERE}</a> {$APP.LBL_TO_CONFIGURE}</b></font></div>
+<div id="mailconfchk" class="small" style="position:absolute;display:none;left:350px;top:160px;height:27px;white-space:nowrap;z-index:10000007px;"><font color='red'><b>{$MOD.LBL_CONFIGURE_MAIL_SETTINGS}.<br> {$APP.LBL_PLEASE_CLICK} <a href="index.php?module=Users&action=AddMailAccount&record={$USERID}">{$APP.LBL_HERE}</a> {$APP.LBL_TO_CONFIGURE}</b></font></div>
 <!-- Shadow starts here -->
 <table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
 	<tr>
@@ -96,7 +96,7 @@
 												</td>
 												<td nowrap style="padding-left:20px;padding-right:20px" class=small>
 												<img src="{$IMAGE_PATH}webmail_settings.gif" align="absmiddle" />
-							&nbsp;<a href="index.php?module=Settings&action=AddMailAccount&record={$USERID}" >{$MOD.LBL_SETTINGS}</a>
+							&nbsp;<a href="index.php?module=Users&action=AddMailAccount&record={$USERID}" >{$MOD.LBL_SETTINGS}</a>
 												</td>
 											</tr>
 											</table>

Modified: vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl Fri Dec  1 06:18:44 2006
@@ -37,7 +37,7 @@
 							</td>
 							<td width="10%">
 								<img src="{$IMAGE_PATH}webmail_settings.gif" align="absmiddle" />
-								&nbsp;<a href="index.php?module=Settings&action=AddMailAccount&record={$USERID}" class="webMnu">{$MOD.LBL_SETTINGS}</a>
+								&nbsp;<a href="index.php?module=Users&action=AddMailAccount&record={$USERID}" class="webMnu">{$MOD.LBL_SETTINGS}</a>
 							</td>
 							<!--td width="12%">
 								<img src="{$IMAGE_PATH}webmail_settings.gif" align="absmiddle" />

Modified: vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php Fri Dec  1 06:18:44 2006
@@ -510,58 +510,11 @@
 
 'LBL_RSS_CATEGORY'=>'Rss Category',
 
-//Added for Web based Email client integration (post 4.0.1 release)
-
-'LBL_ADD_MAIL_ACCOUNT'=>'Add Mail Account',
-'LBL_NEW_MAIL_ACCOUNT_TITLE'=>'New Mail Account [Alt+M]',
-'LBL_NEW_MAIL_ACCOUNT_KEY'=>'M',
-'LBL_NEW_MAIL_ACCOUNT_LABEL'=>'New Mail Account',
-'LBL_GENERAL_INFO'=>'General Information',
-'LBL_DISPLAY_NAME'=>'Display Name',
-'LBL_MAIL_PROTOCOL'=>'Mail Protocol',
-'LBL_LIST_PASSWORD'=>'Password',
-'LBL_MAIL_SERVER_NAME'=>'Mail Server Name or IP',
-'LBL_MAIL_SERVER_SETTINGS'=>'Outgoing Server',
-'LBL_INCOME_SERVER_SETTINGS'=>'Incoming Server',
-'LBL_TEST_SETTINGS'=>'Test my account setting immediately',
-'LBL_TEST_BUTTON_TITLE'=>'Test my account now! [Alt+T]',
-'LBL_TEST_BUTTON_KEY'=>'T',
-'LBL_TEST_BUTTON_LABEL'=>'Test my account now!',
-'LBL_DEFAULT'=>'Default',
-'LBL_IMAP2'=>'IMAP2',
-'LBL_IMAP4'=>'IMAP4',
-'LBL_POP'=>'POP',
-'LBL_IMAP'=>'IMAP',
-'LBL_MAIL_DISCLAIM'=>'Items marked with <font color="red">*</font> are required<br>Items marked with <font color="red">* *</font> are not fully supported',
-'LBL_SSL_OPTIONS'=>'SSL Options',
-'LBL_TLS'=>'TLS',
-'LBL_NO_TLS'=>'No TLS',
-'LBL_CERT_VAL'=>'Certificate Validations',
-'LBL_INT_MAILER'=>'Use Internal Mailer?',
-'LBL_INT_MAILER_USE'=>'Yes',
-'LBL_INT_MAILER_NOUSE'=>'No',
-'LBL_VAL_SSL_CERT'=>'Validate SSL Cert',
-'LBL_DONOT_VAL_SSL_CERT'=>'Do Not Validate SSL Cert',
-'LBL_WEB_MAIL_CONFIG'=>'Web Mail Configuration',
-'LBL_CONFIGURE_WEB_MAIL'=>' - Configure Web Mail',
-'LBL_LIST_MAIL_ACCOUNT'=>'  List Mail Account',
 'LBL_USAGEUNIT'=>'Usage Unit',
 'LBL_GLACCT'=>'GL Account',
 'LBL_QUOTE_STAGE'=>'Quote Stage',
 'LBL_CARRIER'=>'Carrier',
 'LBL_TAXCLASS'=>'Tax Class',
-'LBL_MY_DETAILS'=>'My Details',
-'LBL_MY_MAIL_SERVER_DET'=>'My Incoming Mail Server Details',
-'LBL_EMAIL_ID'=>'Email ID',
-'LBL_NAME_EXAMPLE'=>'(example : John Fenner)',
-'LBL_EMAIL_EXAMPLE'=>'(example : johnfenner at xyz.com)',
-'LBL_REFRESH_TIMEOUT'=>'Refresh Timeout',
-'LBL_1_MIN'=>'1 minute',
-'LBL_2_MIN'=>'2 minutes',
-'LBL_3_MIN'=>'3 minutes',
-'LBL_4_MIN'=>'4 minutes',
-'LBL_5_MIN'=>'5 minutes',
-'LBL_EMAILS_PER_PAGE'=>'Emails per Page',
 
 //Added for Organization Details (4.2 release)
 'LBL_ORGANIZATION_NAME'=>'Company Name',

Modified: vtigercrm/branches/5.0.3/modules/Users/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Users/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Users/language/en_us.lang.php Fri Dec  1 06:18:44 2006
@@ -611,6 +611,56 @@
 
 'LBL_ASSIGN_ROLE'=>'Assign Role',
 
+//Moved from Settings to here for Webmail client integration (for 5.0.3 release)
+
+'LBL_ADD_MAIL_ACCOUNT'=>'Add Mail Account',
+'LBL_NEW_MAIL_ACCOUNT_TITLE'=>'New Mail Account [Alt+M]',
+'LBL_NEW_MAIL_ACCOUNT_KEY'=>'M',
+'LBL_NEW_MAIL_ACCOUNT_LABEL'=>'New Mail Account',
+'LBL_GENERAL_INFO'=>'General Information',
+'LBL_DISPLAY_NAME'=>'Display Name',
+'LBL_MAIL_PROTOCOL'=>'Mail Protocol',
+'LBL_LIST_PASSWORD'=>'Password',
+'LBL_MAIL_SERVER_NAME'=>'Mail Server Name or IP',
+'LBL_MAIL_SERVER_SETTINGS'=>'Outgoing Server',
+'LBL_INCOME_SERVER_SETTINGS'=>'Incoming Server',
+'LBL_TEST_SETTINGS'=>'Test my account setting immediately',
+'LBL_TEST_BUTTON_TITLE'=>'Test my account now! [Alt+T]',
+'LBL_TEST_BUTTON_KEY'=>'T',
+'LBL_TEST_BUTTON_LABEL'=>'Test my account now!',
+'LBL_DEFAULT'=>'Default',
+'LBL_IMAP2'=>'IMAP2',
+'LBL_IMAP4'=>'IMAP4',
+'LBL_POP'=>'POP',
+'LBL_IMAP'=>'IMAP',
+'LBL_MAIL_DISCLAIM'=>'Items marked with <font color="red">*</font> are required<br>Items marked with <font color="red">* *</font> are not fully supported',
+'LBL_SSL_OPTIONS'=>'SSL Options',
+'LBL_TLS'=>'TLS',
+'LBL_NO_TLS'=>'No TLS',
+'LBL_CERT_VAL'=>'Certificate Validations',
+'LBL_INT_MAILER'=>'Use Internal Mailer?',
+'LBL_INT_MAILER_USE'=>'Yes',
+'LBL_INT_MAILER_NOUSE'=>'No',
+'LBL_VAL_SSL_CERT'=>'Validate SSL Cert',
+'LBL_DONOT_VAL_SSL_CERT'=>'Do Not Validate SSL Cert',
+'LBL_WEB_MAIL_CONFIG'=>'Web Mail Configuration',
+'LBL_CONFIGURE_WEB_MAIL'=>' - Configure Web Mail',
+'LBL_LIST_MAIL_ACCOUNT'=>'  List Mail Account',
+'LBL_MY_MAIL_SERVER_DET'=>'My Incoming Mail Server Details',
+'LBL_MY_DETAILS'=>'My Details',
+'LBL_EMAIL_ID'=>'Email ID',
+'LBL_EMAIL_ADDRESS'=>'Email',
+'LBL_NAME_EXAMPLE'=>'(example : John Fenner)',
+'LBL_EMAIL_EXAMPLE'=>'(example : johnfenner at xyz.com)',
+'LBL_REFRESH_TIMEOUT'=>'Refresh Timeout',
+'LBL_1_MIN'=>'1 minute',
+'LBL_2_MIN'=>'2 minutes',
+'LBL_3_MIN'=>'3 minutes',
+'LBL_4_MIN'=>'4 minutes',
+'LBL_5_MIN'=>'5 minutes',
+'LBL_EMAILS_PER_PAGE'=>'Emails per Page',
+
+
 );
 
 ?>

Modified: vtigercrm/branches/5.0.3/modules/Webmails/MailBox.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Webmails/MailBox.php (original)
+++ vtigercrm/branches/5.0.3/modules/Webmails/MailBox.php Fri Dec  1 06:18:44 2006
@@ -1,4 +1,4 @@
-<?php
+<?php
 /*********************************************************************************
  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
   * ("License"); You may not use this file except in compliance with the License
@@ -167,7 +167,7 @@
 			{
 				global $current_user;
 				$this->db->println("CONNECTION ERROR - Could not be connected to the server using imap_open function through the connection strings $connectString and $connectString1");
-				echo "<br>&nbsp;<b>Could not connect to the server. Please check the server details <a href='index.php?module=Settings&action=AddMailAccount&record=".$current_user->id."'> Here </a></b>";
+				echo "<br>&nbsp;<b>Could not connect to the server. Please check the server details <a href='index.php?module=Users&action=AddMailAccount&record=".$current_user->id."'> Here </a></b>";
 				exit;
 			}
 		}




From vtigercrm-commits at vtiger.fosslabs.com  Tue Dec  5 01:08:08 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 05 Dec 2006 06:08:08 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9932 - in
 /vtigercrm/branches/5.0.3/modules/Webmails: DetailView.php ListView.php
 MailParse.php Webmail.php body.php
Message-ID: <20061205060808.994F5788AA5@vtiger.fosslabs.com>

Author: richie
Date: Mon Dec  4 23:08:02 2006
New Revision: 9932

Log:
* Added utf6 decoding to display the all language characters correctly -- Mickie

Modified:
    vtigercrm/branches/5.0.3/modules/Webmails/DetailView.php
    vtigercrm/branches/5.0.3/modules/Webmails/ListView.php
    vtigercrm/branches/5.0.3/modules/Webmails/MailParse.php
    vtigercrm/branches/5.0.3/modules/Webmails/Webmail.php
    vtigercrm/branches/5.0.3/modules/Webmails/body.php

Modified: vtigercrm/branches/5.0.3/modules/Webmails/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Webmails/DetailView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Webmails/DetailView.php Mon Dec  4 23:08:02 2006
@@ -31,6 +31,10 @@
 echo '<table border="0" width="100%" cellpadding="0" cellspacing="0">';
 echo '<tr><td width="10%">From:</td><td>'.$elist->from.'</td></tr>';
 echo '<tr><td width="10%">To:</td><td>'.$elist->to.'</td></tr>';
+
+//Added to get the UTF-8 string - 30-11-06 - Mickie
+$elist->subject = utf8_decode(imap_utf8($elist->subject));
+
 echo '<tr><td width="10%">Subject:</td><td>'.$elist->subject.'</td></tr>';
 echo '<tr><td width="10%">Date:</td><td>'.$elist->date.'</td></tr>';
 echo '</table>';

Modified: vtigercrm/branches/5.0.3/modules/Webmails/ListView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Webmails/ListView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Webmails/ListView.php Mon Dec  4 23:08:02 2006
@@ -157,7 +157,7 @@
 );
 </script>
 <script language="JavaScript" type="text/javascript" src="modules/Webmails/webmails.js"></script>
-<?
+<?php
 
 global $displayed_msgs;
 // AJAX commands (should be moved)
@@ -217,7 +217,7 @@
 // these are mainly used in the preview window and could be ajaxified/
 // during the preview window load instead.
 var msgCount = "<?php echo $numEmails;?>";
-<?
+<?php
 $mails = array();
 if (is_array($overview)) {
    foreach ($overview as $val) {
@@ -226,9 +226,15 @@
 	webmail[<?php echo $val->msgno;?>] = new Array();
 	webmail[<?php echo $val->msgno;?>]["from"]="<?php echo addslashes($val->from);?>";
 	webmail[<?php echo $val->msgno;?>]["to"]="<?php echo addslashes($val->to);?>";
+
+	<?php 
+		//Added to get the UTF-8 string - 30-11-06 - Mickie
+		$val->subject = utf8_decode(imap_utf8($val->subject));
+	?>
+		
 	webmail[<?php echo $val->msgno;?>]["subject"]="<?php echo addslashes($val->subject);?>";
 	webmail[<?php echo $val->msgno;?>]["date"]="<?php echo addslashes($val->date);?>";
-	<?
+	<?php
    }
 }
 echo "</script>";

Modified: vtigercrm/branches/5.0.3/modules/Webmails/MailParse.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Webmails/MailParse.php (original)
+++ vtigercrm/branches/5.0.3/modules/Webmails/MailParse.php Mon Dec  4 23:08:02 2006
@@ -1,4 +1,4 @@
-<?php
+<?php
 /*********************************************************************************
  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
   * ("License"); You may not use this file except in compliance with the License
@@ -11,35 +11,47 @@
 
 
 // draw a row for the listview entry
-function show_msg($mails,$start_message) {
-        global $MailBox,$displayed_msgs,$show_hidden,$new_msgs;
+function show_msg($mails,$start_message)
+{
+	global $MailBox,$displayed_msgs,$show_hidden,$new_msgs;
 
-        $num = $mails[$start_message]->msgno;
-        $msg_ob = new Webmail($MailBox->mbox,$mails[$start_message]->msgno);
+	$num = $mails[$start_message]->msgno;
+	$msg_ob = new Webmail($MailBox->mbox,$mails[$start_message]->msgno);
 
-        // TODO: scan the current db vtiger_tables to find a
-        // matching email address that will make a good
-        // candidate for record_id
-        // this module will also need to be able to associate to any entity type
-        $record_id='';
+	// TODO: scan the current db vtiger_tables to find a
+	// matching email address that will make a good
+	// candidate for record_id
+	// this module will also need to be able to associate to any entity type
+	$record_id='';
 
-        if($mails[$start_message]->subject=="")
-                $mails[$start_message]->subject="(No Subject)";
+	if($mails[$start_message]->subject=="")
+		$mails[$start_message]->subject="(No Subject)";
 
-        // Let's pre-build our URL parameters since it's too much of a pain not to
-        $detailParams = 'record='.$num.'&mailbox='.$mailbox.'&mailid='.$num.'&parenttab=My Home Page';
+	// Let's pre-build our URL parameters since it's too much of a pain not to
+	$detailParams = 'record='.$num.'&mailbox='.$mailbox.'&mailid='.$num.'&parenttab=My Home Page';
 
-        $displayed_msgs++;
-        if ($mails[$start_message]->deleted && !$show_hidden) {
+	$displayed_msgs++;
+	if ($mails[$start_message]->deleted && !$show_hidden)
+	{
                 $flags = "<tr id='row_".$num."' class='mailSelected' style='display:none'><td width='2px'><input type='checkbox' name='checkbox_".$num."' class='msg_check'></td><td colspan='1'>";
-        $displayed_msgs--;
-        } elseif ($mails[$start_message]->deleted && $show_hidden)
-                $flags = "<tr id='row_".$num."' class='mailSelected'><td width='2px'><input type='checkbox' name='checkbox_".$num."' class='msg_check'></td><td colspan='1'>";
-        elseif (!$mails[$start_message]->seen || $mails[$start_message]->recent) {
-                $flags = "<tr class='mailSelected' id='row_".$num."'><td width='2px'><input type='checkbox' name='checkbox_".$num."' class='msg_check'></td><td colspan='1'>";
-                $new_msgs++;
-        } else
-                $flags = "<tr onmouseover='this.className=\"tabSelected\"' onmouseout='this.className=\"\"' id='row_".$num."'><td width='2px'><input type='checkbox' name='checkbox_".$num."' class='msg_check'></td><td colspan='1'>";
+        	$displayed_msgs--;
+	}
+	elseif ($mails[$start_message]->deleted && $show_hidden)
+	{
+		$flags = "<tr id='row_".$num."' class='mailSelected'><td width='2px'><input type='checkbox' name='checkbox_".$num."' class='msg_check'></td><td colspan='1'>";
+	}
+	elseif (!$mails[$start_message]->seen || $mails[$start_message]->recent)
+	{
+		$flags = "<tr class='mailSelected' id='row_".$num."'><td width='2px'><input type='checkbox' name='checkbox_".$num."' class='msg_check'></td><td colspan='1'>";
+		$new_msgs++;
+	}
+	else
+	{
+		$flags = "<tr onmouseover='this.className=\"tabSelected\"' onmouseout='this.className=\"\"' id='row_".$num."'><td width='2px'><input type='checkbox' name='checkbox_".$num."' class='msg_check'></td><td colspan='1'>";
+	}
+
+
+
 
         // Attachment Icons
         if($msg_ob->has_attachments)
@@ -47,17 +59,25 @@
         else
                 $flags.='<img src="modules/Webmails/images/blank.png" border="0" width="14px" height="14" alt="">&nbsp;';
 
+
+
         // read/unread/forwarded/replied
         if(!$mails[$start_message]->seen || $mails[$start_message]->recent)
-        {
-                $flags.='<span id="unread_img_'.$num.'"><a href="javascript:;" onclick="OpenCompose(\''.$num.'\',\'reply\');"><img src="modules/Webmails/images/stock_mail-unread.png" border="0" width="10" height="14"></a></span>&nbsp;';
-        }
-        elseif ($mails[$start_message]->in_reply_to || $mails[$start_message]->references || preg_match("/^re:/i",$mails[$start_message]->subject))
-                $flags.='<a href="javascript:;" onclick="OpenCompose(\''.$num.'\',\'reply\');"><img src="modules/Webmails/images/stock_mail-replied.png" border="0" width="10" height="12"></a>&nbsp;';
-        elseif (preg_match("/^fw:/i",$mails[$start_message]->subject))
-                $flags.='<a href="javascript:;" onclick="OpenCompose(\''.$num.'\',\'reply\');"><img src="modules/Webmails/images/stock_mail-forward.png" border="0" width="10" height="13"></a>&nbsp;';
-        else
+	{
+		$flags.='<span id="unread_img_'.$num.'"><a href="javascript:;" onclick="OpenCompose(\''.$num.'\',\'reply\');"><img src="modules/Webmails/images/stock_mail-unread.png" border="0" width="10" height="14"></a></span>&nbsp;';
+	}
+	elseif ($mails[$start_message]->in_reply_to || $mails[$start_message]->references || preg_match("/^re:/i",$mails[$start_message]->subject))
+	{
+		$flags.='<a href="javascript:;" onclick="OpenCompose(\''.$num.'\',\'reply\');"><img src="modules/Webmails/images/stock_mail-replied.png" border="0" width="10" height="12"></a>&nbsp;';
+	}
+	elseif (preg_match("/^fw:/i",$mails[$start_message]->subject))
+	{
+		$flags.='<a href="javascript:;" onclick="OpenCompose(\''.$num.'\',\'reply\');"><img src="modules/Webmails/images/stock_mail-forward.png" border="0" width="10" height="13"></a>&nbsp;';
+	}
+	else
+	{
                 $flags.='<a href="javascript:;" onclick="OpenCompose(\''.$num.'\',\'reply\');"><img src="modules/Webmails/images/stock_mail-read.png" border="0" width="10" height="11"></a>&nbsp;';
+	}
 
         // Set IMAP flag
         if($mails[$start_message]->flagged)
@@ -66,31 +86,61 @@
                 $flags.='<span id="set_td_'.$num.'"><a href="javascript:void(0);" onclick="runEmailCommand(\'set_flag\','.$num.');"><img src="modules/Webmails/images/plus.gif" border="0" width="11" height="11" id="set_flag_img_'.$num.'"></a></span>';
 
 
+
         $tmp=imap_mime_header_decode($mails[$start_message]->from);
         $from = $tmp[0]->text;
         $listview_entries[$num] = array();
 
         $listview_entries[$num][] = $flags."</td>";
 
-        if ($mails[$start_message]->deleted) {
-                $listview_entries[$num][] = '<td width="20%" nowrap align="left" id="deleted_subject_'.$num.'"><s><a href="javascript:;" onclick="load_webmail(\''.$num.'\');">'.substr($mails[$start_message]->subject,0,50).'</a></s></td>';
-                $listview_entries[$num][] = '<td width="10%" nowrap align="left" nowrap id="deleted_date_'.$num.'"><s>'.substr($mails[$start_message]->date,0,30).'</s></td>';
-                $listview_entries[$num][] = '<td width="10%" nowrap align="left" id="deleted_from_'.$num.'"><s>'.substr($from,0,20).'</s></td>';
-        } elseif(!$mails[$start_message]->seen || $mails[$start_message]->recent) {
-                $listview_entries[$num][] = '<td width="20%" nowrap align="left" ><a href="javascript:;" onclick="load_webmail(\''.$num.'\');" id="ndeleted_subject_'.$num.'">'.substr($mails[$start_message]->subject,0,50).'</a></td>';
-                $listview_entries[$num][] = '<td width="10%" nowrap align="left" nowrap id="ndeleted_date_'.$num.'" >'.substr($mails[$start_message]->date,0,30).' &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;</td>';
-                $listview_entries[$num][] = '<td  width="10%" nowrap align="left" id="ndeleted_from_'.$num.'">'.substr($from,0,20).'</td>';
-        } else {
-                $listview_entries[$num][] = '<td width="20%" nowrap align="left" ><a href="javascript:;" onclick="load_webmail(\''.$num.'\');" id="ndeleted_subject_'.$num.'">'.substr($mails[$start_message]->subject,0,50).'</a></td>';
-                $listview_entries[$num][] = '<td width="10%" npwrap align="left" nowrap id="ndeleted_date_'.$num.'">'.substr($mails[$start_message]->date,0,30).'</td>';
-                $listview_entries[$num][] = '<td width="10%" nowrap align="left" id="ndeleted_from_'.$num.'">'.substr($from,0,20).'</td>';
-        }
+	if ($mails[$start_message]->deleted)
+	{
+		$listview_entries[$num][] = '<td width="20%" nowrap align="left" id="deleted_subject_'.$num.'"><s><a href="javascript:;" onclick="load_webmail(\''.$num.'\');">'.substr($mails[$start_message]->subject,0,50).'</a></s></td>';
+		$listview_entries[$num][] = '<td width="10%" nowrap align="left" nowrap id="deleted_date_'.$num.'"><s>'.substr($mails[$start_message]->date,0,30).'</s></td>';
+		$listview_entries[$num][] = '<td width="10%" nowrap align="left" id="deleted_from_'.$num.'"><s>'.substr($from,0,20).'</s></td>';
+	}
+	elseif(!$mails[$start_message]->seen || $mails[$start_message]->recent)
+	{
+		$listview_entries[$num][] = '<td width="20%" nowrap align="left" ><a href="javascript:;" onclick="load_webmail(\''.$num.'\');" id="ndeleted_subject_'.$num.'">'.substr($mails[$start_message]->subject,0,50).'</a></td>';
+		$listview_entries[$num][] = '<td width="10%" nowrap align="left" nowrap id="ndeleted_date_'.$num.'" >'.substr($mails[$start_message]->date,0,30).' &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;</td>';
+		$listview_entries[$num][] = '<td  width="10%" nowrap align="left" id="ndeleted_from_'.$num.'">'.substr($from,0,20).'</td>';
+	}
+	else
+	{
+		//IMPORTANT - This UTF-8 conversion has been done in ListView.php so no need to do again here
+		//Added to shown the original UTF-8 characters - Mickie - 30-11-06 - Starts
+		//we can use the option 1 or option 2
+		//Option 1 - Starts
+		/*
+		$translated_subject = imap_mime_header_decode($mails[$start_message]->subject);
+		for($i=0;$i<count($translated_subject);$i++)
+		{
+			if($translated_subject[$i]->charset != 'default')
+			{
+				$tmp .= $translated_subject[$i]->text;
+				$mails[$start_message]->subject = utf8_decode($tmp);//$tmp;
+			}
+		}
+		//Option 1 - Ends
+		*/
+		//Option 2 - Starts
+		//$mails[$start_message]->subject = utf8_decode(imap_utf8($mails[$start_message]->subject));//imap_utf8($mails[$start_message]->subject);
+		//Option 2 - Ends
+		//Added to shown the original UTF-8 characters - Mickie - 30-11-06 - Ends
 
+		$listview_entries[$num][] = '<td width="20%" nowrap align="left" ><a href="javascript:;" onclick="load_webmail(\''.$num.'\');" id="ndeleted_subject_'.$num.'">'.substr($mails[$start_message]->subject,0,50).'</a></td>';
+		$listview_entries[$num][] = '<td width="10%" npwrap align="left" nowrap id="ndeleted_date_'.$num.'">'.substr($mails[$start_message]->date,0,30).'</td>';
+		$listview_entries[$num][] = '<td width="10%" nowrap align="left" id="ndeleted_from_'.$num.'">'.substr($from,0,20).'</td>';
+	}
+
+
+	
         if($mails[$start_message]->deleted)
                 $listview_entries[$num][] = '<td nowrap align="center" id="deleted_td_'.$num.'"><span id="del_link_'.$num.'"><a href="javascript:void(0);" onclick="runEmailCommand(\'undelete_msg\','.$num.');"><img src="modules/Webmails/images/gnome-fs-trash-empty.png" border="0" width="14" height="14" alt="del"></a></span></td></tr>';
         else
                 $listview_entries[$num][] = '<td nowrap align="center" id="ndeleted_td_'.$num.'"><span id="del_link_'.$num.'"><a href="javascript:void(0);" onclick="runEmailCommand(\'delete_msg\','.$num.');"><img src="modules/Webmails/images/gnome-fs-trash-empty.png" border="0" width="14" height="14" alt="del"></a></span></td></tr>';
 
+
         return $listview_entries[$num];
 }
 

Modified: vtigercrm/branches/5.0.3/modules/Webmails/Webmail.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Webmails/Webmail.php (original)
+++ vtigercrm/branches/5.0.3/modules/Webmails/Webmail.php Mon Dec  4 23:08:02 2006
@@ -145,7 +145,7 @@
     	return $ret = Array("theader"=>$mailHeader);
     }
 
-    private function get_attachments() {
+    function get_attachments() {
        $struct = @imap_fetchstructure($this->mbox, $this->mailid);
        $parts = $struct->parts;
 
@@ -192,7 +192,7 @@
         return false;
     }
 
-    private function find_relationships() {
+    function find_relationships() {
 	// leads search
 	$sql = "SELECT * from vtiger_leaddetails left join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_leaddetails.leadid where vtiger_leaddetails.email = '".trim($this->from)."' AND vtiger_crmentity.deleted='0'";
 	$res = $this->db->query($sql,true,"Error: "."<BR>$query");
@@ -218,7 +218,7 @@
     }
 
     
-	private function dl_inline()
+	function dl_inline()
 	{
 		$struct = imap_fetchstructure($this->mbox, $this->mailid);
 		$parts = $struct->parts;
@@ -264,7 +264,10 @@
 							$filedata = $this->mail_fetchpart($partstring);
 						else
 							$filedata = imap_fetchbody($this->mbox, $this->mailid, $partstring);
-						
+
+						//Added to get the UTF-8 string - 30-11-06 - Mickie
+						$parts[$i]->dparameters[0]->value = utf8_decode(imap_utf8($parts[$i]->dparameters[0]->value));
+
 						$inline[] = array("filename" => $parts[$i]->dparameters[0]->value,"filedata"=>$filedata,"subtype"=>$parts[$i]->subtype,"filesize"=>$parts[$i]->bytes);
 					}
 				}
@@ -283,7 +286,7 @@
 		return $inline;
 	}
 
-	private function dl_attachments()
+	function dl_attachments()
 	{
 
 		$struct = imap_fetchstructure($this->mbox, $this->mailid);
@@ -345,7 +348,7 @@
 	}
 
 
-	private function load_mail()
+	function load_mail()
 	{
 		// parse the message
 		$struct = imap_fetchstructure($this->mbox, $this->mailid);

Modified: vtigercrm/branches/5.0.3/modules/Webmails/body.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Webmails/body.php (original)
+++ vtigercrm/branches/5.0.3/modules/Webmails/body.php Mon Dec  4 23:08:02 2006
@@ -34,6 +34,10 @@
 <?php
 
 $email->loadMail();
+
+//Added to get the UTF-8 string - 30-11-06 - Mickie
+$email->body = utf8_decode(imap_utf8($email->body));
+
 echo $email->body;
 echo "<br><br>";
 




From vtigercrm-commits at vtiger.fosslabs.com  Tue Dec  5 01:36:36 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 05 Dec 2006 06:36:36 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9933 -
 /vtigercrm/branches/5.0.3/themes/bluelagoon/style.css
Message-ID: <20061205063636.AB361788BB9@vtiger.fosslabs.com>

Author: richie
Date: Mon Dec  4 23:36:32 2006
New Revision: 9933

Log:
unwanted class removed

Modified:
    vtigercrm/branches/5.0.3/themes/bluelagoon/style.css

Modified: vtigercrm/branches/5.0.3/themes/bluelagoon/style.css
==============================================================================
--- vtigercrm/branches/5.0.3/themes/bluelagoon/style.css (original)
+++ vtigercrm/branches/5.0.3/themes/bluelagoon/style.css Mon Dec  4 23:36:32 2006
@@ -1753,6 +1753,8 @@
 	font-weight:bold;
 
 }
+
+/*
 .cellLabel {
 	background-color:#eaebd9;
 	border-top:1px solid #efefef;
@@ -1764,6 +1766,7 @@
 	color:#333333;
 	border-bottom:1px solid #dadada;
 }
+*/
 
 .listTable{
 	border-left:1px solid #cccccc;




From vtigercrm-commits at vtiger.fosslabs.com  Tue Dec  5 04:22:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 05 Dec 2006 09:22:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9934 - in
 /vtigercrm/branches/5.0.3/themes/woodspice/images:
 actionGenPurchaseOrder.gif actionGenerateInvoice.gif actionGeneratePDF.gif
 actionGenerateQuote.gif actionGenerateSalesOrder.gif actionPrintNow.gif
Message-ID: <20061205092250.1D50278948F@vtiger.fosslabs.com>

Author: richie
Date: Tue Dec  5 02:22:38 2006
New Revision: 9934

Log:
added action icons

Added:
    vtigercrm/branches/5.0.3/themes/woodspice/images/actionGenPurchaseOrder.gif   (with props)
    vtigercrm/branches/5.0.3/themes/woodspice/images/actionGenerateInvoice.gif   (with props)
    vtigercrm/branches/5.0.3/themes/woodspice/images/actionGeneratePDF.gif   (with props)
    vtigercrm/branches/5.0.3/themes/woodspice/images/actionGenerateQuote.gif   (with props)
    vtigercrm/branches/5.0.3/themes/woodspice/images/actionGenerateSalesOrder.gif   (with props)
    vtigercrm/branches/5.0.3/themes/woodspice/images/actionPrintNow.gif   (with props)




From vtigercrm-commits at vtiger.fosslabs.com  Tue Dec  5 04:25:05 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 05 Dec 2006 09:25:05 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9935 - in
 /vtigercrm/branches/5.0.3/themes: alphagrey/images/ bluelagoon/images/
Message-ID: <20061205092505.9B21C789051@vtiger.fosslabs.com>

Author: richie
Date: Tue Dec  5 02:24:46 2006
New Revision: 9935

Log:
added action icons

Added:
    vtigercrm/branches/5.0.3/themes/alphagrey/images/actionGenPurchaseOrder.gif   (with props)
    vtigercrm/branches/5.0.3/themes/alphagrey/images/actionGenerateInvoice.gif   (with props)
    vtigercrm/branches/5.0.3/themes/alphagrey/images/actionGeneratePDF.gif   (with props)
    vtigercrm/branches/5.0.3/themes/alphagrey/images/actionGenerateQuote.gif   (with props)
    vtigercrm/branches/5.0.3/themes/alphagrey/images/actionGenerateSalesOrder.gif   (with props)
    vtigercrm/branches/5.0.3/themes/alphagrey/images/actionPrintNow.gif   (with props)
    vtigercrm/branches/5.0.3/themes/bluelagoon/images/actionGenPurchaseOrder.gif   (with props)
    vtigercrm/branches/5.0.3/themes/bluelagoon/images/actionGenerateInvoice.gif   (with props)
    vtigercrm/branches/5.0.3/themes/bluelagoon/images/actionGeneratePDF.gif   (with props)
    vtigercrm/branches/5.0.3/themes/bluelagoon/images/actionGenerateQuote.gif   (with props)
    vtigercrm/branches/5.0.3/themes/bluelagoon/images/actionGenerateSalesOrder.gif   (with props)
    vtigercrm/branches/5.0.3/themes/bluelagoon/images/actionPrintNow.gif   (with props)




From vtigercrm-commits at vtiger.fosslabs.com  Tue Dec  5 04:29:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 05 Dec 2006 09:29:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9936 -
 /vtigercrm/branches/5.0.3/Smarty/templates/Inventory/InventoryActions.tpl
Message-ID: <20061205092937.03429789717@vtiger.fosslabs.com>

Author: richie
Date: Tue Dec  5 02:29:33 2006
New Revision: 9936

Log:
added action icons with links

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/Inventory/InventoryActions.tpl

Modified: vtigercrm/branches/5.0.3/Smarty/templates/Inventory/InventoryActions.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/Inventory/InventoryActions.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/Inventory/InventoryActions.tpl Tue Dec  5 02:29:33 2006
@@ -34,27 +34,28 @@
 	<!-- Module based actions starts -->
 	{if $MODULE eq 'Products'}
 	   <!-- Product Actions starts -->
-	   <tr>
-		<td align="left" style="padding-left:10px;">
-			<img src="{$IMAGE_PATH}pointer.gif" hspace="5" align="absmiddle"/>
+
+	   <tr>
+		<td align="left" style="padding-left:5px;">
+	<a href="javascript: document.DetailView.module.value='Quotes'; document.DetailView.action.value='EditView'; document.DetailView.return_module.value='Products'; document.DetailView.return_action.value='DetailView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.parent_id.value='{$ID}'; document.DetailView.product_id.value='{$ID}'; document.DetailView.record.value=''; document.DetailView.submit();" class="webMnu"><img src="{$IMAGE_PATH}actionGenerateQuote.gif" hspace="2" align="absmiddle" border="0"/></a>
 			<a href="javascript: document.DetailView.module.value='Quotes'; document.DetailView.action.value='EditView'; document.DetailView.return_module.value='Products'; document.DetailView.return_action.value='DetailView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.parent_id.value='{$ID}'; document.DetailView.product_id.value='{$ID}'; document.DetailView.record.value=''; document.DetailView.submit();" class="webMnu">{$APP.LBL_CREATE_BUTTON_LABEL} {$APP.Quote}</a> 
 		</td>
 	   </tr>
 	   <tr>
-		<td align="left" style="padding-left:10px;">
-			<img src="{$IMAGE_PATH}pointer.gif" hspace="5" align="absmiddle"/>
+		<td align="left" style="padding-left:5px;">
+			<a href="javascript: document.DetailView.module.value='Invoice'; document.DetailView.action.value='EditView'; document.DetailView.return_module.value='Products'; document.DetailView.return_action.value='DetailView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.parent_id.value='{$ID}'; document.DetailView.product_id.value='{$ID}'; document.DetailView.record.value=''; document.DetailView.submit();" class="webMnu"><img src="{$IMAGE_PATH}actionGenerateInvoice.gif" hspace="2" align="absmiddle" border="0"/></a>
 			<a href="javascript: document.DetailView.module.value='Invoice'; document.DetailView.action.value='EditView'; document.DetailView.return_module.value='Products'; document.DetailView.return_action.value='DetailView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.parent_id.value='{$ID}'; document.DetailView.product_id.value='{$ID}'; document.DetailView.record.value=''; document.DetailView.submit();" class="webMnu">{$APP.LBL_CREATE_BUTTON_LABEL} {$APP.Invoice}</a> 
 		</td>
 	   </tr>
 	   <tr>
-		<td align="left" style="padding-left:10px;">
-			<img src="{$IMAGE_PATH}pointer.gif" hspace="5" align="absmiddle"/>
+		<td align="left" style="padding-left:5px;">
+<a href="javascript: document.DetailView.module.value='SalesOrder'; document.DetailView.action.value='EditView'; document.DetailView.return_module.value='Products'; document.DetailView.return_action.value='DetailView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.parent_id.value='{$ID}'; document.DetailView.product_id.value='{$ID}'; document.DetailView.record.value=''; document.DetailView.submit();" class="webMnu"><img src="{$IMAGE_PATH}actionGenerateSalesOrder.gif" hspace="2" align="absmiddle" border="0"/></a>
 			<a href="javascript: document.DetailView.module.value='SalesOrder'; document.DetailView.action.value='EditView'; document.DetailView.return_module.value='Products'; document.DetailView.return_action.value='DetailView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.parent_id.value='{$ID}'; document.DetailView.product_id.value='{$ID}'; document.DetailView.record.value=''; document.DetailView.submit();" class="webMnu">{$APP.LBL_CREATE_BUTTON_LABEL} {$APP.SalesOrder}</a> 
 		</td>
 	   </tr>
 	   <tr>
-		<td align="left" style="padding-left:10px;">
-			<img src="{$IMAGE_PATH}pointer.gif" hspace="5" align="absmiddle"/>
+		<td align="left" style="padding-left:5px;">
+			<a href="javascript: document.DetailView.module.value='PurchaseOrder'; document.DetailView.action.value='EditView'; document.DetailView.return_module.value='Products'; document.DetailView.return_action.value='DetailView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.parent_id.value='{$ID}'; document.DetailView.product_id.value='{$ID}'; document.DetailView.record.value=''; document.DetailView.submit();" class="webMnu"><img src="{$IMAGE_PATH}actionGenPurchaseOrder.gif" hspace="2" align="absmiddle" border="0"/></a>
 			<a href="javascript: document.DetailView.module.value='PurchaseOrder'; document.DetailView.action.value='EditView'; document.DetailView.return_module.value='Products'; document.DetailView.return_action.value='DetailView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.parent_id.value='{$ID}'; document.DetailView.product_id.value='{$ID}'; document.DetailView.record.value=''; document.DetailView.submit();" class="webMnu">{$APP.LBL_CREATE_BUTTON_LABEL} {$APP.PurchaseOrder}</a> 
 		</td>
 	   </tr>
@@ -90,7 +91,7 @@
 	   <!-- Vendors Actions starts -->
 	   <tr>
 		<td align="left" style="padding-left:10px;">
-			<img src="{$IMAGE_PATH}pointer.gif" hspace="5" align="absmiddle"/>
+<a href="javascript: document.DetailView.module.value='PurchaseOrder'; document.DetailView.action.value='EditView'; document.DetailView.return_module.value='Vendors'; document.DetailView.return_action.value='DetailView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.parent_id.value='{$ID}'; document.DetailView.vendor_id.value='{$ID}'; document.DetailView.record.value=''; document.DetailView.submit();" class="webMnu">	<img src="{$IMAGE_PATH}actionGenPurchaseOrder.gif" hspace="5" align="absmiddle" border="0"/></a>
 			<a href="javascript: document.DetailView.module.value='PurchaseOrder'; document.DetailView.action.value='EditView'; document.DetailView.return_module.value='Vendors'; document.DetailView.return_action.value='DetailView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.parent_id.value='{$ID}'; document.DetailView.vendor_id.value='{$ID}'; document.DetailView.record.value=''; document.DetailView.submit();" class="webMnu">{$APP.LBL_CREATE_BUTTON_LABEL} {$APP.PurchaseOrder}</a> 
 		</td>
 	   </tr>
@@ -120,7 +121,7 @@
 	   <!-- SO Actions starts -->
 	   <tr>
 		<td align="left" style="padding-left:10px;">
-			<img src="{$IMAGE_PATH}pointer.gif" hspace="5" align="absmiddle"/>
+			<a href="javascript: document.DetailView.module.value='Invoice'; document.DetailView.action.value='EditView'; document.DetailView.return_module.value='SalesOrder'; document.DetailView.return_action.value='DetailView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.record.value='{$ID}'; document.DetailView.convertmode.value='sotoinvoice'; document.DetailView.submit();" class="webMnu"><img src="{$IMAGE_PATH}actionGenerateInvoice.gif" hspace="5" align="absmiddle" border="0"/></a>
 			<a href="javascript: document.DetailView.module.value='Invoice'; document.DetailView.action.value='EditView'; document.DetailView.return_module.value='SalesOrder'; document.DetailView.return_action.value='DetailView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.record.value='{$ID}'; document.DetailView.convertmode.value='sotoinvoice'; document.DetailView.submit();" class="webMnu">{$APP.LBL_CREATE_BUTTON_LABEL} {$APP.Invoice}</a> 
 		</td>
 	   </tr>
@@ -144,13 +145,14 @@
 	   <!-- Quotes Actions starts -->
 	   <tr>
 		<td align="left" style="padding-left:10px;">
-			<img src="{$IMAGE_PATH}pointer.gif" hspace="5" align="absmiddle"/> 
-			<a href="javascript: document.DetailView.return_module.value='{$MODULE}'; document.DetailView.return_action.value='DetailView'; document.DetailView.convertmode.value='{$CONVERTMODE}'; document.DetailView.module.value='Invoice'; document.DetailView.action.value='EditView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.submit();" class="webMnu">{$APP.LBL_GENERATE} {$APP.Invoice}</a> 
-		</td>
-	   </tr>
+<a href="javascript: document.DetailView.return_module.value='{$MODULE}'; document.DetailView.return_action.value='DetailView'; document.DetailView.convertmode.value='{$CONVERTMODE}'; document.DetailView.module.value='Invoice'; document.DetailView.action.value='EditView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.submit();" class="webMnu"><img src="{$IMAGE_PATH}actionGenerateInvoice.gif" hspace="5" align="absmiddle" border="0"/></a> 
+		<a href="javascript: document.DetailView.return_module.value='{$MODULE}'; document.DetailView.return_action.value='DetailView'; document.DetailView.convertmode.value='{$CONVERTMODE}'; document.DetailView.module.value='Invoice'; document.DetailView.action.value='EditView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.submit();" class="webMnu">{$APP.LBL_GENERATE} {$APP.Invoice}</a> 
+		</td>
+	   </tr>
+
 	   <tr>
 		<td align="left" style="padding-left:10px;border-bottom:1px dotted #CCCCCC;">
-			<img src="{$IMAGE_PATH}pointer.gif" hspace="5" align="absmiddle"/>
+			<a href="javascript: document.DetailView.return_module.value='{$MODULE}'; document.DetailView.return_action.value='DetailView'; document.DetailView.convertmode.value='quotetoso'; document.DetailView.module.value='SalesOrder'; document.DetailView.action.value='EditView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.submit();" class="webMnu"><img src="{$IMAGE_PATH}actionGenerateSalesOrder.gif" hspace="5" align="absmiddle" border="0"/></a>
 			<a href="javascript: document.DetailView.return_module.value='{$MODULE}'; document.DetailView.return_action.value='DetailView'; document.DetailView.convertmode.value='quotetoso'; document.DetailView.module.value='SalesOrder'; document.DetailView.action.value='EditView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.submit();" class="webMnu">{$APP.LBL_GENERATE} {$APP.SalesOrder}</a> 
 		</td>
 	   </tr>
@@ -198,7 +200,8 @@
 
    <tr>
 	<td align="left" style="padding-left:10px;">
-		<img src="{$IMAGE_PATH}pointer.gif" hspace="5" align="absmiddle"/>
+		<a href="javascript: document.DetailView.return_module.value='{$MODULE}'; document.DetailView.return_action.value='DetailView'; document.DetailView.module.value='{$MODULE}'; document.DetailView.action.value='{$export_pdf_action}'; document.DetailView.record.value='{$ID}'; document.DetailView.return_id.value='{$ID}'; document.DetailView.submit();" class="
+webMnu"><img src="{$IMAGE_PATH}actionGeneratePDF.gif" hspace="5" align="absmiddle" border="0"/></a>
 		<a href="javascript: document.DetailView.return_module.value='{$MODULE}'; document.DetailView.return_action.value='DetailView'; document.DetailView.module.value='{$MODULE}'; document.DetailView.action.value='{$export_pdf_action}'; document.DetailView.record.value='{$ID}'; document.DetailView.return_id.value='{$ID}'; document.DetailView.submit();" class="webMnu">{$APP.LBL_EXPORT_TO_PDF}</a> 
 	</td>
    </tr>




From vtigercrm-commits at vtiger.fosslabs.com  Tue Dec  5 04:41:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 05 Dec 2006 09:41:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9937 -
 /vtigercrm/branches/5.0.3/modules/SalesOrder/SalesOrder.php
Message-ID: <20061205094126.EC31F78993F@vtiger.fosslabs.com>

Author: richie
Date: Tue Dec  5 02:41:23 2006
New Revision: 9937

Log:
assignedto add in invoice related list

Modified:
    vtigercrm/branches/5.0.3/modules/SalesOrder/SalesOrder.php

Modified: vtigercrm/branches/5.0.3/modules/SalesOrder/SalesOrder.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/SalesOrder/SalesOrder.php (original)
+++ vtigercrm/branches/5.0.3/modules/SalesOrder/SalesOrder.php Tue Dec  5 02:41:23 2006
@@ -267,8 +267,16 @@
 		else
 			$returnset = '&return_module=SalesOrder&return_action=CallRelatedList&return_id='.$id;
 
-
-		$query = "select vtiger_crmentity.*, vtiger_invoice.*, vtiger_account.accountname, vtiger_salesorder.subject as salessubject from vtiger_invoice inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_invoice.invoiceid left outer join vtiger_account on vtiger_account.accountid=vtiger_invoice.accountid inner join vtiger_salesorder on vtiger_salesorder.salesorderid=vtiger_invoice.salesorderid left join vtiger_invoicegrouprelation on vtiger_invoice.invoiceid=vtiger_invoicegrouprelation.invoiceid left join vtiger_groups on vtiger_groups.groupname=vtiger_invoicegrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_salesorder.salesorderid=".$id;
+			$query = "select vtiger_crmentity.*, vtiger_invoice.*, vtiger_account.accountname, vtiger_salesorder.subject as salessubject, vtiger_users.user_name
+				from vtiger_invoice 
+				inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_invoice.invoiceid 
+				left outer join vtiger_account on vtiger_account.accountid=vtiger_invoice.accountid 
+				inner join vtiger_salesorder on vtiger_salesorder.salesorderid=vtiger_invoice.salesorderid 
+				left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid
+				left join vtiger_invoicegrouprelation on vtiger_invoice.invoiceid=vtiger_invoicegrouprelation.invoiceid 
+				left join vtiger_groups on vtiger_groups.groupname=vtiger_invoicegrouprelation.groupname 
+				where vtiger_crmentity.deleted=0 and vtiger_salesorder.salesorderid=".$id;
+
 		$log->debug("Exiting get_invoices method ...");
 		return GetRelatedList('SalesOrder','Invoice',$focus,$query,$button,$returnset);
 	




From vtigercrm-commits at vtiger.fosslabs.com  Tue Dec  5 04:50:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 05 Dec 2006 09:50:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9938 -
 /vtigercrm/branches/5.0.3/modules/Reports/Reports.php
Message-ID: <20061205095041.E6E1C789944@vtiger.fosslabs.com>

Author: richie
Date: Tue Dec  5 02:50:35 2006
New Revision: 9938

Log:
activity type not displyed in report module - fixed

Modified:
    vtigercrm/branches/5.0.3/modules/Reports/Reports.php

Modified: vtigercrm/branches/5.0.3/modules/Reports/Reports.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Reports/Reports.php (original)
+++ vtigercrm/branches/5.0.3/modules/Reports/Reports.php Tue Dec  5 02:50:35 2006
@@ -320,6 +320,12 @@
 			$profileList = getCurrentUserProfileList();
 			$sql = "select * from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.uitype != 50 and vtiger_field.tabid=".$tabid." and vtiger_field.block in (".$block .") and vtiger_field.displaytype in (1,2) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by sequence";
 		}
+		//Added to include vtiger_activity type for Reports Module
+		if($module == 'Calendar' && $block == 19)
+		{
+			 $module_columnlist['vtiger_activity:activitytype:Calendar_Activity_Type:activitytype:C'] = 'Activity Type';
+		}
+
 		$result = $adb->query($sql);
 		$noofrows = $adb->num_rows($result);
 		for($i=0; $i<$noofrows; $i++)




From vtigercrm-commits at vtiger.fosslabs.com  Tue Dec  5 05:02:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 05 Dec 2006 10:02:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9939 -
	/vtigercrm/branches/5.0.3/data/CRMEntity.php
Message-ID: <20061205100241.751C478993F@vtiger.fosslabs.com>

Author: richie
Date: Tue Dec  5 03:02:37 2006
New Revision: 9939

Log:
Error while saving an event in edit mode

Modified:
    vtigercrm/branches/5.0.3/data/CRMEntity.php

Modified: vtigercrm/branches/5.0.3/data/CRMEntity.php
==============================================================================
--- vtigercrm/branches/5.0.3/data/CRMEntity.php (original)
+++ vtigercrm/branches/5.0.3/data/CRMEntity.php Tue Dec  5 03:02:37 2006
@@ -892,6 +892,12 @@
 
 	function insertIntoGroupTable($module)
 	{
+		global $log;
+
+		if($module == 'Events')
+		{
+			$module = 'Calendar';
+		}
 		if($this->mode=='edit')
 		{
 						
@@ -900,12 +906,14 @@
 		  	{	  
 			  	if($_REQUEST['assigntype'] == 'T')
 			  	{
-				  	$groupname = $_REQUEST['assigned_group_name'];
+					$groupname = $_REQUEST['assigned_group_name'];
+
+
 					updateModuleGroupRelation($module,$this->id,$groupname);
 
 			  	}
 			  	else
-			  	{
+				{
 					  updateModuleGroupRelation($module,$this->id,'');
 				  
 			  	}
@@ -913,8 +921,6 @@
       		}
 		else
 		{
-				
-			
 			$groupname = $_REQUEST['assigned_group_name'];
 		 	if($_REQUEST['assigntype'] == 'T')
 		  	{




From vtigercrm-commits at vtiger.fosslabs.com  Tue Dec  5 05:18:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 05 Dec 2006 10:18:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9940 - in
 /vtigercrm/branches/5.0.3/modules: Settings/language/en_us.lang.php
 Users/language/en_us.lang.php
Message-ID: <20061205101840.082FA78993F@vtiger.fosslabs.com>

Author: richie
Date: Tue Dec  5 03:18:33 2006
New Revision: 9940

Log:
* language entry of LBL_MAIL_SERVER_SETTINGS has been moved from users to setting which is used only in settings

Modified:
    vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php
    vtigercrm/branches/5.0.3/modules/Users/language/en_us.lang.php

Modified: vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php Tue Dec  5 03:18:33 2006
@@ -510,6 +510,7 @@
 
 'LBL_RSS_CATEGORY'=>'Rss Category',
 
+'LBL_MAIL_SERVER_SETTINGS'=>'Outgoing Server',
 'LBL_USAGEUNIT'=>'Usage Unit',
 'LBL_GLACCT'=>'GL Account',
 'LBL_QUOTE_STAGE'=>'Quote Stage',

Modified: vtigercrm/branches/5.0.3/modules/Users/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Users/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Users/language/en_us.lang.php Tue Dec  5 03:18:33 2006
@@ -622,7 +622,6 @@
 'LBL_MAIL_PROTOCOL'=>'Mail Protocol',
 'LBL_LIST_PASSWORD'=>'Password',
 'LBL_MAIL_SERVER_NAME'=>'Mail Server Name or IP',
-'LBL_MAIL_SERVER_SETTINGS'=>'Outgoing Server',
 'LBL_INCOME_SERVER_SETTINGS'=>'Incoming Server',
 'LBL_TEST_SETTINGS'=>'Test my account setting immediately',
 'LBL_TEST_BUTTON_TITLE'=>'Test my account now! [Alt+T]',




From vtigercrm-commits at vtiger.fosslabs.com  Wed Dec  6 01:40:31 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 06 Dec 2006 06:40:31 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9941 -
 /vtigercrm/branches/5.0.3/user_privileges/default_module_view.php
Message-ID: <20061206064031.99831789433@vtiger.fosslabs.com>

Author: richie
Date: Tue Dec  5 23:40:27 2006
New Revision: 9941

Log:
control M characters removed

Modified:
    vtigercrm/branches/5.0.3/user_privileges/default_module_view.php

Modified: vtigercrm/branches/5.0.3/user_privileges/default_module_view.php
==============================================================================
--- vtigercrm/branches/5.0.3/user_privileges/default_module_view.php (original)
+++ vtigercrm/branches/5.0.3/user_privileges/default_module_view.php Tue Dec  5 23:40:27 2006
@@ -1,14 +1,14 @@
-<?php
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("License"); You may not use this file except in compliance with the License
-   * The Original Code is:  vtiger CRM Open Source
-   * The Initial Developer of the Original Code is vtiger.
-   * Portions created by vtiger are Copyright (C) vtiger.
-   * All Rights Reserved.
-  *
-  ********************************************************************************/
-
+<?php
+/*********************************************************************************
+  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+   * ("License"); You may not use this file except in compliance with the License
+   * The Original Code is:  vtiger CRM Open Source
+   * The Initial Developer of the Original Code is vtiger.
+   * Portions created by vtiger are Copyright (C) vtiger.
+   * All Rights Reserved.
+  *
+  ********************************************************************************/
+
 $singlepane_view = 'false';
-
-?>
+
+?>




From vtigercrm-commits at vtiger.fosslabs.com  Wed Dec  6 08:56:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 06 Dec 2006 13:56:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9942 -
 /vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php
Message-ID: <20061206135640.13B50789977@vtiger.fosslabs.com>

Author: richie
Date: Wed Dec  6 06:56:35 2006
New Revision: 9942

Log:
activity type added in reports

Modified:
    vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php

Modified: vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php (original)
+++ vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php Wed Dec  6 06:56:35 2006
@@ -333,7 +333,11 @@
 					}
 					$advorsqls = implode(" or ",$advorsql);
 					$fieldvalue = " (".$advorsqls.") ";
-				}else
+				}elseif($selectedfields[1] == 'status')
+				{
+					$fieldvalue = "(case when (vtiger_activity.status not like '') then vtiger_activity.status else vtiger_activity.eventstatus end)".$this->getAdvComparator($comparator,trim($value),$datatype);
+				}
+				else
 				{
 					$fieldvalue = $selectedfields[0].".".$selectedfields[1].$this->getAdvComparator($comparator,trim($value),$datatype);
 				}




From vtigercrm-commits at vtiger.fosslabs.com  Thu Dec  7 00:52:56 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 07 Dec 2006 05:52:56 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9943 - in
 /vtigercrm/branches/5.0.3: include/utils/CommonUtils.php
 include/utils/ListViewUtils.php modules/CustomView/CustomView.php
 modules/Reports/ReportRun.php modules/Reports/Reports.php
Message-ID: <20061207055256.0C051788C9D@vtiger.fosslabs.com>

Author: richie
Date: Wed Dec  6 22:52:47 2006
New Revision: 9943

Log:
modifed customview column headers for activities

Modified:
    vtigercrm/branches/5.0.3/include/utils/CommonUtils.php
    vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php
    vtigercrm/branches/5.0.3/modules/CustomView/CustomView.php
    vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php
    vtigercrm/branches/5.0.3/modules/Reports/Reports.php

Modified: vtigercrm/branches/5.0.3/include/utils/CommonUtils.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/utils/CommonUtils.php (original)
+++ vtigercrm/branches/5.0.3/include/utils/CommonUtils.php Wed Dec  6 22:52:47 2006
@@ -329,6 +329,27 @@
 	return $tabid;
 
 }
+/**
+ * Function to get the CustomViewName
+ * Takes the input as $cvid - customviewid
+ * returns the cvname string fromat
+ */
+
+function getCVname($cvid)
+{
+        global $log;
+        $log->debug("Entering getCVname method ...");
+
+        global $adb;
+        $sql = "select viewname from vtiger_customview where cvid=".$cvid;
+        $result = $adb->query($sql);
+        $cvname =  $adb->query_result($result,0,"viewname");
+
+        $log->debug("Exiting getCVname method ...");
+        return $cvname;
+
+}
+
 
 
 /**
@@ -2053,7 +2074,7 @@
 }
 function getUserslist()
 {
-	global $log;
+	global $log,$current_user;
 	$log->debug("Entering getUserslist() method ...");
 	global $adb;
 	$result=$adb->query("select * from vtiger_users");
@@ -2062,7 +2083,7 @@
 	       $useridlist[$i]=$adb->query_result($result,$i,'id');
 	       $usernamelist[$useridlist[$i]]=$adb->query_result($result,$i,'user_name');
 	}
-	$change_owner = get_select_options_with_id($usernamelist,'admin');
+	$change_owner = get_select_options_with_id($usernamelist,$current_user->user_name);
 	$log->debug("Exiting getUserslist method ...");
 	return $change_owner;
 }

Modified: vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php (original)
+++ vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Wed Dec  6 22:52:47 2006
@@ -984,8 +984,11 @@
 	global $log;
 	$log->debug("Entering getValue(".$field_result.",". $list_result.",".$fieldname.",".$focus.",".$module.",".$entity_id.",".$list_result_count.",".$mode.",".$popuptype.",".$returnset.",".$viewid.") method ...");
 	global $adb,$current_user;
+	
+	$viewname = getCVname($viewid);
 	require('user_privileges/user_privileges_'.$current_user->id.'.php');
 	$tabname = getParentTab();
+	$tabid = getTabid($module);
 	$uicolarr=$field_result[$fieldname];
 	foreach($uicolarr as $key=>$value)
 	{
@@ -1020,6 +1023,12 @@
 		else
 		{
 			$value = $temp_val;
+		}
+		//Added to get both start date & time
+		if(($tabid == 9 || $tabid == 16) && $uitype == 6 && $viewname != 'All')
+		{
+			$timestart = $adb->query_result($list_result,$list_result_count,'time_start');
+			$value = $value .'&nbsp;&nbsp;&nbsp;'.$timestart;
 		}
 		
 	}
@@ -2542,6 +2551,7 @@
 	//code added by raju ends
 	$log->debug("Exiting getRelatedTo method ...");
         return $parent_value;
+	
 
 
 }

Modified: vtigercrm/branches/5.0.3/modules/CustomView/CustomView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/CustomView/CustomView.php (original)
+++ vtigercrm/branches/5.0.3/modules/CustomView/CustomView.php Wed Dec  6 22:52:47 2006
@@ -184,6 +184,8 @@
 	{
 		global $adb;
 		$tabid = getTabid($module);
+		if($tabid == 9)
+			$tabid ="9,16";
 		global $current_user;
 	        require('user_privileges/user_privileges_'.$current_user->id.'.php');
 		if($tabid == 4 || $tabid ==7)
@@ -197,7 +199,7 @@
 		if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0)
 		{
 			$sql = "select * from vtiger_field ";
-			$sql.= " where vtiger_field.tabid=".$tabid." and vtiger_field.block in (".$block.") and";
+			$sql.= " where vtiger_field.tabid in (".$tabid.") and vtiger_field.block in (".$block.") and";
 			$sql.= $display_type;
 			$sql.= " order by sequence";
 		}
@@ -206,13 +208,12 @@
 
 			$profileList = getCurrentUserProfileList();
 			$sql = "select * from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid ";
-			$sql.= " where vtiger_field.tabid=".$tabid." and vtiger_field.block in (".$block.") and";
+			$sql.= " where vtiger_field.tabid in (".$tabid.") and vtiger_field.block in (".$block.") and";
 			$sql.= "$display_type and vtiger_profile2field.visible=0";
-			$sql.= " and vtiger_def_org_field.visible=0  and vtiger_profile2field.profileid in ".$profileList." order by sequence";
+			$sql.= " and vtiger_def_org_field.visible=0  and vtiger_profile2field.profileid in ".$profileList." order by sequence group by columnname";
 		}	
-
-
-
+		if($tabid == '9,16')
+                        $tabid ="9";
 		$result = $adb->query($sql);
 		$noofrows = $adb->num_rows($result);
 		//Added on 14-10-2005 -- added ticket id in list
@@ -287,6 +288,7 @@
 		foreach($this->module_list[$module] as $key=>$value)
 		{
 			$columnlist = $this->getColumnsListbyBlock($module,$value);
+			
 			if(isset($columnlist))
 			{
 				$ret_module_list[$module][$key] = $columnlist;
@@ -1429,6 +1431,7 @@
 	{
 		if($viewid != "" && $listquery != "")
 		{
+			
 			$listviewquery = substr($listquery, strpos($listquery,'FROM'),strlen($listquery));
 			if($module == "Calendar" || $module == "Emails")
 			{
@@ -1539,8 +1542,14 @@
 		global $current_language;
 		$current_mod_strings = return_specified_module_language($current_language, $module); 
 		$block_info = Array();
-		$Sql = "select distinct block,vtiger_field.tabid,name,blocklabel from vtiger_field inner join vtiger_blocks on vtiger_blocks.blockid=vtiger_field.block inner join vtiger_tab on vtiger_tab.tabid=vtiger_field.tabid where displaytype != 3 and vtiger_field.block not in(40,6,75,35,30,54,60,66,72) and vtiger_tab.name='$module' order by block";
+		if($module == "Calendar")
+			$module = "Calendar','Events";
+
+		$Sql = "select distinct block,vtiger_field.tabid,name,blocklabel from vtiger_field inner join vtiger_blocks on vtiger_blocks.blockid=vtiger_field.block inner join vtiger_tab on vtiger_tab.tabid=vtiger_field.tabid where displaytype != 3 and vtiger_field.block not in(40,6,75,35,30,54,60,66,72) and vtiger_tab.name in ('".$module."') order by block";
 		$result = $adb->query($Sql);
+		if($module == "Calendar','Events")
+			$module = "Calendar";
+
 		while($block_result = $adb->fetch_array($result))
 		{
 			$block_label = $block_result['blocklabel'];

Modified: vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php (original)
+++ vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php Wed Dec  6 22:52:47 2006
@@ -1081,6 +1081,29 @@
 		}
 		if($module == "Calendar")
 		{
+			//Added Leads,Accounts,Potentials as secondarymodule for Calendar
+
+			if($secmodule == "Leads")
+			{
+				$query = "left join vtiger_leaddetails on vtiger_leaddetails.leadid = vtiger_seactivityrel.crmid 
+					left join vtiger_crmentity as vtiger_crmentityLeads on vtiger_crmentityLeads.crmid = vtiger_leaddetails.leadid 
+					left join vtiger_leadaddress on vtiger_leaddetails.leadid = vtiger_leadaddress.leadaddressid 
+					left join vtiger_leadsubdetails on vtiger_leadsubdetails.leadsubscriptionid = vtiger_leaddetails.leadid 
+					left join vtiger_leadscf on vtiger_leadscf.leadid = vtiger_leaddetails.leadid 
+					left join vtiger_users as vtiger_usersLeads on vtiger_usersLeads.id = vtiger_crmentityLeads.smownerid ";
+	
+			}
+			if($secmodule == "Accounts")
+			{
+				$query = "left join vtiger_account on vtiger_account.accountid = vtiger_seactivityrel.crmid
+					left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid
+					left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid
+					left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid
+					left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid
+					left join vtiger_account as vtiger_accountAccounts on vtiger_accountAccounts.accountid = vtiger_account.parentid
+					left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid ";
+
+			}
 			if($secmodule == "Contacts")
 			{
 				$query = "left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid 
@@ -1093,6 +1116,14 @@
 					left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid
 					left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid ";
 			}
+			if($secmodule == "Potentials")
+                        {
+				$query = "left join vtiger_potential on vtiger_potential.potentialid = vtiger_seactivityrel.crmid 
+                                        left join vtiger_crmentity as vtiger_crmentityPotentials on vtiger_crmentityPotentials.crmid=vtiger_potential.potentialid
+                                        left join vtiger_potentialscf on vtiger_potentialscf.potentialid = vtiger_potential.potentialid
+                                        left join vtiger_users as vtiger_usersPotentials on vtiger_usersPotentials.id = vtiger_crmentityPotentials.smownerid ";
+
+                        }
 		}
 		if($module == 'Campaigns')
 		{

Modified: vtigercrm/branches/5.0.3/modules/Reports/Reports.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Reports/Reports.php (original)
+++ vtigercrm/branches/5.0.3/modules/Reports/Reports.php Wed Dec  6 22:52:47 2006
@@ -41,7 +41,7 @@
 			 'Accounts'=>Array('Potentials','Contacts','Products','Quotes','Invoice'),
 			 'Contacts'=>Array('Accounts','Potentials','Quotes','PurchaseOrder'),
 			 'Potentials'=>Array('Accounts','Contacts','Quotes'),
-			 'Calendar'=>Array('Contacts'),
+			 'Calendar'=>Array('Leads','Accounts','Contacts','Potentials'),
 			 'Products'=>Array('Accounts','Contacts'),
 			 'HelpDesk'=>Array('Products'),
 			 'Quotes'=>Array('Accounts','Contacts','Potentials'),




From vtigercrm-commits at vtiger.fosslabs.com  Thu Dec  7 09:22:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 07 Dec 2006 14:22:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9944 - in
 /vtigercrm/branches/5.0.3/modules: Calendar/language/en_us.lang.php
 CustomView/EditView.php
Message-ID: <20061207142250.08618789A61@vtiger.fosslabs.com>

Author: richie
Date: Thu Dec  7 07:22:45 2006
New Revision: 9944

Log:
renamed task/event information in customview column header to calendar information

Modified:
    vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php
    vtigercrm/branches/5.0.3/modules/CustomView/EditView.php

Modified: vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php Thu Dec  7 07:22:45 2006
@@ -263,6 +263,7 @@
 'LBL_NEW_FORM_TITLE'=>'New Activity',
 'LBL_TASK_INFORMATION'=>'Task Information',
 'LBL_EVENT_INFORMATION'=>'Event Information',
+'LBL_CALENDAR_INFORMATION'=>'Calendar Information',
 
 'LBL_NAME'=>'Subject:',
 'LBL_ACTIVITY_STRING'=>'There is an activity',

Modified: vtigercrm/branches/5.0.3/modules/CustomView/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/CustomView/EditView.php (original)
+++ vtigercrm/branches/5.0.3/modules/CustomView/EditView.php Thu Dec  7 07:22:45 2006
@@ -54,7 +54,7 @@
 	$log->info('CustomView :: Successfully got StandardFilter for the module'.$cv_module);
 	$stdfiltercolhtml = getStdFilterHTML($cv_module);
 	$stdfilterjs = $oCustomView->getCriteriaJS();
-	$smarty->assign("MOD",$mod_strings);
+
 	//step4
 	$advfilterhtml = getAdvCriteriaHTML();
 	for($i=1;$i<10;$i++)
@@ -72,7 +72,7 @@
 	$smarty->assign("STDFILTERCRITERIA",$stdfilterhtml);
 	$smarty->assign("STDFILTER_JAVASCRIPT",$stdfilterjs);
 
-	$smarty->assign("MANDATORYCHECK",implode(",",$oCustomView->mandatoryvalues));
+	$smarty->assign("MANDATORYCHECK",implode(",",array_unique($oCustomView->mandatoryvalues)));
 	$smarty->assign("SHOWVALUES",implode(",",$oCustomView->showvalues));
 }
 else
@@ -82,6 +82,7 @@
 	$customviewdtls = $oCustomView->getCustomViewByCvid($recordid);
 	$log->info('CustomView :: Successfully got ViewDetails for the Viewid'.$recordid);
 	$modulecollist = $oCustomView->getModuleColumnsList($cv_module);
+
 	$selectedcolumnslist = $oCustomView->getColumnsListByCvid($recordid);
 	$log->info('CustomView :: Successfully got ColumnsList for the Viewid'.$recordid);
 
@@ -128,7 +129,7 @@
 	$smarty->assign("STDFILTERCRITERIA",$stdfilterhtml);
 	$smarty->assign("STDFILTER_JAVASCRIPT",$stdfilterjs);
 
-	$smarty->assign("MANDATORYCHECK",implode(",",$oCustomView->mandatoryvalues));
+	$smarty->assign("MANDATORYCHECK",implode(",",array_unique($oCustomView->mandatoryvalues)));
 	$smarty->assign("SHOWVALUES",implode(",",$oCustomView->showvalues));
 
 	$cactionhtml = "<input name='customaction' class='button' type='button' value='Create Custom Action' onclick=goto_CustomAction('".$cv_module."');>";
@@ -216,8 +217,9 @@
 	global $oCustomView;
 	global $app_list_strings;
 	$advfilter = array();
-	$mod_strings = return_module_language($current_language,$module);
-
+	$mod_strings = return_specified_module_language($current_language,$module);
+	
+	$check_dup = Array();
 	foreach($oCustomView->module_list[$module] as $key=>$value)
 	{
 		$advfilter = array();			
@@ -226,37 +228,67 @@
 		{
 			foreach($columnslist[$module][$key] as $field=>$fieldlabel)
 			{
-				if(isset($mod_strings[$fieldlabel]))
-				{
-					if($selected == $field)
+				if(!in_array($fieldlabel,$check_dup))
+				{
+					if(isset($mod_strings[$fieldlabel]))
 					{
-						$advfilter_option['value'] = $field;
-						$advfilter_option['text'] = $mod_strings[$fieldlabel];
-						$advfilter_option['selected'] = "selected";
+						if($selected == $field)
+						{
+							$advfilter_option['value'] = $field;
+							$advfilter_option['text'] = $mod_strings[$fieldlabel];
+							$advfilter_option['selected'] = "selected";
+						}else
+						{
+							$advfilter_option['value'] = $field;
+							$advfilter_option['text'] = $mod_strings[$fieldlabel];
+							$advfilter_option['selected'] = "";
+						}
 					}else
 					{
-						$advfilter_option['value'] = $field;
-						$advfilter_option['text'] = $mod_strings[$fieldlabel];
-						$advfilter_option['selected'] = "";
+						if($selected == $field)
+						{
+							$advfilter_option['value'] = $field;
+							$advfilter_option['text'] = $fieldlabel;
+							$advfilter_option['selected'] = "selected";
+						}else
+						{
+							$advfilter_option['value'] = $field;
+							$advfilter_option['text'] = $fieldlabel;
+							$advfilter_option['selected'] = "";
+						}
 					}
-				}else
-				{
-					if($selected == $field)
-					{
-						$advfilter_option['value'] = $field;
-						$advfilter_option['text'] = $fieldlabel;
-						$advfilter_option['selected'] = "selected";
-					}else
-					{
-						$advfilter_option['value'] = $field;
-						$advfilter_option['text'] = $fieldlabel;
-						$advfilter_option['selected'] = "";
-					}
+					$advfilter[] = $advfilter_option;
+					$check_dup [] = $fieldlabel;
 				}
-				$advfilter[] = $advfilter_option;
 			}
 			$advfilter_out[$label]= $advfilter;
 		}
+	}
+	
+	$finalfield = Array();
+	foreach($advfilter_out as $header=>$value)
+	{
+		if($header == $mod_strings['LBL_TASK_INFORMATION'])
+		{
+			$newLabel = $mod_strings['LBL_CALENDAR_INFORMATION'];
+		    	$finalfield[$newLabel] = $advfilter_out[$header];
+		    	
+		}
+		elseif($header == $mod_strings['LBL_EVENT_INFORMATION'])
+		{
+			$index = count($finalfield[$newLabel]);
+			foreach($value as $key=>$result)
+			{
+				$finalfield[$newLabel][$index]=$result;
+				$index++;
+			}
+		}
+		else
+		{
+			$finalfield = $advfilter_out;
+		}
+
+		$advfilter_out=$finalfield;
 	}
 	return $advfilter_out;
 }




From vtigercrm-commits at vtiger.fosslabs.com  Thu Dec  7 09:46:10 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 07 Dec 2006 14:46:10 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9945 -
 /vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php
Message-ID: <20061207144610.D4B0F789A7C@vtiger.fosslabs.com>

Author: richie
Date: Thu Dec  7 07:46:07 2006
New Revision: 9945

Log:
Start Date and Time added in report columns

Modified:
    vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php

Modified: vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php (original)
+++ vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php Thu Dec  7 07:46:07 2006
@@ -97,6 +97,10 @@
 					if($selectedfields[0] == 'vtiger_activity' && $selectedfields[1] == 'status')
 					{
 						$columnslist[$fieldcolname] = " case when (vtiger_activity.status not like '') then vtiger_activity.status else vtiger_activity.eventstatus end as Calendar_Status";
+					}
+					elseif($selectedfields[0] == 'vtiger_activity' && $selectedfields[1] == 'date_start')
+					{
+						$columnslist[$fieldcolname] = "concat(vtiger_activity.date_start,'  ',vtiger_activity.time_start) as Calendar_Start_Date_and_Time";
 					}
 					else
 					{




From vtigercrm-commits at vtiger.fosslabs.com  Thu Dec  7 10:04:34 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 07 Dec 2006 15:04:34 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9946 - in
 /vtigercrm/branches/5.0.3: include/utils/DetailViewUtils.php
 include/utils/ListViewUtils.php include/utils/UserInfoUtil.php
 modules/Settings/language/en_us.lang.php
Message-ID: <20061207150434.6F687789A7C@vtiger.fosslabs.com>

Author: richie
Date: Thu Dec  7 08:04:25 2006
New Revision: 9946

Log:
Roles moved to settings- issues fixed

Modified:
    vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php
    vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php
    vtigercrm/branches/5.0.3/include/utils/UserInfoUtil.php
    vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php

Modified: vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php (original)
+++ vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php Thu Dec  7 08:04:25 2006
@@ -931,7 +931,7 @@
 	{
 	 	$label_fld[] =$mod_strings[$fieldlabel];
 		if(is_admin($current_user))
-			$label_fld[] = '<a href="index.php?module=Users&action=RoleDetailView&roleid='.$col_fields[$fieldname].'">'.getRoleName($col_fields[$fieldname]).'</a>';
+			$label_fld[] = '<a href="index.php?module=Settings&action=RoleDetailView&roleid='.$col_fields[$fieldname].'">'.getRoleName($col_fields[$fieldname]).'</a>';
 		else
 			$label_fld[] = getRoleName($col_fields[$fieldname]);
 	}elseif($uitype == 85) //Added for Skype by Minnie

Modified: vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php (original)
+++ vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Thu Dec  7 08:04:25 2006
@@ -1299,7 +1299,7 @@
         }
 	elseif($uitype == 98)
 	{
-		$value = '<a href="index.php?action=RoleDetailView&module=Users&parenttab=Settings&roleid='.$temp_val.'">'.getRoleName($temp_val).'</a>';  
+		$value = '<a href="index.php?action=RoleDetailView&module=Settings&parenttab=Settings&roleid='.$temp_val.'">'.getRoleName($temp_val).'</a>';  
 	}
 	else
 	{

Modified: vtigercrm/branches/5.0.3/include/utils/UserInfoUtil.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/utils/UserInfoUtil.php (original)
+++ vtigercrm/branches/5.0.3/include/utils/UserInfoUtil.php Thu Dec  7 08:04:25 2006
@@ -3794,12 +3794,12 @@
 	elseif($entityType == 'roles')
 	{
 		$roleName=getRoleName($entityid);	
-		$display_out = "<a href='index.php?module=Users&action=RoleDetailView&returnaction=OrgSharingDetailView&roleid=".$entityid."'>Role::".$roleName. "</a>";			
+		$display_out = "<a href='index.php?module=Settings&action=RoleDetailView&returnaction=OrgSharingDetailView&roleid=".$entityid."'>Role::".$roleName. "</a>";			
 	}
 	elseif($entityType == 'rs')
 	{
 		$roleName=getRoleName($entityid);	
-		$display_out = "<a href='index.php?module=Users&action=RoleDetailView&returnaction=OrgSharingDetailView&roleid=".$entityid."'>RoleAndSubordinate::".$roleName. "</a>";			
+		$display_out = "<a href='index.php?module=Settings&action=RoleDetailView&returnaction=OrgSharingDetailView&roleid=".$entityid."'>RoleAndSubordinate::".$roleName. "</a>";			
 	}
 	$log->debug("Exiting getEntityDisplayLink method ...");
 	return $display_out;

Modified: vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php Thu Dec  7 08:04:25 2006
@@ -693,6 +693,8 @@
 'LBL_DELETE_ROLE'=>'Delete Role',
 'LBL_ROLE_TO_BE_DELETED'=>'Role to be Deleted',
 'LBL_TRANSFER_USER_ROLE'=>'Transfer Users to Role',
+'LBL_ASSOCIATED_PROFILES'=>'Associated Profiles :',
+'LBL_ASSOCIATED_USERS'=>'Associated Users :',
 );
 
 




From vtigercrm-commits at vtiger.fosslabs.com  Thu Dec  7 23:59:35 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 08 Dec 2006 04:59:35 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9947 -
	/vtigercrm/branches/5.0.3/modules/uploads/upload.php
Message-ID: <20061208045935.CD6D5788CB2@vtiger.fosslabs.com>

Author: richie
Date: Thu Dec  7 21:59:29 2006
New Revision: 9947

Log:
* Modified the hardcoded file size to configurable from config.inc.php file, Fixes #2714

Modified:
    vtigercrm/branches/5.0.3/modules/uploads/upload.php

Modified: vtigercrm/branches/5.0.3/modules/uploads/upload.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/uploads/upload.php (original)
+++ vtigercrm/branches/5.0.3/modules/uploads/upload.php Thu Dec  7 21:59:29 2006
@@ -25,7 +25,7 @@
 
 ?>
 
-<INPUT TYPE="hidden" NAME="MAX_FILE_SIZE" VALUE="1000000">
+<INPUT TYPE="hidden" NAME="MAX_FILE_SIZE" VALUE="<?php echo $upload_maxsize; ?>">
 <INPUT TYPE="hidden" NAME="return_module" VALUE="<?php echo $ret_module ?>">
 <INPUT TYPE="hidden" NAME="return_action" VALUE="<?php echo $ret_action ?>">
 <INPUT TYPE="hidden" NAME="return_id" VALUE="<?php echo $ret_id ?>">




From vtigercrm-commits at vtiger.fosslabs.com  Fri Dec  8 01:56:16 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 08 Dec 2006 06:56:16 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9948 - in
 /vtigercrm/branches/4.2: install/5createTables.inc.php
 modules/Users/Authenticate.php schema/DatabaseSchema.xml update.php
 updates/ updates/vtiger/ updates/vtiger/9816.php vtigerversion.php
Message-ID: <20061208065616.8AFC6789408@vtiger.fosslabs.com>

Author: allanbush
Date: Thu Dec  7 23:56:10 2006
New Revision: 9948

Log:
Added SVN revision controlled incremental database update system.  Refs #2720.

Added:
    vtigercrm/branches/4.2/update.php
    vtigercrm/branches/4.2/updates/
    vtigercrm/branches/4.2/updates/vtiger/
    vtigercrm/branches/4.2/updates/vtiger/9816.php
Modified:
    vtigercrm/branches/4.2/install/5createTables.inc.php
    vtigercrm/branches/4.2/modules/Users/Authenticate.php
    vtigercrm/branches/4.2/schema/DatabaseSchema.xml
    vtigercrm/branches/4.2/vtigerversion.php

Modified: vtigercrm/branches/4.2/install/5createTables.inc.php
==============================================================================
--- vtigercrm/branches/4.2/install/5createTables.inc.php (original)
+++ vtigercrm/branches/4.2/install/5createTables.inc.php Thu Dec  7 23:56:10 2006
@@ -285,6 +285,14 @@
 }
 eecho ("Done.");
 
+// insert database version control 
+include 'vtigerversion.php'; 
+foreach($svn_revision as $project=>$version) { 
+	$sql = "INSERT INTO vtigerversion (project, revision) 
+		VALUES (".$db->quote($project).", ".$version.")"; 
+	$db->query($sql); 
+} 
+
 /*
 if ($new_tables)
         create_default_users();

Modified: vtigercrm/branches/4.2/modules/Users/Authenticate.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Users/Authenticate.php (original)
+++ vtigercrm/branches/4.2/modules/Users/Authenticate.php Thu Dec  7 23:56:10 2006
@@ -33,6 +33,8 @@
 // Add in defensive code here.
 $focus->user_name = to_html($_REQUEST['user_name']);
 $user_password = $_REQUEST['user_password'];
+
+include 'update.php';
 
 $focus->load_user($user_password);
 

Modified: vtigercrm/branches/4.2/schema/DatabaseSchema.xml
==============================================================================
--- vtigercrm/branches/4.2/schema/DatabaseSchema.xml (original)
+++ vtigercrm/branches/4.2/schema/DatabaseSchema.xml Thu Dec  7 23:56:10 2006
@@ -3813,4 +3813,13 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
+	<table name="vtigerversion">
+		<field name="id" type="I" size="19">
+			<key />
+			<autoincrement />
+		</field>
+		<field name="project" type="C" size="50" />
+		<field name="revision" type="I" size="19" />
+	</table>
+
 </schema>

Modified: vtigercrm/branches/4.2/vtigerversion.php
==============================================================================
--- vtigercrm/branches/4.2/vtigerversion.php (original)
+++ vtigercrm/branches/4.2/vtigerversion.php Thu Dec  7 23:56:10 2006
@@ -12,5 +12,6 @@
 $patch_version = '';
 $modified_database = '';
 $vtiger_version = '4.2.4';
+$svn_revision['vtiger'] = 9947;
 $release_date = '1 June 2006';
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Fri Dec  8 02:43:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 08 Dec 2006 07:43:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9949 -
 /vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php
Message-ID: <20061208074338.9BB7C788CB4@vtiger.fosslabs.com>

Author: richie
Date: Fri Dec  8 00:43:32 2006
New Revision: 9949

Log:
problem selecting related to in todo fixed

Modified:
    vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php

Modified: vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php (original)
+++ vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Fri Dec  8 00:43:32 2006
@@ -985,7 +985,10 @@
 	$log->debug("Entering getValue(".$field_result.",". $list_result.",".$fieldname.",".$focus.",".$module.",".$entity_id.",".$list_result_count.",".$mode.",".$popuptype.",".$returnset.",".$viewid.") method ...");
 	global $adb,$current_user;
 	
-	$viewname = getCVname($viewid);
+	if($viewid != '')
+	{
+		$viewname = getCVname($viewid);
+	}
 	require('user_privileges/user_privileges_'.$current_user->id.'.php');
 	$tabname = getParentTab();
 	$tabid = getTabid($module);




From vtigercrm-commits at vtiger.fosslabs.com  Fri Dec  8 04:42:29 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 08 Dec 2006 09:42:29 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9950 -
 /vtigercrm/branches/5.0.3/Smarty/templates/QuickCreate.tpl
Message-ID: <20061208094229.A2841789971@vtiger.fosslabs.com>

Author: richie
Date: Fri Dec  8 02:42:25 2006
New Revision: 9950

Log:
changes made for i18N support

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/QuickCreate.tpl

Modified: vtigercrm/branches/5.0.3/Smarty/templates/QuickCreate.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/QuickCreate.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/QuickCreate.tpl Fri Dec  8 02:42:25 2006
@@ -69,7 +69,11 @@
 					<select name="{$fldname}">
 					{foreach item=arr from=$fldvalue}
 						{foreach key=sel_value item=value from=$arr}
+							{if $MOD.$sel_value neq ''}
+							<option value="{$sel_value}" {$value}>{$MOD.$sel_value}</option>
+							{else}
 							<option value="{$sel_value}" {$value}>{$sel_value}</option>
+							{/if}
 						{/foreach}
 					{/foreach}
 					</select>




From vtigercrm-commits at vtiger.fosslabs.com  Fri Dec  8 14:19:13 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 08 Dec 2006 19:19:13 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9951 -
 /vtigercrm/branches/5.0.3/include/utils/CommonUtils.php
Message-ID: <20061208191914.2927B788AA0@vtiger.fosslabs.com>

Author: richie
Date: Fri Dec  8 12:19:09 2006
New Revision: 9951

Log:
Security check for changowner added

Modified:
    vtigercrm/branches/5.0.3/include/utils/CommonUtils.php

Modified: vtigercrm/branches/5.0.3/include/utils/CommonUtils.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/utils/CommonUtils.php (original)
+++ vtigercrm/branches/5.0.3/include/utils/CommonUtils.php Fri Dec  8 12:19:09 2006
@@ -2074,16 +2074,28 @@
 }
 function getUserslist()
 {
-	global $log,$current_user;
+	global $log,$current_user,$module,$adb,$assigned_user_id;
 	$log->debug("Entering getUserslist() method ...");
-	global $adb;
-	$result=$adb->query("select * from vtiger_users");
-	for($i=0;$i<$adb->num_rows($result);$i++)
-	{
-	       $useridlist[$i]=$adb->query_result($result,$i,'id');
-	       $usernamelist[$useridlist[$i]]=$adb->query_result($result,$i,'user_name');
-	}
-	$change_owner = get_select_options_with_id($usernamelist,$current_user->user_name);
+	require('user_privileges/user_privileges_'.$current_user->id.'.php');
+	require('user_privileges/sharing_privileges_'.$current_user->id.'.php');
+	
+	if($is_admin==false && $profileGlobalPermission[2] == 1 && ($defaultOrgSharingPermission[getTabid($module)] == 3 or $defaultOrgSharingPermission[getTabid($module)] == 0))
+	{
+		$users_combo = get_select_options_array(get_user_array(FALSE, "Active", $current_user->id,'private'), $current_user->id);
+	}
+	else
+	{
+		$users_combo = get_select_options_array(get_user_array(FALSE, "Active", $current_user->id),$current_user->id);
+	}
+	foreach($users_combo as $userid=>$value)	
+	{
+
+		foreach($value as $username=>$selected)
+		{
+			$change_owner .= "<option value=$userid $selected>".$username."</option>";
+		}
+	}
+	
 	$log->debug("Exiting getUserslist method ...");
 	return $change_owner;
 }
@@ -2091,20 +2103,40 @@
 
 function getGroupslist()
 {
-	global $log;
+	global $log,$adb,$module,$current_user;
 	$log->debug("Entering getGroupslist() method ...");
-	global $adb;
-	$result=$adb->query("select * from vtiger_groups");
-	
-	for($i=0;$i<$adb->num_rows($result);$i++)
-	{
-	       $groupidlist[$i]=$adb->query_result($result,$i,'groupid');
-	       $groupnamelist[$groupidlist[$i]]=$adb->query_result($result,$i,'groupname');
-	       
-	}
-	$change_groups_owner = get_select_options_with_id($groupnamelist,'');
+	require('user_privileges/user_privileges_'.$current_user->id.'.php');
+	require('user_privileges/sharing_privileges_'.$current_user->id.'.php');
+	if($is_admin==false && $profileGlobalPermission[2] == 1 && ($defaultOrgSharingPermission[getTabid($module)] == 3 or $defaultOrgSharingPermission[getTabid($module)] == 0))
+	{
+		$result=get_current_user_access_groups($module);
+	}
+	else
+	{
+		$result = get_group_options();
+	}
+	$groupArray = $adb->fetch_array($result);
+
+	do{
+		$groupname=$groupArray["groupname"];
+		$group_id=$groupArray["groupid"];
+		$selected = '';
+		if($groupname == $selected_groupname[0])
+		{
+			$selected = "selected";
+		}
+		if($groupname != '')
+			$group_option[$group_id] = array($groupname=>$selected);
+          }while($groupArray = $adb->fetch_array($result));
+
+	foreach($group_option as $groupid=>$value)  
+	{ 
+		foreach($value as $groupname=>$selected) 
+		{
+			$change_groups_owner .= "<option value=$groupid $selected >".$groupname."</option>";  
+		} 
+	}
 	$log->debug("Exiting getGroupslist method ...");
-
 	return $change_groups_owner;
 }
 




From vtigercrm-commits at vtiger.fosslabs.com  Mon Dec 11 04:39:06 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 11 Dec 2006 09:39:06 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9952 - in
 /vtigercrm/branches/5.0.3: Smarty/templates/ Smarty/templates/Inventory/
 themes/alphagrey/ themes/bluelagoon/ themes/woodspice/
Message-ID: <20061211093906.677A1788A1B@vtiger.fosslabs.com>

Author: richie
Date: Mon Dec 11 02:38:54 2006
New Revision: 9952

Log:
Changes made to wrap the contents in the description field

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/DetailViewFields.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/Inventory/InventoryDetailView.tpl
    vtigercrm/branches/5.0.3/themes/alphagrey/style.css
    vtigercrm/branches/5.0.3/themes/bluelagoon/style.css
    vtigercrm/branches/5.0.3/themes/woodspice/style.css

Modified: vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl Mon Dec 11 02:38:54 2006
@@ -288,13 +288,12 @@
 				{else}
 					<td class="dvtCellLabel" align=right width=25%><input type="hidden" id="hdtxt_IsAdmin" value={$keyadmin}></input>{$label}</td>
 				{/if}  
-{if $EDIT_PERMISSION eq 'yes'}							{include file="DetailViewUI.tpl"}
-{else}										{include file="DetailViewFields.tpl"}
-{/if}
-						   {else} 
-                                          <td class="dvtCellLabel" align=right>&nbsp;</td>
-                                           <td class="dvtCellInfo" align=left >&nbsp;</td>
-							   {/if}
+				{if $EDIT_PERMISSION eq 'yes'}
+					{include file="DetailViewUI.tpl"}
+				{else}
+					{include file="DetailViewFields.tpl"}
+				{/if}
+			   {/if}
                                    {/foreach}
 						      </tr>	
 						   {/foreach}	

Modified: vtigercrm/branches/5.0.3/Smarty/templates/DetailViewFields.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/DetailViewFields.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/DetailViewFields.tpl Mon Dec 11 02:38:54 2006
@@ -32,7 +32,7 @@
                                                   <td width=25% class="dvtCellInfo" align="left">&nbsp;<a href="http://{$keyval}" target="_blank">{$keyval}</a>
                                                   </td>
                                              {elseif $keyid eq '19' || $keyid eq '20'} <!--TextArea/Description-->
-                                                  <td width=25% class="dvtCellInfo" align="left">&nbsp;{$keyval}                   
+                                                  <td width=100% class="dvtCellInfo" align="left">&nbsp;{$keyval}                   
                                                   </td>
                                              {elseif $keyid eq '21' || $keyid eq '24' || $keyid eq '22'} <!--TextArea/Street-->
                                                   <td width=25% class="dvtCellInfo" align="left">&nbsp;{$keyval}

Modified: vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl Mon Dec 11 02:38:54 2006
@@ -133,7 +133,7 @@
 						{/if}
 							<!--{assign var="DESCRIPTION_SEPARATOR_STRING" value=" "}  {* Separates Description *}-->
 							<!--{assign var="DESCRIPTION_WORDWRAP_WIDTH" value="70"} {* No. of chars for word wrapping long lines of Description *}-->
-                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">
+                                                  <td width=100% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">
 							{$keyval}<!--|replace:$DESCRIPTION_SEPARATOR_STRING:"\x1"|replace:" ":"\x0"|replace:"\x1":$DESCRIPTION_SEPARATOR_STRING|wordwrap:$DESCRIPTION_WORDWRAP_WIDTH:"<br>&nbsp;"|replace:"\x0":"&nbsp;"}-->
 							</span>
                                               		<div id="editarea_{$label}" style="display:none;">

Modified: vtigercrm/branches/5.0.3/Smarty/templates/Inventory/InventoryDetailView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/Inventory/InventoryDetailView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/Inventory/InventoryDetailView.tpl Mon Dec 11 02:38:54 2006
@@ -204,9 +204,6 @@
 					{else}
 						{include file="DetailViewFields.tpl"}
 					{/if}
-				{else} 
-					<td class="dvtCellLabel" align=right>&nbsp;</td>
-					<td class="dvtCellInfo" align=left >&nbsp;</td>
 				{/if}
 		{/foreach}
 	   </tr>	

Modified: vtigercrm/branches/5.0.3/themes/alphagrey/style.css
==============================================================================
--- vtigercrm/branches/5.0.3/themes/alphagrey/style.css (original)
+++ vtigercrm/branches/5.0.3/themes/alphagrey/style.css Mon Dec 11 02:38:54 2006
@@ -320,7 +320,6 @@
 	padding-left:10px;
 	padding-right:10px;
 	border-bottom:1px dotted #efefef;
-	white-space:nowrap;
 }
 
 .rightMailMerge {

Modified: vtigercrm/branches/5.0.3/themes/bluelagoon/style.css
==============================================================================
--- vtigercrm/branches/5.0.3/themes/bluelagoon/style.css (original)
+++ vtigercrm/branches/5.0.3/themes/bluelagoon/style.css Mon Dec 11 02:38:54 2006
@@ -321,7 +321,6 @@
 	padding-left:10px;
 	padding-right:10px;
 	border-bottom:1px solid #efefef;
-	white-space:nowrap;
 }
 
 .rightMailMerge {

Modified: vtigercrm/branches/5.0.3/themes/woodspice/style.css
==============================================================================
--- vtigercrm/branches/5.0.3/themes/woodspice/style.css (original)
+++ vtigercrm/branches/5.0.3/themes/woodspice/style.css Mon Dec 11 02:38:54 2006
@@ -311,7 +311,6 @@
 	padding-left:10px;
 	padding-right:10px;
 	border-bottom:1px solid #999;
-	white-space:nowrap;
 }
 
 .rightMailMerge {




From vtigercrm-commits at vtiger.fosslabs.com  Mon Dec 11 05:05:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 11 Dec 2006 10:05:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9953 - in
 /vtigercrm/branches/5.0.3: Smarty/templates/EmailDetailView.tpl
 modules/Emails/language/en_us.lang.php
Message-ID: <20061211100526.A596078967D@vtiger.fosslabs.com>

Author: richie
Date: Mon Dec 11 03:05:18 2006
New Revision: 9953

Log:
added proper theme image

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/EmailDetailView.tpl
    vtigercrm/branches/5.0.3/modules/Emails/language/en_us.lang.php

Modified: vtigercrm/branches/5.0.3/Smarty/templates/EmailDetailView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/EmailDetailView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/EmailDetailView.tpl Mon Dec 11 03:05:18 2006
@@ -24,12 +24,12 @@
 <tbody>
    <tr>
 	<td colspan="3">
-		<table width="100%" border="0" cellpadding="0" cellspacing="0">
-		   <tr>
-			<td background="{$IMAGE_PATH}mailHdr.jpg" style="background-repeat:repeat-x;" width="100%">&nbsp;</td>
-			<td width="86"><img src="{$IMAGE_PATH}mailTitle.jpg"></td>
-		   </tr>
-		</table>	
+		<table border=0 cellspacing=0 cellpadding=0 width=100% class="mailClientWriteEmailHeader">
+		<tr>
+		<td >{$MOD.LBL_DETAILVIEW_EMAIL}</td>
+		</tr>
+		</table>
+
 	</td>
    </tr> 
    {foreach item=row from=$BLOCKS}

Modified: vtigercrm/branches/5.0.3/modules/Emails/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Emails/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Emails/language/en_us.lang.php Mon Dec 11 03:05:18 2006
@@ -43,7 +43,8 @@
 'LBL_SUBJECT'=>'Subject:',
 'LBL_BODY'=>'Body:',
 'LBL_CONTACT_NAME'=>' Contact Name: ',
-'LBL_EMAIL'=>'Email:',  
+'LBL_EMAIL'=>'Email:', 
+'LBL_DETAILVIEW_EMAIL'=>'E-Mail', 
 'LBL_COLON'=>':',
 'LBL_CHK_MAIL'=>'Check Mail',
 'LBL_COMPOSE'=>'Compose',




From vtigercrm-commits at vtiger.fosslabs.com  Mon Dec 11 06:26:01 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 11 Dec 2006 11:26:01 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9954 - in
 /vtigercrm/branches/5.0.3: Smarty/templates/SetMenu.tpl
 Smarty/templates/Settings.tpl Smarty/templates/Settings/InventoryNotify.tpl
 modules/Settings/language/en_us.lang.php
Message-ID: <20061211112601.50810788A1B@vtiger.fosslabs.com>

Author: richie
Date: Mon Dec 11 04:25:45 2006
New Revision: 9954

Log:
Inventory notification moved to settings

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/Settings.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/Settings/InventoryNotify.tpl
    vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php

Modified: vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl Mon Dec 11 04:25:45 2006
@@ -87,27 +87,27 @@
 		<tr><td class="settingsTabHeader" nowrap>{$MOD.LBL_COMMUNICATION_TEMPLATES}</td></tr>
 
 		{if $smarty.request.action eq 'listemailtemplates' || $smarty.request.action eq 'detailviewemailtemplate' || $smarty.request.action eq 'editemailtemplate' || $smarty.request.action eq 'saveemailtemplate' || $smarty.request.action eq 'deleteemailtemplate' || $smarty.request.action eq 'createemailtemplate'}
-		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings">{$MOD.EMAILTEMPLATES}</a></td></tr>
+		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Settings&action=listemailtemplates&parenttab=Settings">{$MOD.EMAILTEMPLATES}</a></td></tr>
 		{else}
-		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings">{$MOD.EMAILTEMPLATES}</a></td></tr>
+		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=listemailtemplates&parenttab=Settings">{$MOD.EMAILTEMPLATES}</a></td></tr>
 		{/if}
 
-		{if $smarty.request.action eq 'listwordtemplates' || $smarty.request.action eq 'add2db' || $smarty.request.action eq 'deletewordtemplate' || $smarty.request.action eq 'upload'}
-		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings">{$MOD.WORDINTEGRATION}</a></td></tr>
+		{if $smarty.request.action eq 'listwordtemplates' || $smarty.request.action eq 'savewordtemplate' || $smarty.request.action eq 'deletewordtemplate' || $smarty.request.action eq 'upload'}
+		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Settings&action=listwordtemplates&parenttab=Settings">{$MOD.WORDINTEGRATION}</a></td></tr>
 		{else}	
-		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings">{$MOD.WORDINTEGRATION}</a></td></tr>
+		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=listwordtemplates&parenttab=Settings">{$MOD.WORDINTEGRATION}</a></td></tr>
 		{/if}
 
-		{if $smarty.request.action eq 'listnotificationschedulers' || $smarty.request.action eq 'UsersAjax'}
-		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Users&action=listnotificationschedulers&parenttab=Settings">{$MOD.NOTIFICATIONSCHEDULERS}</a></td></tr>
+		{if $smarty.request.action eq 'listnotificationschedulers' || $smarty.request.action eq 'SettingsAjax'}
+		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Settings&action=listnotificationschedulers&parenttab=Settings">{$MOD.NOTIFICATIONSCHEDULERS}</a></td></tr>
 		{else}
-		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listnotificationschedulers&parenttab=Settings">{$MOD.NOTIFICATIONSCHEDULERS}</a></td></tr>
+		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=listnotificationschedulers&parenttab=Settings">{$MOD.NOTIFICATIONSCHEDULERS}</a></td></tr>
 		{/if}
 				
 		{if $smarty.request.action eq 'listinventorynotifications' || $smarty.request.action eq 'UsersAjax'}
-		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Users&action=listinventorynotifications&parenttab=Settings">{$MOD.INVENTORYNOTIFICATION}</a></td></tr>
+		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Settings&action=listinventorynotifications&parenttab=Settings">{$MOD.INVENTORYNOTIFICATION}</a></td></tr>
 		{else}	
-		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listinventorynotifications&parenttab=Settings">{$MOD.INVENTORYNOTIFICATION}</a></td></tr>
+		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=listinventorynotifications&parenttab=Settings">{$MOD.INVENTORYNOTIFICATION}</a></td></tr>
 		{/if} 	
 
 		

Modified: vtigercrm/branches/5.0.3/Smarty/templates/Settings.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/Settings.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/Settings.tpl Mon Dec 11 04:25:45 2006
@@ -192,8 +192,8 @@
 						<table border=0 cellspacing=0 cellpadding=5 width=100%>
 						<tr>
 
-							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=PickList&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}picklist.gif" alt="{$MOD.LBL_PICKLIST_EDITOR}" title="{$MOD.LBL_PICKLIST_EDITOR}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Settings&action=PickList&parenttab=Settings">{$MOD.LBL_PICKLIST_EDITOR}</a></td>
+							<td rowspan=2 valign=top><a href="index.php?module=Users&action=PickList&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}picklist.gif" alt="{$MOD.LBL_PICKLIST_EDITOR}" title="{$MOD.LBL_PICKLIST_EDITOR}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Users&action=PickList&parenttab=Settings">{$MOD.LBL_PICKLIST_EDITOR}</a></td>
 						</tr>
 						<tr>
 							<td class="small" valign=top>{$MOD.LBL_PICKLIST_DESCRIPTION}</td>	
@@ -254,8 +254,8 @@
 					<!-- icon 11-->
 						<table border=0 cellspacing=0 cellpadding=5 width=100%>
 						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}ViewTemplate.gif" alt="{$MOD.EMAILTEMPLATES}" title="{$MOD.EMAILTEMPLATES}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings">{$MOD.EMAILTEMPLATES}</a></td>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=listemailtemplates&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}ViewTemplate.gif" alt="{$MOD.EMAILTEMPLATES}" title="{$MOD.EMAILTEMPLATES}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=listemailtemplates&parenttab=Settings">{$MOD.EMAILTEMPLATES}</a></td>
 
 						</tr>
 						<tr>
@@ -268,8 +268,8 @@
 
 						<table border=0 cellspacing=0 cellpadding=5 width=100%>
 						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}mailmarge.gif" alt="{$MOD.LBL_MAIL_MERGE}" title="{$MOD.LBL_MAIL_MERGE}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings">{$MOD.WORDINTEGRATION}</a></td>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=listwordtemplates&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}mailmarge.gif" alt="{$MOD.LBL_MAIL_MERGE}" title="{$MOD.LBL_MAIL_MERGE}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=listwordtemplates&parenttab=Settings">{$MOD.WORDINTEGRATION}</a></td>
 						</tr>
 						<tr>
 							<td class="small" valign=top>{$MOD.LBL_MAIL_MERGE_DESCRIPTION}</td>
@@ -281,8 +281,8 @@
 					<!-- icon 13-->
 						<table border=0 cellspacing=0 cellpadding=5 width=100%>
 						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Users&action=listnotificationschedulers&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}notification.gif" alt="{$MOD.NOTIFICATIONSCHEDULERS}" title="{$MOD.NOTIFICATIONSCHEDULERS}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Users&action=listnotificationschedulers&parenttab=Settings">{$MOD.NOTIFICATIONSCHEDULERS}</a></td>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=listnotificationschedulers&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}notification.gif" alt="{$MOD.NOTIFICATIONSCHEDULERS}" title="{$MOD.NOTIFICATIONSCHEDULERS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=listnotificationschedulers&parenttab=Settings">{$MOD.NOTIFICATIONSCHEDULERS}</a></td>
 
 						</tr>
 						<tr>
@@ -295,8 +295,8 @@
 
 						<table border=0 cellspacing=0 cellpadding=5 width=100%>
 						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Users&action=listinventorynotifications&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}inventory.gif" alt="{$MOD.INVENTORYNOTIFICATION}" title="{$MOD.INVENTORYNOTIFICATION}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Users&action=listinventorynotifications&parenttab=Settings">{$MOD.INVENTORYNOTIFICATION}</a></td>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=listinventorynotifications&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}inventory.gif" alt="{$MOD.INVENTORYNOTIFICATION}" title="{$MOD.INVENTORYNOTIFICATION}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=listinventorynotifications&parenttab=Settings">{$MOD.INVENTORYNOTIFICATION}</a></td>
 						</tr>
 						<tr>
 							<td class="small" valign=top>{$MOD.LBL_INV_NOTIF_DESCRIPTION}</td>

Modified: vtigercrm/branches/5.0.3/Smarty/templates/Settings/InventoryNotify.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/Settings/InventoryNotify.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/Settings/InventoryNotify.tpl Mon Dec 11 04:25:45 2006
@@ -104,7 +104,7 @@
                 'index.php',
                 {queue: {position: 'end', scope: 'command'},
                         method: 'post',
-                        postBody: 'action=UsersAjax&module=Users&file=SaveInventoryNotification&notifysubject='+subject+'&notifybody='+body+'&record='+id,
+                        postBody: 'action=SettingsAjax&module=Settings&file=SaveInventoryNotification&notifysubject='+subject+'&notifybody='+body+'&record='+id,
                         onComplete: function(response) {
                                 $("status").style.display="none";
                         }
@@ -119,7 +119,7 @@
                 'index.php',
                 {queue: {position: 'end', scope: 'command'},
                         method: 'post',
-                        postBody: 'action=UsersAjax&module=Users&file=EditInventoryNotification&record='+id,
+                        postBody: 'action=SettingsAjax&module=Settings&file=EditInventoryNotification&record='+id,
                         onComplete: function(response) {
                                 $("status").style.display="none";
 				$("editdiv").innerHTML=response.responseText;

Modified: vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php Mon Dec 11 04:25:45 2006
@@ -510,12 +510,58 @@
 
 'LBL_RSS_CATEGORY'=>'Rss Category',
 
+//Added for Web based Email client integration (post 4.0.1 release)
+
+'LBL_ADD_MAIL_ACCOUNT'=>'Add Mail Account',
+'LBL_NEW_MAIL_ACCOUNT_TITLE'=>'New Mail Account [Alt+M]',
+'LBL_NEW_MAIL_ACCOUNT_KEY'=>'M',
+'LBL_NEW_MAIL_ACCOUNT_LABEL'=>'New Mail Account',
+'LBL_GENERAL_INFO'=>'General Information',
+'LBL_DISPLAY_NAME'=>'Display Name',
+'LBL_MAIL_PROTOCOL'=>'Mail Protocol',
+'LBL_LIST_PASSWORD'=>'Password',
+'LBL_MAIL_SERVER_NAME'=>'Mail Server Name or IP',
 'LBL_MAIL_SERVER_SETTINGS'=>'Outgoing Server',
+'LBL_INCOME_SERVER_SETTINGS'=>'Incoming Server',
+'LBL_TEST_SETTINGS'=>'Test my account setting immediately',
+'LBL_TEST_BUTTON_TITLE'=>'Test my account now! [Alt+T]',
+'LBL_TEST_BUTTON_KEY'=>'T',
+'LBL_TEST_BUTTON_LABEL'=>'Test my account now!',
+'LBL_DEFAULT'=>'Default',
+'LBL_IMAP2'=>'IMAP2',
+'LBL_IMAP4'=>'IMAP4',
+'LBL_POP'=>'POP',
+'LBL_IMAP'=>'IMAP',
+'LBL_MAIL_DISCLAIM'=>'Items marked with <font color="red">*</font> are required<br>Items marked with <font color="red">* *</font> are not fully supported',
+'LBL_SSL_OPTIONS'=>'SSL Options',
+'LBL_TLS'=>'TLS',
+'LBL_NO_TLS'=>'No TLS',
+'LBL_CERT_VAL'=>'Certificate Validations',
+'LBL_INT_MAILER'=>'Use Internal Mailer?',
+'LBL_INT_MAILER_USE'=>'Yes',
+'LBL_INT_MAILER_NOUSE'=>'No',
+'LBL_VAL_SSL_CERT'=>'Validate SSL Cert',
+'LBL_DONOT_VAL_SSL_CERT'=>'Do Not Validate SSL Cert',
+'LBL_WEB_MAIL_CONFIG'=>'Web Mail Configuration',
+'LBL_CONFIGURE_WEB_MAIL'=>' - Configure Web Mail',
+'LBL_LIST_MAIL_ACCOUNT'=>'  List Mail Account',
 'LBL_USAGEUNIT'=>'Usage Unit',
 'LBL_GLACCT'=>'GL Account',
 'LBL_QUOTE_STAGE'=>'Quote Stage',
 'LBL_CARRIER'=>'Carrier',
 'LBL_TAXCLASS'=>'Tax Class',
+'LBL_MY_DETAILS'=>'My Details',
+'LBL_MY_MAIL_SERVER_DET'=>'My Incoming Mail Server Details',
+'LBL_EMAIL_ID'=>'Email ID',
+'LBL_NAME_EXAMPLE'=>'(example : John Fenner)',
+'LBL_EMAIL_EXAMPLE'=>'(example : johnfenner at xyz.com)',
+'LBL_REFRESH_TIMEOUT'=>'Refresh Timeout',
+'LBL_1_MIN'=>'1 minute',
+'LBL_2_MIN'=>'2 minutes',
+'LBL_3_MIN'=>'3 minutes',
+'LBL_4_MIN'=>'4 minutes',
+'LBL_5_MIN'=>'5 minutes',
+'LBL_EMAILS_PER_PAGE'=>'Emails per Page',
 
 //Added for Organization Details (4.2 release)
 'LBL_ORGANIZATION_NAME'=>'Company Name',
@@ -695,6 +741,53 @@
 'LBL_TRANSFER_USER_ROLE'=>'Transfer Users to Role',
 'LBL_ASSOCIATED_PROFILES'=>'Associated Profiles :',
 'LBL_ASSOCIATED_USERS'=>'Associated Users :',
+//Added while moving email templates from Users to Settings
+'LBL_EMAIL_TEMPLATES'=>'Email Templates',
+'LBL_EMAIL_TEMPLATE_DESC'=>'Manage email templates used for Campaigns and Mass mailing',
+'LBL_LIST_SELECT'=>'Select',
+'LBL_EMAIL_TEMPLATE'=>'Email Template',
+'LBL_TEMPLATE_TOOLS'=>'Tools',
+'LBL_DELETE' => 'Delete',
+'LBL_NEW_TEMPLATE' =>'New Template',
+'LBL_FOLDER'=>'Folder',
+'LBL_NAME'=>'Name',
+'LBL_PERSONAL'=>'Personal',
+'LBL_PUBLIC'=>'Public',
+'LBL_ACCOUNT_FIELDS'=>'Account Fields',
+'LBL_CONTACT_FIELDS'=>'Contact Fields',
+'LBL_LEAD_FIELDS'=>'Lead Fields',
+'LBL_USER_FIELDS'=>'User Fields',
+'LNK_SAMPLE_EMAIL'=>'View Sample Email',
+//Added while moving Mail Merge templates from Users to Settings
+'LBL_TEMPLATE_FILE'=>'Template File',
+'LBL_MODULENAMES'=>'Module',
+'LBL_LIST_TOOLS'=>'Tools',
+'LBL_DOWNLOAD'=>'Download',
+'LBL_ADD_TEMPLATE'=>'Add Template',
+'LBL_WORD_TEMPLATES'=>'Mail Merge Templates',
+//Added while moving Notification Schedulers from Users to Settings
+'LBL_TASK_NOTIFICATION'=>'Delayed Task Notification',
+'LBL_BIG_DEAL'=>'Big Deal Notification',
+'LBL_PENDING_TICKETS'=>'Pending Tickets Notification',
+'LBL_MANY_TICKETS'=>'Too many tickets  Notification',
+'LBL_START_NOTIFICATION'=>'Support Start Notification',
+'LBL_SUPPORT_NOTICIATION'=>'Support End Notification',
+'LBL_ACTIVITY_NOTIFICATION'=>'Event Reminder Notification',
+
+'LBL_TASK_NOTIFICATION_DESCRITPION'=>'Notify when a task is delayed beyond 24 hrs',
+'LBL_BIG_DEAL_DESCRIPTION'=>'Notify on completion of big deal',
+'LBL_TICKETS_DESCRIPTION'=>'Notify for getting attention to status of tickets which are pending',
+'LBL_MANY_TICKETS_DESCRIPTION'=>'Notify when a particular entity is allocated too many tickets, might reflect Service Level commitments',
+'LBL_START_DESCRIPTION'=>'Notifiy stating the start of support/service',
+'LBL_SUPPORT_DESCRIPTION'=>'Notify when support is about to end',
+'LBL_ACTIVITY_REMINDER_DESCRIPTION'=>'Notify before an event to occur based on the reminder set',
+//Added while moving Inventory Notifications from Users to Settings
+'QuoteNotificationDescription'=>'During quote generation if the product stock in warehouse is lesser than the  quantity mentioned in quote then this notification will be sent to the product handler',
+'SalesOrderNotificationDescription'=>'During sales order generation if the product stock in warehouse is lesser than the quantity mentioned in sales order then this notification will be sent to the product handler',
+'Tools'=>'Tools',
+'QuoteNotification'=>'Product Stock Notification during Quote Generation',
+'SalesOrderNotification'=>'Product Stock Notification during Sales Order Generation',
+'LBL_NOTE_DO_NOT_REMOVE_INFO'=>'Note: Donot remove or alter the values within {  }',
 );
 
 




From vtigercrm-commits at vtiger.fosslabs.com  Mon Dec 11 06:28:15 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 11 Dec 2006 11:28:15 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9955 - in
 /vtigercrm/branches/5.0.3/modules/Settings: EditInventoryNotification.php
 SaveInventoryNotification.php listinventorynotifications.php
Message-ID: <20061211112815.886B0788A1B@vtiger.fosslabs.com>

Author: richie
Date: Mon Dec 11 04:28:06 2006
New Revision: 9955

Log:
Inventory notification moved to settings

Added:
    vtigercrm/branches/5.0.3/modules/Settings/EditInventoryNotification.php   (with props)
    vtigercrm/branches/5.0.3/modules/Settings/SaveInventoryNotification.php   (with props)
    vtigercrm/branches/5.0.3/modules/Settings/listinventorynotifications.php   (with props)




From vtigercrm-commits at vtiger.fosslabs.com  Tue Dec 12 03:01:54 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Dec 2006 08:01:54 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9956 - in
 /vtigercrm/branches/5.0.3: Smarty/templates/Settings/ modules/Settings/
 modules/Users/
Message-ID: <20061212080154.88399788D0F@vtiger.fosslabs.com>

Author: richie
Date: Tue Dec 12 01:01:41 2006
New Revision: 9956

Log:
Notification Scheduler moved to Settings module

Added:
    vtigercrm/branches/5.0.3/modules/Settings/CreateSharingRule.php   (with props)
    vtigercrm/branches/5.0.3/modules/Settings/EditNotification.php
    vtigercrm/branches/5.0.3/modules/Settings/SaveNotification.php   (with props)
    vtigercrm/branches/5.0.3/modules/Settings/listnotificationschedulers.php
Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/Settings/EmailNotification.tpl
    vtigercrm/branches/5.0.3/modules/Settings/SettingsAjax.php
    vtigercrm/branches/5.0.3/modules/Users/UsersAjax.php

Modified: vtigercrm/branches/5.0.3/Smarty/templates/Settings/EmailNotification.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/Settings/EmailNotification.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/Settings/EmailNotification.tpl Tue Dec 12 01:01:41 2006
@@ -47,7 +47,7 @@
 			<!-- DISPLAY -->
 			<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
 			<tr>
-				<td width="50" rowspan="2" valign="top"><img src="{$IMAGE_PATH}notification.gif" alt="Users" width="48" height="48" border=0 title="Users"></td>
+				<td width="50" rowspan="2" valign="top"><img src="{$IMAGE_PATH}notification.gif" alt="Settings" width="48" height="48" border=0 title="Settings"></td>
 				<td colspan="2" class="heading2" valign=bottom align="left"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > {$MOD.NOTIFICATIONSCHEDULERS} </b></td>
 				<td rowspan=2 class="small" align=right>&nbsp;</td>
 			</tr>
@@ -110,7 +110,7 @@
                 'index.php',
                 {queue: {position: 'end', scope: 'command'},
                         method: 'post',
-                        postBody: 'action=UsersAjax&module=Users&file=SaveNotification&active='+active+'&notifysubject='+subject+'&notifybody='+body+'&record='+id,
+                        postBody: 'action=SettingsAjax&module=Settings&file=SaveNotification&active='+active+'&notifysubject='+subject+'&notifybody='+body+'&record='+id,
                         onComplete: function(response) {
                                 $("status").style.display="none";
 				$("notifycontents").innerHTML=response.responseText;
@@ -126,7 +126,7 @@
                 'index.php',
                 {queue: {position: 'end', scope: 'command'},
                         method: 'post',
-                        postBody:'action=UsersAjax&module=Users&file=EditNotification&record='+id,
+                        postBody:'action=SettingsAjax&module=Settings&file=EditNotification&record='+id,
                         onComplete: function(response) {
                                 $("status").style.display="none";
                                 $("editdiv").innerHTML=response.responseText;

Modified: vtigercrm/branches/5.0.3/modules/Settings/SettingsAjax.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Settings/SettingsAjax.php (original)
+++ vtigercrm/branches/5.0.3/modules/Settings/SettingsAjax.php Tue Dec 12 01:01:41 2006
@@ -13,5 +13,22 @@
 {
 	require_once('modules/Settings/'.$_REQUEST['file'].'.php');
 }
-
+if(isset($_REQUEST['orgajax']) && ($_REQUEST['orgajax'] !=''))
+{
+        require_once('modules/Settings/CreateSharingRule.php');
+}
+elseif(isset($_REQUEST['announce_save']) && ($_REQUEST['announce_save'] != ''))
+{
+        $date_var = date('YmdHis');
+        $announcement = $_REQUEST['announcement'];
+        $title = $_REQUEST['title_announcement'];
+        $sql="select * from vtiger_announcement where creatorid=".$current_user->id;
+        $is_announce=$adb->query($sql);
+        if($adb->num_rows($is_announce) > 0)
+                $query="update vtiger_announcement set announcement=".$adb->formatString("vtiger_announcement","announcement",$announcement).",time=".$adb->formatString("vtiger_announcement","time",$date_var).",title='announcement' where creatorid=".$current_user->id;
+        else
+                $query="insert into vtiger_announcement values (".$current_user->id.",".$adb->formatString("vtiger_announcement","announcement",$announcement).",'announcement',".$adb->formatString("vtiger_announcement","time",$date_var).")";
+        $result=$adb->query($query);
+        echo $announcement;
+}
 ?>

Modified: vtigercrm/branches/5.0.3/modules/Users/UsersAjax.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Users/UsersAjax.php (original)
+++ vtigercrm/branches/5.0.3/modules/Users/UsersAjax.php Tue Dec 12 01:01:41 2006
@@ -11,27 +11,8 @@
 
 global $current_user;
 global $adb;
-
 if(isset($_REQUEST['file']) && ($_REQUEST['file'] !=''))
 {
 	require_once('modules/Users/'.$_REQUEST['file'].'.php');
 }
-if(isset($_REQUEST['orgajax']) && ($_REQUEST['orgajax'] !=''))
-{
-	require_once('modules/Users/CreateSharingRule.php');	
-}
-elseif(isset($_REQUEST['announce_save']) && ($_REQUEST['announce_save'] != ''))
-{
-	$date_var = date('YmdHis');
-	$announcement = $_REQUEST['announcement'];
-	$title = $_REQUEST['title_announcement'];
-	$sql="select * from vtiger_announcement where creatorid=".$current_user->id;
-	$is_announce=$adb->query($sql);
-	if($adb->num_rows($is_announce) > 0)
-		$query="update vtiger_announcement set announcement=".$adb->formatString("vtiger_announcement","announcement",$announcement).",time=".$adb->formatString("vtiger_announcement","time",$date_var).",title='announcement' where creatorid=".$current_user->id;
-	else
-		$query="insert into vtiger_announcement values (".$current_user->id.",".$adb->formatString("vtiger_announcement","announcement",$announcement).",'announcement',".$adb->formatString("vtiger_announcement","time",$date_var).")";
-	$result=$adb->query($query);
-	echo $announcement;
-}
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Tue Dec 12 05:20:12 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Dec 2006 10:20:12 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9957 - in
 /vtigercrm/branches/5.0.3: ./ Smarty/templates/ modules/Settings/
Message-ID: <20061212102012.02E2978972D@vtiger.fosslabs.com>

Author: richie
Date: Tue Dec 12 03:19:59 2006
New Revision: 9957

Log:
Mail Merge templates moved to settings module

Added:
    vtigercrm/branches/5.0.3/modules/Settings/deletewordtemplate.php   (with props)
    vtigercrm/branches/5.0.3/modules/Settings/listwordtemplates.php
    vtigercrm/branches/5.0.3/modules/Settings/mailmergedownloadfile.php   (with props)
    vtigercrm/branches/5.0.3/modules/Settings/savewordtemplate.php   (with props)
    vtigercrm/branches/5.0.3/modules/Settings/upload.php   (with props)
Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/CreateWordTemplate.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/Settings.tpl
    vtigercrm/branches/5.0.3/index.php

Modified: vtigercrm/branches/5.0.3/Smarty/templates/CreateWordTemplate.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/CreateWordTemplate.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/CreateWordTemplate.tpl Tue Dec 12 03:19:59 2006
@@ -22,14 +22,14 @@
 
 				<!-- DISPLAY -->
 				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
-				<form action="index.php?module=Users&action=add2db" method="post" enctype="multipart/form-data">
+				<form action="index.php?module=Settings&action=savewordtemplate" method="post" enctype="multipart/form-data">
 				<input type="hidden" name="return_module" value="Settings">
 				<input type="hidden" name="parenttab" value="{$PARENTTAB}">
 				<input type="hidden" name="MAX_FILE_SIZE" value="{$MAX_FILE_SIZE}">
 				<input type="hidden" name="action">
 				<tr>
-					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}mailmarge.gif" alt="Users" width="48" height="48" border=0 title="Users"></td>
-					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings">{$UMOD.LBL_WORD_TEMPLATES}</a> > {$UMOD.LBL_NEW_TEMPLATE} </b></td>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}mailmarge.gif" alt="Settings" width="48" height="48" border=0 title="Settings"></td>
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Settings&action=listwordtemplates&parenttab=Settings">{$UMOD.LBL_WORD_TEMPLATES}</a> > {$UMOD.LBL_NEW_TEMPLATE} </b></td>
 				</tr>
 				<tr>
 					<td valign=top class="small">{$MOD.LBL_MAIL_MERGE_DESC}</td>
@@ -45,7 +45,7 @@
 					<tr>
 						<td class="big"><strong>{$UMOD.LBL_NEW_TEMPLATE}</strong><br>{$ERRORFLAG}</br></td>
 						<td class="small" align=right>
-							<input title="{$APP.LBL_SAVE_BUTTON_LABEL}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" type="submit" tabindex="4" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}" onclick="this.form.action.value='add2db'; this.form.parenttab.value='Settings'" class="crmButton small save" />&nbsp;
+							<input title="{$APP.LBL_SAVE_BUTTON_LABEL}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" type="submit" tabindex="4" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}" onclick="this.form.action.value='savewordtemplate'; this.form.parenttab.value='Settings'" class="crmButton small save" />&nbsp;
 							&nbsp;<input title="{$APP.LBL_CANCEL_BUTTON_LABEL}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" tabindex="5"  onclick="window.history.back()" type="button" name="button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" class="crmButton small cancel" />
 						</td>
 					</tr>
@@ -66,10 +66,10 @@
 						<td valign=top class="small cellLabel"><strong>{$UMOD.LBL_MODULENAMES}</strong></td>
 						<td class="cellText small" valign=top>
 						<select name="target_module" size=1 class="small" tabindex="3">
-							<option value="Leads">{$APP.COMBO_LEADS}</option>	
-							<option value="Accounts">{$APP.COMBO_ACCOUNTS}</option>	
-							<option value="Contacts">{$APP.COMBO_CONTACTS}</option>	
-							<option value="HelpDesk">{$APP.COMBO_HELPDESK}</option>	
+						<option value="Leads" {$LEADS_SELECTED}>{$APP.COMBO_LEADS}</option>
+						<option value="Accounts" {$ACCOUNTS_SELECTED}>{$APP.COMBO_ACCOUNTS}</option>
+						<option value="Contacts" {$CONTACTS_SELECTED}>{$APP.COMBO_CONTACTS}</option>
+						<option value="HelpDesk" {$HELPDESK_SELECTED}>{$APP.COMBO_HELPDESK}</option>
 			                      </select>
 						</td>
 					  </tr>

Modified: vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl Tue Dec 12 03:19:59 2006
@@ -104,7 +104,7 @@
 		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=listnotificationschedulers&parenttab=Settings">{$MOD.NOTIFICATIONSCHEDULERS}</a></td></tr>
 		{/if}
 				
-		{if $smarty.request.action eq 'listinventorynotifications' || $smarty.request.action eq 'UsersAjax'}
+		{if $smarty.request.action eq 'listinventorynotifications' || $smarty.request.action eq 'SettingsAjax'}
 		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Settings&action=listinventorynotifications&parenttab=Settings">{$MOD.INVENTORYNOTIFICATION}</a></td></tr>
 		{else}	
 		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=listinventorynotifications&parenttab=Settings">{$MOD.INVENTORYNOTIFICATION}</a></td></tr>
@@ -161,7 +161,7 @@
 		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=ProxyServerConfig&parenttab=Settings">{$MOD.LBL_PROXY_SETTINGS}</a></td></tr>
 		{/if}
 
-		{if  $smarty.request.action eq 'Announcements' ||  $smarty.request.action eq 'UsersAjax' }
+		{if  $smarty.request.action eq 'Announcements' ||  $smarty.request.action eq 'SettingsAjax' }
 		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Settings&action=Announcements&parenttab=Settings">{$MOD.LBL_ANNOUNCEMENT}</a></td></tr>		
 		{else}
 		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=Announcements&parenttab=Settings">{$MOD.LBL_ANNOUNCEMENT}</a></td></tr>

Modified: vtigercrm/branches/5.0.3/Smarty/templates/Settings.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/Settings.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/Settings.tpl Tue Dec 12 03:19:59 2006
@@ -68,8 +68,8 @@
 					<!-- icon 3-->
 						<table border=0 cellspacing=0 cellpadding=5 width=100%>
 						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Users&action=ListProfiles&parenttab=Settings"><img src="{$IMAGE_PATH}ico-profile.gif" alt="{$MOD.LBL_PROFILES}" width="48" height="48" border=0 title="{$MOD.LBL_PROFILES}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Users&action=ListProfiles&parenttab=Settings">{$MOD.LBL_PROFILES}</a></td>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=ListProfiles&parenttab=Settings"><img src="{$IMAGE_PATH}ico-profile.gif" alt="{$MOD.LBL_PROFILES}" width="48" height="48" border=0 title="{$MOD.LBL_PROFILES}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=ListProfiles&parenttab=Settings">{$MOD.LBL_PROFILES}</a></td>
 						</tr>
 
 						<tr>
@@ -82,8 +82,8 @@
 						<table border=0 cellspacing=0 cellpadding=5 width=100%>
 
 						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Users&action=listgroups&parenttab=Settings"><img src="{$IMAGE_PATH}ico-groups.gif" alt="{$MOD.USERGROUPLIST}" width="48" height="48" border=0 title="{$MOD.USERGROUPLIST}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Users&action=listgroups&parenttab=Settings">{$MOD.USERGROUPLIST}</a></td>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=listgroups&parenttab=Settings"><img src="{$IMAGE_PATH}ico-groups.gif" alt="{$MOD.USERGROUPLIST}" width="48" height="48" border=0 title="{$MOD.USERGROUPLIST}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=listgroups&parenttab=Settings">{$MOD.USERGROUPLIST}</a></td>
 						</tr>
 						<tr>
 							<td class="small" valign=top>{$MOD.LBL_GROUP_DESCRIPTION}</td>
@@ -98,9 +98,9 @@
 					<!-- icon 5-->
 						<table border=0 cellspacing=0 cellpadding=5 width=100%>
 						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Users&action=OrgSharingDetailView&parenttab=Settings"><img src="{$IMAGE_PATH}shareaccess.gif" alt="{$MOD.LBL_SHARING_ACCESS}" width="48" height="48" border=0 title="{$MOD.LBL_SHARING_ACCESS}"></a></td>
-
-							<td class=big valign=top><a href="index.php?module=Users&action=OrgSharingDetailView&parenttab=Settings">{$MOD.LBL_SHARING_ACCESS}</a></td>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=OrgSharingDetailView&parenttab=Settings"><img src="{$IMAGE_PATH}shareaccess.gif" alt="{$MOD.LBL_SHARING_ACCESS}" width="48" height="48" border=0 title="{$MOD.LBL_SHARING_ACCESS}"></a></td>
+
+							<td class=big valign=top><a href="index.php?module=Settings&action=OrgSharingDetailView&parenttab=Settings">{$MOD.LBL_SHARING_ACCESS}</a></td>
 						</tr>
 						<tr>
 							<td class="small" valign=top>{$MOD.LBL_SHARING_ACCESS_DESCRIPTION}</td>
@@ -112,8 +112,8 @@
 					<!-- icon 6 -->
 						<table border=0 cellspacing=0 cellpadding=5 width=100%>
 						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Users&action=DefaultFieldPermissions&parenttab=Settings"><img src="{$IMAGE_PATH}orgshar.gif" alt="Fields to be shown" width="48" height="48" border=0 title="Fields to be shown"></a></td>
-							<td class=big valign=top><a href="index.php?module=Users&action=DefaultFieldPermissions&parenttab=Settings">{$MOD.LBL_FIELDS_ACCESS}</a></td>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=DefaultFieldPermissions&parenttab=Settings"><img src="{$IMAGE_PATH}orgshar.gif" alt="Fields to be shown" width="48" height="48" border=0 title="Fields to be shown"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=DefaultFieldPermissions&parenttab=Settings">{$MOD.LBL_FIELDS_ACCESS}</a></td>
 						</tr>
 						<tr>
 							<td class="small" valign=top>{$MOD.LBL_SHARING_FIELDS_DESCRIPTION}</td>
@@ -125,8 +125,8 @@
 					<!-- icon 7-->
 						<table border=0 cellspacing=0 cellpadding=5 width=100%>
 						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Users&action=AuditTrailList&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}audit.gif" alt="{$MOD.LBL_AUDIT_TRAIL}" title="{$MOD.LBL_AUDIT_TRAIL}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Users&action=AuditTrailList&parenttab=Settings">{$MOD.LBL_AUDIT_TRAIL}</a></td>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=AuditTrailList&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}audit.gif" alt="{$MOD.LBL_AUDIT_TRAIL}" title="{$MOD.LBL_AUDIT_TRAIL}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=AuditTrailList&parenttab=Settings">{$MOD.LBL_AUDIT_TRAIL}</a></td>
 						</tr>
 
 						<tr>
@@ -140,8 +140,8 @@
 					<!-- icon 8-->	
 						<table border=0 cellspacing=0 cellpadding=5 width=100%>
 						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Users&action=ListLoginHistory&parenttab=Settings"><img src="{$IMAGE_PATH}set-IcoLoginHistory.gif" alt="{$MOD.LBL_LOGIN_HISTORY_DETAILS}" width="48" height="48" border=0 title="{$MOD.LBL_LOGIN_HISTORY_DETAILS}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Users&action=ListLoginHistory&parenttab=Settings">{$MOD.LBL_LOGIN_HISTORY_DETAILS}</a></td>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=ListLoginHistory&parenttab=Settings"><img src="{$IMAGE_PATH}set-IcoLoginHistory.gif" alt="{$MOD.LBL_LOGIN_HISTORY_DETAILS}" width="48" height="48" border=0 title="{$MOD.LBL_LOGIN_HISTORY_DETAILS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=ListLoginHistory&parenttab=Settings">{$MOD.LBL_LOGIN_HISTORY_DETAILS}</a></td>
 						</tr>
 						<tr>
 							<td class="small" valign=top>{$MOD.LBL_LOGIN_HISTORY_DESCRIPTION}</td>
@@ -192,8 +192,8 @@
 						<table border=0 cellspacing=0 cellpadding=5 width=100%>
 						<tr>
 
-							<td rowspan=2 valign=top><a href="index.php?module=Users&action=PickList&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}picklist.gif" alt="{$MOD.LBL_PICKLIST_EDITOR}" title="{$MOD.LBL_PICKLIST_EDITOR}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Users&action=PickList&parenttab=Settings">{$MOD.LBL_PICKLIST_EDITOR}</a></td>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=PickList&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}picklist.gif" alt="{$MOD.LBL_PICKLIST_EDITOR}" title="{$MOD.LBL_PICKLIST_EDITOR}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=PickList&parenttab=Settings">{$MOD.LBL_PICKLIST_EDITOR}</a></td>
 						</tr>
 						<tr>
 							<td class="small" valign=top>{$MOD.LBL_PICKLIST_DESCRIPTION}</td>	
@@ -455,8 +455,8 @@
 					<!-- icon 9-->	
 					<table border=0 cellspacing=0 cellpadding=5 width=100%>
 					<tr>
-						<td rowspan=2 valign=top><a href="index.php?module=Users&action=DefModuleView&parenttab=Settings"><img src="{$IMAGE_PATH}set-IcoTwoTabConfig.gif" alt="{$MOD.LBL_DEFAULT_MODULE_VIEW}" width="48" height="48" border=0 title="{$MOD.LBL_DEFAULT_MODULE_VIEW}"></a></td>
-						<td class=big valign=top><a href="index.php?module=Users&action=DefModuleView&parenttab=Settings">{$MOD.LBL_DEFAULT_MODULE_VIEW}</a></td>
+						<td rowspan=2 valign=top><a href="index.php?module=Settings&action=DefModuleView&parenttab=Settings"><img src="{$IMAGE_PATH}set-IcoTwoTabConfig.gif" alt="{$MOD.LBL_DEFAULT_MODULE_VIEW}" width="48" height="48" border=0 title="{$MOD.LBL_DEFAULT_MODULE_VIEW}"></a></td>
+						<td class=big valign=top><a href="index.php?module=Settings&action=DefModuleView&parenttab=Settings">{$MOD.LBL_DEFAULT_MODULE_VIEW}</a></td>
 					</tr>
 					<tr>
 						<td class="small" valign=top>{$MOD.LBL_DEFAULT_MODULE_VIEW_DESC}</td>
@@ -478,8 +478,8 @@
 			<table border=0 cellspacing=0 cellpadding=5 width=100%>
 			<tr>
 
-			<td rowspan=2 valign=top><a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}terms.gif" alt="{$MOD.INVENTORYTERMSANDCONDITIONS}" title="{$MOD.INVENTORYTERMSANDCONDITIONS}"></a></td>
-			<td class=big valign=top><a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings">{$MOD.LBL_INVENTORY_TANDC}</a></td>
+			<td rowspan=2 valign=top><a href="index.php?module=Settings&action=OrganizationTermsandConditions&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}terms.gif" alt="{$MOD.INVENTORYTERMSANDCONDITIONS}" title="{$MOD.INVENTORYTERMSANDCONDITIONS}"></a></td>
+			<td class=big valign=top><a href="index.php?module=Settings&action=OrganizationTermsandConditions&parenttab=Settings">{$MOD.LBL_INVENTORY_TANDC}</a></td>
 			</tr>
 			<tr>
 			<td class="small" valign=top>{$MOD.LBL_INV_TANDC_DESCRIPTION}</td>

Modified: vtigercrm/branches/5.0.3/index.php
==============================================================================
--- vtigercrm/branches/5.0.3/index.php (original)
+++ vtigercrm/branches/5.0.3/index.php Tue Dec 12 03:19:59 2006
@@ -280,7 +280,10 @@
 		ereg("^RecalculateSharingRules",$action) ||
 		(ereg("^body",$action) && ereg("^Webmails",$module)) ||
 		(ereg("^dlAttachments",$action) && ereg("^Webmails",$module)) ||
-		(ereg("^DetailView",$action) &&	ereg("^Webmails",$module) ))
+		(ereg("^DetailView",$action) &&	ereg("^Webmails",$module) ) ||
+		ereg("^savewordtemplate",$action))
+	
+		
 	{
 		$skipHeaders=true;
 		//skip headers for all these invocations as they are mostly popups




From vtigercrm-commits at vtiger.fosslabs.com  Tue Dec 12 07:15:00 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Dec 2006 12:15:00 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9958 - in
 /vtigercrm/branches/5.0.3: Smarty/templates/ modules/Settings/
Message-ID: <20061212121500.5535D789BA3@vtiger.fosslabs.com>

Author: richie
Date: Tue Dec 12 05:14:47 2006
New Revision: 9958

Log:
Email templates moved to settings module

Added:
    vtigercrm/branches/5.0.3/modules/Settings/createemailtemplate.php
    vtigercrm/branches/5.0.3/modules/Settings/deleteemailtemplate.php   (with props)
    vtigercrm/branches/5.0.3/modules/Settings/detailviewemailtemplate.php
    vtigercrm/branches/5.0.3/modules/Settings/editemailtemplate.php
    vtigercrm/branches/5.0.3/modules/Settings/listemailtemplates.php
    vtigercrm/branches/5.0.3/modules/Settings/saveemailtemplate.php   (with props)
Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/CreateEmailTemplate.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/DetailViewEmailTemplate.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/ListEmailTemplates.tpl

Modified: vtigercrm/branches/5.0.3/Smarty/templates/CreateEmailTemplate.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/CreateEmailTemplate.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/CreateEmailTemplate.tpl Tue Dec 12 05:14:47 2006
@@ -135,15 +135,15 @@
 				<form action="index.php" method="post" name="templatecreate" onsubmit="return check4null(templatecreate);">  
 				<input type="hidden" name="action">
 				<input type="hidden" name="mode" value="{$EMODE}">
-				<input type="hidden" name="module" value="Users">
+				<input type="hidden" name="module" value="Settings">
 				<input type="hidden" name="templateid" value="{$TEMPLATEID}">
 				<input type="hidden" name="parenttab" value="PARENTTAB}">
 				<tr>
-					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}ViewTemplate.gif" alt="Users" width="45" height="60" border=0 title="Users"></td>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}ViewTemplate.gif" alt="Settings" width="45" height="60" border=0 title="Settings"></td>
 				{if $EMODE eq 'edit'}
-					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings">{$UMOD.LBL_EMAIL_TEMPLATES}</a> &gt; {$MOD.LBL_EDIT} &quot;{$TEMPLATENAME}&quot; </b></td>
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Settings&action=listemailtemplates&parenttab=Settings">{$UMOD.LBL_EMAIL_TEMPLATES}</a> &gt; {$MOD.LBL_EDIT} &quot;{$TEMPLATENAME}&quot; </b></td>
 				{else}
-					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings">{$UMOD.LBL_EMAIL_TEMPLATES}</a> &gt; {$MOD.LBL_CREATE_EMAIL_TEMPLATES} </b></td>
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Settings&action=listemailtemplates&parenttab=Settings">{$UMOD.LBL_EMAIL_TEMPLATES}</a> &gt; {$MOD.LBL_CREATE_EMAIL_TEMPLATES} </b></td>
 				{/if}
 					
 				</tr>

Modified: vtigercrm/branches/5.0.3/Smarty/templates/DetailViewEmailTemplate.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/DetailViewEmailTemplate.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/DetailViewEmailTemplate.tpl Tue Dec 12 05:14:47 2006
@@ -24,14 +24,14 @@
 				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
 		    		<form method="post" action="index.php" name="etemplatedetailview">  
 				<input type="hidden" name="action" value="editemailtemplate">
-				<input type="hidden" name="module" value="Users">
+				<input type="hidden" name="module" value="Settings">
 				<input type="hidden" name="templatename" value="{$TEMPLATENAME}">
 				<input type="hidden" name="templateid" value="{$TEMPLATEID}">
 				<input type="hidden" name="foldername" value="{$FOLDERNAME}">
 				<input type="hidden" name="parenttab" value="{$PARENTTAB}">
 				<tr>
 					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}ViewTemplate.gif" width="45" height="60" border=0 ></td>
-					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings">{$UMOD.LBL_EMAIL_TEMPLATES}</a> &gt; {$MOD.LBL_VIEWING} &quot;{$TEMPLATENAME}&quot; </b></td>
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Settings&action=listemailtemplates&parenttab=Settings">{$UMOD.LBL_EMAIL_TEMPLATES}</a> &gt; {$MOD.LBL_VIEWING} &quot;{$TEMPLATENAME}&quot; </b></td>
 				</tr>
 				<tr>
 					<td valign=top class="small">{$UMOD.LBL_EMAIL_TEMPLATE_DESC}</td>

Modified: vtigercrm/branches/5.0.3/Smarty/templates/ListEmailTemplates.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/ListEmailTemplates.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/ListEmailTemplates.tpl Tue Dec 12 05:14:47 2006
@@ -90,7 +90,7 @@
        {rdelim}
 		if(confirm("Are you sure you want to delete the selected "+xx+" records ?"))
 		{ldelim}
-	        document.massdelete.action="index.php?module=Users&action=deleteemailtemplate&return_module=Users&return_action=listemailtemplates";
+	        document.massdelete.action="index.php?module=Settings&action=deleteemailtemplate&return_module=Settings&return_action=listemailtemplates";
 		{rdelim}
 		else
 		{ldelim}
@@ -113,7 +113,7 @@
 				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
 				<form  name="massdelete" method="POST">
 	    			<input name="idlist" type="hidden">
-    				<input name="module" type="hidden" value="Users">
+    				<input name="module" type="hidden" value="Settings">
     				<input name="action" type="hidden" value="deleteemailtemplate">
 				<tr>
 					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}ViewTemplate.gif" width="45" height="60" border=0></td>
@@ -156,11 +156,11 @@
 						<td class="listTableRow small" valign=top>{$smarty.foreach.emailtemplate.iteration}</td>
 						<td class="listTableRow small" valign=top><input type="checkbox" name="selected_id" value="{$template.templateid}" onClick="ifselected(); " class=small></td>
 						<td class="listTableRow small" valign=top>
-							<a href="index.php?module=Users&action=detailviewemailtemplate&parenttab=Settings&templateid={$template.templateid}" ><b>{$template.templatename}</b></a>
+							<a href="index.php?module=Settings&action=detailviewemailtemplate&parenttab=Settings&templateid={$template.templateid}" ><b>{$template.templatename}</b></a>
 						</td>
 						<td class="listTableRow small" valign=top>{$template.description}&nbsp;</td>
 					        <td class="listTableRow small" valign=top>
-							<a href="index.php?module=Users&action=detailviewemailtemplate&parenttab=Settings&templateid={$template.templateid}">{$UMOD.LNK_SAMPLE_EMAIL}</a>
+							<a href="index.php?module=Settings&action=detailviewemailtemplate&parenttab=Settings&templateid={$template.templateid}">{$UMOD.LNK_SAMPLE_EMAIL}</a>
 						</td>
 					</tr>
 					{/foreach}	




From vtigercrm-commits at vtiger.fosslabs.com  Tue Dec 12 09:44:20 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Dec 2006 14:44:20 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9959 - in
 /vtigercrm/branches/5.0.3: Smarty/templates/DetailViewUI.tpl
 include/utils/EditViewUtils.php
Message-ID: <20061212144420.7DEE5788CE6@vtiger.fosslabs.com>

Author: richie
Date: Tue Dec 12 07:44:13 2006
New Revision: 9959

Log:
ajax edit broken for other languages

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl
    vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php

Modified: vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl Tue Dec 12 07:44:13 2006
@@ -1,286 +1,286 @@
-{*<!--
-
-/*********************************************************************************
-** The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
-*
- ********************************************************************************/
-
--->*}
-
-<!-- This file is used to display the fields based on the ui type in detailview -->
-		{if $keyid eq '1' || $keyid eq 2 || $keyid eq '11' || $keyid eq '7' || $keyid eq '9' || $keyid eq '55' || $keyid eq '71' || $keyid eq '72' || $keyid eq '103'} <!--TextBox-->
-                                         		<td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">
-                                         		      {if $keyid eq '55'}<!--SalutationSymbol-->
-                                         		            {$keysalut}
-                                         		      {*elseif $keyid eq '71' || $keyid eq '72'}  <!--CurrencySymbol-->
-                                         		            {$keycursymb*}
-                                                        {/if}
-                                                       &nbsp;&nbsp;<span id="dtlview_{$label}">{$keyval}</span>
-                                              		<div id="editarea_{$label}" style="display:none;">
-                                              		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="{$keyfldname}" maxlength='100' value="{$keyval}"></input>
-                                              		  <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
-                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
-                                                       </div>
-                                                  </td>
-                                             {elseif $keyid eq '13' || $keyid eq '104'} <!--Email-->
-                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="mailto:{$keyval}" target="_blank">{$keyval}</a></span>
-                                              		<div id="editarea_{$label}" style="display:none;">
-                                              		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="{$keyfldname}" maxlength='100' value="{$keyval}"></input>
-                                              		  <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
-                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
-                                                       </div>
-                                                  </td>
-						<!-- uitype 111 added for noneditable existing picklist values - ahmed -->
-                                             {elseif $keyid eq '15' || $keyid eq '16' || $keyid eq '111'} <!--ComboBox-->
-               							<td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}</span>
-                                              		<div id="editarea_{$label}" style="display:none;">
-                    							   <select id="txtbox_{$label}" name="{$keyfldname}">
-                    								{foreach item=arr from=$keyoptions}
-                    									{foreach key=sel_value item=value from=$arr}
-                    										<option value="{$sel_value}" {$value}>{if $APP.$sel_value}{$APP.$sel_value}{else}{$sel_value}{/if}</option>
-                    									
-                    									{/foreach}
-                    								{/foreach}
-                    							   </select>
-                    							   <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
-                                              		   <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
-                    							</div>
-               							</td>
-                                          {elseif $keyid eq '33'}<!--Multi Select Combo box-->
-						<!--code given by Neil start Ref:http://forums.vtiger.com/viewtopic.php?p=31096#31096-->
-						{assign var="MULTISELECT_COMBO_BOX_ITEM_SEPARATOR_STRING" value=", "}  {* Separates Multi-Select Combo Box items *}
-						{assign var="DETAILVIEW_WORDWRAP_WIDTH" value="70"} {* No. of chars for word wrapping long lines of Multi-Select Combo Box items *}
-                                          <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">
-						{$keyval|replace:$MULTISELECT_COMBO_BOX_ITEM_SEPARATOR_STRING:"\x1"|replace:" ":"\x0"|replace:"\x1":$MULTISELECT_COMBO_BOX_ITEM_SEPARATOR_STRING|wordwrap:$DETAILVIEW_WORDWRAP_WIDTH:"<br>&nbsp;"|replace:"\x0":"&nbsp;"}
-						</span>
-						<!--code given by Neil End-->
-                                          <div id="editarea_{$label}" style="display:none;">
-                                          <select MULTIPLE id="txtbox_{$label}" name="{$keyfldname}" size="4" style="width:160px;">
-				                                    {foreach item=arr from=$keyoptions}
-					                                     {foreach key=sel_value item=value from=$arr}
-						                                      <option value="{$sel_value}" {$value}>{$sel_value}</option>
-					                                     {/foreach}
-				                                    {/foreach}
-			                                   </select>
-			                                   <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
-                                              		   <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
-                    							</div>
-               							</td>
-						{elseif $keyid eq '115'} <!--ComboBox Status edit only for admin Users-->
-								{if $keyadmin eq 1}
-               							<td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}</span>
-                                              		<div id="editarea_{$label}" style="display:none;">
-                    							   <select id="txtbox_{$label}" name="{$keyfldname}">
-                    								{foreach item=arr from=$keyoptions}
-                    									{foreach key=sel_value item=value from=$arr}
-                    										<option value="{$sel_value}" {$value}>{$sel_value}</option>
-                    									{/foreach}
-                    								{/foreach}
-                    							   </select>
-                    							   <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
-                                              		   <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
-                    							</div>
-								{else}
-               							<td width=25% class="dvtCellInfo" align="left">{$keyval}
-								{/if}	
-								
-               							</td>
-						{elseif $keyid eq '116'} <!--ComboBox currency id edit only for admin Users-->
-								{if $keyadmin eq 1}
-               							<td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}</span>
-								<div id="editarea_{$label}" style="display:none;">
-                    							   <select id="txtbox_{$label}" name="{$keyfldname}">
-									{foreach item=arr key=uivalueid from=$keyoptions}
-									{foreach key=sel_value item=value from=$arr}
-										<option value="{$uivalueid}" {$value}>{$sel_value}</option>	
-									{/foreach}
-									{/foreach}
-                    							   </select>
-                    							   <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
-                                              		   <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
-                    							</div>
-								{else}
-               							<td width=25% class="dvtCellInfo" align="left">{$keyval}
-								{/if}	
-
-                                        		
-               							</td>
-                                             {elseif $keyid eq '17'} <!--WebSite-->
-                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="http://{$keyval}" target="_blank">{$keyval}</a></span>
-                                              		<div id="editarea_{$label}" style="display:none;">
-                                              		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="{$keyfldname}" maxlength='100' value="{$keyval}"></input>
-                                              		  <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
-                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
-                                                       </div>
-                                                  </td>
-					     {elseif $keyid eq '85'}<!--Skype-->
-                                                <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<img src="{$IMAGE_PATH}skype.gif" alt="Skype" title="Skype" LANGUAGE=javascript align="absmiddle"></img><span id="dtlview_{$label}"><a href="skype:{$keyval}?call">{$keyval}</a></span>
-                                                        <div id="editarea_{$label}" style="display:none;">
-                                                          <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="{$keyfldname}" maxlength='100' value="{$keyval}"></input>
-                                                          <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
-                                                          <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
-                                                       </div>
-                                                  </td>	
-                                             {elseif $keyid eq '19' || $keyid eq '20'} <!--TextArea/Description-->
-						<!-- we will empty the value of ticket and faq comment -->
-						{if $label eq $MOD.LBL_ADD_COMMENT}
-							{assign var=keyval value=''}
-						{/if}
-							<!--{assign var="DESCRIPTION_SEPARATOR_STRING" value=" "}  {* Separates Description *}-->
-							<!--{assign var="DESCRIPTION_WORDWRAP_WIDTH" value="70"} {* No. of chars for word wrapping long lines of Description *}-->
-                                                  <td width=100% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">
-							{$keyval}<!--|replace:$DESCRIPTION_SEPARATOR_STRING:"\x1"|replace:" ":"\x0"|replace:"\x1":$DESCRIPTION_SEPARATOR_STRING|wordwrap:$DESCRIPTION_WORDWRAP_WIDTH:"<br>&nbsp;"|replace:"\x0":"&nbsp;"}-->
-							</span>
-                                              		<div id="editarea_{$label}" style="display:none;">
-                                              		  <textarea id="txtbox_{$label}" name="{$keyfldname}"  class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'"onBlur="this.className='detailedViewTextBox'" cols="90" rows="8">{$keyval}</textarea>                                            		  
-                                              		  <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
-                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
-                                                       </div>
-                                                  </td>
-                                             {elseif $keyid eq '21' || $keyid eq '24' || $keyid eq '22'} <!--TextArea/Street-->
-                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}</span>
-                                              		<div id="editarea_{$label}" style="display:none;">
-                                              		  <textarea id="txtbox_{$label}" name="{$keyfldname}"  class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'"onBlur="this.className='detailedViewTextBox'" rows=2>{$keyval}</textarea>                                            		  
-                                              		  <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
-                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
-                                                       </div>
-                                                  </td>
-                                             {elseif $keyid eq '50' || $keyid eq '73' || $keyid eq '51'} <!--AccountPopup-->
-                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}">&nbsp;<a href="{$keyseclink}">{$keyval}</a>
-                                                  </td>
-                                             {elseif $keyid eq '57'} <!--ContactPopup-->
-                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
-                                              		<div id="editarea_{$label}" style="display:none;">                                              		  
-                                                         <input id="popuptxt_{$label}" name="contact_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=602,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.contact_id.value=''; this.form.contact_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
-                                                         <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
-                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
-                                                       </div>
-                                                  </td>                                                  
-                                             {elseif $keyid eq '59'} <!--ProductPopup-->
-                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
-                                              		<div id="editarea_{$label}" style="display:none;">                                              		  
-                                                         <input id="popuptxt_{$label}" name="product_name" readonly type="text" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Products&action=Popup&html=Popup_picker&form=HelpDeskEditView&popuptype=specific","test","width=600,height=602,resizable=1,scrollbars=1,top=150,left=200");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.product_id.value=''; this.form.product_name.value=''; return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
-                                                         <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
-                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
-                                                       </div>
-                                                  </td>
-                                             {elseif $keyid eq '75' || $keyid eq '81'} <!--VendorPopup-->
-                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}">&nbsp;<a href="{$keyseclink}">{$keyval}</a>
-                                                  </td>
-                                             {elseif $keyid eq 76} <!--PotentialPopup-->
-                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}">&nbsp;<a href="{$keyseclink}">{$keyval}</a>
-                                                  </td>
-                                             {elseif $keyid eq 78} <!--QuotePopup-->
-                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}">&nbsp;<a href="{$keyseclink}">{$keyval}</a>
-                                                  </td>
-                                             {elseif $keyid eq 82} <!--Email Body-->
-                                                  <td colspan="3" width=100% class="dvtCellInfo" align="left"><div id="dtlview_{$label}" style="width:100%;height:200px;overflow:hidden;border:1px solid gray" class="detailedViewTextBox" onmouseover="this.className='detailedViewTextBoxOn'" onmouseout="this.className='detailedViewTextBox'">{$keyval}</div>
-                                                  </td>
-                                             {elseif $keyid eq 80} <!--SalesOrderPopup-->
-                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}">&nbsp;<a href="{$keyseclink}">{$keyval}</a>
-                                                  </td>
-					     {elseif $keyid eq '53'} <!--Assigned To-->
-                    				  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">
-                    				{if $keyoptions.0 eq 'User' && $keyadmin eq 1}
-			                        	<a href="{$keyseclink.0}">{$keyval}</a>         
-			                        {elseif $keyoptions.0 eq 'Group' && $keyadmin eq 1}
-                        				<a href="{$keyseclink.1}">{$keyval}</a>         
-						{else}	
-                        				{$keyval}
-                    				{/if}
-					&nbsp;</span>
-                    				<div id="editarea_{$label}" style="display:none;">
-			                   	<input type="hidden" id="hdtxt_{$label}" value="{$keyval}"></input>
-						{if $keyoptions.0 eq 'User'}
-							<input name="assigntype" id="assigntype" checked="checked" value="U" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;{$APP.LBL_USER}
-							{if $keyoptions.2 neq ''}
-								<input name="assigntype" id="assigntype" value="T" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;{$APP.LBL_GROUP_NAME}
-							{/if}
-							<span id="assign_user" style="display: block;">
-						{else}
-							<input name="assigntype" id="assigntype" value="U" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;{$APP.LBL_USER}
-							<input name="assigntype" checked="checked" id="assigntype" value="T" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;{$APP.LBL_GROUP_NAME}
-							<span id="assign_user" style="display: none;">
-						{/if}
-                   				<select id="txtbox_U{$label}" onchange="setSelectValue('{$label}')" name="{$keyfldname}">
-				                    {foreach item=arr key=id from=$keyoptions.1}
-				                    	{foreach key=sel_value item=value from=$arr}
-                       						 <option value="{$id}" {$value}>{$sel_value}</option>
-				                        {/foreach}
-				                    {/foreach}
-			                    	</select>
-						</span>
-					{if $keyoptions.0 eq 'Group'}
-						<span id="assign_team" style="display: block;">
-					{else}
-						<span id="assign_team" style="display: none;">
-					{/if}
-                   	<select id="txtbox_G{$label}" onchange="setSelectValue('{$label}')" name="{$keyfldname}">
-                    {foreach item=arr key=id from=$keyoptions.2}
-                    	{foreach key=sel_value item=value from=$arr}
-                       		 <option value="{$id}" {$value}>{$sel_value}</option>
-                        {/foreach}
-                    {/foreach}
-                    </select>
-					</span>
-
-                    <br>
-                    <input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> {$APP.LBL_OR}
-                    <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
-                    </div>
-                    </td>
-						{elseif $keyid eq '99'}<!-- Password Field-->
-						<td width=25% class="dvtCellInfo" align="left">{$CHANGE_PW_BUTTON}</td>	
-					    {elseif $keyid eq '56'} <!--CheckBox--> 
-                      <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onMouseOver="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}&nbsp;</span>
-                    	<div id="editarea_{$label}" style="display:none;">
-                        {if $keyval eq 'yes'}                                              		  
-                            <input id="txtbox_{$label}" name="{$keyfldname}" type="checkbox" style="border:1px solid #bababa;" checked value="1">
-                        {else}
-                          <input id="txtbox_{$label}" type="checkbox" name="{$keyfldname}" style="border:1px solid #bababa;" value="0">
-                       	{/if}
-                         <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> {$APP.LBL_OR}
-                          <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
-                        </div>
-                        </td>    
-			{elseif $keyid eq '156'} <!--CheckBox for is admin-->
-			{if $smarty.request.record neq $CURRENT_USERID && $keyadmin eq 1} 
-                      <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onMouseOver="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}&nbsp;</span>
-                    	<div id="editarea_{$label}" style="display:none;">
-                        {if $keyval eq 'on'}                                              		  
-                            <input id="txtbox_{$label}" name="{$keyfldname}" type="checkbox" style="border:1px solid #bababa;" checked value="1">
-                        {else}
-                          <input id="txtbox_{$label}" type="checkbox" name="{$keyfldname}" style="border:1px solid #bababa;" value="0">
-                       	{/if}
-                         <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> {$APP.LBL_OR}
-                          <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
-                        </div>
-			{else}
-				 <td width=25% class="dvtCellInfo" align="left">{$keyval}
-			{/if}
-                        </td>    
-			 
-						{elseif $keyid eq 83}<!-- Handle the Tax in Inventory -->
-							{foreach item=tax key=count from=$TAX_DETAILS}
-								<td align="right" class="dvtCellLabel">
-									{$tax.taxlabel} {$APP.COVERED_PERCENTAGE}
-							
-								</td>
-								<td class="dvtCellInfo" align="left">
-									{$tax.percentage}
-								</td>
-								<td colspan="2" class="dvtCellInfo">&nbsp;</td>
-							   </tr>
-							{/foreach}
-
-
-				{elseif $keyid eq 69}<!-- for Image Reflection -->
-                                                  	<td align="left" width=25%">&nbsp;{$keyval}</td>
-				{else}									
-                                                  	<td class="dvtCellInfo" align="left" width=25%">&nbsp;{$keyval}</td>
-				{/if}
+{*<!--
+
+/*********************************************************************************
+** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+ * ("License"); You may not use this file except in compliance with the License
+ * The Original Code is:  vtiger CRM Open Source
+ * The Initial Developer of the Original Code is vtiger.
+ * Portions created by vtiger are Copyright (C) vtiger.
+ * All Rights Reserved.
+*
+ ********************************************************************************/
+
+-->*}
+
+<!-- This file is used to display the fields based on the ui type in detailview -->
+		{if $keyid eq '1' || $keyid eq 2 || $keyid eq '11' || $keyid eq '7' || $keyid eq '9' || $keyid eq '55' || $keyid eq '71' || $keyid eq '72' || $keyid eq '103'} <!--TextBox-->
+                                         		<td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label|escape:'quotes'}');" onmouseout="fnhide('crmspanid');">
+                                         		      {if $keyid eq '55'}<!--SalutationSymbol-->
+                                         		            {$keysalut}
+                                         		      {*elseif $keyid eq '71' || $keyid eq '72'}  <!--CurrencySymbol-->
+                                         		            {$keycursymb*}
+                                                        {/if}
+                                                       &nbsp;&nbsp;<span id="dtlview_{$label}">{$keyval}</span>
+                                              		<div id="editarea_{$label}" style="display:none;">
+                                              		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="{$keyfldname}" maxlength='100' value="{$keyval}"></input>
+                                              		  <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label|escape:'quotes'}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label|escape:'quotes'}','editarea_{$label|escape:'quotes'}','{$label|escape:'quotes'}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
+                                                       </div>
+                                                  </td>
+                                             {elseif $keyid eq '13' || $keyid eq '104'} <!--Email-->
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label|escape:'quotes'}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="mailto:{$keyval}" target="_blank">{$keyval}</a></span>
+                                              		<div id="editarea_{$label}" style="display:none;">
+                                              		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="{$keyfldname}" maxlength='100' value="{$keyval}"></input>
+                                              		  <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label|escape:'quotes'}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label|escape:'quotes'}','editarea_{$label|escape:'quotes'}','{$label|escape:'quotes'}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
+                                                       </div>
+                                                  </td>
+						<!-- uitype 111 added for noneditable existing picklist values - ahmed -->
+                                             {elseif $keyid eq '15' || $keyid eq '16' || $keyid eq '111'} <!--ComboBox-->
+               							<td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label|escape:'quotes'}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}</span>
+                                              		<div id="editarea_{$label}" style="display:none;">
+                    							   <select id="txtbox_{$label}" name="{$keyfldname}">
+                    								{foreach item=arr from=$keyoptions}
+                    									{foreach key=sel_value item=value from=$arr}
+                    										<option value="{$sel_value}" {$value}>{if $APP.$sel_value}{$APP.$sel_value}{else}{$sel_value}{/if}</option>
+                    									
+                    									{/foreach}
+                    								{/foreach}
+                    							   </select>
+                    							   <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label|escape:'quotes'}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
+                                              		   <a href="javascript:;" onclick="hndCancel('dtlview_{$label|escape:'quotes'}','editarea_{$label|escape:'quotes'}','{$label|escape:'quotes'}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
+                    							</div>
+               							</td>
+                                          {elseif $keyid eq '33'}<!--Multi Select Combo box-->
+						<!--code given by Neil start Ref:http://forums.vtiger.com/viewtopic.php?p=31096#31096-->
+						{assign var="MULTISELECT_COMBO_BOX_ITEM_SEPARATOR_STRING" value=", "}  {* Separates Multi-Select Combo Box items *}
+						{assign var="DETAILVIEW_WORDWRAP_WIDTH" value="70"} {* No. of chars for word wrapping long lines of Multi-Select Combo Box items *}
+                                          <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label|escape:'quotes'}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">
+						{$keyval|replace:$MULTISELECT_COMBO_BOX_ITEM_SEPARATOR_STRING:"\x1"|replace:" ":"\x0"|replace:"\x1":$MULTISELECT_COMBO_BOX_ITEM_SEPARATOR_STRING|wordwrap:$DETAILVIEW_WORDWRAP_WIDTH:"<br>&nbsp;"|replace:"\x0":"&nbsp;"}
+						</span>
+						<!--code given by Neil End-->
+                                          <div id="editarea_{$label}" style="display:none;">
+                                          <select MULTIPLE id="txtbox_{$label}" name="{$keyfldname}" size="4" style="width:160px;">
+				                                    {foreach item=arr from=$keyoptions}
+					                                     {foreach key=sel_value item=value from=$arr}
+						                                      <option value="{$sel_value}" {$value}>{$sel_value}</option>
+					                                     {/foreach}
+				                                    {/foreach}
+			                                   </select>
+			                                   <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label|escape:'quotes'}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
+                                              		   <a href="javascript:;" onclick="hndCancel('dtlview_{$label|escape:'quotes'}','editarea_{$label|escape:'quotes'}','{$label|escape:'quotes'}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
+                    							</div>
+               							</td>
+						{elseif $keyid eq '115'} <!--ComboBox Status edit only for admin Users-->
+								{if $keyadmin eq 1}
+               							<td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label|escape:'quotes'}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}</span>
+                                              		<div id="editarea_{$label}" style="display:none;">
+                    							   <select id="txtbox_{$label}" name="{$keyfldname}">
+                    								{foreach item=arr from=$keyoptions}
+                    									{foreach key=sel_value item=value from=$arr}
+                    										<option value="{$sel_value}" {$value}>{$sel_value}</option>
+                    									{/foreach}
+                    								{/foreach}
+                    							   </select>
+                    							   <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label|escape:'quotes'}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
+                                              		   <a href="javascript:;" onclick="hndCancel('dtlview_{$label|escape:'quotes'}','editarea_{$label|escape:'quotes'}','{$label|escape:'quotes'}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
+                    							</div>
+								{else}
+               							<td width=25% class="dvtCellInfo" align="left">{$keyval}
+								{/if}	
+								
+               							</td>
+						{elseif $keyid eq '116'} <!--ComboBox currency id edit only for admin Users-->
+								{if $keyadmin eq 1}
+               							<td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label|escape:'quotes'}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}</span>
+								<div id="editarea_{$label}" style="display:none;">
+                    							   <select id="txtbox_{$label}" name="{$keyfldname}">
+									{foreach item=arr key=uivalueid from=$keyoptions}
+									{foreach key=sel_value item=value from=$arr}
+										<option value="{$uivalueid}" {$value}>{$sel_value}</option>	
+									{/foreach}
+									{/foreach}
+                    							   </select>
+                    							   <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label|escape:'quotes'}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
+                                              		   <a href="javascript:;" onclick="hndCancel('dtlview_{$label|escape:'quotes'}','editarea_{$label|escape:'quotes'}','{$label|escape:'quotes'}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
+                    							</div>
+								{else}
+               							<td width=25% class="dvtCellInfo" align="left">{$keyval}
+								{/if}	
+
+                                        		
+               							</td>
+                                             {elseif $keyid eq '17'} <!--WebSite-->
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label|escape:'quotes'}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="http://{$keyval}" target="_blank">{$keyval}</a></span>
+                                              		<div id="editarea_{$label}" style="display:none;">
+                                              		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="{$keyfldname}" maxlength='100' value="{$keyval}"></input>
+                                              		  <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label|escape:'quotes'}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label|escape:'quotes'}','editarea_{$label|escape:'quotes'}','{$label|escape:'quotes'}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
+                                                       </div>
+                                                  </td>
+					     {elseif $keyid eq '85'}<!--Skype-->
+                                                <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label|escape:'quotes'}');" onmouseout="fnhide('crmspanid');">&nbsp;<img src="{$IMAGE_PATH}skype.gif" alt="Skype" title="Skype" LANGUAGE=javascript align="absmiddle"></img><span id="dtlview_{$label}"><a href="skype:{$keyval}?call">{$keyval}</a></span>
+                                                        <div id="editarea_{$label}" style="display:none;">
+                                                          <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="{$keyfldname}" maxlength='100' value="{$keyval}"></input>
+                                                          <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label|escape:'quotes'}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
+                                                          <a href="javascript:;" onclick="hndCancel('dtlview_{$label|escape:'quotes'}','editarea_{$label|escape:'quotes'}','{$label|escape:'quotes'}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
+                                                       </div>
+                                                  </td>	
+                                             {elseif $keyid eq '19' || $keyid eq '20'} <!--TextArea/Description-->
+						<!-- we will empty the value of ticket and faq comment -->
+						{if $label eq $MOD.LBL_ADD_COMMENT}
+							{assign var=keyval value=''}
+						{/if}
+							<!--{assign var="DESCRIPTION_SEPARATOR_STRING" value=" "}  {* Separates Description *}-->
+							<!--{assign var="DESCRIPTION_WORDWRAP_WIDTH" value="70"} {* No. of chars for word wrapping long lines of Description *}-->
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label|escape:'quotes'}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">
+							{$keyval}<!--|replace:$DESCRIPTION_SEPARATOR_STRING:"\x1"|replace:" ":"\x0"|replace:"\x1":$DESCRIPTION_SEPARATOR_STRING|wordwrap:$DESCRIPTION_WORDWRAP_WIDTH:"<br>&nbsp;"|replace:"\x0":"&nbsp;"}-->
+							</span>
+                                              		<div id="editarea_{$label}" style="display:none;">
+                                              		  <textarea id="txtbox_{$label}" name="{$keyfldname}"  class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'"onBlur="this.className='detailedViewTextBox'" cols="90" rows="8">{$keyval}</textarea>                                            		  
+                                              		  <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label|escape:'quotes'}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label|escape:'quotes'}','editarea_{$label|escape:'quotes'}','{$label|escape:'quotes'}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
+                                                       </div>
+                                                  </td>
+                                             {elseif $keyid eq '21' || $keyid eq '24' || $keyid eq '22'} <!--TextArea/Street-->
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label|escape:'quotes'}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}</span>
+                                              		<div id="editarea_{$label}" style="display:none;">
+                                              		  <textarea id="txtbox_{$label}" name="{$keyfldname}"  class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'"onBlur="this.className='detailedViewTextBox'" rows=2>{$keyval}</textarea>                                            		  
+                                              		  <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label|escape:'quotes'}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label|escape:'quotes'}','editarea_{$label|escape:'quotes'}','{$label|escape:'quotes'}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
+                                                       </div>
+                                                  </td>
+                                             {elseif $keyid eq '50' || $keyid eq '73' || $keyid eq '51'} <!--AccountPopup-->
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}">&nbsp;<a href="{$keyseclink}">{$keyval}</a>
+                                                  </td>
+                                             {elseif $keyid eq '57'} <!--ContactPopup-->
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label|escape:'quotes'}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
+                                              		<div id="editarea_{$label}" style="display:none;">                                              		  
+                                                         <input id="popuptxt_{$label}" name="contact_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=602,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.contact_id.value=''; this.form.contact_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
+                                                         <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label|escape:'quotes'}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label|escape:'quotes'}','editarea_{$label|escape:'quotes'}','{$label|escape:'quotes'}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
+                                                       </div>
+                                                  </td>                                                  
+                                             {elseif $keyid eq '59'} <!--ProductPopup-->
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label|escape:'quotes'}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
+                                              		<div id="editarea_{$label}" style="display:none;">                                              		  
+                                                         <input id="popuptxt_{$label}" name="product_name" readonly type="text" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Products&action=Popup&html=Popup_picker&form=HelpDeskEditView&popuptype=specific","test","width=600,height=602,resizable=1,scrollbars=1,top=150,left=200");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.product_id.value=''; this.form.product_name.value=''; return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
+                                                         <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label|escape:'quotes'}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label|escape:'quotes'}','editarea_{$label|escape:'quotes'}','{$label|escape:'quotes'}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
+                                                       </div>
+                                                  </td>
+                                             {elseif $keyid eq '75' || $keyid eq '81'} <!--VendorPopup-->
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}">&nbsp;<a href="{$keyseclink}">{$keyval}</a>
+                                                  </td>
+                                             {elseif $keyid eq 76} <!--PotentialPopup-->
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}">&nbsp;<a href="{$keyseclink}">{$keyval}</a>
+                                                  </td>
+                                             {elseif $keyid eq 78} <!--QuotePopup-->
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}">&nbsp;<a href="{$keyseclink}">{$keyval}</a>
+                                                  </td>
+                                             {elseif $keyid eq 82} <!--Email Body-->
+                                                  <td colspan="3" width=100% class="dvtCellInfo" align="left"><div id="dtlview_{$label}" style="width:100%;height:200px;overflow:hidden;border:1px solid gray" class="detailedViewTextBox" onmouseover="this.className='detailedViewTextBoxOn'" onmouseout="this.className='detailedViewTextBox'">{$keyval}</div>
+                                                  </td>
+                                             {elseif $keyid eq 80} <!--SalesOrderPopup-->
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}">&nbsp;<a href="{$keyseclink}">{$keyval}</a>
+                                                  </td>
+					     {elseif $keyid eq '53'} <!--Assigned To-->
+                    				  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label|escape:'quotes'}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">
+                    				{if $keyoptions.0 eq 'User' && $keyadmin eq 1}
+			                        	<a href="{$keyseclink.0}">{$keyval}</a>         
+			                        {elseif $keyoptions.0 eq 'Group' && $keyadmin eq 1}
+                        				<a href="{$keyseclink.1}">{$keyval}</a>         
+						{else}	
+                        				{$keyval}
+                    				{/if}
+					&nbsp;</span>
+                    				<div id="editarea_{$label}" style="display:none;">
+			                   	<input type="hidden" id="hdtxt_{$label}" value="{$keyval}"></input>
+						{if $keyoptions.0 eq 'User'}
+							<input name="assigntype" id="assigntype" checked="checked" value="U" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;{$APP.LBL_USER}
+							{if $keyoptions.2 neq ''}
+								<input name="assigntype" id="assigntype" value="T" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;{$APP.LBL_GROUP_NAME}
+							{/if}
+							<span id="assign_user" style="display: block;">
+						{else}
+							<input name="assigntype" id="assigntype" value="U" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;{$APP.LBL_USER}
+							<input name="assigntype" checked="checked" id="assigntype" value="T" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;{$APP.LBL_GROUP_NAME}
+							<span id="assign_user" style="display: none;">
+						{/if}
+                   				<select id="txtbox_U{$label}" onchange="setSelectValue('{$label}')" name="{$keyfldname}">
+				                    {foreach item=arr key=id from=$keyoptions.1}
+				                    	{foreach key=sel_value item=value from=$arr}
+                       						 <option value="{$id}" {$value}>{$sel_value}</option>
+				                        {/foreach}
+				                    {/foreach}
+			                    	</select>
+						</span>
+					{if $keyoptions.0 eq 'Group'}
+						<span id="assign_team" style="display: block;">
+					{else}
+						<span id="assign_team" style="display: none;">
+					{/if}
+                   	<select id="txtbox_G{$label}" onchange="setSelectValue('{$label}')" name="{$keyfldname}">
+                    {foreach item=arr key=id from=$keyoptions.2}
+                    	{foreach key=sel_value item=value from=$arr}
+                       		 <option value="{$id}" {$value}>{$sel_value}</option>
+                        {/foreach}
+                    {/foreach}
+                    </select>
+					</span>
+
+                    <br>
+                    <input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label|escape:'quotes'}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> {$APP.LBL_OR}
+                    <a href="javascript:;" onclick="hndCancel('dtlview_{$label|escape:'quotes'}','editarea_{$label|escape:'quotes'}','{$label|escape:'quotes'}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
+                    </div>
+                    </td>
+						{elseif $keyid eq '99'}<!-- Password Field-->
+						<td width=25% class="dvtCellInfo" align="left">{$CHANGE_PW_BUTTON}</td>	
+					    {elseif $keyid eq '56'} <!--CheckBox--> 
+                      <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onMouseOver="hndMouseOver({$keyid},'{$label|escape:'quotes'}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}&nbsp;</span>
+                    	<div id="editarea_{$label}" style="display:none;">
+                        {if $keyval eq 'yes'}                                              		  
+                            <input id="txtbox_{$label}" name="{$keyfldname}" type="checkbox" style="border:1px solid #bababa;" checked value="1">
+                        {else}
+                          <input id="txtbox_{$label}" type="checkbox" name="{$keyfldname}" style="border:1px solid #bababa;" value="0">
+                       	{/if}
+                         <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label|escape:'quotes'}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> {$APP.LBL_OR}
+                          <a href="javascript:;" onclick="hndCancel('dtlview_{$label|escape:'quotes'}','editarea_{$label|escape:'quotes'}','{$label|escape:'quotes'}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
+                        </div>
+                        </td>    
+			{elseif $keyid eq '156'} <!--CheckBox for is admin-->
+			{if $smarty.request.record neq $CURRENT_USERID && $keyadmin eq 1} 
+                      <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onMouseOver="hndMouseOver({$keyid},'{$label|escape:'quotes'}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}&nbsp;</span>
+                    	<div id="editarea_{$label}" style="display:none;">
+                        {if $keyval eq 'on'}                                              		  
+                            <input id="txtbox_{$label}" name="{$keyfldname}" type="checkbox" style="border:1px solid #bababa;" checked value="1">
+                        {else}
+                          <input id="txtbox_{$label}" type="checkbox" name="{$keyfldname}" style="border:1px solid #bababa;" value="0">
+                       	{/if}
+                         <br><input name="button_{$label}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label|escape:'quotes'}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> {$APP.LBL_OR}
+                          <a href="javascript:;" onclick="hndCancel('dtlview_{$label|escape:'quotes'}','editarea_{$label|escape:'quotes'}','{$label|escape:'quotes'}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
+                        </div>
+			{else}
+				 <td width=25% class="dvtCellInfo" align="left">{$keyval}
+			{/if}
+                        </td>    
+			 
+						{elseif $keyid eq 83}<!-- Handle the Tax in Inventory -->
+							{foreach item=tax key=count from=$TAX_DETAILS}
+								<td align="right" class="dvtCellLabel">
+									{$tax.taxlabel} {$APP.COVERED_PERCENTAGE}
+							
+								</td>
+								<td class="dvtCellInfo" align="left">
+									{$tax.percentage}
+								</td>
+								<td colspan="2" class="dvtCellInfo">&nbsp;</td>
+							   </tr>
+							{/foreach}
+
+
+				{elseif $keyid eq 69}<!-- for Image Reflection -->
+                                                  	<td align="left" width=25%">&nbsp;{$keyval}</td>
+				{else}									
+                                                  	<td class="dvtCellInfo" align="left" width=25%">&nbsp;{$keyval}</td>
+				{/if}

Modified: vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php (original)
+++ vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php Tue Dec 12 07:44:13 2006
@@ -1789,7 +1789,6 @@
 * Return type array 
 */
 
-
 function split_validationdataArray($validationData)
 {
 	global $log;
@@ -1812,11 +1811,11 @@
 		{
 			if($fieldLabel == '')
 			{
-				$fieldLabel = "'".$fldLabel ."'";
+				$fieldLabel = "'".addslashes($fldLabel)."'";
 			}
 			else
 			{
-				$fieldLabel .= ",'".$fldLabel ."'";
+				$fieldLabel .= ",'".addslashes($fldLabel)."'";
 			}
 			if($fldDataType == '')
 			{




From vtigercrm-commits at vtiger.fosslabs.com  Tue Dec 12 11:00:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Dec 2006 16:00:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9960 - in
 /vtigercrm/branches/5.0.3: Smarty/templates/ modules/Settings/language/
 modules/Users/
Message-ID: <20061212160051.242EC788DE9@vtiger.fosslabs.com>

Author: richie
Date: Tue Dec 12 09:00:39 2006
New Revision: 9960

Log:
Profiles moved to settings module

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/CreateProfile.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/EditProfile.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/ProfileDetailView.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/UserProfileList.tpl
    vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php
    vtigercrm/branches/5.0.3/modules/Users/DeleteProfile.php
    vtigercrm/branches/5.0.3/modules/Users/SaveProfile.php
    vtigercrm/branches/5.0.3/modules/Users/UpdateProfileChanges.php

Modified: vtigercrm/branches/5.0.3/Smarty/templates/CreateProfile.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/CreateProfile.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/CreateProfile.tpl Tue Dec 12 09:00:39 2006
@@ -21,7 +21,7 @@
 	<div align=center>
 				{include file='SetMenu.tpl'}
 				<form action="index.php" method="post" name="profileform" id="form">
-                                <input type="hidden" name="module" value="Users">
+                                <input type="hidden" name="module" value="Settings">
                                 <input type="hidden" name="mode" value="{$MODE}">
                                 <input type="hidden" name="action" value="profilePrivileges">
                                 <input type="hidden" name="parenttab" value="Settings">
@@ -32,7 +32,7 @@
 				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
 				<tr>
 					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}ico-profile.gif" alt="{$MOD.LBL_PROFILES}" width="48" height="48" border=0 title="{$MOD.LBL_PROFILES}"></td>
-					<td class=heading2 valign=bottom><b> <a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=ListProfiles&parenttab=Settings">{$CMOD.LBL_PROFILE_PRIVILEGES}</a></b></td>
+					<td class=heading2 valign=bottom><b> <a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Settings&action=ListProfiles&parenttab=Settings">{$CMOD.LBL_PROFILE_PRIVILEGES}</a></b></td>
 				</tr>
 				<tr>
 					<td valign=top class="small">{$MOD.LBL_PROFILE_DESCRIPTION}</td>

Modified: vtigercrm/branches/5.0.3/Smarty/templates/EditProfile.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/EditProfile.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/EditProfile.tpl Tue Dec 12 09:00:39 2006
@@ -45,7 +45,7 @@
 				<table class="settingsSelUITopLine" border="0" cellpadding="5" cellspacing="0" width="100%">
 				<tbody><tr>
 					<td rowspan="2" valign="top" width="50"><img src="{$IMAGE_PATH}ico-profile.gif" alt="{$MOD.LBL_PROFILES}" title="{$MOD.LBL_PROFILES}" border="0" height="48" width="48"></td>
-					<td class="heading2" valign="bottom"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=ListProfiles&parenttab=Settings">{$CMOD.LBL_PROFILE_PRIVILEGES}</a> &gt; {$CMOD.LBL_VIEWING} &quot;{$PROFILE_NAME}&quot;</b></td>
+					<td class="heading2" valign="bottom"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Settings&action=ListProfiles&parenttab=Settings">{$CMOD.LBL_PROFILE_PRIVILEGES}</a> &gt; {$CMOD.LBL_VIEWING} &quot;{$PROFILE_NAME}&quot;</b></td>
 				</tr>
 				<tr>
 					<td class="small" valign="top">{$CMOD.LBL_PROFILE_MESG} &quot;{$PROFILE_NAME}&quot; </td>

Modified: vtigercrm/branches/5.0.3/Smarty/templates/ProfileDetailView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/ProfileDetailView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/ProfileDetailView.tpl Tue Dec 12 09:00:39 2006
@@ -70,7 +70,7 @@
 			{include file='SetMenu.tpl'}
 			
 				<form  method="post" name="new" id="form">
-			        <input type="hidden" name="module" value="Users">
+			        <input type="hidden" name="module" value="Settings">
 			        <input type="hidden" name="action" value="profilePrivileges">
 			        <input type="hidden" name="parenttab" value="Settings">
 			        <input type="hidden" name="return_action" value="profilePrivileges">
@@ -81,7 +81,7 @@
 				<table class="settingsSelUITopLine" border="0" cellpadding="5" cellspacing="0" width="100%">
 				<tbody><tr>
 					<td rowspan="2" valign="top" width="50"><img src="{$IMAGE_PATH}ico-profile.gif" alt="{$MOD.LBL_PROFILES}" title="{$MOD.LBL_PROFILES}" border="0" height="48" width="48"></td>
-					<td class="heading2" valign="bottom"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=ListProfiles&parenttab=Settings">{$CMOD.LBL_PROFILE_PRIVILEGES}</a> &gt; {$CMOD.LBL_VIEWING} &quot;{$PROFILE_NAME}&quot;</b></td>
+					<td class="heading2" valign="bottom"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Settings&action=ListProfiles&parenttab=Settings">{$CMOD.LBL_PROFILE_PRIVILEGES}</a> &gt; {$CMOD.LBL_VIEWING} &quot;{$PROFILE_NAME}&quot;</b></td>
 				</tr>
 				<tr>
 					<td class="small" valign="top">{$CMOD.LBL_PROFILE_MESG} &quot;{$PROFILE_NAME}&quot; </td>

Modified: vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl Tue Dec 12 09:00:39 2006
@@ -36,39 +36,39 @@
 		{/if}
 
 		{if $smarty.request.action eq 'ListProfiles' || $smarty.request.action eq 'profilePrivileges' ||  $smarty.request.action eq 'CreateProfile' ||  $smarty.request.action eq 'SaveProfile' || $smarty.request.action eq 'UpdateProfileChanges' }
-		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Users&action=ListProfiles&parenttab=Settings">{$MOD.LBL_PROFILES}</a></td></tr>
+		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Settings&action=ListProfiles&parenttab=Settings">{$MOD.LBL_PROFILES}</a></td></tr>
 		{else}
-		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=ListProfiles&parenttab=Settings">{$MOD.LBL_PROFILES}</a></td></tr>
+		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=ListProfiles&parenttab=Settings">{$MOD.LBL_PROFILES}</a></td></tr>
 		{/if}
 
 		{if $smarty.request.action eq 'listgroups' || $smarty.request.action eq 'GroupDetailView' || $smarty.request.action eq 'createnewgroup' || $smarty.request.action eq 'SaveGroup'}
-		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Users&action=listgroups&parenttab=Settings">{$MOD.USERGROUPLIST}</a></td></tr>   	
+		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Settings&action=listgroups&parenttab=Settings">{$MOD.USERGROUPLIST}</a></td></tr>   	
 		{else}
-		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listgroups&parenttab=Settings">{$MOD.USERGROUPLIST}</a></td></tr>
+		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=listgroups&parenttab=Settings">{$MOD.USERGROUPLIST}</a></td></tr>
 		{/if}
 
 		{if  $smarty.request.action eq 'OrgSharingEditView' || $smarty.request.action eq 'OrgSharingDetailView' || $smarty.request.action eq 'SaveOrgSharing'}
-		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Users&action=OrgSharingDetailView&parenttab=Settings">{$MOD.LBL_SHARING_ACCESS}</a></td></tr>  	
+		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Settings&action=OrgSharingDetailView&parenttab=Settings">{$MOD.LBL_SHARING_ACCESS}</a></td></tr>  	
 		{else}
-		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=OrgSharingDetailView&parenttab=Settings">{$MOD.LBL_SHARING_ACCESS}</a></td></tr>
+		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=OrgSharingDetailView&parenttab=Settings">{$MOD.LBL_SHARING_ACCESS}</a></td></tr>
 		{/if}
 			
 		{if $smarty.request.action eq 'DefaultFieldPermissions' || $smarty.request.action eq 'UpdateDefaultFieldLevelAccess' || $smarty.request.action eq 'EditDefOrgFieldLevelAccess' }
-		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Users&action=DefaultFieldPermissions&parenttab=Settings">{$MOD.LBL_FIELDS_ACCESS}</a></td></tr>
+		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Settings&action=DefaultFieldPermissions&parenttab=Settings">{$MOD.LBL_FIELDS_ACCESS}</a></td></tr>
 		{else}
-		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=DefaultFieldPermissions&parenttab=Settings">{$MOD.LBL_FIELDS_ACCESS}</a></td></tr>
+		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=DefaultFieldPermissions&parenttab=Settings">{$MOD.LBL_FIELDS_ACCESS}</a></td></tr>
 		{/if}
 			
 		{if $smarty.request.action eq 'AuditTrailList'}
-		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Users&action=AuditTrailList&parenttab=Settings">{$MOD.LBL_AUDIT_TRAIL}</a></td></tr>
+		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Settings&action=AuditTrailList&parenttab=Settings">{$MOD.LBL_AUDIT_TRAIL}</a></td></tr>
         {else}
-        <tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=AuditTrailList&parenttab=Settings">{$MOD.LBL_AUDIT_TRAIL}</a></td></tr>
+        <tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=AuditTrailList&parenttab=Settings">{$MOD.LBL_AUDIT_TRAIL}</a></td></tr>
         {/if}
 
 		{if $smarty.request.action eq 'ListLoginHistory'}
-		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Users&action=ListLoginHistory&parenttab=Settings">{$MOD.LBL_LOGIN_HISTORY_DETAILS}</a></td></tr>
+		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Settings&action=ListLoginHistory&parenttab=Settings">{$MOD.LBL_LOGIN_HISTORY_DETAILS}</a></td></tr>
 		{else}
-		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=ListLoginHistory&parenttab=Settings">{$MOD.LBL_LOGIN_HISTORY_DETAILS}</a></td></tr>
+		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=ListLoginHistory&parenttab=Settings">{$MOD.LBL_LOGIN_HISTORY_DETAILS}</a></td></tr>
 		{/if}
 
 		
@@ -168,17 +168,17 @@
 		{/if}
 		
 		{if $smarty.request.action eq 'DefModuleView'}
-		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Users&action=DefModuleView&parenttab=Settings">{$MOD.LBL_DEFAULT_MODULE_VIEW}</a></td></tr>
+		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Settings&action=DefModuleView&parenttab=Settings">{$MOD.LBL_DEFAULT_MODULE_VIEW}</a></td></tr>
 		{else}
-		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=DefModuleView&parenttab=Settings">{$MOD.LBL_DEFAULT_MODULE_VIEW}</a></td></tr>
+		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=DefModuleView&parenttab=Settings">{$MOD.LBL_DEFAULT_MODULE_VIEW}</a></td></tr>
 		{/if}
 	
 		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Migration&action=MigrationStep1&parenttab=Settings">{$MOD.LBL_MIGRATION}</a></td></tr>
 
 		{if $smarty.request.action eq 'OrganizationTermsandConditions' || $smarty.request.action eq 'savetermsandconditions'}
-		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings">{$MOD.LBL_INVENTORY_TANDC}</a></td></tr>
+		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Settings&action=OrganizationTermsandConditions&parenttab=Settings">{$MOD.LBL_INVENTORY_TANDC}</a></td></tr>
 		{else}
-		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings">{$MOD.LBL_INVENTORY_TANDC}</a></td></tr>
+		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=OrganizationTermsandConditions&parenttab=Settings">{$MOD.LBL_INVENTORY_TANDC}</a></td></tr>
 		{/if}
 
 		</table>

Modified: vtigercrm/branches/5.0.3/Smarty/templates/UserProfileList.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/UserProfileList.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/UserProfileList.tpl Tue Dec 12 09:00:39 2006
@@ -69,7 +69,7 @@
 					<tr>
 						<td class="listTableRow small" valign=top>{$smarty.foreach.profilelist.iteration}</td>
 						<td class="listTableRow small" valign=top nowrap>
-							<a href="index.php?module=Users&action=profilePrivileges&return_action=ListProfiles&parenttab=Settings&mode=edit&profileid={$listvalues.profileid}"><img src="{$IMAGE_PATH}editfield.gif" alt="Edit" title="Edit" border="0" align="absmiddle"></a>
+							<a href="index.php?module=Settings&action=profilePrivileges&return_action=ListProfiles&parenttab=Settings&mode=edit&profileid={$listvalues.profileid}"><img src="{$IMAGE_PATH}editfield.gif" alt="Edit" title="Edit" border="0" align="absmiddle"></a>
 	                                                {if $listvalues.del_permission eq 'yes'}
         	                                                &nbsp;|&nbsp;
                 	                                <a href="#"><img src="{$IMAGE_PATH}delete.gif" border="0" height="15" width="15" onclick="DeleteProfile(this,'{$listvalues.profileid}')" align="absmiddle"></a>
@@ -77,7 +77,7 @@
                                                 	{/if}
 
 						</td>
-						<td class="listTableRow small" valign=top><a href="index.php?module=Users&action=profilePrivileges&mode=view&parenttab=Settings&profileid={$listvalues.profileid}"><b>{$listvalues.profilename}</b></a></td>
+						<td class="listTableRow small" valign=top><a href="index.php?module=Settings&action=profilePrivileges&mode=view&parenttab=Settings&profileid={$listvalues.profileid}"><b>{$listvalues.profilename}</b></a></td>
 						<td class="listTableRow small" valign=top>{$listvalues.description}</td>
 					  </tr>
 					{/foreach}		

Modified: vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php Tue Dec 12 09:00:39 2006
@@ -788,6 +788,35 @@
 'QuoteNotification'=>'Product Stock Notification during Quote Generation',
 'SalesOrderNotification'=>'Product Stock Notification during Sales Order Generation',
 'LBL_NOTE_DO_NOT_REMOVE_INFO'=>'Note: Donot remove or alter the values within {  }',
+
+//Added while moving Profile file from User to Setting Module
+'LBL_TOTAL'=>'Total :',
+'LBL_NEW_PROFILE'=>'New Profile',
+'LBL_LIST_NO'=>'#',
+'LBL_NEW_PROFILE_NAME'=>'Profile Name',
+'LBL_LIST_TOOLS'=>'Tools',
+'LBL_PROFILE_MESG'=>'Viewing access privileges for',
+'LBL_PROFILE_PRIVILEGES'=>'Profile Privileges',
+'LBL_DEFINE_PRIV_FOR'=>' Define Privileges for ',
+'LBL_USE_OPTION_TO_SET_PRIV'=>'Use the options below to set privileges',
+'LBL_SUPER_USER_PRIV'=>'Global Privileges',
+'LBL_SET_PRIV_FOR_EACH_MODULE'=>'Set Privileges for each Module ',
+'LBL_FIELDS_AND_TOOLS_SETTINGS'=>'Fields & Tools Settings',
+'LBL_VIEW_ALL'=>'View all',
+'LBL_EDIT_ALL'=>'Edit all',
+'LBL_ALLOW'=>'Allows',
+'LBL_MESG_VIEW'=>'to view all information / modules of vtiger CRM',
+'LBL_MESG_EDIT'=>'to edit all information / modules of vtiger CRM',
+'LBL_TAB_MESG_OPTION'=>'modules to be shown',
+'LBL_EDIT_PERMISSIONS'=>'Edit Permissions',
+'LBL_CREATE_EDIT'=>'Create/Edit',
+'LBL_VIEW'=>'View',
+'LBL_MANDATORY_MSG'=>'Mandatory Fields',
+'LBL_DISABLE_FIELD_MSG'=>'Fields Disabled from Global Field Access Settings',
+'LBL_DELETE'=>'Delete',
+
+'LBL_STEP_2_2'=>'Step 2 of 2',
+'LBL_FINISH_BUTTON'=>'Finish',
 );
 
 

Modified: vtigercrm/branches/5.0.3/modules/Users/DeleteProfile.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Users/DeleteProfile.php (original)
+++ vtigercrm/branches/5.0.3/modules/Users/DeleteProfile.php Tue Dec 12 09:00:39 2006
@@ -14,5 +14,5 @@
 $tran_id = $_REQUEST['transfer_prof_id'];
 //Deleting the Profile
 deleteProfile($del_id,$tran_id);
-header("Location: index.php?module=Users&action=ListProfiles&parenttab=Settings");
+header("Location: index.php?module=Settings&action=ListProfiles&parenttab=Settings");
 ?>

Modified: vtigercrm/branches/5.0.3/modules/Users/SaveProfile.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Users/SaveProfile.php (original)
+++ vtigercrm/branches/5.0.3/modules/Users/SaveProfile.php Tue Dec 12 09:00:39 2006
@@ -180,7 +180,7 @@
                 $adb->query($sql11);
 	}
 }
-	$loc = "Location: index.php?action=ListProfiles&module=Users&mode=view&parenttab=Settings&profileid=".$profileid."&selected_tab=".$def_tab."&selected_module=".$def_module;
+	$loc = "Location: index.php?action=ListProfiles&module=Settings&mode=view&parenttab=Settings&profileid=".$profileid."&selected_tab=".$def_tab."&selected_module=".$def_module;
 	header($loc);
 
 

Modified: vtigercrm/branches/5.0.3/modules/Users/UpdateProfileChanges.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Users/UpdateProfileChanges.php (original)
+++ vtigercrm/branches/5.0.3/modules/Users/UpdateProfileChanges.php Tue Dec 12 09:00:39 2006
@@ -172,7 +172,14 @@
 
 	}
 }
-	$loc = "Location: index.php?action=".$return_action."&module=Users&mode=view&parenttab=Settings&profileid=".$profileid."&selected_tab=".$def_tab."&selected_module=".$def_module;
+	if($return_action == 'profilePrivileges' || $return_action == 'ListProfiles')
+	{
+		$loc = "Location: index.php?action=".$return_action."&module=Settings&mode=view&parenttab=Settings&profileid=".$profileid."&selected_tab=".$def_tab."&selected_module=".$def_module;
+	}
+	else
+	{
+		$loc = "Location: index.php?action=".$return_action."&module=Users&mode=view&parenttab=Settings&profileid=".$profileid."&selected_tab=".$def_tab."&selected_module=".$def_module;
+	}
 	header($loc);
 
  /** returns value 0 if request permission is on else returns value 1




From vtigercrm-commits at vtiger.fosslabs.com  Wed Dec 13 02:06:36 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Dec 2006 07:06:36 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9961 -
 /vtigercrm/branches/5.0.3/modules/Settings/ListProfiles.php
Message-ID: <20061213070636.0528C7896E4@vtiger.fosslabs.com>

Author: richie
Date: Wed Dec 13 00:06:31 2006
New Revision: 9961

Log:
Added to move profiles to settings

Added:
    vtigercrm/branches/5.0.3/modules/Settings/ListProfiles.php




From vtigercrm-commits at vtiger.fosslabs.com  Wed Dec 13 04:48:11 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Dec 2006 09:48:11 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9962 - in
 /vtigercrm/branches/5.0.3: Smarty/templates/ include/js/ include/utils/
 modules/Settings/ modules/Settings/language/ modules/Users/
Message-ID: <20061213094812.5336D789BB7@vtiger.fosslabs.com>

Author: richie
Date: Wed Dec 13 02:47:57 2006
New Revision: 9962

Log:
Groups moved to settings

Added:
    vtigercrm/branches/5.0.3/modules/Settings/GroupDetailView.php
    vtigercrm/branches/5.0.3/modules/Settings/createnewgroup.php
    vtigercrm/branches/5.0.3/modules/Settings/listgroups.php
Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/GroupDetailview.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/GroupEditView.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/ListGroup.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/UserGroups.tpl
    vtigercrm/branches/5.0.3/include/js/dtlviewajax.js
    vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php
    vtigercrm/branches/5.0.3/include/utils/UserInfoUtil.php
    vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php
    vtigercrm/branches/5.0.3/modules/Users/DeleteGroup.php

Modified: vtigercrm/branches/5.0.3/Smarty/templates/GroupDetailview.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/GroupDetailview.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/GroupDetailview.tpl Wed Dec 13 02:47:57 2006
@@ -23,14 +23,14 @@
 				<!-- DISPLAY -->
 				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
 				<form action="index.php" method="post" name="new" id="form">
-				<input type="hidden" name="module" value="Users">
+				<input type="hidden" name="module" value="Settings">
 				<input type="hidden" name="action" value="createnewgroup">
 				<input type="hidden" name="groupId" value="{$GROUPID}">
 				<input type="hidden" name="mode" value="edit">
 				<input type="hidden" name="parenttab" value="Settings">
 				<tr>
 					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}ico-groups.gif" width="48" height="48" border=0 ></td>
-					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=listgroups&parenttab=Settings">{$CMOD.LBL_GROUPS}</a> &gt; {$CMOD.LBL_VIEWING} &quot;{$GROUPINFO.0.groupname}&quot; </b></td>
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Settings&action=listgroups&parenttab=Settings">{$CMOD.LBL_GROUPS}</a> &gt; {$CMOD.LBL_VIEWING} &quot;{$GROUPINFO.0.groupname}&quot; </b></td>
 				</tr>
 				<tr>
 					<td valign=top class="small">{$CMOD.LBL_VIEWING} {$CMOD.LBL_PROPERTIES} &quot;{$GROUPINFO.0.groupname}`&quot; {$CMOD.LBL_GROUP_NAME} </td>
@@ -92,7 +92,15 @@
                             <td width="16"><div align="center"></div></td>
                             <td>
 					{foreach item=element from=$details}
+						{if $element.memberaction == "GroupDetailView"}
+						<a href="index.php?module=Settings&action={$element.memberaction}&{$element.actionparameter}={$element.memberid}">{$element.membername}</a><br />
+						{/if}
+						{if $element.memberaction == "RoleDetailView"}	
+						<a href="index.php?module=Settings&action={$element.memberaction}&{$element.actionparameter}={$element.memberid}">{$element.membername}</a><br />
+						{/if}
+						{if $element.memberaction == "DetailView"}	
 						<a href="index.php?module=Users&action={$element.memberaction}&{$element.actionparameter}={$element.memberid}">{$element.membername}</a><br />
+						{/if}
 					{/foreach}
 			    </td>  	 
                           </tr>

Modified: vtigercrm/branches/5.0.3/Smarty/templates/GroupEditView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/GroupEditView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/GroupEditView.tpl Wed Dec 13 02:47:57 2006
@@ -172,9 +172,9 @@
 				<tr>
 					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}ico-groups.gif" alt="Groups" width="48" height="48" border=0 title="Roles"></td>
 					{if $MODE eq 'edit'}
-					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=listgroups&parenttab=Settings">{$CMOD.LBL_GROUPS}</a> &gt; {$MOD.LBL_EDIT} &quot;{$GROUPNAME}&quot; </b></td>
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Settings&action=listgroups&parenttab=Settings">{$CMOD.LBL_GROUPS}</a> &gt; {$MOD.LBL_EDIT} &quot;{$GROUPNAME}&quot; </b></td>
 					{else}	
-					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=listgroups&parenttab=Settings">{$CMOD.LBL_GROUPS}</a> &gt; {$CMOD.LBL_CREATE_NEW_GROUP}</b></td>
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Settings&action=listgroups&parenttab=Settings">{$CMOD.LBL_GROUPS}</a> &gt; {$CMOD.LBL_CREATE_NEW_GROUP}</b></td>
 					{/if}
 				</tr>
 				<tr>

Modified: vtigercrm/branches/5.0.3/Smarty/templates/ListGroup.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/ListGroup.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/ListGroup.tpl Wed Dec 13 02:47:57 2006
@@ -23,7 +23,7 @@
 				<!-- DISPLAY -->
 				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
 				<form action="index.php" method="post" name="new" id="form">
-				<input type="hidden" name="module" value="Users">
+				<input type="hidden" name="module" value="Settings">
 				<input type="hidden" name="action" value="createnewgroup">
 				<input type="hidden" name="mode" value="create">
 				<input type="hidden" name="parenttab" value="Settings">
@@ -67,11 +67,11 @@
 					  <tr>
 						<td class="listTableRow small" valign=top>{$smarty.foreach.grouplist.iteration}</td>
 						<td class="listTableRow small" valign=top nowrap>
-							  	<a href="index.php?module=Users&action=createnewgroup&returnaction=listgroups&parenttab=Settings&mode=edit&groupId={$groupvalues.groupid}"><img src="{$IMAGE_PATH}editfield.gif" alt="{$APP.LNK_EDIT}" title="{$APP.LNK_EDIT}" border="0" align="absmiddle"></a>&nbsp;|	
+							  	<a href="index.php?module=Settings&action=createnewgroup&returnaction=listgroups&parenttab=Settings&mode=edit&groupId={$groupvalues.groupid}"><img src="{$IMAGE_PATH}editfield.gif" alt="{$APP.LNK_EDIT}" title="{$APP.LNK_EDIT}" border="0" align="absmiddle"></a>&nbsp;|	
 								<a href="#" onClick="deletegroup(this,'{$groupvalues.groupid}')";><img src="{$IMAGE_PATH}delete.gif" alt="{$LNK_DELETE}" title="{$APP.LNK_DELETE}" border="0" align="absmiddle"></a>
 						</td>
 						<td class="listTableRow small" valign=top><strong>
-                              				<a href="index.php?module=Users&action=GroupDetailView&parenttab=Settings&groupId={$groupvalues.groupid}">{$groupvalues.groupname}</a></strong>
+                              				<a href="index.php?module=Settings&action=GroupDetailView&parenttab=Settings&groupId={$groupvalues.groupid}">{$groupvalues.groupname}</a></strong>
 						</td>
 						<td class="listTableRow small" valign=top>{$groupvalues.description}</td>
 					  </tr>

Modified: vtigercrm/branches/5.0.3/Smarty/templates/UserGroups.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/UserGroups.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/UserGroups.tpl Wed Dec 13 02:47:57 2006
@@ -19,7 +19,7 @@
 <tr>
 <td class="listTableRow small" valign="top" width="5%">{$smarty.foreach.groupiter.iteration}</td>
 {if $IS_ADMIN}
-<td class="listTableRow small" valign="top"><a href="index.php?module=Users&action=GroupDetailView&parenttab=Settings&groupId={$id}">{$groupname.1}</a></td>
+<td class="listTableRow small" valign="top"><a href="index.php?module=Settings&action=GroupDetailView&parenttab=Settings&groupId={$id}">{$groupname.1}</a></td>
 {else}
 <td class="listTableRow small" valign="top">{$groupname.1}</td>
 {/if}

Modified: vtigercrm/branches/5.0.3/include/js/dtlviewajax.js
==============================================================================
--- vtigercrm/branches/5.0.3/include/js/dtlviewajax.js (original)
+++ vtigercrm/branches/5.0.3/include/js/dtlviewajax.js Wed Dec 13 02:47:57 2006
@@ -238,7 +238,7 @@
 			getObj(dtlView).innerHTML = "<a href=\"index.php?module=Users&action=DetailView&record="+tagValue+"\">"+hdObj.value+"&nbsp;</a>";
 		}else if(isAdmin == "1" && assign_type_G == true)
 		{
-			getObj(dtlView).innerHTML = "<a href=\"index.php?module=Users&action=GroupDetailView&groupId="+tagValue+"\">"+hdObj.value+"&nbsp;</a>";
+			getObj(dtlView).innerHTML = "<a href=\"index.php?module=Settings&action=GroupDetailView&groupId="+tagValue+"\">"+hdObj.value+"&nbsp;</a>";
 		}
 	}else if(uitype == '56')
 	{

Modified: vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php (original)
+++ vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php Wed Dec 13 02:47:57 2006
@@ -222,7 +222,7 @@
 			$label_fld["secid"][] = $user_id;
 			$label_fld["link"][] = "index.php?module=Users&action=DetailView&record=".$user_id;
 			$label_fld["secid"][] = $groupid;
-			$label_fld["link"][] = "index.php?module=Users&action=GroupDetailView&groupId=".$groupid;
+			$label_fld["link"][] = "index.php?module=Settings&action=GroupDetailView&groupId=".$groupid;
 		}
 		//Security Checks
 		if($fieldlabel == 'Assigned To' && $is_admin==false && $profileGlobalPermission[2] == 1 && ($defaultOrgSharingPermission[getTabid($module)] == 3 or $defaultOrgSharingPermission[getTabid($module)] == 0))

Modified: vtigercrm/branches/5.0.3/include/utils/UserInfoUtil.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/utils/UserInfoUtil.php (original)
+++ vtigercrm/branches/5.0.3/include/utils/UserInfoUtil.php Wed Dec 13 02:47:57 2006
@@ -613,7 +613,7 @@
 	$sql = "insert into vtiger_groups(name,description) values('" .$groupName ."','". $groupDescription ."')";
 	$result = $adb->query($sql); 
 	$log->debug("Exiting createNewGroup method ...");
-	header("Location: index.php?module=Users&action=listgroups");
+	header("Location: index.php?module=Settings&action=listgroups");
 	
 }
 
@@ -3789,7 +3789,7 @@
 	if($entityType == 'groups')
 	{
 		$groupNameArr = getGroupInfo($entityid); 
-		$display_out = "<a href='index.php?module=Users&action=GroupDetailView&returnaction=OrgSharingDetailView&groupId=".$entityid."'>Group::". $groupNameArr[0]." </a>";			
+		$display_out = "<a href='index.php?module=Settings&action=GroupDetailView&returnaction=OrgSharingDetailView&groupId=".$entityid."'>Group::". $groupNameArr[0]." </a>";			
 	}
 	elseif($entityType == 'roles')
 	{

Modified: vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php Wed Dec 13 02:47:57 2006
@@ -817,6 +817,17 @@
 
 'LBL_STEP_2_2'=>'Step 2 of 2',
 'LBL_FINISH_BUTTON'=>'Finish',
+
+//Added while moving Groups file from User to Setting Module
+'LBL_NEW_GROUP'=>'New Group',
+'LBL_GROUPS'=>'Groups',
+'LBL_GROUP_NAME'=>'Group Name',
+'LBL_ROLES_SUBORDINATES'=>'Roles and Subordinates',
+'LBL_MEMBER_AVLBL'=>'Available Entities & Members',
+'LBL_MEMBER_SELECTED'=>'Selected Members',
+'LBL_ENTITY'=>'Entity',
+'LBL_OF'=>'of',
+
 );
 
 

Modified: vtigercrm/branches/5.0.3/modules/Users/DeleteGroup.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Users/DeleteGroup.php (original)
+++ vtigercrm/branches/5.0.3/modules/Users/DeleteGroup.php Wed Dec 13 02:47:57 2006
@@ -33,5 +33,5 @@
 deleteGroup($del_id,$transferId,$transferType);
 
 
-header("Location: index.php?action=listgroups&module=Users&parenttab=Settings");
+header("Location: index.php?action=listgroups&module=Settings&parenttab=Settings");
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Wed Dec 13 05:15:46 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Dec 2006 10:15:46 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9963 -
 /vtigercrm/branches/5.0.3/modules/Users/LoginHistory.php
Message-ID: <20061213101546.A1839788B5B@vtiger.fosslabs.com>

Author: richie
Date: Wed Dec 13 03:15:40 2006
New Revision: 9963

Log:
added again

Added:
    vtigercrm/branches/5.0.3/modules/Users/LoginHistory.php   (with props)




From vtigercrm-commits at vtiger.fosslabs.com  Wed Dec 13 05:17:17 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Dec 2006 10:17:17 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9964 - in
 /vtigercrm/branches/5.0.3/modules/Settings: ListLoginHistory.php
 language/en_us.lang.php
Message-ID: <20061213101717.499A0788B5B@vtiger.fosslabs.com>

Author: richie
Date: Wed Dec 13 03:17:11 2006
New Revision: 9964

Log:
LoginHistory moved to settings

Added:
    vtigercrm/branches/5.0.3/modules/Settings/ListLoginHistory.php
Modified:
    vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php

Modified: vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php Wed Dec 13 03:17:11 2006
@@ -828,6 +828,46 @@
 'LBL_ENTITY'=>'Entity',
 'LBL_OF'=>'of',
 
+//Sharing
+'LBL_GLOBAL_ACCESS_PRIVILEGES'=>'Organization-level Sharing Rules',
+'LBL_RECALCULATE_BUTTON'=>'Recalculate',
+'LBL_CHANGE'=>'Change',
+'LBL_PRIVILEGES'=>'Privileges',
+'LBL_CUSTOM_ACCESS_PRIVILEGES'=>'Custom Sharing Rules',
+'LBL_ADD_PRIVILEGES_BUTTON'=>'Add Privileges',
+'LBL_RULE_NO'=>'Rule No.',
+'LBL_CAN_BE_ACCESSED'=>'can be accessed by',
+'LBL_CUSTOM_ACCESS_MESG'=>'No Custom Access Rules defined .',
+'LNK_CLICK_HERE'=>'Click here',
+'LBL_CREATE_RULE_MESG'=>'to create a new Rule',
+'LBL_RECALC_MSG'=>'Are you sure, you wish to Recalculate Sharing Access?',
+'LBL_YES'=>'Yes',
+'LBL_NO'=>'No',
+'LBL_IN_PERMISSION'=>'in the permission',
+'LBL_RELATED_MODULE_RIGHTS'=>'Related Module Rights',
+'LBL_USR_CAN_ACCESS'=>'Users can ',
+'LBL_USR_OTHERS'=>' other users ',
+'LBL_USR_CANNOT_ACCESS'=>'Users cannot access other users ',
+ 
+'LBL_ORG_SHARING_PRIVILEGES'=>'Organisation Sharing  Privileges',
+'LBL_EDIT_PERMISSIONS'=>'Edit Permissions',
+'LBL_SAVE_PERMISSIONS'=>'Save Permissions',
+'LBL_READ_ONLY'=>'Public: Read Only',
+'LBL_EDIT_CREATE_ONLY'=>'Public: Read, Create/Edit',
+'LBL_READ_CREATE_EDIT_DEL'=>'Public: Read, Create/Edit, Delete',
+'LBL_PRIVATE'=>'Private',
+ 
+'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',
+
+//Added for User Login History While moving from User to Settings
+'LBL_LOGIN_HISTORY'=>'Login History',
 );
 
 




From vtigercrm-commits at vtiger.fosslabs.com  Wed Dec 13 05:45:00 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Dec 2006 10:45:00 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9965 -
 /vtigercrm/branches/5.0.3/modules/Calendar/DetailView.php
Message-ID: <20061213104500.8251D788B5B@vtiger.fosslabs.com>

Author: richie
Date: Wed Dec 13 03:44:56 2006
New Revision: 9965

Log:
i18n support for calendar combo

Modified:
    vtigercrm/branches/5.0.3/modules/Calendar/DetailView.php

Modified: vtigercrm/branches/5.0.3/modules/Calendar/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Calendar/DetailView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Calendar/DetailView.php Wed Dec 13 03:44:56 2006
@@ -136,21 +136,30 @@
 $data['date_start'] = $stdate;
 $data['due_date'] = $enddate;
 $data['assigned_user_id'] = $finaldata['assigned_user_id'];
-$data['taskpriority'] = $mod_strings[$finaldata['taskpriority']];
+if($mod_strings[$finaldata['taskpriority']] != '')
+	$data['taskpriority'] = $mod_strings[$finaldata['taskpriority']];
+else
+	$data['taskpriority'] = $finaldata['taskpriority'];
 $data['modifiedtime'] = $finaldata['modifiedtime'];
 $data['createdtime'] = $finaldata['createdtime'];
 $data['parent_name'] = $finaldata['parent_id'];
 $data['description'] = $finaldata['description'];
 if($activity_mode == 'Task')
 {
-	$data['taskstatus'] = $mod_strings[$finaldata['taskstatus']];
+	if($mod_strings[$finaldata['taskstatus']] != '')
+		$data['taskstatus'] = $mod_strings[$finaldata['taskstatus']];
+	else
+		$data['taskstatus'] = $finaldata['taskstatus'];
 	$data['activitytype'] = $activity_mode;
 	$data['contact_id'] = $finaldata['contact_id'];
 }
 elseif($activity_mode == 'Events')
 {
 	$data['visibility'] = $finaldata['visibility'];
-	$data['eventstatus'] = $mod_strings[$finaldata['eventstatus']];
+	if($mod_strings[$finaldata['taskstatus']] != '')
+		$data['eventstatus'] = $mod_strings[$finaldata['eventstatus']];
+	else
+		$data['eventstatus'] = $finaldata['eventstatus'];
 	$data['activitytype'] = $finaldata['activitytype'];
 	$data['location'] = $finaldata['location'];
 	//Calculating reminder time




From vtigercrm-commits at vtiger.fosslabs.com  Wed Dec 13 07:37:46 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Dec 2006 12:37:46 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9966 - in
 /vtigercrm/branches/5.0.3: include/fpdf/fpdf.php
 modules/Reports/CreatePDF.php
Message-ID: <20061213123747.1EC7A7895F9@vtiger.fosslabs.com>

Author: richie
Date: Wed Dec 13 05:37:39 2006
New Revision: 9966

Log:
Pdf truncated . Fixes #2255

Modified:
    vtigercrm/branches/5.0.3/include/fpdf/fpdf.php
    vtigercrm/branches/5.0.3/modules/Reports/CreatePDF.php

Modified: vtigercrm/branches/5.0.3/include/fpdf/fpdf.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/fpdf/fpdf.php (original)
+++ vtigercrm/branches/5.0.3/include/fpdf/fpdf.php Wed Dec 13 05:37:39 2006
@@ -122,7 +122,9 @@
 	if(is_string($format))
 	{
 		$format=strtolower($format);
-		if($format=='a3')
+		if($format=='a1')
+			$format=array(2500,3000);
+		elseif($format=='a3')
 			$format=array(841.89,1190.55);
 		elseif($format=='a4')
 			$format=array(595.28,841.89);

Modified: vtigercrm/branches/5.0.3/modules/Reports/CreatePDF.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Reports/CreatePDF.php (original)
+++ vtigercrm/branches/5.0.3/modules/Reports/CreatePDF.php Wed Dec 13 05:37:39 2006
@@ -52,6 +52,7 @@
 
 function Html2PDF($orientation='P',$unit='mm',$format='A4')
 {
+//echo '<pre>';print_r($format);echo '</pre>';	
     //Call parent constructor
     $this->FPDF($orientation,$unit,$format);
     //Initialization
@@ -295,35 +296,6 @@
 $filterlist = $oReportRun->RunTimeFilter($filtercolumn,$filter,$_REQUEST["startdate"],$_REQUEST["enddate"]);
 
 $arr_val = $oReportRun->GenerateReport("PDF",$filterlist);
-
-if(isset($arr_val))
-{
-        $columnlength = count($arr_val[0]);
-}
-
-if($columnlength > 0 && $columnlength <= 4)
-{
-        $pdf = new Html2PDF('P','mm','A4');
-}elseif($columnlength >= 5 && $columnlength < 8)
-{
-        $pdf = new Html2PDF('L','mm','A4');
-}elseif($columnlength >= 8 && $columnlength <= 12)
-{
-        $pdf = new Html2PDF('P','mm','A3');
-}elseif($columnlength > 12)
-{
-        $pdf = new Html2PDF('L','mm','A3');
-}
-
-$pdf->AddPage();
-
-$pdf->SetFillColor(224,235,255);
-$pdf->SetTextColor(0);
-$pdf->SetFont('Arial','B',14);
-$pdf->Cell(($pdf->columnlength*50),10,$oReport->reportname,0,0,'C',0);
-$pdf->Ln();
-
-$pdf->SetFont('Arial','',10);
 
 if(isset($arr_val))
 {
@@ -396,6 +368,35 @@
 '.$dataHTML.'
 </table>';
 
+if(isset($arr_val))
+{
+	$columnlength = array_sum($col_width);
+}
+
+if($columnlength <= 420 )
+{
+        $pdf = new Html2PDF('P','mm','A5');
+}elseif($columnlength >= 421 && $columnlength <= 600)
+{
+        $pdf = new Html2PDF('L','mm','A4');
+}elseif($columnlength >=601 && $columnlength <= 850)
+{
+        $pdf = new Html2PDF('P','mm','A3');
+}elseif($columnlength >=851 )
+{
+        $pdf = new Html2PDF('L','mm','A1');
+}
+//echo '<pre>';print_r($columnlength);echo '</pre>';
+$pdf->AddPage();
+
+$pdf->SetFillColor(224,235,255);
+$pdf->SetTextColor(0);
+$pdf->SetFont('Arial','B',14);
+$pdf->Cell(($pdf->columnlength*50),10,$oReport->reportname,0,0,'C',0);
+$pdf->Ln();
+
+$pdf->SetFont('Arial','',10);
+
 $pdf->WriteHTML($html);
 $pdf->Output('Reports.pdf','D');
 exit();




From vtigercrm-commits at vtiger.fosslabs.com  Wed Dec 13 09:05:25 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Dec 2006 14:05:25 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9967 - in
 /vtigercrm/branches/5.0.3: Smarty/templates/FieldAccess.tpl
 modules/Settings/DefaultFieldPermissions.php
 modules/Settings/EditDefOrgFieldLevelAccess.php
 modules/Settings/UpdateDefaultFieldLevelAccess.php
Message-ID: <20061213140525.A51CB789BF7@vtiger.fosslabs.com>

Author: richie
Date: Wed Dec 13 07:05:14 2006
New Revision: 9967

Log:
Field access moved to settings

Added:
    vtigercrm/branches/5.0.3/modules/Settings/DefaultFieldPermissions.php   (with props)
    vtigercrm/branches/5.0.3/modules/Settings/EditDefOrgFieldLevelAccess.php   (with props)
    vtigercrm/branches/5.0.3/modules/Settings/UpdateDefaultFieldLevelAccess.php   (with props)
Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/FieldAccess.tpl

Modified: vtigercrm/branches/5.0.3/Smarty/templates/FieldAccess.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/FieldAccess.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/FieldAccess.tpl Wed Dec 13 07:05:14 2006
@@ -23,7 +23,7 @@
 		<!-- DISPLAY -->
 		<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
 		<form action="index.php" method="post" name="new" id="form">
-		<input type="hidden" name="module" value="Users">
+		<input type="hidden" name="module" value="Settings">
 		<input type="hidden" name="parenttab" value="Settings">
 		<input type="hidden" name="fld_module" id="fld_module" value="{$DEF_MODULE}">
 		{if $MODE neq 'view'}
@@ -32,7 +32,7 @@
 			<input type="hidden" name="action" value="EditDefOrgFieldLevelAccess">
 		{/if}	
 		<tr>
-			<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}orgshar.gif" alt="Users" width="48" height="48" border=0 title="Users"></td>
+			<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}orgshar.gif" alt="Settings" width="48" height="48" border=0 title="Settings"></td>
 			<td colspan=2 class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > {$MOD.LBL_FIELDS_ACCESS} </b></td>
 			<td rowspan=2 class="small" align=right>&nbsp;</td>
 		</tr>




From vtigercrm-commits at vtiger.fosslabs.com  Wed Dec 13 09:31:04 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Dec 2006 14:31:04 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9968 - in
 /vtigercrm/branches/5.0.3: Smarty/templates/ modules/Settings/
 modules/Users/
Message-ID: <20061213143104.7A88F789BF0@vtiger.fosslabs.com>

Author: richie
Date: Wed Dec 13 07:30:54 2006
New Revision: 9968

Log:
Sharing access, Defaultmodule view moved to settings

Added:
    vtigercrm/branches/5.0.3/modules/Settings/DefModuleView.php
    vtigercrm/branches/5.0.3/modules/Settings/OrgSharingDetailView.php
    vtigercrm/branches/5.0.3/modules/Settings/SaveSharingRule.php
Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/OrgSharingDetailView.tpl
    vtigercrm/branches/5.0.3/modules/Users/DeleteSharingRule.php
    vtigercrm/branches/5.0.3/modules/Users/RecalculateSharingRules.php
    vtigercrm/branches/5.0.3/modules/Users/SaveOrgSharing.php

Modified: vtigercrm/branches/5.0.3/Smarty/templates/OrgSharingDetailView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/OrgSharingDetailView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/OrgSharingDetailView.tpl Wed Dec 13 07:30:54 2006
@@ -228,7 +228,7 @@
                 'index.php',
                 {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
                         method: 'post',
-                        postBody: 'module=Users&action=UsersAjax&orgajax=true&mode='+mode+'&sharing_module='+modulename+'&shareid='+id,
+                        postBody: 'module=Settings&action=SettingsAjax&orgajax=true&mode='+mode+'&sharing_module='+modulename+'&shareid='+id,
                         onComplete: function(response) {ldelim}
                                 $("status").style.display="none";
                                 $("tempdiv").innerHTML=response.responseText;

Modified: vtigercrm/branches/5.0.3/modules/Users/DeleteSharingRule.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Users/DeleteSharingRule.php (original)
+++ vtigercrm/branches/5.0.3/modules/Users/DeleteSharingRule.php Wed Dec 13 07:30:54 2006
@@ -13,5 +13,5 @@
 $shareid =  $_REQUEST['shareid'];
 deleteSharingRule($shareid);
 
-header("Location: index.php?module=Users&action=OrgSharingDetailView&parenttab=Settings");
+header("Location: index.php?module=Settings&action=OrgSharingDetailView&parenttab=Settings");
 ?>

Modified: vtigercrm/branches/5.0.3/modules/Users/RecalculateSharingRules.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Users/RecalculateSharingRules.php (original)
+++ vtigercrm/branches/5.0.3/modules/Users/RecalculateSharingRules.php Wed Dec 13 07:30:54 2006
@@ -11,7 +11,7 @@
 
 RecalculateSharingRules();
 
-header("Location: index.php?action=OrgSharingDetailView&parenttab=Settings&module=Users");
+header("Location: index.php?action=OrgSharingDetailView&parenttab=Settings&module=Settings");
 
 
 ?>

Modified: vtigercrm/branches/5.0.3/modules/Users/SaveOrgSharing.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Users/SaveOrgSharing.php (original)
+++ vtigercrm/branches/5.0.3/modules/Users/SaveOrgSharing.php Wed Dec 13 07:30:54 2006
@@ -39,6 +39,6 @@
 			
 		}
 }
-$loc = "Location: index.php?action=OrgSharingDetailView&module=Users&parenttab=Settings";
+$loc = "Location: index.php?action=OrgSharingDetailView&module=Settings&parenttab=Settings";
 header($loc);
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Wed Dec 13 09:46:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Dec 2006 14:46:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9969 - in
 /vtigercrm/branches/5.0.3: Smarty/templates/ modules/Settings/
Message-ID: <20061213144640.51442789BF6@vtiger.fosslabs.com>

Author: richie
Date: Wed Dec 13 07:46:28 2006
New Revision: 9969

Log:
Audit trial moved to settings

Added:
    vtigercrm/branches/5.0.3/modules/Settings/AuditTrail.php   (with props)
    vtigercrm/branches/5.0.3/modules/Settings/AuditTrailList.php   (with props)
    vtigercrm/branches/5.0.3/modules/Settings/SaveAuditTrail.php
    vtigercrm/branches/5.0.3/modules/Settings/ShowAuditTrail.php   (with props)
Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/AuditTrailList.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/ShowAuditTrail.tpl

Modified: vtigercrm/branches/5.0.3/Smarty/templates/AuditTrailList.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/AuditTrailList.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/AuditTrailList.tpl Wed Dec 13 07:46:28 2006
@@ -18,10 +18,10 @@
         <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
         <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
 <form action="index.php" method="post" name="AuditTrail" id="form">
-<input type='hidden' name='module' value='Users'>
+<input type='hidden' name='module' value='Settings'>
 <input type='hidden' name='action' value='AuditTrail'>
 <input type='hidden' name='return_action' value='ListView'>
-<input type='hidden' name='return_module' value='Users'>
+<input type='hidden' name='return_module' value='Settings'>
 <input type='hidden' name='parenttab' value='Settings'>
 
         <br>
@@ -135,7 +135,7 @@
                 'index.php',
                 {queue: {position: 'end', scope: 'command'},
                         method: 'post',
-                        postBody: 'module=Users&action=UsersAjax&file=SaveAuditTrail&ajax=true&audit_trail='+status,
+                        postBody: 'module=Settings&action=SettingsAjax&file=SaveAuditTrail&ajax=true&audit_trail='+status,
                         onComplete: function(response) {
                                 $("status").style.display="none";
                         }
@@ -149,7 +149,7 @@
 {
 	
 	var userid = $('user_list').options[$('user_list').selectedIndex].value;
-	window.open("index.php?module=Users&action=UsersAjax&file=ShowAuditTrail&userid="+userid,"","width=645,height=750,resizable=0,scrollbars=1,left=100");
+	window.open("index.php?module=Settings&action=SettingsAjax&file=ShowAuditTrail&userid="+userid,"","width=645,height=750,resizable=0,scrollbars=1,left=100");
 	
 
 }

Modified: vtigercrm/branches/5.0.3/Smarty/templates/ShowAuditTrail.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/ShowAuditTrail.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/ShowAuditTrail.tpl Wed Dec 13 07:46:28 2006
@@ -14,7 +14,7 @@
 <body class="small" marginwidth=0 marginheight=0 leftmargin=0 topmargin=0 bottommargin=0 rigthmargin=0>
 
 <form action="index.php" method="post" id="form">
-<input type='hidden' name='module' value='Users'>
+<input type='hidden' name='module' value='Settings'>
 <input type='hidden' id='userid' name='userid' value='{$USERID}'>
 
 <table  width="100%" border="0" cellspacing="0" cellpadding="0" class="mailClient mailClientBg">
@@ -50,7 +50,7 @@
                 'index.php',
                 {queue: {position: 'end', scope: 'command'},
                         method: 'post',
-                        postBody: 'module=Users&action=UsersAjax&file=ShowAuditTrail&ajax=true&'+url+'&userid='+userid,
+                        postBody: 'module=Settings&action=SettingsAjax&file=ShowAuditTrail&ajax=true&'+url+'&userid='+userid,
                         onComplete: function(response) {
                                 $("AuditTrailContents").innerHTML= response.responseText;
                         }




From vtigercrm-commits at vtiger.fosslabs.com  Wed Dec 13 10:06:58 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Dec 2006 15:06:58 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9970 - in
 /vtigercrm/branches/5.0.3: Smarty/templates/Settings/InventoryTerms.tpl
 modules/Settings/OrganizationTermsandConditions.php
 modules/Settings/savetermsandconditions.php
Message-ID: <20061213150658.29EAC789C08@vtiger.fosslabs.com>

Author: richie
Date: Wed Dec 13 08:06:51 2006
New Revision: 9970

Log:
inventory terms and condition moved to settings

Added:
    vtigercrm/branches/5.0.3/modules/Settings/OrganizationTermsandConditions.php
    vtigercrm/branches/5.0.3/modules/Settings/savetermsandconditions.php
Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/Settings/InventoryTerms.tpl

Modified: vtigercrm/branches/5.0.3/Smarty/templates/Settings/InventoryTerms.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/Settings/InventoryTerms.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/Settings/InventoryTerms.tpl Wed Dec 13 08:06:51 2006
@@ -18,7 +18,7 @@
         <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
 <br>
 <form action="index.php" method="post" name="tandc">
-<input type="hidden" name="module" value="Users">
+<input type="hidden" name="module" value="Settings">
 <input type="hidden" name="action">
 <input type="hidden" name="inv_terms_mode">
 <input type="hidden" name="parenttab" value="Settings">




From vtigercrm-commits at vtiger.fosslabs.com  Thu Dec 14 05:09:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 14 Dec 2006 10:09:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9971 -
 /vtigercrm/branches/5.0.3/modules/PurchaseOrder/Save.php
Message-ID: <20061214100939.ECCFA789AAD@vtiger.fosslabs.com>

Author: richie
Date: Thu Dec 14 03:09:35 2006
New Revision: 9971

Log:
* Modified to update the stock when PO status is Received Shipment when it is created also, Fixes #2741

Modified:
    vtigercrm/branches/5.0.3/modules/PurchaseOrder/Save.php

Modified: vtigercrm/branches/5.0.3/modules/PurchaseOrder/Save.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/PurchaseOrder/Save.php (original)
+++ vtigercrm/branches/5.0.3/modules/PurchaseOrder/Save.php Thu Dec 14 03:09:35 2006
@@ -33,13 +33,18 @@
 
 //Added code for auto product stock updation on receiving goods
 $focus->update_prod_stock='';
-if($focus->column_fields['postatus'] == 'Received Shipment' && $focus->mode == 'edit')
+if($focus->column_fields['postatus'] == 'Received Shipment')
 {
-        $prev_postatus=getPoStatus($focus->id);
-        if($focus->column_fields['postatus'] != $prev_postatus)
-        {
-                $focus->update_prod_stock='true';
-        }
+	if($focus->mode != 'edit')
+		$focus->update_prod_stock='true';
+	else
+	{
+        	$prev_postatus=getPoStatus($focus->id);
+        	if($focus->column_fields['postatus'] != $prev_postatus)
+        	{
+        	        $focus->update_prod_stock='true';
+        	}
+	}
 
 }
 




From vtigercrm-commits at vtiger.fosslabs.com  Thu Dec 14 05:23:29 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 14 Dec 2006 10:23:29 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9972 - in
 /vtigercrm/branches/5.0.3: ./ modules/Accounts/ modules/Calendar/
 modules/Contacts/ modules/HelpDesk/ modules/Leads/
 modules/Settings/language/
Message-ID: <20061214102329.35C6D789AAD@vtiger.fosslabs.com>

Author: richie
Date: Thu Dec 14 03:23:15 2006
New Revision: 9972

Log:
mailmerge template option will be hidden if no template is present

Modified:
    vtigercrm/branches/5.0.3/modules/Accounts/ListView.php
    vtigercrm/branches/5.0.3/modules/Calendar/OpenListView.php
    vtigercrm/branches/5.0.3/modules/Contacts/ListView.php
    vtigercrm/branches/5.0.3/modules/HelpDesk/ListView.php
    vtigercrm/branches/5.0.3/modules/Leads/ListView.php
    vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php
    vtigercrm/branches/5.0.3/vtigerversion.php

Modified: vtigercrm/branches/5.0.3/modules/Accounts/ListView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Accounts/ListView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Accounts/ListView.php Thu Dec 14 03:23:15 2006
@@ -226,7 +226,6 @@
 }
 if(isPermitted("Accounts","Merge") == 'yes') 
 {
-	$smarty->assign("MERGEBUTTON","<td><input title=\"$app_strings[LBL_MERGE_BUTTON_TITLE]\" accessKey=\"$app_strings[LBL_MERGE_BUTTON_KEY]\" class=\"crmbutton small create\" onclick=\"return massMerge('Accounts')\" type=\"submit\" name=\"Merge\" value=\" $app_strings[LBL_MERGE_BUTTON_LABEL]\"></td>");
 	$wordTemplateResult = fetchWordTemplateList("Accounts");
 	$tempCount = $adb->num_rows($wordTemplateResult);
 	$tempVal = $adb->fetch_array($wordTemplateResult);
@@ -235,8 +234,22 @@
 		$optionString .="<option value=\"".$tempVal["templateid"]."\">" .$tempVal["filename"] ."</option>";
 		$tempVal = $adb->fetch_array($wordTemplateResult);
 	}
-	$smarty->assign("WORDTEMPLATEOPTIONS","<td>".$app_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']."</td><td style=\"padding-left:5px;padding-right:5px\"><select class=\"small\" name=\"mergefile\">".$optionString."</select></td>");
-}
+	if($tempCount > 0)
+	{
+		$smarty->assign("WORDTEMPLATEOPTIONS","<td>".$app_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']."</td><td style=\"padding-left:5px;padding-right:5px\"><select class=\"small\" name=\"mergefile\">".$optionString."</select></td>");
+
+		$smarty->assign("MERGEBUTTON","<td><input title=\"$app_strings[LBL_MERGE_BUTTON_TITLE]\" accessKey=\"$app_strings[LBL_MERGE_BUTTON_KEY]\" class=\"crmbutton small create\" onclick=\"return massMerge('Accounts')\" type=\"submit\" name=\"Merge\" value=\" $app_strings[LBL_MERGE_BUTTON_LABEL]\"></td>");
+	}
+	else
+        {
+                require("user_privileges/user_privileges_1.php");
+                if($is_admin == true)
+                {
+		$smarty->assign("MERGEBUTTON",'<td><a href=index.php?module=Settings&action=upload&tempModule='.$currentModule.'>'. $app_strings["LBL_CREATE_MERGE_TEMPLATE"].'</td>');
+                }
+        }
+}
+
 //mass merge for word templates
 
 $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows;
@@ -268,7 +281,7 @@
 $smarty->assign("NAVIGATION", $navigationOutput);
 $smarty->assign("RECORD_COUNTS", $record_string);
 
-$check_button = Button_Check($module);
+$check_button = Button_Check($module); 
 $smarty->assign("CHECK", $check_button);
 
 if(isset($_REQUEST['ajax']) && $_REQUEST['ajax'] != '')

Modified: vtigercrm/branches/5.0.3/modules/Calendar/OpenListView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Calendar/OpenListView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Calendar/OpenListView.php Thu Dec 14 03:23:15 2006
@@ -75,7 +75,7 @@
 	{
 		//for upcoming avtivities
 		$list_query = " select vtiger_crmentity.crmid,vtiger_crmentity.smownerid,vtiger_crmentity.setype, vtiger_activity.*, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_account.accountid, vtiger_account.accountname, vtiger_recurringevents.recurringtype,vtiger_recurringevents.recurringdate from vtiger_activity inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid LEFT JOIN vtiger_activitygrouprelation ON vtiger_activitygrouprelation.activityid = vtiger_crmentity.crmid LEFT JOIN vtiger_groups ON vtiger_groups.groupname = vtiger_activitygrouprelation.groupname left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid left join vtiger_seactivityrel on vtiger_seactivityrel.activityid = vtiger_activity.activityid left outer join vtiger_account on vtiger_account.accountid = vtiger_contactdetails.accountid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid WHERE vtiger_crmentity.deleted=0 and (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task') AND ( vtiger_activity.status is NULL OR vtiger_activity.status != 'Completed' ) and ( vtiger_activity.status is NULL OR vtiger_activity.status != 'Deferred') and  (  vtiger_activity.eventstatus is NULL OR  vtiger_activity.eventstatus != 'Held') and (vtiger_activity.eventstatus is NULL OR  vtiger_activity.eventstatus != 'Not Held' ) ".$upcoming_condition." AND vtiger_crmentity.smownerid !=0 AND vtiger_salesmanactivityrel.smid ='$current_user->id'";
-		if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[9] == 3)
+		if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[16] == 3)
 		{
 			$sec_parameter=getListViewSecurityParameter('Calendar');
 			$list_query .= $sec_parameter;
@@ -87,7 +87,7 @@
 	{
 		//for pending activities
 		$list_query = " select vtiger_crmentity.crmid,vtiger_crmentity.smownerid,vtiger_crmentity.setype, vtiger_activity.*, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_account.accountid, vtiger_account.accountname, vtiger_recurringevents.recurringtype,vtiger_recurringevents.recurringdate from vtiger_activity inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid  LEFT JOIN vtiger_activitygrouprelation ON vtiger_activitygrouprelation.activityid = vtiger_crmentity.crmid LEFT JOIN vtiger_groups ON vtiger_groups.groupname = vtiger_activitygrouprelation.groupname left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid left join vtiger_seactivityrel on vtiger_seactivityrel.activityid = vtiger_activity.activityid left outer join vtiger_account on vtiger_account.accountid = vtiger_contactdetails.accountid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid WHERE vtiger_crmentity.deleted=0 and (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task') AND ( vtiger_activity.status is NULL OR vtiger_activity.status != 'Completed' ) and ( vtiger_activity.status is NULL OR vtiger_activity.status != 'Deferred') and (  vtiger_activity.eventstatus is NULL OR  vtiger_activity.eventstatus != 'Held') and (vtiger_activity.eventstatus is NULL OR  vtiger_activity.eventstatus != 'Not Held' ) ".$pending_condition." AND vtiger_crmentity.smownerid !=0 AND vtiger_salesmanactivityrel.smid ='$current_user->id'";
-		if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[9] == 3)                   
+		if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[16] == 3)                   
                 {
 			$sec_parameter=getListViewSecurityParameter('Calendar'); 
 	                $list_query .= $sec_parameter; 

Modified: vtigercrm/branches/5.0.3/modules/Contacts/ListView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Contacts/ListView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Contacts/ListView.php Thu Dec 14 03:23:15 2006
@@ -234,7 +234,6 @@
 }
 if(isPermitted("Contacts","Merge") == 'yes') 
 {
-	$smarty->assign("MERGEBUTTON","<td><input title=\"$app_strings[LBL_MERGE_BUTTON_TITLE]\" accessKey=\"$app_strings[LBL_MERGE_BUTTON_KEY]\" class=\"crmbutton small create\" onclick=\"return massMerge('Contacts')\" type=\"submit\" name=\"Merge\" value=\" $app_strings[LBL_MERGE_BUTTON_LABEL]\"></td>");
 	$wordTemplateResult = fetchWordTemplateList("Contacts");
 	$tempCount = $adb->num_rows($wordTemplateResult);
 	$tempVal = $adb->fetch_array($wordTemplateResult);
@@ -243,7 +242,20 @@
 		$optionString .="<option value=\"".$tempVal["templateid"]."\">" .$tempVal["filename"] ."</option>";
 		$tempVal = $adb->fetch_array($wordTemplateResult);
 	}
-	$smarty->assign("WORDTEMPLATEOPTIONS","<td>".$app_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']."</td><td style=\"padding-left:5px;padding-right:5px\"><select class=\"small\" name=\"mergefile\">".$optionString."</select></td>");
+	if($tempCount > 0)
+	{
+		$smarty->assign("WORDTEMPLATEOPTIONS","<td>".$app_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']."</td><td style=\"padding-left:5px;padding-right:5px\"><select class=\"small\" name=\"mergefile\">".$optionString."</select></td>");
+	
+		$smarty->assign("MERGEBUTTON","<td><input title=\"$app_strings[LBL_MERGE_BUTTON_TITLE]\" accessKey=\"$app_strings[LBL_MERGE_BUTTON_KEY]\" class=\"crmbutton small create\" onclick=\"return massMerge('Contacts')\" type=\"submit\" name=\"Merge\" value=\" $app_strings[LBL_MERGE_BUTTON_LABEL]\"></td>");
+	}
+	else
+	{ 
+		require("user_privileges/user_privileges_1.php");
+		if($is_admin == true)
+		{
+			$smarty->assign("MERGEBUTTON","<td><a href=index.php?module=Settings&action=upload&tempModule=".$currentModule.">". $app_strings['LBL_CREATE_MERGE_TEMPLATE']."</td>");
+		}
+	}
 }
 //mass merge for word templates
 

Modified: vtigercrm/branches/5.0.3/modules/HelpDesk/ListView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/HelpDesk/ListView.php (original)
+++ vtigercrm/branches/5.0.3/modules/HelpDesk/ListView.php Thu Dec 14 03:23:15 2006
@@ -204,7 +204,6 @@
 }
 if(isPermitted("HelpDesk","Merge") == 'yes') 
 {
-	$smarty->assign("MERGEBUTTON","<td><input title=\"$app_strings[LBL_MERGE_BUTTON_TITLE]\" accessKey=\"$app_strings[LBL_MERGE_BUTTON_KEY]\" class=\"crmbutton small create\" onclick=\"return massMerge('HelpDesk')\" type=\"submit\" name=\"Merge\" value=\" $app_strings[LBL_MERGE_BUTTON_LABEL]\"></td>");
 	$wordTemplateResult = fetchWordTemplateList("HelpDesk");
 	$tempCount = $adb->num_rows($wordTemplateResult);
 	$tempVal = $adb->fetch_array($wordTemplateResult);
@@ -213,7 +212,21 @@
 		$optionString .="<option value=\"".$tempVal["templateid"]."\">" .$tempVal["filename"] ."</option>";
 		$tempVal = $adb->fetch_array($wordTemplateResult);
 	}
-	$smarty->assign("WORDTEMPLATEOPTIONS","<td>".$app_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']."</td><td style=\"padding-left:5px;padding-right:5px\"><select class=\"small\" name=\"mergefile\">".$optionString."</select></td>");
+	if($tempCount > 0)
+	{
+		$smarty->assign("WORDTEMPLATEOPTIONS","<td>".$app_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']."</td><td style=\"padding-left:5px;padding-right:5px\"><select class=\"small\" name=\"mergefile\">".$optionString."</select></td>");
+
+		$smarty->assign("MERGEBUTTON","<td><input title=\"$app_strings[LBL_MERGE_BUTTON_TITLE]\" accessKey=\"$app_strings[LBL_MERGE_BUTTON_KEY]\" class=\"crmbutton small create\" onclick=\"return massMerge('HelpDesk')\" type=\"submit\" name=\"Merge\" value=\" $app_strings[LBL_MERGE_BUTTON_LABEL]\"></td>");
+	}
+	else
+        {
+                require("user_privileges/user_privileges_1.php");
+                if($is_admin == true)
+                {
+			$smarty->assign("MERGEBUTTON",'<td><a href=index.php?module=Settings&action=upload&tempModule='.$currentModule.'>'. $app_strings["LBL_CREATE_MERGE_TEMPLATE"].'</td>');
+                }
+        }
+
 }
 //mass merge for word templates
 

Modified: vtigercrm/branches/5.0.3/modules/Leads/ListView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Leads/ListView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Leads/ListView.php Thu Dec 14 03:23:15 2006
@@ -221,7 +221,6 @@
 }
 if(isPermitted("Leads","Merge") == 'yes') 
 {
-	$smarty->assign("MERGEBUTTON","<td><input title=\"$app_strings[LBL_MERGE_BUTTON_TITLE]\" accessKey=\"$app_strings[LBL_MERGE_BUTTON_KEY]\" class=\"crmbutton small create\" onclick=\"return massMerge('Leads')\" type=\"submit\" name=\"Merge\" value=\" $app_strings[LBL_MERGE_BUTTON_LABEL]\"></td>");
 	$wordTemplateResult = fetchWordTemplateList("Leads");
 	$tempCount = $adb->num_rows($wordTemplateResult);
 	$tempVal = $adb->fetch_array($wordTemplateResult);
@@ -230,7 +229,22 @@
 		$optionString .="<option value=\"".$tempVal["templateid"]."\">" .$tempVal["filename"] ."</option>";
 		$tempVal = $adb->fetch_array($wordTemplateResult);
 	}
-	$smarty->assign("WORDTEMPLATEOPTIONS","<td>".$mod_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']."</td><td style=\"padding-left:5px;padding-right:5px\"><select class=\"small\" name=\"mergefile\">".$optionString."</select></td>");
+	if($tempCount > 0)
+	{
+		$smarty->assign("WORDTEMPLATEOPTIONS","<td>".$mod_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']."</td><td style=\"padding-left:5px;padding-right:5px\"><select class=\"small\" name=\"mergefile\">".$optionString."</select></td>");
+
+		$smarty->assign("MERGEBUTTON","<td><input title=\"$app_strings[LBL_MERGE_BUTTON_TITLE]\" accessKey=\"$app_strings[LBL_MERGE_BUTTON_KEY]\" class=\"crmbutton small create\" onclick=\"return massMerge('Leads')\" type=\"submit\" name=\"Merge\" value=\" $app_strings[LBL_MERGE_BUTTON_LABEL]\"></td>");
+	}
+	else
+        {
+                require("user_privileges/user_privileges_1.php");
+                if($is_admin == true)
+                {
+			$smarty->assign("MERGEBUTTON",'<td><a href=index.php?module=Settings&action=upload&tempModule='.$currentModule.'>'. $app_strings["LBL_CREATE_MERGE_TEMPLATE"].'</td>');
+                }
+        }
+
+
 }
 //mass merge for word templates
 

Modified: vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php Thu Dec 14 03:23:15 2006
@@ -827,8 +827,13 @@
 'LBL_MEMBER_SELECTED'=>'Selected Members',
 'LBL_ENTITY'=>'Entity',
 'LBL_OF'=>'of',
-
-//Sharing
+'LBL_CREATE_NEW_GROUP'=>'Create New Group',
+'LBL_ADD_GROUP_BUTTON'=>'Add Group',
+'LBL_GROUP_MESG1'=>'Groups are a flexible way to assign access rights, when complex access rights has to be defined. You can combine multiple entities like Roles, Users, profiles etc into a single group.',
+'LBL_GROUP_MESG2'=>'To add, select the Entity members from left and click the ">>" button.',
+'LBL_GROUP_MESG3'=>'To remove, select the group members from the right and click the "<<" button.',
+
+//Sharing Privileges
 'LBL_GLOBAL_ACCESS_PRIVILEGES'=>'Organization-level Sharing Rules',
 'LBL_RECALCULATE_BUTTON'=>'Recalculate',
 'LBL_CHANGE'=>'Change',
@@ -868,6 +873,12 @@
 
 //Added for User Login History While moving from User to Settings
 'LBL_LOGIN_HISTORY'=>'Login History',
+//Sharing Access module moved to Setting
+'Read/Write'=>'Read/Write',
+'Read Only '=>'Read Only ',
+'LBL_GROUP'=>'Group',
+'LBL_ACCESS_RIGHTS_FOR_MODULES'=>'Access rights for relative modules',
+'LBL_ADD_RULE'=>'Add Rule',
 );
 
 

Modified: vtigercrm/branches/5.0.3/vtigerversion.php
==============================================================================
--- vtigercrm/branches/5.0.3/vtigerversion.php (original)
+++ vtigercrm/branches/5.0.3/vtigerversion.php Thu Dec 14 03:23:15 2006
@@ -10,5 +10,5 @@
  ********************************************************************************/
 $patch_version = '';
 $modified_database = '';
-$vtiger_current_version = '5.0.2';
+$vtiger_current_version = '5.0.3';
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Thu Dec 14 06:02:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 14 Dec 2006 11:02:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9973 - in
 /vtigercrm/branches/5.0.3: Smarty/templates/ActivityDetailView.tpl
 modules/Calendar/DetailView.php
Message-ID: <20061214110230.39EF6789BF4@vtiger.fosslabs.com>

Author: richie
Date: Thu Dec 14 04:02:23 2006
New Revision: 9973

Log:
cannot see invited users in detailview

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/ActivityDetailView.tpl
    vtigercrm/branches/5.0.3/modules/Calendar/DetailView.php

Modified: vtigercrm/branches/5.0.3/Smarty/templates/ActivityDetailView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/ActivityDetailView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/ActivityDetailView.tpl Thu Dec 14 04:02:23 2006
@@ -203,7 +203,7 @@
                                                                                         <td width="30%" valign="top" align=right><b>{$MOD.LBL_USERS}</b></td>
                                                                                         <td width="70%" align=left valign="top" >
 												{foreach item=username key=userid from=$INVITEDUSERS}
-                                                                                        	        {$username.3}<br>
+                                                                                        	        {$username}<br>
                                                                                                 {/foreach}
 											</td>
                                                                                 </tr>

Modified: vtigercrm/branches/5.0.3/modules/Calendar/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Calendar/DetailView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Calendar/DetailView.php Thu Dec 14 04:02:23 2006
@@ -28,7 +28,7 @@
 require_once('include/utils/utils.php');
 require_once('modules/Calendar/calendarLayout.php');
 include_once 'modules/Calendar/header.php';
-global $mod_strings, $currentModule;
+global $mod_strings, $currentModule,$adb;
 if( $_SESSION['mail_send_error']!="")
 {
 	echo '<b><font color=red>'. $mod_strings{"LBL_NOTIFICATION_ERROR"}.'</font></b><br>';
@@ -247,8 +247,18 @@
 		$data['recurringcheck'] = 'No';
 		$data['repeat_month_str'] = '';
 	}
+	$sql = 'select vtiger_users.user_name,vtiger_invitees.* from vtiger_invitees left join vtiger_users on vtiger_invitees.inviteeid=vtiger_users.id where activityid='.$focus->id;
+	$result = $adb->query($sql);
+	$num_rows=$adb->num_rows($result);
+	$invited_users=Array();
+	for($i=0;$i<$num_rows;$i++)
+	{
+		$userid=$adb->query_result($result,$i,'inviteeid');
+		$username=$adb->query_result($result,$i,'user_name');
+		$invited_users[$userid]=$username;
+	}
+	$smarty->assign("INVITEDUSERS",$invited_users);
 	$related_array = getRelatedLists("Calendar", $focus);
-	$smarty->assign("INVITEDUSERS",$related_array['Users']['entries']);
 	$smarty->assign("CONTACTS",$related_array['Contacts']['entries']);
 
 




From vtigercrm-commits at vtiger.fosslabs.com  Thu Dec 14 06:30:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 14 Dec 2006 11:30:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9974 -
 /vtigercrm/branches/5.0.3/Smarty/templates/ActivityEditView.tpl
Message-ID: <20061214113050.8245F78915E@vtiger.fosslabs.com>

Author: richie
Date: Thu Dec 14 04:30:46 2006
New Revision: 9974

Log:
contact list display arranged properly

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/ActivityEditView.tpl

Modified: vtigercrm/branches/5.0.3/Smarty/templates/ActivityEditView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/ActivityEditView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/ActivityEditView.tpl Thu Dec 14 04:30:46 2006
@@ -562,9 +562,7 @@
 								<td><b>{$APP.Contacts}</b></td>
 								<td colspan="2">
 									<input name="contactidlist" id="contactidlist" value="{$CONTACTSID}" type="hidden">
-									<textarea rows="5" name="contactlist" readonly="readonly" class="calTxt">
-									{$CONTACTSNAME}
-									</textarea>&nbsp;
+									<textarea rows="5" name="contactlist" readonly="readonly" class="calTxt">{$CONTACTSNAME}</textarea>&nbsp;
 									<input type="button" onclick="return window.open('index.php?module=Contacts&action=Popup&return_module=Calendar&popuptype=detailview&select=enable&form=EditView&form_submit=false','test','width=640,height=602,resizable=0,scrollbars=0');" class="crmButton small edit" name="selectcnt" value="Select Contacts">
 								</td>
 							</tr>




From vtigercrm-commits at vtiger.fosslabs.com  Thu Dec 14 08:45:08 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 14 Dec 2006 13:45:08 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9975 - in
 /vtigercrm/branches/5.0.3/modules: Contacts/Contacts.php Leads/Leads.php
 Potentials/Potentials.php Quotes/Quotes.php
Message-ID: <20061214134508.3A761789C34@vtiger.fosslabs.com>

Author: richie
Date: Thu Dec 14 06:44:57 2006
New Revision: 9975

Log:
Start and end date not visible in activity history . Fixes #2723

Modified:
    vtigercrm/branches/5.0.3/modules/Contacts/Contacts.php
    vtigercrm/branches/5.0.3/modules/Leads/Leads.php
    vtigercrm/branches/5.0.3/modules/Potentials/Potentials.php
    vtigercrm/branches/5.0.3/modules/Quotes/Quotes.php

Modified: vtigercrm/branches/5.0.3/modules/Contacts/Contacts.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Contacts/Contacts.php (original)
+++ vtigercrm/branches/5.0.3/modules/Contacts/Contacts.php Thu Dec 14 06:44:57 2006
@@ -398,7 +398,7 @@
 		global $log;
 		$log->debug("Entering get_history(".$id.") method ...");
 		$query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status, vtiger_activity.eventstatus,
-		vtiger_activity.activitytype, vtiger_contactdetails.contactid, vtiger_contactdetails.firstname,
+		vtiger_activity.activitytype, vtiger_activity.date_start, vtiger_activity.due_date,vtiger_contactdetails.contactid, vtiger_contactdetails.firstname,
 		vtiger_contactdetails.lastname, vtiger_crmentity.modifiedtime,
 		vtiger_crmentity.createdtime, vtiger_crmentity.description, vtiger_users.user_name
 				from vtiger_activity

Modified: vtigercrm/branches/5.0.3/modules/Leads/Leads.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Leads/Leads.php (original)
+++ vtigercrm/branches/5.0.3/modules/Leads/Leads.php Thu Dec 14 06:44:57 2006
@@ -291,8 +291,9 @@
 	global $log;
 	$log->debug("Entering get_history(".$id.") method ...");
 	$query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status,
-	vtiger_activity.eventstatus, vtiger_activity.activitytype, vtiger_crmentity.modifiedtime,
-	vtiger_crmentity.createdtime, vtiger_crmentity.description, vtiger_users.user_name,vtiger_activitygrouprelation.groupname
+		vtiger_activity.eventstatus, vtiger_activity.activitytype,vtiger_activity.date_start, 
+		vtiger_activity.due_date, vtiger_crmentity.modifiedtime,vtiger_crmentity.createdtime,
+		vtiger_crmentity.description, vtiger_users.user_name,vtiger_activitygrouprelation.groupname
 			from vtiger_activity
 			inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid
 			inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid

Modified: vtigercrm/branches/5.0.3/modules/Potentials/Potentials.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Potentials/Potentials.php (original)
+++ vtigercrm/branches/5.0.3/modules/Potentials/Potentials.php Thu Dec 14 06:44:57 2006
@@ -373,8 +373,9 @@
 			global $log;
 			$log->debug("Entering get_history(".$id.") method ...");
 			$query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status,
-		vtiger_activity.eventstatus, vtiger_activity.activitytype, vtiger_crmentity.modifiedtime,
-		vtiger_crmentity.createdtime, vtiger_crmentity.description, vtiger_users.user_name
+		vtiger_activity.eventstatus, vtiger_activity.activitytype,vtiger_activity.date_start, 
+		vtiger_activity.due_date, vtiger_crmentity.modifiedtime, vtiger_crmentity.createdtime, 
+		vtiger_crmentity.description, vtiger_users.user_name
 				from vtiger_activity
 				inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid
 				inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid

Modified: vtigercrm/branches/5.0.3/modules/Quotes/Quotes.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Quotes/Quotes.php (original)
+++ vtigercrm/branches/5.0.3/modules/Quotes/Quotes.php Thu Dec 14 06:44:57 2006
@@ -206,7 +206,8 @@
 		global $log;
 		$log->debug("Entering get_history(".$id.") method ...");
 		$query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status,
-			vtiger_activity.eventstatus, vtiger_activity.activitytype, vtiger_contactdetails.contactid,
+			vtiger_activity.eventstatus, vtiger_activity.activitytype,vtiger_activity.date_start, 
+			vtiger_activity.due_date, vtiger_contactdetails.contactid,
 			vtiger_contactdetails.firstname,vtiger_contactdetails.lastname, vtiger_crmentity.modifiedtime,
 			vtiger_crmentity.createdtime, vtiger_crmentity.description, vtiger_users.user_name
 			from vtiger_activity




From vtigercrm-commits at vtiger.fosslabs.com  Thu Dec 14 09:26:13 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 14 Dec 2006 14:26:13 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9976 -
 /vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl
Message-ID: <20061214142613.402D8789C0F@vtiger.fosslabs.com>

Author: richie
Date: Thu Dec 14 07:26:07 2006
New Revision: 9976

Log:
Textarea size increased to fix nowarp issue. Fixes 2676

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl

Modified: vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl Thu Dec 14 07:26:07 2006
@@ -133,7 +133,7 @@
 						{/if}
 							<!--{assign var="DESCRIPTION_SEPARATOR_STRING" value=" "}  {* Separates Description *}-->
 							<!--{assign var="DESCRIPTION_WORDWRAP_WIDTH" value="70"} {* No. of chars for word wrapping long lines of Description *}-->
-                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label|escape:'quotes'}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">
+                                                  <td width="100%" class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label|escape:'quotes'}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">
 							{$keyval}<!--|replace:$DESCRIPTION_SEPARATOR_STRING:"\x1"|replace:" ":"\x0"|replace:"\x1":$DESCRIPTION_SEPARATOR_STRING|wordwrap:$DESCRIPTION_WORDWRAP_WIDTH:"<br>&nbsp;"|replace:"\x0":"&nbsp;"}-->
 							</span>
                                               		<div id="editarea_{$label}" style="display:none;">




From vtigercrm-commits at vtiger.fosslabs.com  Fri Dec 15 07:02:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 15 Dec 2006 12:02:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9977 -
 /vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl
Message-ID: <20061215120226.33290789AA1@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Fri Dec 15 05:02:09 2006
New Revision: 9977

Log:
Tag cloud validate has been fixed--Jeri

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl

Modified: vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl Fri Dec 15 05:02:09 2006
@@ -46,7 +46,7 @@
 
 function tagvalidate()
 {ldelim}
-	if(document.getElementById('txtbox_tagfields').value != '')
+	if(trim(document.getElementById('txtbox_tagfields').value) != '')
 		SaveTag('txtbox_tagfields','{$ID}','{$MODULE}');	
 	else
 	{ldelim}




From vtigercrm-commits at vtiger.fosslabs.com  Fri Dec 15 08:25:22 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 15 Dec 2006 13:25:22 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9978 -
 /vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php
Message-ID: <20061215132522.76DD5788A8F@vtiger.fosslabs.com>

Author: richie
Date: Fri Dec 15 06:25:15 2006
New Revision: 9978

Log:
missing labels added

Modified:
    vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php

Modified: vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php Fri Dec 15 06:25:15 2006
@@ -879,7 +879,12 @@
 'LBL_GROUP'=>'Group',
 'LBL_ACCESS_RIGHTS_FOR_MODULES'=>'Access rights for relative modules',
 'LBL_ADD_RULE'=>'Add Rule',
+'LBL_ADD_CUSTOM_RULE'=>'Add Custom Privilege Rule',
+'LBL_RULE_CONSTRUCTION'=>'Rule Construction Display',
+'LBL_STEP'=>'Step',
+'LBL_SELECT_ENTITY'=>'Select an entity below',
+'LBL_CAN_BE_ACCESSED_BY'=>'Can be accessed by',
+'LBL_PERMISSIONS'=>'Permissions',
+
 );
-
-
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Fri Dec 15 08:39:16 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 15 Dec 2006 13:39:16 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9979 - in
 /vtigercrm/branches/5.0.3: include/utils/ListViewUtils.php
 modules/Campaigns/Campaigns.php
Message-ID: <20061215133916.B922A789893@vtiger.fosslabs.com>

Author: richie
Date: Fri Dec 15 06:39:10 2006
New Revision: 9979

Log:
changes made to show accountname in campaings related to

Modified:
    vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php
    vtigercrm/branches/5.0.3/modules/Campaigns/Campaigns.php

Modified: vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php (original)
+++ vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Fri Dec 15 06:39:10 2006
@@ -2335,7 +2335,7 @@
 {
 	global $log;
 	$log->debug("Entering getRelatedToEntity(".$module.",".$list_result.",".$rset.") method ...");
-
+	
 	global $adb;
 	$seid = $adb->query_result($list_result,$rset,"relatedto");
 	$action = "DetailView";
@@ -2462,8 +2462,10 @@
         $evt_result = $adb->query($evt_query);
 		$numrows= $adb->num_rows($evt_result);
 		
-		$parent_module = $adb->query_result($evt_result,0,'setype');
+	$parent_module = $adb->query_result($evt_result,0,'setype');
         $parent_id = $adb->query_result($evt_result,0,'crmid');
+
+
 		
 		if ($numrows>1){
 		$parent_module ='Multiple';
@@ -2541,6 +2543,16 @@
 			$parent_name = substr($parent_name,0,25).'...';
 		}
 	}
+	if($parent_module == 'Campaigns')
+	{
+		$parent_query = "SELECT campaignname FROM vtiger_campaign WHERE campaignid=".$parent_id;
+		$parent_result = $adb->query($parent_query);
+		$parent_name = $adb->query_result($parent_result,0,"campaignname");
+		if(strlen($parent_name) > 25)
+		{
+			$parent_name = substr($parent_name,0,25).'...';
+		}
+	}
 
 	//added by rdhital for better emails - Raju
 	if ($parent_module == 'Multiple')

Modified: vtigercrm/branches/5.0.3/modules/Campaigns/Campaigns.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Campaigns/Campaigns.php (original)
+++ vtigercrm/branches/5.0.3/modules/Campaigns/Campaigns.php Fri Dec 15 06:39:10 2006
@@ -187,7 +187,7 @@
 		else
 			$returnset = '&return_module=Campaigns&return_action=CallRelatedList&return_id='.$id;
 
-		$query = 'select vtiger_users.user_name,vtiger_groups.groupname, vtiger_potential.potentialid, vtiger_potential.potentialname, vtiger_potential.potentialtype, vtiger_potential.sales_stage, vtiger_potential.amount, vtiger_potential.closingdate, vtiger_crmentity.crmid, vtiger_crmentity.smownerid from vtiger_campaign inner join vtiger_potential on vtiger_campaign.campaignid = vtiger_potential.campaignid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_potential.potentialid left join vtiger_potentialgrouprelation on vtiger_potential.potentialid=vtiger_potentialgrouprelation.potentialid left join vtiger_groups on vtiger_groups.groupname=vtiger_potentialgrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_campaign.campaignid = '.$id.' and vtiger_crmentity.deleted=0';
+		$query = 'select vtiger_users.user_name,vtiger_groups.groupname, vtiger_potential.accountid, vtiger_potential.potentialid, vtiger_potential.potentialname, vtiger_potential.potentialtype, vtiger_potential.sales_stage, vtiger_potential.amount, vtiger_potential.closingdate, vtiger_crmentity.crmid, vtiger_crmentity.smownerid from vtiger_campaign inner join vtiger_potential on vtiger_campaign.campaignid = vtiger_potential.campaignid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_potential.potentialid left join vtiger_potentialgrouprelation on vtiger_potential.potentialid=vtiger_potentialgrouprelation.potentialid left join vtiger_groups on vtiger_groups.groupname=vtiger_potentialgrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_campaign.campaignid = '.$id.' and vtiger_crmentity.deleted=0';
 		if($this->column_fields['account_id'] != 0)
 		$log->debug("Exiting get_opportunities method ...");
 		return GetRelatedList('Campaigns','Potentials',$focus,$query,$button,$returnset);
@@ -248,6 +248,7 @@
 				OR activitytype = 'Meeting')";
 		$log->debug("Exiting get_activities method ...");
 		return GetRelatedList('Campaigns','Calendar',$focus,$query,$button,$returnset);
+	
 	}
 
 }




From vtigercrm-commits at vtiger.fosslabs.com  Fri Dec 15 08:41:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 15 Dec 2006 13:41:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9980 -
 /vtigercrm/branches/5.0.3/Smarty/templates/DisplayFields.tpl
Message-ID: <20061215134145.2C1D6789893@vtiger.fosslabs.com>

Author: richie
Date: Fri Dec 15 06:41:40 2006
New Revision: 9980

Log:
textfield size modified in firstname and website

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/DisplayFields.tpl

Modified: vtigercrm/branches/5.0.3/Smarty/templates/DisplayFields.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/DisplayFields.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/DisplayFields.tpl Fri Dec 15 06:41:40 2006
@@ -270,8 +270,8 @@
 				{$fldlabel}
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
-				&nbsp;&nbsp;http://&nbsp;
-				<input type="text" tabindex="{$vt_tab}" name="{$fldname}" style="border:1px solid #bababa;" size="27" onFocus="this.className='detailedViewTextBoxOn'"onBlur="this.className='detailedViewTextBox'" value="{$fldvalue}">
+				&nbsp;&nbsp;http://
+			<input style="width:74%;" class = 'detailedViewTextBoxOn' type="text" tabindex="{$vt_tab}" name="{$fldname}" style="border:1px solid #bababa;" size="27" onFocus="this.className='detailedViewTextBoxOn'"onBlur="this.className='detailedViewTextBox'"  value="{$fldvalue}">
 			</td>
 
 		{elseif $uitype eq 85}
@@ -423,7 +423,7 @@
 						{/foreach}
 					{/foreach}
 				</select>
-				<input type="text" name="{$fldname}" tabindex="{$vt_tab}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" value= "{$secondvalue}">
+			<input type="text" name="{$fldname}" tabindex="{$vt_tab}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" style="width:58%;" value= "{$secondvalue}" >
 			</td>
 
 		{elseif $uitype eq 22}




From vtigercrm-commits at vtiger.fosslabs.com  Fri Dec 15 09:36:15 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 15 Dec 2006 14:36:15 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9981 - in
 /vtigercrm/branches/5.0.3: Smarty/templates/ Smarty/templates/Inventory/
 include/language/ modules/Accounts/ modules/Calendar/ modules/Campaigns/
 modules/Contacts/ modules/Faq/ modules/HelpDesk/ modules/Invoice/
 modules/Leads/ modules/Notes/ modules/PriceBooks/ modules/Products/
 modules/PurchaseOrder/ modules/Quotes/ modules/SalesOrder/ modules/Users/
 modules/Vendors/
Message-ID: <20061215143615.B3D2678916B@vtiger.fosslabs.com>

Author: richie
Date: Fri Dec 15 07:35:38 2006
New Revision: 9981

Log:
Text changed in header when a entity is duplicated

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/ActivityEditView.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/CreateView.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/Inventory/InventoryCreateView.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/UserEditView.tpl
    vtigercrm/branches/5.0.3/include/language/en_us.lang.php
    vtigercrm/branches/5.0.3/modules/Accounts/EditView.php
    vtigercrm/branches/5.0.3/modules/Calendar/EditView.php
    vtigercrm/branches/5.0.3/modules/Campaigns/EditView.php
    vtigercrm/branches/5.0.3/modules/Contacts/EditView.php
    vtigercrm/branches/5.0.3/modules/Faq/EditView.php
    vtigercrm/branches/5.0.3/modules/HelpDesk/EditView.php
    vtigercrm/branches/5.0.3/modules/Invoice/EditView.php
    vtigercrm/branches/5.0.3/modules/Leads/EditView.php
    vtigercrm/branches/5.0.3/modules/Notes/EditView.php
    vtigercrm/branches/5.0.3/modules/PriceBooks/EditView.php
    vtigercrm/branches/5.0.3/modules/Products/EditView.php
    vtigercrm/branches/5.0.3/modules/PurchaseOrder/EditView.php
    vtigercrm/branches/5.0.3/modules/Quotes/EditView.php
    vtigercrm/branches/5.0.3/modules/SalesOrder/EditView.php
    vtigercrm/branches/5.0.3/modules/Users/EditView.php
    vtigercrm/branches/5.0.3/modules/Vendors/EditView.php

Modified: vtigercrm/branches/5.0.3/Smarty/templates/ActivityEditView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/ActivityEditView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/ActivityEditView.tpl Fri Dec 15 07:35:38 2006
@@ -43,7 +43,11 @@
 					<span class="small">{$UPDATEINFO}	 </span> 
 				{/if}
 				{if $OP_MODE eq 'create_view'}
+					{if $DUPLICATE neq 'true'}
 					<span class="lvtHeaderText">{$APP.LBL_CREATING} {$SINGLE_MOD}</span> <br>
+					{else}
+					<span class="lvtHeaderText">{$APP.LBL_DUPLICATING} "{$NAME}"</span> <br>
+					{/if}
 				{/if}
 			</td></tr>
 		</table>

Modified: vtigercrm/branches/5.0.3/Smarty/templates/CreateView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/CreateView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/CreateView.tpl Fri Dec 15 07:35:38 2006
@@ -61,7 +61,11 @@
 			{$UPDATEINFO}	 
 		 {/if}
 		 {if $OP_MODE eq 'create_view'}
+			{if $DUPLICATE neq 'true'}
 			<span class="lvtHeaderText">{$APP.LBL_CREATING} {$APP.LBL_NEW} {$APP[$SINGLE_MOD]}</span> <br>
+			{else}
+			<span class="lvtHeaderText">{$APP.LBL_DUPLICATING} "{$NAME}" </span> <br>
+			{/if}
 		 {/if}
 
 		 <hr noshade size=1>

Modified: vtigercrm/branches/5.0.3/Smarty/templates/Inventory/InventoryCreateView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/Inventory/InventoryCreateView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/Inventory/InventoryCreateView.tpl Fri Dec 15 07:35:38 2006
@@ -65,7 +65,11 @@
 			{$UPDATEINFO}	 
 		 {/if}
 		 {if $OP_MODE eq 'create_view'}
+			{if $DUPLICATE neq 'true'}
 			<span class="lvtHeaderText">{$APP.LBL_CREATING} {$APP.LBL_NEW} {$MOD[$SINGLE_MOD]}</span> <br>
+			{else}
+			<span class="lvtHeaderText">{$APP.LBL_DUPLICATING} "{$NAME}" </span> <br>
+			{/if}
 		 {/if}
 
 		 <hr noshade size=1>

Modified: vtigercrm/branches/5.0.3/Smarty/templates/UserEditView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/UserEditView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/UserEditView.tpl Fri Dec 15 07:35:38 2006
@@ -90,7 +90,11 @@
 					{if $MODE eq 'edit'}
 						{$UMOD.LBL_EDITING} "{$USERNAME}" 
 					{else}
+						{if $DUPLICATE neq 'true'}
 						{$UMOD.LBL_CREATE_NEW_USER}
+						{else}
+						{$APP.LBL_DUPLICATING} "{$USERNAME}"
+						{/if}
 					{/if}
 					</b></span>
 				{else}
@@ -106,7 +110,9 @@
 			{if $MODE eq 'edit'}
 				<td><b class="small">{$UMOD.LBL_EDIT_VIEW} "{$USERNAME}"</b>
 			{else}
+				{if $DUPLICATE neq 'true'}
 				<td><b class="small">{$UMOD.LBL_CREATE_NEW_USER}</b>
+				{/if}
 			{/if}
 			</td>
                 </tr>

Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/include/language/en_us.lang.php Fri Dec 15 07:35:38 2006
@@ -424,6 +424,7 @@
 'LBL_MORE' => 'More',
 'LBL_BASIC' => 'Basic',
 'LBL_CREATING' => 'Creating',
+'LBL_DUPLICATING' => 'Duplicating',
 'LBL_EDITING' => 'Editing',
 'LBL_NEW' => 'New',
 'Lead' => 'Lead',

Modified: vtigercrm/branches/5.0.3/modules/Accounts/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Accounts/EditView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Accounts/EditView.php Fri Dec 15 07:35:38 2006
@@ -110,6 +110,7 @@
 
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
+$smarty->assign("DUPLICATE",$_REQUEST['isDuplicate'] );
  
 if ($focus->mode == 'edit')
 $smarty->display('salesEditView.tpl');

Modified: vtigercrm/branches/5.0.3/modules/Calendar/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Calendar/EditView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Calendar/EditView.php Fri Dec 15 07:35:38 2006
@@ -240,6 +240,7 @@
 
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
+$smarty->assign("DUPLICATE", $_REQUEST['isDuplicate']);
 
 $smarty->display("ActivityEditView.tpl");
 

Modified: vtigercrm/branches/5.0.3/modules/Campaigns/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Campaigns/EditView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Campaigns/EditView.php Fri Dec 15 07:35:38 2006
@@ -99,7 +99,7 @@
 
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
-
+$smarty->assign("DUPLICATE", $_REQUEST['isDuplicate']);
 if($focus->mode == 'edit')
 	$smarty->display("salesEditView.tpl");
 else

Modified: vtigercrm/branches/5.0.3/modules/Contacts/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Contacts/EditView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Contacts/EditView.php Fri Dec 15 07:35:38 2006
@@ -205,6 +205,7 @@
 
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
+$smarty->assign("DUPLICATE", $_REQUEST['isDuplicate']);
 
 if($focus->mode == 'edit')
 $smarty->display("salesEditView.tpl");

Modified: vtigercrm/branches/5.0.3/modules/Faq/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Faq/EditView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Faq/EditView.php Fri Dec 15 07:35:38 2006
@@ -111,7 +111,7 @@
 	//Added to display the Faq comments information
 	$smarty->assign("COMMENT_BLOCK",$focus->getFAQComments($_REQUEST['record']));
 }
-
+$smarty->assign("DUPLICATE", $_REQUEST['isDuplicate']);
 if($focus->mode == 'edit')
 	$smarty->display("salesEditView.tpl");
 else

Modified: vtigercrm/branches/5.0.3/modules/HelpDesk/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/HelpDesk/EditView.php (original)
+++ vtigercrm/branches/5.0.3/modules/HelpDesk/EditView.php Fri Dec 15 07:35:38 2006
@@ -111,7 +111,7 @@
 	//Added to display the ticket comments information
 	$smarty->assign("COMMENT_BLOCK",$focus->getCommentInformation($_REQUEST['record']));
 }
-
+$smarty->assign("DUPLICATE", $_REQUEST['isDuplicate']);
 if($focus->mode == 'edit')
 	$smarty->display("salesEditView.tpl");
 else

Modified: vtigercrm/branches/5.0.3/modules/Invoice/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Invoice/EditView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Invoice/EditView.php Fri Dec 15 07:35:38 2006
@@ -351,7 +351,7 @@
 
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
-
+$smarty->assign("DUPLICATE", $_REQUEST['isDuplicate']);
 if($focus->mode == 'edit')
 	$smarty->display("Inventory/InventoryEditView.tpl");
 else

Modified: vtigercrm/branches/5.0.3/modules/Leads/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Leads/EditView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Leads/EditView.php Fri Dec 15 07:35:38 2006
@@ -108,7 +108,7 @@
 
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
-
+$smarty->assign("DUPLICATE",$_REQUEST['isDuplicate']);
 if($focus->mode == 'edit')
 $smarty->display("salesEditView.tpl");
 else

Modified: vtigercrm/branches/5.0.3/modules/Notes/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Notes/EditView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Notes/EditView.php Fri Dec 15 07:35:38 2006
@@ -182,7 +182,7 @@
  $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);
  $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']);
  $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']);
-
+ $smarty->assign("DUPLICATE", $_REQUEST['isDuplicate']);
 if($focus->mode == 'edit')
 	$smarty->display("salesEditView.tpl");
 else

Modified: vtigercrm/branches/5.0.3/modules/PriceBooks/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/PriceBooks/EditView.php (original)
+++ vtigercrm/branches/5.0.3/modules/PriceBooks/EditView.php Fri Dec 15 07:35:38 2006
@@ -90,7 +90,7 @@
 
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
-
+$smarty->assign("DUPLICATE", $_REQUEST['isDuplicate']);
 if($focus->mode == 'edit')
 	$smarty->display('Inventory/InventoryEditView.tpl');
 else 

Modified: vtigercrm/branches/5.0.3/modules/Products/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Products/EditView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Products/EditView.php Fri Dec 15 07:35:38 2006
@@ -203,7 +203,7 @@
 
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
-
+$smarty->assign("DUPLICATE", $_REQUEST['isDuplicate']);
 if($focus->mode == 'edit')
 	$smarty->display('Inventory/InventoryEditView.tpl');
 else

Modified: vtigercrm/branches/5.0.3/modules/PurchaseOrder/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/PurchaseOrder/EditView.php (original)
+++ vtigercrm/branches/5.0.3/modules/PurchaseOrder/EditView.php Fri Dec 15 07:35:38 2006
@@ -199,6 +199,7 @@
 
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
+$smarty->assign("DUPLICATE", $_REQUEST['isDuplicate']);
 if($focus->mode == 'edit')
 	$smarty->display('Inventory/InventoryEditView.tpl');
 else

Modified: vtigercrm/branches/5.0.3/modules/Quotes/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Quotes/EditView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Quotes/EditView.php Fri Dec 15 07:35:38 2006
@@ -209,6 +209,7 @@
 
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
+$smarty->assign("DUPLICATE", $_REQUEST['isDuplicate']);
 if($focus->mode == 'edit')
 	$smarty->display("Inventory/InventoryEditView.tpl");
 else

Modified: vtigercrm/branches/5.0.3/modules/SalesOrder/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/SalesOrder/EditView.php (original)
+++ vtigercrm/branches/5.0.3/modules/SalesOrder/EditView.php Fri Dec 15 07:35:38 2006
@@ -307,6 +307,7 @@
 
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
+$smarty->assign("DUPLICATE", $_REQUEST['isDuplicate']);
 if($focus->mode == 'edit')
 	$smarty->display("Inventory/InventoryEditView.tpl");
 else

Modified: vtigercrm/branches/5.0.3/modules/Users/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Users/EditView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Users/EditView.php Fri Dec 15 07:35:38 2006
@@ -110,8 +110,7 @@
 }
 
 $smarty->assign("HOMEORDER",$focus->getHomeOrder($focus->id));
-
-
+$smarty->assign("DUPLICATE",$_REQUEST['isDuplicate']);
 
 $smarty->assign('PARENTTAB',$_REQUEST['parenttab']);
 

Modified: vtigercrm/branches/5.0.3/modules/Vendors/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Vendors/EditView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Vendors/EditView.php Fri Dec 15 07:35:38 2006
@@ -95,6 +95,7 @@
 
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
+$smarty->assign("DUPLICATE", $_REQUEST['isDuplicate']);
 
 if($focus->mode == 'edit')
 	$smarty->display('Inventory/InventoryEditView.tpl');




From vtigercrm-commits at vtiger.fosslabs.com  Fri Dec 15 09:42:04 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 15 Dec 2006 14:42:04 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9982 -
	/vtigercrm/branches/5.0.3/include/js/Mail.js
Message-ID: <20061215144204.77104789AA1@vtiger.fosslabs.com>

Author: richie
Date: Fri Dec 15 07:42:00 2006
New Revision: 9982

Log:
alert message changed

Modified:
    vtigercrm/branches/5.0.3/include/js/Mail.js

Modified: vtigercrm/branches/5.0.3/include/js/Mail.js
==============================================================================
--- vtigercrm/branches/5.0.3/include/js/Mail.js (original)
+++ vtigercrm/branches/5.0.3/include/js/Mail.js Fri Dec 15 07:42:00 2006
@@ -79,7 +79,7 @@
 		window.close();
 	}else
 	{
-		alert('The user "'+parentname+'" doesn\'t have an email id' );
+		alert('"'+parentname+'" doesn\'t have an Email Id' );
 		return false;
 	}
 }	




From vtigercrm-commits at vtiger.fosslabs.com  Sat Dec 16 01:31:19 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 16 Dec 2006 06:31:19 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9983 -
	/vtigercrm/branches/5.0.3/modules/Users/
Message-ID: <20061216063119.6D374789D16@vtiger.fosslabs.com>

Author: richie
Date: Fri Dec 15 23:31:01 2006
New Revision: 9983

Log:
files moved to settings

Removed:
    vtigercrm/branches/5.0.3/modules/Users/AuditTrail.php
    vtigercrm/branches/5.0.3/modules/Users/AuditTrailList.php
    vtigercrm/branches/5.0.3/modules/Users/CreateSharingRule.php
    vtigercrm/branches/5.0.3/modules/Users/DefModuleView.php
    vtigercrm/branches/5.0.3/modules/Users/DefaultFieldPermissions.php
    vtigercrm/branches/5.0.3/modules/Users/EditDefOrgFieldLevelAccess.php
    vtigercrm/branches/5.0.3/modules/Users/EditInventoryNotification.php
    vtigercrm/branches/5.0.3/modules/Users/EditNotification.php
    vtigercrm/branches/5.0.3/modules/Users/GroupDetailView.php
    vtigercrm/branches/5.0.3/modules/Users/ListLoginHistory.php
    vtigercrm/branches/5.0.3/modules/Users/ListProfiles.php
    vtigercrm/branches/5.0.3/modules/Users/OrgSharingDetailView.php
    vtigercrm/branches/5.0.3/modules/Users/OrganizationTermsandConditions.php
    vtigercrm/branches/5.0.3/modules/Users/RoleDeleteStep1.php
    vtigercrm/branches/5.0.3/modules/Users/RoleDetailView.php
    vtigercrm/branches/5.0.3/modules/Users/SaveAuditTrail.php
    vtigercrm/branches/5.0.3/modules/Users/SaveInventoryNotification.php
    vtigercrm/branches/5.0.3/modules/Users/SaveNotification.php
    vtigercrm/branches/5.0.3/modules/Users/SaveRole.php
    vtigercrm/branches/5.0.3/modules/Users/SaveSharingRule.php
    vtigercrm/branches/5.0.3/modules/Users/ShowAuditTrail.php
    vtigercrm/branches/5.0.3/modules/Users/UpdateDefaultFieldLevelAccess.php
    vtigercrm/branches/5.0.3/modules/Users/createemailtemplate.php
    vtigercrm/branches/5.0.3/modules/Users/createnewgroup.php
    vtigercrm/branches/5.0.3/modules/Users/createrole.php
    vtigercrm/branches/5.0.3/modules/Users/deleteemailtemplate.php
    vtigercrm/branches/5.0.3/modules/Users/detailviewemailtemplate.php
    vtigercrm/branches/5.0.3/modules/Users/editemailtemplate.php
    vtigercrm/branches/5.0.3/modules/Users/listemailtemplates.php
    vtigercrm/branches/5.0.3/modules/Users/listgroups.php
    vtigercrm/branches/5.0.3/modules/Users/listinventorynotifications.php
    vtigercrm/branches/5.0.3/modules/Users/listnotificationschedulers.php
    vtigercrm/branches/5.0.3/modules/Users/listroles.php
    vtigercrm/branches/5.0.3/modules/Users/listwordtemplates.php
    vtigercrm/branches/5.0.3/modules/Users/profilePrivileges.php
    vtigercrm/branches/5.0.3/modules/Users/saveemailtemplate.php
    vtigercrm/branches/5.0.3/modules/Users/savetermsandconditions.php
    vtigercrm/branches/5.0.3/modules/Users/upload.php




From vtigercrm-commits at vtiger.fosslabs.com  Sat Dec 16 03:24:03 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 16 Dec 2006 08:24:03 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9984 -
	/vtigercrm/branches/5.0.3/data/CRMEntity.php
Message-ID: <20061216082403.74C07789C18@vtiger.fosslabs.com>

Author: richie
Date: Sat Dec 16 01:23:58 2006
New Revision: 9984

Log:
* Added condition to avoid function call to getDBInsertDateValue in ajax save, Fixes #2731

Modified:
    vtigercrm/branches/5.0.3/data/CRMEntity.php

Modified: vtigercrm/branches/5.0.3/data/CRMEntity.php
==============================================================================
--- vtigercrm/branches/5.0.3/data/CRMEntity.php (original)
+++ vtigercrm/branches/5.0.3/data/CRMEntity.php Sat Dec 16 01:23:58 2006
@@ -420,7 +420,8 @@
 				  }
 				  else
 				  {
-					  $fldvalue = getDBInsertDateValue($this->column_fields[$fieldname]);
+					  //Added to avoid function call getDBInsertDateValue in ajax save
+					  $fldvalue = (($_REQUEST['ajxaction'] == 'DETAILVIEW')?$this->column_fields[$fieldname]:getDBInsertDateValue($this->column_fields[$fieldname]));
 				  }
 			  }
 			  elseif($uitype == 7)




From vtigercrm-commits at vtiger.fosslabs.com  Sat Dec 16 05:29:18 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 16 Dec 2006 10:29:18 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9985 -
 /vtigercrm/branches/5.0.3/themes/bluelagoon/style.css
Message-ID: <20061216102918.7525A789051@vtiger.fosslabs.com>

Author: richie
Date: Sat Dec 16 03:29:13 2006
New Revision: 9985

Log:
style modified

Modified:
    vtigercrm/branches/5.0.3/themes/bluelagoon/style.css

Modified: vtigercrm/branches/5.0.3/themes/bluelagoon/style.css
==============================================================================
--- vtigercrm/branches/5.0.3/themes/bluelagoon/style.css (original)
+++ vtigercrm/branches/5.0.3/themes/bluelagoon/style.css Sat Dec 16 03:29:13 2006
@@ -1753,9 +1753,8 @@
 
 }
 
-/*
 .cellLabel {
-	background-color:#eaebd9;
+	background-color:#f5f5ff;
 	border-top:1px solid #efefef;
 	border-bottom:1px solid #dadada;
 	color:#555555;
@@ -1765,7 +1764,6 @@
 	color:#333333;
 	border-bottom:1px solid #dadada;
 }
-*/
 
 .listTable{
 	border-left:1px solid #cccccc;




From vtigercrm-commits at vtiger.fosslabs.com  Mon Dec 18 02:20:51 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 18 Dec 2006 07:20:51 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9986 - in
 /vtigercrm/branches/5.0.3/Smarty/templates: CustomView.tpl DetailView.tpl
Message-ID: <20061218072051.B3EA7788B4B@vtiger.fosslabs.com>

Author: richie
Date: Mon Dec 18 00:20:47 2006
New Revision: 9986

Log:
UI issue fixed

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl

Modified: vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl Mon Dec 18 00:20:47 2006
@@ -568,6 +568,8 @@
   </td></tr>
   <tr><td colspan="4">&nbsp;</td></tr>
 </table>
+</table>
+</table>
 {$STDFILTER_JAVASCRIPT}
 {$JAVASCRIPT}
 <!-- to show the mandatory fields while creating new customview -->

Modified: vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl Mon Dec 18 00:20:47 2006
@@ -293,7 +293,10 @@
 				{else}
 					{include file="DetailViewFields.tpl"}
 				{/if}
-			   {/if}
+			{else}
+                                <td class="dvtCellLabel" align=right>&nbsp;</td>
+                                <td class="dvtCellInfo" align=left >&nbsp;</td>
+			{/if}
                                    {/foreach}
 						      </tr>	
 						   {/foreach}	




From vtigercrm-commits at vtiger.fosslabs.com  Mon Dec 18 02:42:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 18 Dec 2006 07:42:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9987 - in
 /vtigercrm/branches/5.0.3: Smarty/templates/DetailView.tpl
 modules/Accounts/DetailView.php modules/Contacts/DetailView.php
 modules/HelpDesk/DetailView.php modules/Leads/DetailView.php
Message-ID: <20061218074202.B8F14788CDB@vtiger.fosslabs.com>

Author: richie
Date: Mon Dec 18 00:41:49 2006
New Revision: 9987

Log:
mail merge template check added

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl
    vtigercrm/branches/5.0.3/modules/Accounts/DetailView.php
    vtigercrm/branches/5.0.3/modules/Contacts/DetailView.php
    vtigercrm/branches/5.0.3/modules/HelpDesk/DetailView.php
    vtigercrm/branches/5.0.3/modules/Leads/DetailView.php

Modified: vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl Mon Dec 18 00:41:49 2006
@@ -293,10 +293,10 @@
 				{else}
 					{include file="DetailViewFields.tpl"}
 				{/if}
-			{else}
-                                <td class="dvtCellLabel" align=right>&nbsp;</td>
-                                <td class="dvtCellInfo" align=left >&nbsp;</td>
-			{/if}
+			   {else}
+				<td class="dvtCellLabel" align=right>&nbsp;</td>
+				<td class="dvtCellInfo" align=left >&nbsp;</td>
+			   {/if}
                                    {/foreach}
 						      </tr>	
 						   {/foreach}	
@@ -416,10 +416,14 @@
       					   <td class="rightMailMergeHeader"><b>{$WORDTEMPLATEOPTIONS}</b></td>
       				</tr>
       				<tr style="height:25px">
-      						<td class="rightMailMergeContent">
-          						<select name="mergefile">{foreach key=templid item=tempflname from=$TOPTIONS}<option value="{$templid}">{$tempflname}</option>{/foreach}</select>
-          						<input class="crmbutton small create" value="{$APP.LBL_MERGE_BUTTON_LABEL}" onclick="this.form.action.value='Merge';" type="submit"></input>
-      					  </td>
+					<td class="rightMailMergeContent">
+						{if $TEMPLATECOUNT neq 0}
+						<select name="mergefile">{foreach key=templid item=tempflname from=$TOPTIONS}<option value="{$templid}">{$tempflname}</option>{/foreach}</select>
+                                                   <input class="crmbutton small create" value="{$APP.LBL_MERGE_BUTTON_LABEL}" onclick="this.form.action.value='Merge';" type="submit"></input> 
+						{else}
+						<a href=index.php?module=Settings&action=upload&tempModule={$MODULE}>{$APP.LBL_CREATE_MERGE_TEMPLATE}</a>
+						{/if}
+					</td>
       				</tr>
   				</table>
 				</form>

Modified: vtigercrm/branches/5.0.3/modules/Accounts/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Accounts/DetailView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Accounts/DetailView.php Mon Dec 18 00:41:49 2006
@@ -92,6 +92,7 @@
 		$optionString[$tempVal["templateid"]]=$tempVal["filename"];
 		$tempVal = $adb->fetch_array($wordTemplateResult);
 	}
+	$smarty->assign("TEMPLATECOUNT",$tempCount);
 	$smarty->assign("WORDTEMPLATEOPTIONS",$app_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']);
         $smarty->assign("TOPTIONS",$optionString);
 }

Modified: vtigercrm/branches/5.0.3/modules/Contacts/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Contacts/DetailView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Contacts/DetailView.php Mon Dec 18 00:41:49 2006
@@ -99,6 +99,7 @@
 		$optionString[$tempVal["templateid"]]=$tempVal["filename"];
 		$tempVal = $adb->fetch_array($wordTemplateResult);
 	}
+	 $smarty->assign("TEMPLATECOUNT",$tempCount);
 	$smarty->assign("WORDTEMPLATEOPTIONS",$app_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']);
         $smarty->assign("TOPTIONS",$optionString);
 }

Modified: vtigercrm/branches/5.0.3/modules/HelpDesk/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/HelpDesk/DetailView.php (original)
+++ vtigercrm/branches/5.0.3/modules/HelpDesk/DetailView.php Mon Dec 18 00:41:49 2006
@@ -85,6 +85,7 @@
                 $optionString[$tempVal["templateid"]]=$tempVal["filename"];
                 $tempVal = $adb->fetch_array($wordTemplateResult);
         }
+	 $smarty->assign("TEMPLATECOUNT",$tempCount);
 	$smarty->assign("WORDTEMPLATEOPTIONS",$app_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']);
         $smarty->assign("TOPTIONS",$optionString);
 }

Modified: vtigercrm/branches/5.0.3/modules/Leads/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Leads/DetailView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Leads/DetailView.php Mon Dec 18 00:41:49 2006
@@ -106,6 +106,7 @@
 		$optionString[$tempVal["templateid"]] =$tempVal["filename"];
 		$tempVal = $adb->fetch_array($wordTemplateResult);
 	}
+	 $smarty->assign("TEMPLATECOUNT",$tempCount);
 	$smarty->assign("WORDTEMPLATEOPTIONS",$app_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']);
         $smarty->assign("TOPTIONS",$optionString);
 }




From vtigercrm-commits at vtiger.fosslabs.com  Mon Dec 18 05:35:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 18 Dec 2006 10:35:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9988 - in
 /vtigercrm/branches/5.0.3/Smarty/templates: DetailView.tpl DetailViewUI.tpl
Message-ID: <20061218103509.0508E788CB5@vtiger.fosslabs.com>

Author: richie
Date: Mon Dec 18 03:35:05 2006
New Revision: 9988

Log:
changes made for description ui type

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl

Modified: vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl Mon Dec 18 03:35:05 2006
@@ -293,9 +293,6 @@
 				{else}
 					{include file="DetailViewFields.tpl"}
 				{/if}
-			   {else}
-				<td class="dvtCellLabel" align=right>&nbsp;</td>
-				<td class="dvtCellInfo" align=left >&nbsp;</td>
 			   {/if}
                                    {/foreach}
 						      </tr>	

Modified: vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl Mon Dec 18 03:35:05 2006
@@ -133,7 +133,7 @@
 						{/if}
 							<!--{assign var="DESCRIPTION_SEPARATOR_STRING" value=" "}  {* Separates Description *}-->
 							<!--{assign var="DESCRIPTION_WORDWRAP_WIDTH" value="70"} {* No. of chars for word wrapping long lines of Description *}-->
-                                                  <td width="100%" class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label|escape:'quotes'}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">
+                                                  <td width="100%" colspan="3" class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label|escape:'quotes'}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">
 							{$keyval}<!--|replace:$DESCRIPTION_SEPARATOR_STRING:"\x1"|replace:" ":"\x0"|replace:"\x1":$DESCRIPTION_SEPARATOR_STRING|wordwrap:$DESCRIPTION_WORDWRAP_WIDTH:"<br>&nbsp;"|replace:"\x0":"&nbsp;"}-->
 							</span>
                                               		<div id="editarea_{$label}" style="display:none;">




From vtigercrm-commits at vtiger.fosslabs.com  Tue Dec 19 09:11:22 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 19 Dec 2006 14:11:22 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9989 - in
 /vtigercrm/branches/5.0.3/soap: thunderbirdplugin.php vtigerolservice.php
Message-ID: <20061219141123.1CF8E789FC5@vtiger.fosslabs.com>

Author: richie
Date: Tue Dec 19 07:11:17 2006
New Revision: 9989

Log:
changes to fix assigned to problem from plugin

Modified:
    vtigercrm/branches/5.0.3/soap/thunderbirdplugin.php
    vtigercrm/branches/5.0.3/soap/vtigerolservice.php

Modified: vtigercrm/branches/5.0.3/soap/thunderbirdplugin.php
==============================================================================
--- vtigercrm/branches/5.0.3/soap/thunderbirdplugin.php (original)
+++ vtigercrm/branches/5.0.3/soap/thunderbirdplugin.php Tue Dec 19 07:11:17 2006
@@ -200,13 +200,15 @@
 
 function track_email($user_name, $contact_ids, $date_sent, $email_subject, $email_body)
 {
+	global $current_user;
 	global $adb;
+	global $log;
 	require_once('modules/Users/Users.php');
 	require_once('modules/Emails/Emails.php');
 
-	$seed_user = new Users();
-	$user_id = $seed_user->retrieve_user_id($user_name);
-
+	$current_user = new Users();
+	$user_id = $current_user->retrieve_user_id($user_name);
+	$current_user = $current_user->retrieveCurrentUserInfoFromFile($user_id);
 	$email = new Emails();
 	//$log->debug($msgdtls['contactid']);
 	$emailbody = str_replace("'", "''", $email_body);
@@ -220,7 +222,6 @@
 	$email->column_fields[activitytype] = 'Emails';
 	$email->plugin_save = true;
 	$email->save("Emails");
-
 	$email->set_emails_contact_invitee_relationship($email->id,$contact_ids);
 	$email->set_emails_se_invitee_relationship($email->id,$contact_ids);
 	$email->set_emails_user_invitee_relationship($email->id,$user_id);

Modified: vtigercrm/branches/5.0.3/soap/vtigerolservice.php
==============================================================================
--- vtigercrm/branches/5.0.3/soap/vtigerolservice.php (original)
+++ vtigercrm/branches/5.0.3/soap/vtigerolservice.php Tue Dec 19 07:11:17 2006
@@ -307,12 +307,14 @@
 
 function AddMessageToContact($username,$contactid,$msgdtls)
 {
+	global $current_user;
 	global $adb;
 	require_once('modules/Users/Users.php');
 	require_once('modules/Emails/Emails.php');
 	
-	$seed_user = new Users();
-	$user_id = $seed_user->retrieve_user_id($username);
+	$current_user = new Users();
+	$user_id = $current_user->retrieve_user_id($username);
+	$current_user = $current_user->retrieveCurrentUserInfoFromFile($user_id);
 	
 	foreach($msgdtls as $msgdtl)
 	{




From vtigercrm-commits at vtiger.fosslabs.com  Tue Dec 19 09:23:52 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 19 Dec 2006 14:23:52 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9990 -
 /vtigercrm/branches/5.0.3/modules/Users/SaveGroup.php
Message-ID: <20061219142352.5BFAE789FC5@vtiger.fosslabs.com>

Author: richie
Date: Tue Dec 19 07:23:47 2006
New Revision: 9990

Log:
error while saving groups

Modified:
    vtigercrm/branches/5.0.3/modules/Users/SaveGroup.php

Modified: vtigercrm/branches/5.0.3/modules/Users/SaveGroup.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Users/SaveGroup.php (original)
+++ vtigercrm/branches/5.0.3/modules/Users/SaveGroup.php Tue Dec 19 07:23:47 2006
@@ -112,7 +112,7 @@
 		$groupMemberArray=constructGroupMemberArray($member_array);
 		updateGroup($groupId,$groupName,$groupMemberArray,$description);
 
-		$loc = "Location: index.php?action=".$returnaction."&module=Users&parenttab=Settings&groupId=".$groupId;
+		$loc = "Location: index.php?action=".$returnaction."&module=Settings&parenttab=Settings&groupId=".$groupId;
 	}
 	elseif(isset($_REQUEST['mode']) && $_REQUEST['mode'] == 'create')
 	{
@@ -120,7 +120,7 @@
 		$member_array = explode(';',$selected_col_string);
 		$groupMemberArray=constructGroupMemberArray($member_array);
 		$groupId=createGroup($groupName,$groupMemberArray,$description);
-		$loc = "Location: index.php?action=".$returnaction."&parenttab=Settings&module=Users&groupId=".$groupId; 	 
+		$loc = "Location: index.php?action=".$returnaction."&parenttab=Settings&module=Settings&groupId=".$groupId; 	 
 
 	}
 




From vtigercrm-commits at vtiger.fosslabs.com  Wed Dec 20 07:40:00 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 20 Dec 2006 12:40:00 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9991 - in
 /vtigercrm/branches/5.0.3: include/fpdf/templates/body.php
 modules/Invoice/CreatePDF.php modules/PurchaseOrder/CreatePDF.php
 modules/Quotes/CreatePDF.php modules/SalesOrder/CreateSOPDF.php
Message-ID: <20061220124000.7B5AF789FBE@vtiger.fosslabs.com>

Author: richie
Date: Wed Dec 20 05:39:46 2006
New Revision: 9991

Log:
* Modified to show the final disocunt amount instead of percentage in pdf file and some alignments, Fixes #2760

Modified:
    vtigercrm/branches/5.0.3/include/fpdf/templates/body.php
    vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php
    vtigercrm/branches/5.0.3/modules/PurchaseOrder/CreatePDF.php
    vtigercrm/branches/5.0.3/modules/Quotes/CreatePDF.php
    vtigercrm/branches/5.0.3/modules/SalesOrder/CreateSOPDF.php

Modified: vtigercrm/branches/5.0.3/include/fpdf/templates/body.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/fpdf/templates/body.php (original)
+++ vtigercrm/branches/5.0.3/include/fpdf/templates/body.php Wed Dec 20 05:39:46 2006
@@ -82,28 +82,33 @@
 if($focus->column_fields["hdnTaxType"] != "individual") {
 	$lineData=array("105",$bottom+37,"94");
 	$pdf->drawLine($lineData);
-	$data= $app_strings['LBL_NET_TOTAL'].":                                                                   ".$price_subtotal."";
+	$data= $app_strings['LBL_NET_TOTAL'].":                                                                  ".$price_subtotal."";
 	$pdf->SetXY( 105 , 168 );
 	$pdf->SetFont( "Helvetica", "", 10);
 	$pdf->MultiCell(110, 4, $data);
 
 	$lineData=array("105",$bottom+43,"94");
 	$pdf->drawLine($lineData);
-	$data= $app_strings['LBL_DISCOUNT'].":                                                                      ".$price_discount."";
+
+	//For alignment
+	if($final_price_discount_percent != '')
+		$data= $app_strings['LBL_DISCOUNT'].":   $final_price_discount_percent                                                ".$price_discount."";
+	else
+		$data= $app_strings['LBL_DISCOUNT'].":                                                                  ".$price_discount."";
 	$pdf->SetXY( 105 , 174 );
 	$pdf->SetFont( "Helvetica", "", 10);
 	$pdf->MultiCell(110, 4, $data);
 
 	$lineData=array("105",$bottom+49,"94");
 	$pdf->drawLine($lineData);
-	$data= $app_strings['LBL_TAX'].":  ($group_total_tax_percent %)                                                               ".$price_salestax."";
+	$data= $app_strings['LBL_TAX'].":  ($group_total_tax_percent %)                                                                  ".$price_salestax."";
 	$pdf->SetXY( 105 , 180 );
 	$pdf->SetFont( "Helvetica", "", 10);
 	$pdf->MultiCell(110, 4, $data);
 
 	$lineData=array("105",$bottom+55,"94");
 	$pdf->drawLine($lineData);
-	$data = $app_strings['LBL_SHIPPING_AND_HANDLING_CHARGES'].":                                     ".$price_shipping;
+	$data = $app_strings['LBL_SHIPPING_AND_HANDLING_CHARGES'].":                                  ".$price_shipping;
 	$pdf->SetXY( 105 , 186 );
 	$pdf->SetFont( "Helvetica", "", 10);
 	$pdf->MultiCell(110, 4, $data);
@@ -111,21 +116,27 @@
 } else {
 	$lineData=array("105",$bottom+43,"94");
 	$pdf->drawLine($lineData);
-	$data= $app_strings['LBL_NET_TOTAL'].":                                                                   ".$price_subtotal."";
+	$data= $app_strings['LBL_NET_TOTAL'].":                                                                  ".$price_subtotal."";
 	$pdf->SetXY( 105 , 174 );
 	$pdf->SetFont( "Helvetica", "", 10);
 	$pdf->MultiCell(110, 4, $data);
 
 	$lineData=array("105",$bottom+49,"94");
 	$pdf->drawLine($lineData);
-	$data= $app_strings['LBL_DISCOUNT'].":                                                                      ".$price_discount."";
+
+	//For alignment
+	if($final_price_discount_percent != '')
+		$data= $app_strings['LBL_DISCOUNT'].":   $final_price_discount_percent                                                 ".$price_discount."";
+	else
+		$data= $app_strings['LBL_DISCOUNT'].":                                                                   ".$price_discount."";
+
 	$pdf->SetXY( 105 , 180 );
 	$pdf->SetFont( "Helvetica", "", 10);
 	$pdf->MultiCell(110, 4, $data);
 
 	$lineData=array("105",$bottom+55,"94");
 	$pdf->drawLine($lineData);
-	$data = $app_strings['LBL_SHIPPING_AND_HANDLING_CHARGES'].":                                   ".$price_shipping;
+	$data = $app_strings['LBL_SHIPPING_AND_HANDLING_CHARGES'].":                                  ".$price_shipping;
 	$pdf->SetXY( 105 , 186 );
 	$pdf->SetFont( "Helvetica", "", 10);
 	$pdf->MultiCell(110, 4, $data);
@@ -133,21 +144,21 @@
 
 $lineData=array("105",$bottom+61,"94");
 $pdf->drawLine($lineData);
-$data = $app_strings['LBL_TAX_FOR_SHIPPING_AND_HANDLING'].":  ($sh_tax_percent %)                      ".$price_shipping_tax;
+$data = $app_strings['LBL_TAX_FOR_SHIPPING_AND_HANDLING'].":  ($sh_tax_percent %)               ".$price_shipping_tax;
 $pdf->SetXY( 105 , 192 );
 $pdf->SetFont( "Helvetica", "", 10);
 $pdf->MultiCell(110, 4, $data);
 
 $lineData=array("105",$bottom+67,"94");
 $pdf->drawLine($lineData);
-$data = $app_strings['LBL_ADJUSTMENT'].":                                                                    ".$price_adjustment;
+$data = $app_strings['LBL_ADJUSTMENT'].":                                                                   ".$price_adjustment;
 $pdf->SetXY( 105 , 198 );
 $pdf->SetFont( "Helvetica", "", 10);
 $pdf->MultiCell(110, 4, $data);
 
 $lineData=array("105",$bottom+73,"94");
 $pdf->drawLine($lineData);
-$data = $app_strings['LBL_GRAND_TOTAL'].":(in $currency_symbol)                                                  ".$price_total;
+$data = $app_strings['LBL_GRAND_TOTAL'].":(in $currency_symbol)                                                    ".$price_total;
 $pdf->SetXY( 105 , 204 );
 $pdf->SetFont( "Helvetica", "", 10);
 $pdf->MultiCell(110, 4, $data);

Modified: vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php (original)
+++ vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php Wed Dec 20 05:39:46 2006
@@ -96,7 +96,11 @@
 if($discount_amount != "")
 	$price_discount = number_format($discount_amount,2,'.',',');
 else if($discount_percent != "")
-	$price_discount = $discount_percent."%";
+{
+	//This will be displayed near Discount label - used in include/fpdf/templates/body.php
+	$final_price_discount_percent = "(".number_format($discount_percent,2,'.',',')." %)";
+	$price_discount = number_format((($discount_percent*$focus->column_fields["hdnSubTotal"])/100),2,'.',',');
+}
 else
 	$price_discount = "0.00";
 

Modified: vtigercrm/branches/5.0.3/modules/PurchaseOrder/CreatePDF.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/PurchaseOrder/CreatePDF.php (original)
+++ vtigercrm/branches/5.0.3/modules/PurchaseOrder/CreatePDF.php Wed Dec 20 05:39:46 2006
@@ -95,7 +95,11 @@
 if($discount_amount != "")
 	$price_discount = number_format($discount_amount,2,'.',',');
 else if($discount_percent != "")
-	$price_discount = $discount_percent."%";
+{
+	//This will be displayed near Discount label - used in include/fpdf/templates/body.php
+	$final_price_discount_percent = "(".number_format($discount_percent,2,'.',',')." %)";
+	$price_discount = number_format((($discount_percent*$focus->column_fields["hdnSubTotal"])/100),2,'.',',');
+}
 else
 	$price_discount = "0.00";
 

Modified: vtigercrm/branches/5.0.3/modules/Quotes/CreatePDF.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Quotes/CreatePDF.php (original)
+++ vtigercrm/branches/5.0.3/modules/Quotes/CreatePDF.php Wed Dec 20 05:39:46 2006
@@ -96,7 +96,11 @@
 if($discount_amount != "")
 	$price_discount = number_format($discount_amount,2,'.',',');
 else if($discount_percent != "")
-	$price_discount = $discount_percent."%";
+{
+	//This will be displayed near Discount label - used in include/fpdf/templates/body.php
+	$final_price_discount_percent = "(".number_format($discount_percent,2,'.',',')." %)";
+	$price_discount = number_format((($discount_percent*$focus->column_fields["hdnSubTotal"])/100),2,'.',',');
+}
 else
 	$price_discount = "0.00";
 

Modified: vtigercrm/branches/5.0.3/modules/SalesOrder/CreateSOPDF.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/SalesOrder/CreateSOPDF.php (original)
+++ vtigercrm/branches/5.0.3/modules/SalesOrder/CreateSOPDF.php Wed Dec 20 05:39:46 2006
@@ -94,7 +94,11 @@
 if($discount_amount != "")
 	$price_discount = number_format($discount_amount,2,'.',',');
 else if($discount_percent != "")
-	$price_discount = $discount_percent."%";
+{
+	//This will be displayed near Discount label - used in include/fpdf/templates/body.php
+	$final_price_discount_percent = "(".number_format($discount_percent,2,'.',',')." %)";
+	$price_discount = number_format((($discount_percent*$focus->column_fields["hdnSubTotal"])/100),2,'.',',');
+}
 else
 	$price_discount = "0.00";
 




From vtigercrm-commits at vtiger.fosslabs.com  Wed Dec 20 08:18:21 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 20 Dec 2006 13:18:21 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9992 -
 /vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php
Message-ID: <20061220131821.D5652789FD8@vtiger.fosslabs.com>

Author: richie
Date: Wed Dec 20 06:18:13 2006
New Revision: 9992

Log:
* Modified to get the special character from from_html function, # Fixes 2759

Modified:
    vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php

Modified: vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php (original)
+++ vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php Wed Dec 20 06:18:13 2006
@@ -1449,7 +1449,7 @@
 		}
 
 		$product_Detail[$i]['hdnProductId'.$i] = $hdnProductId;
-		$product_Detail[$i]['productName'.$i]= $productname;
+		$product_Detail[$i]['productName'.$i]= from_html($productname);
 		$product_Detail[$i]['productDescription'.$i]= $productdescription;
 		$product_Detail[$i]['comment'.$i]= $comment;
 




From vtigercrm-commits at vtiger.fosslabs.com  Thu Dec 21 11:33:58 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 21 Dec 2006 16:33:58 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9993 - in
 /vtigercrm/branches/5.0.3/modules: Potentials/Potentials.php
 Products/Products.php Quotes/Quotes.php
Message-ID: <20061221163358.10103789427@vtiger.fosslabs.com>

Author: richie
Date: Thu Dec 21 09:33:46 2006
New Revision: 9993

Log:
Assigned to user missing in quotes and product related list

Modified:
    vtigercrm/branches/5.0.3/modules/Potentials/Potentials.php
    vtigercrm/branches/5.0.3/modules/Products/Products.php
    vtigercrm/branches/5.0.3/modules/Quotes/Quotes.php

Modified: vtigercrm/branches/5.0.3/modules/Potentials/Potentials.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Potentials/Potentials.php (original)
+++ vtigercrm/branches/5.0.3/modules/Potentials/Potentials.php Thu Dec 21 09:33:46 2006
@@ -494,7 +494,16 @@
 			$returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id;
 
 
-		$query = "select vtiger_crmentity.*, vtiger_salesorder.*, vtiger_quotes.subject as quotename, vtiger_account.accountname, vtiger_potential.potentialname from vtiger_salesorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid left outer join vtiger_quotes on vtiger_quotes.quoteid=vtiger_salesorder.quoteid left outer join vtiger_account on vtiger_account.accountid=vtiger_salesorder.accountid left outer join vtiger_potential on vtiger_potential.potentialid=vtiger_salesorder.potentialid left join vtiger_sogrouprelation on vtiger_salesorder.salesorderid=vtiger_sogrouprelation.salesorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_sogrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_potential.potentialid = ".$id;
+		$query = "select vtiger_crmentity.*, vtiger_salesorder.*, vtiger_quotes.subject as quotename, vtiger_account.accountname, vtiger_potential.potentialname,vtiger_users.user_name
+			from vtiger_salesorder 
+			inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid
+			left outer join vtiger_quotes on vtiger_quotes.quoteid=vtiger_salesorder.quoteid 
+			left outer join vtiger_account on vtiger_account.accountid=vtiger_salesorder.accountid 
+			left outer join vtiger_potential on vtiger_potential.potentialid=vtiger_salesorder.potentialid 
+			left join vtiger_sogrouprelation on vtiger_salesorder.salesorderid=vtiger_sogrouprelation.salesorderid 
+			left join vtiger_groups on vtiger_groups.groupname=vtiger_sogrouprelation.groupname
+			left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid
+			 where vtiger_crmentity.deleted=0 and vtiger_potential.potentialid = ".$id;
 		$log->debug("Exiting get_salesorder method ...");
 		return GetRelatedList('Potentials','SalesOrder',$focus,$query,$button,$returnset);
 

Modified: vtigercrm/branches/5.0.3/modules/Products/Products.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Products/Products.php (original)
+++ vtigercrm/branches/5.0.3/modules/Products/Products.php Thu Dec 21 09:33:46 2006
@@ -419,7 +419,8 @@
 			vtiger_quotes.*,
 			vtiger_potential.potentialname,
 			vtiger_account.accountname,
-			vtiger_inventoryproductrel.productid
+			vtiger_inventoryproductrel.productid,
+			vtiger_users.user_name
 			FROM vtiger_quotes
 			INNER JOIN vtiger_crmentity
 				ON vtiger_crmentity.crmid = vtiger_quotes.quoteid
@@ -433,6 +434,8 @@
 				ON vtiger_quotes.quoteid = vtiger_quotegrouprelation.quoteid
 			LEFT JOIN vtiger_groups
 				ON vtiger_groups.groupname = vtiger_quotegrouprelation.groupname
+			LEFT JOIN vtiger_users 
+				ON vtiger_users.id=vtiger_crmentity.smownerid
 			WHERE vtiger_crmentity.deleted = 0
 			AND vtiger_inventoryproductrel.productid = ".$id;
 		$log->debug("Exiting get_quotes method ...");
@@ -461,7 +464,8 @@
 		$query = "SELECT vtiger_crmentity.*,
 			vtiger_purchaseorder.*,
 			vtiger_products.productname,
-			vtiger_inventoryproductrel.productid
+			vtiger_inventoryproductrel.productid,
+			vtiger_users.user_name
 			FROM vtiger_purchaseorder
 			INNER JOIN vtiger_crmentity
 				ON vtiger_crmentity.crmid = vtiger_purchaseorder.purchaseorderid
@@ -473,6 +477,8 @@
 				ON vtiger_purchaseorder.purchaseorderid = vtiger_pogrouprelation.purchaseorderid
 			LEFT JOIN vtiger_groups
 				ON vtiger_groups.groupname = vtiger_pogrouprelation.groupname
+			LEFT JOIN vtiger_users
+				ON vtiger_users.id=vtiger_crmentity.smownerid
 			WHERE vtiger_crmentity.deleted = 0
 			AND vtiger_products.productid = ".$id;
 		$log->debug("Exiting get_purchase_orders method ...");
@@ -501,7 +507,8 @@
 		$query = "SELECT vtiger_crmentity.*,
 			vtiger_salesorder.*,
 			vtiger_products.productname AS productname,
-			vtiger_account.accountname
+			vtiger_account.accountname,
+			vtiger_users.user_name
 			FROM vtiger_salesorder
 			INNER JOIN vtiger_crmentity
 				ON vtiger_crmentity.crmid = vtiger_salesorder.salesorderid
@@ -515,6 +522,8 @@
 				ON vtiger_salesorder.salesorderid = vtiger_sogrouprelation.salesorderid
 			LEFT JOIN vtiger_groups
 				ON vtiger_groups.groupname = vtiger_sogrouprelation.groupname
+			LEFT JOIN vtiger_users 
+				ON vtiger_users.id=vtiger_crmentity.smownerid
 			WHERE vtiger_crmentity.deleted = 0
 			AND vtiger_products.productid = ".$id;
 		$log->debug("Exiting get_salesorder method ...");
@@ -543,7 +552,8 @@
 		$query = "SELECT vtiger_crmentity.*,
 			vtiger_invoice.*,
 			vtiger_inventoryproductrel.quantity,
-			vtiger_account.accountname
+			vtiger_account.accountname,
+			vtiger_users.user_name
 			FROM vtiger_invoice
 			INNER JOIN vtiger_crmentity
 				ON vtiger_crmentity.crmid = vtiger_invoice.invoiceid
@@ -555,6 +565,8 @@
 				ON vtiger_invoice.invoiceid = vtiger_invoicegrouprelation.invoiceid
 			LEFT JOIN vtiger_groups
 				ON vtiger_groups.groupname = vtiger_invoicegrouprelation.groupname
+			LEFT JOIN vtiger_users
+				ON  vtiger_users.id=vtiger_crmentity.smownerid
 			WHERE vtiger_crmentity.deleted = 0
 			AND vtiger_inventoryproductrel.productid = ".$id;
 		$log->debug("Exiting get_invoices method ...");

Modified: vtigercrm/branches/5.0.3/modules/Quotes/Quotes.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Quotes/Quotes.php (original)
+++ vtigercrm/branches/5.0.3/modules/Quotes/Quotes.php Thu Dec 21 09:33:46 2006
@@ -168,7 +168,15 @@
 		else
 			$returnset = '&return_module=Quotes&return_action=CallRelatedList&return_id='.$id;
 
-		$query = "select vtiger_crmentity.*, vtiger_salesorder.*, vtiger_quotes.subject as quotename, vtiger_account.accountname from vtiger_salesorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid left outer join vtiger_quotes on vtiger_quotes.quoteid=vtiger_salesorder.quoteid left outer join vtiger_account on vtiger_account.accountid=vtiger_salesorder.accountid left join vtiger_sogrouprelation on vtiger_salesorder.salesorderid=vtiger_sogrouprelation.salesorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_sogrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_salesorder.quoteid = ".$id;
+		$query = "select vtiger_crmentity.*, vtiger_salesorder.*, vtiger_quotes.subject as quotename, vtiger_account.accountname,vtiger_users.user_name 
+		from vtiger_salesorder
+		inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid
+		left outer join vtiger_quotes on vtiger_quotes.quoteid=vtiger_salesorder.quoteid 
+		left outer join vtiger_account on vtiger_account.accountid=vtiger_salesorder.accountid 
+		left join vtiger_sogrouprelation on vtiger_salesorder.salesorderid=vtiger_sogrouprelation.salesorderid 
+		left join vtiger_groups on vtiger_groups.groupname=vtiger_sogrouprelation.groupname 
+		left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid
+		where vtiger_crmentity.deleted=0 and vtiger_salesorder.quoteid = ".$id;
 		$log->debug("Exiting get_salesorder method ...");
 		return GetRelatedList('Quotes','SalesOrder',$focus,$query,$button,$returnset);
 	}




From vtigercrm-commits at vtiger.fosslabs.com  Thu Dec 21 11:39:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 21 Dec 2006 16:39:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9994 -
 /vtigercrm/branches/5.0.3/Smarty/templates/HomePage.tpl
Message-ID: <20061221163909.6B6D4789427@vtiger.fosslabs.com>

Author: richie
Date: Thu Dec 21 09:39:04 2006
New Revision: 9994

Log:
company name appended for 'my new lead'

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/HomePage.tpl

Modified: vtigercrm/branches/5.0.3/Smarty/templates/HomePage.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/HomePage.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/HomePage.tpl Thu Dec 21 09:39:04 2006
@@ -131,7 +131,11 @@
 												{foreach item=elements from=$tabledetail.Entries}
 													<tr>
 														{if $tabledetail.Title.2 neq 'home_mytopinv' && $tabledetail.Title.2 neq 'home_mytopso' && $tabledetail.Title.2 neq 'home_mytopquote' && $tabledetail.Title.2 neq 'home_metrics' &&  $tabledetail.Title.2 neq 'home_mytoppo' &&  $tabledetail.Title.2 neq 'home_myfaq'  }
-															<td colspan="2"><img src="{$IMAGE_PATH}bookMark.gif" align="absmiddle" /> {$elements.0}</td>
+															<td colspan="2"><img src="{$IMAGE_PATH}bookMark.gif" align="absmiddle" />{$elements.0} 
+															 	{if $modulename eq 'Leads'}
+																 - {$elements.1}	
+																{/if}
+															</td>
 														{elseif $tabledetail.Title.2 eq 'home_metrics'}
 															<td><img src="{$IMAGE_PATH}bookMark.gif" align="absmiddle" /> {$elements.0}</td>
 															<td align="absmiddle" /> {$elements.1}</td>




From vtigercrm-commits at vtiger.fosslabs.com  Thu Dec 21 11:53:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 21 Dec 2006 16:53:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9995 - in
 /vtigercrm/branches/5.0.3: Smarty/templates/CreateView.tpl
 Smarty/templates/QuickCreate.tpl include/js/general.js
 modules/Accounts/Save.php
Message-ID: <20061221165340.8B549789427@vtiger.fosslabs.com>

Author: richie
Date: Thu Dec 21 09:53:31 2006
New Revision: 9995

Log:
Changes made to avoid creating duplicate account

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/CreateView.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/QuickCreate.tpl
    vtigercrm/branches/5.0.3/include/js/general.js
    vtigercrm/branches/5.0.3/modules/Accounts/Save.php

Modified: vtigercrm/branches/5.0.3/Smarty/templates/CreateView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/CreateView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/CreateView.tpl Thu Dec 21 09:53:31 2006
@@ -1,280 +1,284 @@
-{*<!--
-
-/*********************************************************************************
-** The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
-*
- ********************************************************************************/
-
--->*}
-
-{*<!-- module header -->*}
-
-<link rel="stylesheet" type="text/css" media="all" href="jscalendar/calendar-win2k-cold-1.css">
-<script type="text/javascript" src="jscalendar/calendar.js"></script>
-<script type="text/javascript" src="jscalendar/lang/calendar-{$CALENDAR_LANG}.js"></script>
-<script type="text/javascript" src="jscalendar/calendar-setup.js"></script>
-<script type="text/javascript" src="modules/{$MODULE}/{$SINGLE_MOD}.js"></script>
-
-<script type="text/javascript">
-function sensex_info()
-{ldelim}
-        var Ticker = $('tickersymbol').value;
-        if(Ticker!='')
-        {ldelim}
-                $("vtbusy_info").style.display="inline";
-                new Ajax.Request(
-                      'index.php',
-                      {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
-                                method: 'post',
-                                postBody: 'module={$MODULE}&action=Tickerdetail&tickersymbol='+Ticker,
-                                onComplete: function(response) {ldelim}
-                                        $('autocom').innerHTML = response.responseText;
-                                        $('autocom').style.display="block";
-                                        $("vtbusy_info").style.display="none";
-                                {rdelim}
-                        {rdelim}
-                );
-        {rdelim}
-{rdelim}
-</script>
-
-		{include file='Buttons_List1.tpl'}
-
-{*<!-- Contents -->*}
-<table border=0 cellspacing=0 cellpadding=0 width=98% align=center>
-   <tr>
-	<td valign=top>
-		<img src="{$IMAGE_PATH}showPanelTopLeft.gif">
-	</td>
-
-	<td class="showPanelBg" valign=top width=100%>
-	     {*<!-- PUBLIC CONTENTS STARTS-->*}
-	     <div class="small" style="padding:20px">
-		
-		 {if $OP_MODE eq 'edit_view'}   
-			 <span class="lvtHeaderText"><font color="purple">[ {$ID} ] </font>{$NAME} -  {$APP.LBL_EDITING} {$APP[$SINGLE_MOD]} {$APP.LBL_INFORMATION}</span> <br>
-			{$UPDATEINFO}	 
-		 {/if}
-		 {if $OP_MODE eq 'create_view'}
-			{if $DUPLICATE neq 'true'}
-			<span class="lvtHeaderText">{$APP.LBL_CREATING} {$APP.LBL_NEW} {$APP[$SINGLE_MOD]}</span> <br>
-			{else}
-			<span class="lvtHeaderText">{$APP.LBL_DUPLICATING} "{$NAME}" </span> <br>
-			{/if}
-		 {/if}
-
-		 <hr noshade size=1>
-		 <br> 
-		
-		{include file='EditViewHidden.tpl'}
-
-		{*<!-- Account details tabs -->*}
-		<table border=0 cellspacing=0 cellpadding=0 width=95% align=center>
-		   <tr>
-			<td>
-				<table border=0 cellspacing=0 cellpadding=3 width=100% class="small">
-				   <tr>
-					<td class="dvtTabCache" style="width:10px" nowrap>&nbsp;</td>
-
-					{if $ADVBLOCKS neq ''}	
-						<td width=75 style="width:15%" align="center" nowrap class="dvtSelectedCell" id="bi" onclick="fnLoadValues('bi','mi','basicTab','moreTab','normal','{$MODULE}')"><b>{$APP.LBL_BASIC} {$APP.LBL_INFORMATION}</b></td>
-                    				<td class="dvtUnSelectedCell" style="width: 100px;" align="center" nowrap id="mi" onclick="fnLoadValues('mi','bi','moreTab','basicTab','normal','{$MODULE}')"><b>{$APP.LBL_MORE} {$APP.LBL_INFORMATION} </b></td>
-                   				<td class="dvtTabCache" style="width:65%" nowrap>&nbsp;</td>
-					{else}
-						<td class="dvtSelectedCell" align=center nowrap>{$APP.LBL_BASIC} {$APP.LBL_INFORMATION}</td>
-	                                        <td class="dvtTabCache" style="width:65%">&nbsp;</td>
-					{/if}
-				   <tr>
-				</table>
-			</td>
-		   </tr>
-		   <tr>
-			<td valign=top align=left >
-
-			    <!-- Basic Information Tab Opened -->
-			    <div id="basicTab">
-
-				<table border=0 cellspacing=0 cellpadding=3 width=100% class="dvtContentSpace">
-				   <tr>
-					<td align=left>
-					<!-- content cache -->
-					
-						<table border=0 cellspacing=0 cellpadding=0 width=100%>
-						   <tr>
-							<td id ="autocom"></td>
-						   </tr>
-						   <tr>
-							<td style="padding:10px">
-							<!-- General details -->
-								<table border=0 cellspacing=0 cellpadding=0 width=100% class="small">
-								   <tr>
-									<td  colspan=4 style="padding:5px">
-									   <div align="center">
-										<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="crmbutton small save" onclick="this.form.action.value='Save';  return formValidate()" type="submit" name="button" value="  {$APP.LBL_SAVE_BUTTON_LABEL}  " style="width:70px" >
-                                                                 		<input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="crmbutton small cancel" onclick="window.history.back()" type="button" name="button" value="  {$APP.LBL_CANCEL_BUTTON_LABEL}  " style="width:70px">
-									   </div>
-									</td>
-								   </tr>
-
-								   {foreach key=header item=data from=$BASBLOCKS}
-								   <tr>
-									{if $header== $MOD.LBL_ADDRESS_INFORMATION && ($MODULE == 'Accounts' || $MODULE == 'Quotes' || $MODULE == 'PurchaseOrder' || $MODULE == 'SalesOrder'|| $MODULE == 'Invoice')}
-                                                                        <td colspan=2 class="detailedViewHeader">
-                                                                        <b>{$header}</b></td>
-                                                                        <td class="detailedViewHeader">
-                                                                        <input name="cpy" onclick="return copyAddressLeft(EditView)" type="radio"><b>{$APP.LBL_RCPY_ADDRESS}</b></td>
-                                                                        <td class="detailedViewHeader">
-                                                                        <input name="cpy" onclick="return copyAddressRight(EditView)" type="radio"><b>{$APP.LBL_LCPY_ADDRESS}</b></td>
-
-									{elseif $header== $MOD.LBL_ADDRESS_INFORMATION && $MODULE == 'Contacts'}
-									<td colspan=2 class="detailedViewHeader">
-                                                                        <b>{$header}</b></td>
-                                                                        <td class="detailedViewHeader">
-                                                                        <input name="cpy" onclick="return copyAddressLeft(EditView)" type="radio"><b>{$APP.LBL_CPY_OTHER_ADDRESS}</b></td>
-                                                                        <td class="detailedViewHeader">
-                                                                        <input name="cpy" onclick="return copyAddressRight(EditView)" type="radio"><b>{$APP.LBL_CPY_MAILING_ADDRESS}</b></td>
-                                                                        {else}
-						         		<td colspan=4 class="detailedViewHeader">
-                                                	        		<b>{$header}</b>
-									{/if}
-							 		</td>
-		                                        	   </tr>
-
-								   <!-- Here we should include the uitype handlings-->
-								   {include file="DisplayFields.tpl"}							
-								   <tr style="height:25px"><td>&nbsp;</td></tr>
-								   {/foreach}
-
-								   <tr>
-									<td  colspan=4 style="padding:5px">
-									   <div align="center">
-										{if $MODULE eq 'Emails'}
-                                                                			<input title="{$APP.LBL_SELECTEMAILTEMPLATE_BUTTON_TITLE}" accessKey="{$APP.LBL_SELECTEMAILTEMPLATE_BUTTON_KEY}" class="crmbutton small create" onclick="window.open('index.php?module=Users&action=lookupemailtemplates&entityid={$ENTITY_ID}&entity={$ENTITY_TYPE}','emailtemplate','top=100,left=200,height=400,width=300,menubar=no,addressbar=no,status=yes')" type="button" name="button" value="{$APP.LBL_SELECTEMAILTEMPLATE_BUTTON_LABEL}">
-                                                                			<input title="{$MOD.LBL_SEND}" accessKey="{$MOD.LBL_SEND}" class="crmbutton small save" onclick="this.form.action.value='Save';this.form.send_mail.value='true'; return formValidate()" type="submit" name="button" value="  {$MOD.LBL_SEND}  " >
-                                                                		{/if}
-                                                                		<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="crmbutton small save" onclick="this.form.action.value='Save';  return formValidate()" type="submit" name="button" value="  {$APP.LBL_SAVE_BUTTON_LABEL}  " style="width:70px" >
-                                                                		<input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="crmbutton small cancel" onclick="window.history.back()" type="button" name="button" value="  {$APP.LBL_CANCEL_BUTTON_LABEL}  " style="width:70px">
-									   </div>
-									</td>
-								   </tr>
-								</table>
-							</td>
-						   </tr>
-						</table>
-					</td>
-				   </tr>
-				</table>
-					
-			    </div>
-			    <!-- Basic Information Tab Closed -->
-
-			    <!-- More Information Tab Opened -->
-			    <div id="moreTab">
-				<table border=0 cellspacing=0 cellpadding=3 width=100% class="dvtContentSpace">
-				   <tr>
-					<td align=left>
-					{*<!-- content cache -->*}
-					
-						<table border=0 cellspacing=0 cellpadding=0 width=100%>
-						   <tr>
-							<td id ="autocom"></td>
-						   </tr>
-						   <tr>
-							<td style="padding:10px">
-							<!-- General details -->
-								<table border=0 cellspacing=0 cellpadding=0 width=100% class="small">
-								   <tr>
-									<td  colspan=4 style="padding:5px">
-									   <div align="center">
-										<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="crmbutton small save" onclick="this.form.action.value='Save';  return formValidate()" type="submit" name="button" value="  {$APP.LBL_SAVE_BUTTON_LABEL}  " style="width:70px" >
-                                                                 		<input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="crmbutton small cancel" onclick="window.history.back()" type="button" name="button" value="  {$APP.LBL_CANCEL_BUTTON_LABEL}  " style="width:70px">
-									   </div>
-									</td>
-								   </tr>
-
-								   {foreach key=header item=data from=$ADVBLOCKS}
-								   <tr>
-						         		<td colspan=4 class="detailedViewHeader">
-                                                	        		<b>{$header}</b>
-                                                         		</td>
-                                                         	   </tr>
-
-								   <!-- Here we should include the uitype handlings-->
-                                                        	   {include file="DisplayFields.tpl"}
-
-							 	   <tr style="height:25px"><td>&nbsp;</td></tr>
-								   {/foreach}
-
-								   <tr>
-									<td  colspan=4 style="padding:5px">
-									   <div align="center">
-										{if $MODULE eq 'Emails'}
-                                                                			<input title="{$APP.LBL_SELECTEMAILTEMPLATE_BUTTON_TITLE}" accessKey="{$APP.LBL_SELECTEMAILTEMPLATE_BUTTON_KEY}" class="crmbutton small create" onclick="window.open('index.php?module=Users&action=lookupemailtemplates&entityid={$ENTITY_ID}&entity={$ENTITY_TYPE}','emailtemplate','top=100,left=200,height=400,width=300,menubar=no,addressbar=no,status=yes')" type="button" name="button" value="{$APP.LBL_SELECTEMAILTEMPLATE_BUTTON_LABEL}">
-                                                                			<input title="{$MOD.LBL_SEND}" accessKey="{$MOD.LBL_SEND}" class="crmbutton small save" onclick="this.form.action.value='Save';this.form.send_mail.value='true'; return formValidate()" type="submit" name="button" value="  {$MOD.LBL_SEND}  " >
-                                                                		{/if}
-
-										<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="crmbutton small save" onclick="this.form.action.value='Save';return formValidate()" type="submit" name="button" value="  {$APP.LBL_SAVE_BUTTON_LABEL}  " style="width:70px" >
-										<input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="crmbutton small cancel" onclick="window.history.back()" type="button" name="button" value="  {$APP.LBL_CANCEL_BUTTON_LABEL}  " style="width:70px">
-									   </div>
-									</td>
-								   </tr>
-								</table>
-							</td>
-						   </tr>
-						</table>
-					</td>
-				   </tr>
-				</table>
-			    </div>
-
-			</td>
-		   </tr>
-		</table>
-	     </div>
-	</td>
-	<td align=right valign=top><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
-   </tr>
-</table>
-</form>
-
-{if ($MODULE eq 'Emails' || 'Notes') and ($FCKEDITOR_DISPLAY eq 'true')}
-       <script type="text/javascript" src="include/fckeditor/fckeditor.js"></script>
-       <script type="text/javascript" defer="1">
-
-       var oFCKeditor = null;
-
-       {if $MODULE eq 'Notes'}
-               oFCKeditor = new FCKeditor( "notecontent" ) ;
-       {/if}
-
-       oFCKeditor.BasePath   = "include/fckeditor/" ;
-       oFCKeditor.ReplaceTextarea() ;
-
-       </script>
-{/if}
-{if $MODULE eq 'Accounts'}
-<script>
-	ScrollEffect.limit = 201;
-	ScrollEffect.closelimit= 200;
-</script>
-{/if}
-<script>
-
-
-
-        var fieldname = new Array({$VALIDATION_DATA_FIELDNAME})
-
-        var fieldlabel = new Array({$VALIDATION_DATA_FIELDLABEL})
-
-        var fielddatatype = new Array({$VALIDATION_DATA_FIELDDATATYPE})
-
-
-</script>
-
-
-
+{*<!--
+
+/*********************************************************************************
+** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+ * ("License"); You may not use this file except in compliance with the License
+ * The Original Code is:  vtiger CRM Open Source
+ * The Initial Developer of the Original Code is vtiger.
+ * Portions created by vtiger are Copyright (C) vtiger.
+ * All Rights Reserved.
+*
+ ********************************************************************************/
+
+-->*}
+
+{*<!-- module header -->*}
+
+<link rel="stylesheet" type="text/css" media="all" href="jscalendar/calendar-win2k-cold-1.css">
+<script type="text/javascript" src="jscalendar/calendar.js"></script>
+<script type="text/javascript" src="jscalendar/lang/calendar-{$CALENDAR_LANG}.js"></script>
+<script type="text/javascript" src="jscalendar/calendar-setup.js"></script>
+<script type="text/javascript" src="modules/{$MODULE}/{$SINGLE_MOD}.js"></script>
+
+<script type="text/javascript">
+function sensex_info()
+{ldelim}
+        var Ticker = $('tickersymbol').value;
+        if(Ticker!='')
+        {ldelim}
+                $("vtbusy_info").style.display="inline";
+                new Ajax.Request(
+                      'index.php',
+                      {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+                                method: 'post',
+                                postBody: 'module={$MODULE}&action=Tickerdetail&tickersymbol='+Ticker,
+                                onComplete: function(response) {ldelim}
+                                        $('autocom').innerHTML = response.responseText;
+                                        $('autocom').style.display="block";
+                                        $("vtbusy_info").style.display="none";
+                                {rdelim}
+                        {rdelim}
+                );
+        {rdelim}
+{rdelim}
+</script>
+
+		{include file='Buttons_List1.tpl'}
+
+{*<!-- Contents -->*}
+<table border=0 cellspacing=0 cellpadding=0 width=98% align=center>
+   <tr>
+	<td valign=top>
+		<img src="{$IMAGE_PATH}showPanelTopLeft.gif">
+	</td>
+
+	<td class="showPanelBg" valign=top width=100%>
+	     {*<!-- PUBLIC CONTENTS STARTS-->*}
+	     <div class="small" style="padding:20px">
+		
+		 {if $OP_MODE eq 'edit_view'}   
+			 <span class="lvtHeaderText"><font color="purple">[ {$ID} ] </font>{$NAME} -  {$APP.LBL_EDITING} {$APP[$SINGLE_MOD]} {$APP.LBL_INFORMATION}</span> <br>
+			{$UPDATEINFO}	 
+		 {/if}
+		 {if $OP_MODE eq 'create_view'}
+			{if $DUPLICATE neq 'true'}
+			<span class="lvtHeaderText">{$APP.LBL_CREATING} {$APP.LBL_NEW} {$APP[$SINGLE_MOD]}</span> <br>
+			{else}
+			<span class="lvtHeaderText">{$APP.LBL_DUPLICATING} "{$NAME}" </span> <br>
+			{/if}
+		 {/if}
+
+		 <hr noshade size=1>
+		 <br> 
+		
+		{include file='EditViewHidden.tpl'}
+
+		{*<!-- Account details tabs -->*}
+		<table border=0 cellspacing=0 cellpadding=0 width=95% align=center>
+		   <tr>
+			<td>
+				<table border=0 cellspacing=0 cellpadding=3 width=100% class="small">
+				   <tr>
+					<td class="dvtTabCache" style="width:10px" nowrap>&nbsp;</td>
+
+					{if $ADVBLOCKS neq ''}	
+						<td width=75 style="width:15%" align="center" nowrap class="dvtSelectedCell" id="bi" onclick="fnLoadValues('bi','mi','basicTab','moreTab','normal','{$MODULE}')"><b>{$APP.LBL_BASIC} {$APP.LBL_INFORMATION}</b></td>
+                    				<td class="dvtUnSelectedCell" style="width: 100px;" align="center" nowrap id="mi" onclick="fnLoadValues('mi','bi','moreTab','basicTab','normal','{$MODULE}')"><b>{$APP.LBL_MORE} {$APP.LBL_INFORMATION} </b></td>
+                   				<td class="dvtTabCache" style="width:65%" nowrap>&nbsp;</td>
+					{else}
+						<td class="dvtSelectedCell" align=center nowrap>{$APP.LBL_BASIC} {$APP.LBL_INFORMATION}</td>
+	                                        <td class="dvtTabCache" style="width:65%">&nbsp;</td>
+					{/if}
+				   <tr>
+				</table>
+			</td>
+		   </tr>
+		   <tr>
+			<td valign=top align=left >
+
+			    <!-- Basic Information Tab Opened -->
+			    <div id="basicTab">
+
+				<table border=0 cellspacing=0 cellpadding=3 width=100% class="dvtContentSpace">
+				   <tr>
+					<td align=left>
+					<!-- content cache -->
+					
+						<table border=0 cellspacing=0 cellpadding=0 width=100%>
+						   <tr>
+							<td id ="autocom"></td>
+						   </tr>
+						   <tr>
+							<td style="padding:10px">
+							<!-- General details -->
+								<table border=0 cellspacing=0 cellpadding=0 width=100% class="small">
+								   <tr>
+									<td  colspan=4 style="padding:5px">
+									   <div align="center">
+										{if $MODULE eq 'Accounts'}
+											<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="crmbutton small save" onclick="this.form.action.value='Save';  if(formValidate())AjaxDuplicateValidate('Accounts','accountname',this.form);" type="button" name="button" value="  {$APP.LBL_SAVE_BUTTON_LABEL}  " style="width:70px" >
+										{else}
+											<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="crmbutton small save" onclick="this.form.action.value='Save';  return formValidate()" type="submit" name="button" value="  {$APP.LBL_SAVE_BUTTON_LABEL}  " style="width:70px" >
+										{/if}
+                                                                 		<input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="crmbutton small cancel" onclick="window.history.back()" type="button" name="button" value="  {$APP.LBL_CANCEL_BUTTON_LABEL}  " style="width:70px">
+									   </div>
+									</td>
+								   </tr>
+
+								   {foreach key=header item=data from=$BASBLOCKS}
+								   <tr>
+									{if $header== $MOD.LBL_ADDRESS_INFORMATION && ($MODULE == 'Accounts' || $MODULE == 'Quotes' || $MODULE == 'PurchaseOrder' || $MODULE == 'SalesOrder'|| $MODULE == 'Invoice')}
+                                                                        <td colspan=2 class="detailedViewHeader">
+                                                                        <b>{$header}</b></td>
+                                                                        <td class="detailedViewHeader">
+                                                                        <input name="cpy" onclick="return copyAddressLeft(EditView)" type="radio"><b>{$APP.LBL_RCPY_ADDRESS}</b></td>
+                                                                        <td class="detailedViewHeader">
+                                                                        <input name="cpy" onclick="return copyAddressRight(EditView)" type="radio"><b>{$APP.LBL_LCPY_ADDRESS}</b></td>
+
+									{elseif $header== $MOD.LBL_ADDRESS_INFORMATION && $MODULE == 'Contacts'}
+									<td colspan=2 class="detailedViewHeader">
+                                                                        <b>{$header}</b></td>
+                                                                        <td class="detailedViewHeader">
+                                                                        <input name="cpy" onclick="return copyAddressLeft(EditView)" type="radio"><b>{$APP.LBL_CPY_OTHER_ADDRESS}</b></td>
+                                                                        <td class="detailedViewHeader">
+                                                                        <input name="cpy" onclick="return copyAddressRight(EditView)" type="radio"><b>{$APP.LBL_CPY_MAILING_ADDRESS}</b></td>
+                                                                        {else}
+						         		<td colspan=4 class="detailedViewHeader">
+                                                	        		<b>{$header}</b>
+									{/if}
+							 		</td>
+		                                        	   </tr>
+
+								   <!-- Here we should include the uitype handlings-->
+								   {include file="DisplayFields.tpl"}							
+								   <tr style="height:25px"><td>&nbsp;</td></tr>
+								   {/foreach}
+
+								   <tr>
+									<td  colspan=4 style="padding:5px">
+									   <div align="center">
+										{if $MODULE eq 'Emails'}
+                                                                			<input title="{$APP.LBL_SELECTEMAILTEMPLATE_BUTTON_TITLE}" accessKey="{$APP.LBL_SELECTEMAILTEMPLATE_BUTTON_KEY}" class="crmbutton small create" onclick="window.open('index.php?module=Users&action=lookupemailtemplates&entityid={$ENTITY_ID}&entity={$ENTITY_TYPE}','emailtemplate','top=100,left=200,height=400,width=300,menubar=no,addressbar=no,status=yes')" type="button" name="button" value="{$APP.LBL_SELECTEMAILTEMPLATE_BUTTON_LABEL}">
+                                                                			<input title="{$MOD.LBL_SEND}" accessKey="{$MOD.LBL_SEND}" class="crmbutton small save" onclick="this.form.action.value='Save';this.form.send_mail.value='true'; return formValidate()" type="submit" name="button" value="  {$MOD.LBL_SEND}  " >
+                                                                		{/if}
+                                                                		<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="crmbutton small save" onclick="this.form.action.value='Save';  return formValidate()" type="submit" name="button" value="  {$APP.LBL_SAVE_BUTTON_LABEL}  " style="width:70px" >
+                                                                		<input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="crmbutton small cancel" onclick="window.history.back()" type="button" name="button" value="  {$APP.LBL_CANCEL_BUTTON_LABEL}  " style="width:70px">
+									   </div>
+									</td>
+								   </tr>
+								</table>
+							</td>
+						   </tr>
+						</table>
+					</td>
+				   </tr>
+				</table>
+					
+			    </div>
+			    <!-- Basic Information Tab Closed -->
+
+			    <!-- More Information Tab Opened -->
+			    <div id="moreTab">
+				<table border=0 cellspacing=0 cellpadding=3 width=100% class="dvtContentSpace">
+				   <tr>
+					<td align=left>
+					{*<!-- content cache -->*}
+					
+						<table border=0 cellspacing=0 cellpadding=0 width=100%>
+						   <tr>
+							<td id ="autocom"></td>
+						   </tr>
+						   <tr>
+							<td style="padding:10px">
+							<!-- General details -->
+								<table border=0 cellspacing=0 cellpadding=0 width=100% class="small">
+								   <tr>
+									<td  colspan=4 style="padding:5px">
+									   <div align="center">
+										<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="crmbutton small save" onclick="this.form.action.value='Save';  return formValidate()" type="submit" name="button" value="  {$APP.LBL_SAVE_BUTTON_LABEL}  " style="width:70px" >
+                                                                 		<input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="crmbutton small cancel" onclick="window.history.back()" type="button" name="button" value="  {$APP.LBL_CANCEL_BUTTON_LABEL}  " style="width:70px">
+									   </div>
+									</td>
+								   </tr>
+
+								   {foreach key=header item=data from=$ADVBLOCKS}
+								   <tr>
+						         		<td colspan=4 class="detailedViewHeader">
+                                                	        		<b>{$header}</b>
+                                                         		</td>
+                                                         	   </tr>
+
+								   <!-- Here we should include the uitype handlings-->
+                                                        	   {include file="DisplayFields.tpl"}
+
+							 	   <tr style="height:25px"><td>&nbsp;</td></tr>
+								   {/foreach}
+
+								   <tr>
+									<td  colspan=4 style="padding:5px">
+									   <div align="center">
+										{if $MODULE eq 'Emails'}
+                                                                			<input title="{$APP.LBL_SELECTEMAILTEMPLATE_BUTTON_TITLE}" accessKey="{$APP.LBL_SELECTEMAILTEMPLATE_BUTTON_KEY}" class="crmbutton small create" onclick="window.open('index.php?module=Users&action=lookupemailtemplates&entityid={$ENTITY_ID}&entity={$ENTITY_TYPE}','emailtemplate','top=100,left=200,height=400,width=300,menubar=no,addressbar=no,status=yes')" type="button" name="button" value="{$APP.LBL_SELECTEMAILTEMPLATE_BUTTON_LABEL}">
+                                                                			<input title="{$MOD.LBL_SEND}" accessKey="{$MOD.LBL_SEND}" class="crmbutton small save" onclick="this.form.action.value='Save';this.form.send_mail.value='true'; return formValidate()" type="submit" name="button" value="  {$MOD.LBL_SEND}  " >
+                                                                		{/if}
+							{if $MODULE eq 'Accounts'}
+											<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="crmbutton small save" onclick="this.form.action.value='Save';  if(formValidate())AjaxDuplicateValidate('Accounts','accountname',this.form);" type="button" name="button" value="  {$APP.LBL_SAVE_BUTTON_LABEL}  " style="width:70px" >
+										{else}
+											<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="crmbutton small save" onclick="this.form.action.value='Save';  return formValidate()" type="submit" name="button" value="  {$APP.LBL_SAVE_BUTTON_LABEL}  " style="width:70px" >
+										{/if}
+										<input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="crmbutton small cancel" onclick="window.history.back()" type="button" name="button" value="  {$APP.LBL_CANCEL_BUTTON_LABEL}  " style="width:70px">
+									   </div>
+									</td>
+								   </tr>
+								</table>
+							</td>
+						   </tr>
+						</table>
+					</td>
+				   </tr>
+				</table>
+			    </div>
+
+			</td>
+		   </tr>
+		</table>
+	     </div>
+	</td>
+	<td align=right valign=top><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</table>
+</form>
+
+{if ($MODULE eq 'Emails' || 'Notes') and ($FCKEDITOR_DISPLAY eq 'true')}
+       <script type="text/javascript" src="include/fckeditor/fckeditor.js"></script>
+       <script type="text/javascript" defer="1">
+
+       var oFCKeditor = null;
+
+       {if $MODULE eq 'Notes'}
+               oFCKeditor = new FCKeditor( "notecontent" ) ;
+       {/if}
+
+       oFCKeditor.BasePath   = "include/fckeditor/" ;
+       oFCKeditor.ReplaceTextarea() ;
+
+       </script>
+{/if}
+{if $MODULE eq 'Accounts'}
+<script>
+	ScrollEffect.limit = 201;
+	ScrollEffect.closelimit= 200;
+</script>
+{/if}
+<script>
+
+
+
+        var fieldname = new Array({$VALIDATION_DATA_FIELDNAME})
+
+        var fieldlabel = new Array({$VALIDATION_DATA_FIELDLABEL})
+
+        var fielddatatype = new Array({$VALIDATION_DATA_FIELDDATATYPE})
+
+
+</script>

Modified: vtigercrm/branches/5.0.3/Smarty/templates/QuickCreate.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/QuickCreate.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/QuickCreate.tpl Thu Dec 21 09:53:31 2006
@@ -380,7 +380,14 @@
 		<!-- save cancel buttons -->
 		<table border=0 cellspacing=0 cellpadding=5 width=100% class=qcTransport>
 		<tr>
-			<td width=50% align=right><input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="crmbutton small save" type="submit" name="button" value="  {$APP.LBL_SAVE_BUTTON_LABEL}  " style="width:70px" ></td>
+
+										{if $MODULE eq 'Accounts'}
+									<td width=50% align=right><input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="crmbutton small save" onclick="this.form.action.value='Save';AjaxDuplicateValidate('Accounts','accountname',this.form);" type="button" name="button" value="  {$APP.LBL_SAVE_BUTTON_LABEL}  " style="width:70px" ></td>
+										{else}
+											<td width=50% align=right><input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="crmbutton small save" type="submit" name="button" value="  {$APP.LBL_SAVE_BUTTON_LABEL}" style="width:70px" ></td>
+										{/if}
+
+
 			<td width=50% align=left>
 				<input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="crmbutton small cancel" onclick="hide('qcform'); $('qccombo').options.selectedIndex=0;" type="button" name="button" value="  {$APP.LBL_CANCEL_BUTTON_LABEL}  " style="width:70px">
 			</td>

Modified: vtigercrm/branches/5.0.3/include/js/general.js
==============================================================================
--- vtigercrm/branches/5.0.3/include/js/general.js (original)
+++ vtigercrm/branches/5.0.3/include/js/general.js Thu Dec 21 09:53:31 2006
@@ -1717,4 +1717,26 @@
                 inputField : fieldid, ifFormat : dateformat, showsTime : false, button : imageid, singleClick : true, step : 1
         });
 }
-
+function AjaxDuplicateValidate(module,fieldname,oform)
+{
+	var fieldvalue = getObj(fieldname).value;
+	var url = "module="+module+"&action="+module+"Ajax&file=Save&"+fieldname+"="+fieldvalue+"&dup_check=true"
+	new Ajax.Request(
+          	  	      'index.php',
+			      	{queue: {position: 'end', scope: 'command'},
+		                        method: 'post',
+                		        postBody:url,
+		                        onComplete: function(response) {
+						var str = response.responseText
+						if(str.indexOf('SUCCESS') > -1)
+						{
+							oform.submit();	
+						}else
+						{
+							alert(str);
+						}
+		                        }
+              			 }
+       			);	
+
+}

Modified: vtigercrm/branches/5.0.3/modules/Accounts/Save.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Accounts/Save.php (original)
+++ vtigercrm/branches/5.0.3/modules/Accounts/Save.php Thu Dec 21 09:53:31 2006
@@ -26,6 +26,26 @@
 //require_once('database/DatabaseConnection.php');
 require_once('include/database/PearDatabase.php');
 
+if(isset($_REQUEST['dup_check']) && $_REQUEST['dup_check'] != '')
+{
+	//started
+	$value = $_REQUEST['accountname'];
+        $query = "SELECT accountname FROM vtiger_account WHERE accountname ='".$value."'";
+	$result = $adb->query($query);
+        if($adb->num_rows($result) > 0)
+	{
+		echo 'Account Name Already Exists!';
+	}
+	else
+	{
+		echo 'SUCCESS';
+	}
+	die;
+}
+//Ended
+
+
+
 $local_log =& LoggerManager::getLogger('index');
 global $log;
 $focus = new Accounts();
@@ -51,9 +71,7 @@
 	if(isset($_REQUEST[$fieldname]))
 	{
 		$value = $_REQUEST[$fieldname];
-		//echo '<BR>';
-		//echo $fieldname."         ".$value;
-		//echo '<BR>';
+		$log->DEBUG($fieldname."=Field Name &first& Value =".$value);
 		$focus->column_fields[$fieldname] = $value;
 	}
 	if(isset($_REQUEST['annual_revenue']))




From vtigercrm-commits at vtiger.fosslabs.com  Fri Dec 22 09:40:06 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 22 Dec 2006 14:40:06 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9996 - in
 /vtigercrm/branches/5.0.3: include/utils/DetailViewUtils.php
 modules/Users/DefaultDataPopulator.php
Message-ID: <20061222144006.603F5789AAB@vtiger.fosslabs.com>

Author: richie
Date: Fri Dec 22 07:40:00 2006
New Revision: 9996

Log:
related list sequence changed for account

Modified:
    vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php
    vtigercrm/branches/5.0.3/modules/Users/DefaultDataPopulator.php

Modified: vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php (original)
+++ vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php Fri Dec 22 07:40:00 2006
@@ -1299,7 +1299,7 @@
 	
 	$cur_tab_id = getTabid($module);
 
-	$sql1 = "select * from vtiger_relatedlists where tabid=".$cur_tab_id;
+	$sql1 = "select * from vtiger_relatedlists where tabid=".$cur_tab_id." order by sequence";
 	$result = $adb->query($sql1);
 	$num_row = $adb->num_rows($result);
 	for($i=0; $i<$num_row; $i++)

Modified: vtigercrm/branches/5.0.3/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/branches/5.0.3/modules/Users/DefaultDataPopulator.php Fri Dec 22 07:40:00 2006
@@ -1659,25 +1659,24 @@
 
 	//insert into related list vtiger_table
 	//Inserting for vtiger_account related lists
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Potentials").",'get_opportunities',1,'Potentials',0)");	
 		
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Contacts").",'get_contacts',2,'Contacts',0)");
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Calendar").",'get_activities',3,'Activities',0)");
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("HelpDesk").",'get_tickets',4,'HelpDesk',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Calendar").",'get_history',5,'Activity History',0)");
-
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",0,'get_attachments',6,'Attachments',0)");
-
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Quotes").",'get_quotes',7,'Quotes',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Invoice").",'get_invoices',8,'Invoice',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("SalesOrder").",'get_salesorder',9,'Sales Order',0)");
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Contacts").",'get_contacts',1,'Contacts',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Potentials").",'get_opportunities',2,'Potentials',0)");	
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Quotes").",'get_quotes',3,'Quotes',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("SalesOrder").",'get_salesorder',4,'Sales Order',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Invoice").",'get_invoices',5,'Invoice',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Calendar").",'get_activities',6,'Activities',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Calendar").",'get_history',7,'Activity History',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",0,'get_attachments',8,'Attachments',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("HelpDesk").",'get_tickets',9,'HelpDesk',0)");
 	
 	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Products").",'get_products',10,'Products',0)");
 




From vtigercrm-commits at vtiger.fosslabs.com  Fri Dec 22 09:41:33 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 22 Dec 2006 14:41:33 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9997 -
 /vtigercrm/branches/5.0.3/include/language/en_us.lang.php
Message-ID: <20061222144133.05751789AAB@vtiger.fosslabs.com>

Author: richie
Date: Fri Dec 22 07:41:25 2006
New Revision: 9997

Log:
text changed

Modified:
    vtigercrm/branches/5.0.3/include/language/en_us.lang.php

Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/include/language/en_us.lang.php Fri Dec 22 07:41:25 2006
@@ -25,7 +25,7 @@
 'LBL_MY_ACCOUNT' => 'My Account',
 'LBL_MY_PREFERENCES' => 'My Preferences',
 'LBL_ADMIN' => 'Admin',
-'LBL_LOGOUT' => 'Sign out',
+'LBL_LOGOUT' => 'Sign Out',
 'LBL_SEARCH' => 'Search',
 'LBL_LAST_VIEWED' => 'Last Viewed',
 'LBL_TODAY'=>'Today',
@@ -451,7 +451,7 @@
 'LBL_ADD_RSS_FEEDS' => 'Add New RSS Feed',
 'LNK_NEW_FAQ' => 'New FAQ',
 'Vendor Name' => 'Vendor Name',
-'LNK_WEARE' => 'About us',
+'LNK_WEARE' => 'About Us',
 'LBL_ABOUTUS_TITLE' => 'vtiger CRM - About Us',
 'LBL_DISCUSS' => 'Discuss with other users',
 'Quote Stage' => 'Quote Stage',




From vtigercrm-commits at vtiger.fosslabs.com  Wed Dec 27 10:43:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 27 Dec 2006 15:43:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9998 - in
 /vtigercrm/branches/5.0.3: include/fpdf/ include/fpdf/templates/
 modules/Invoice/ modules/Invoice/pdf_templates/ modules/PurchaseOrder/
 modules/PurchaseOrder/pdf_templates/ modules/Quotes/
 modules/Quotes/pdf_templates/ modules/SalesOrder/
 modules/SalesOrder/pdf_templates/
Message-ID: <20061227154359.ACA367896DE@vtiger.fosslabs.com>

Author: richie
Date: Wed Dec 27 08:43:45 2006
New Revision: 9998

Log:
* Modified to configure easily ie., change the bottom and top pixels and number of products  easily to avoid the description wrap

Added:
    vtigercrm/branches/5.0.3/include/fpdf/pdfconfig.php
Modified:
    vtigercrm/branches/5.0.3/include/fpdf/templates/body.php
    vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php
    vtigercrm/branches/5.0.3/modules/Invoice/pdf_templates/footer.php
    vtigercrm/branches/5.0.3/modules/PurchaseOrder/CreatePDF.php
    vtigercrm/branches/5.0.3/modules/PurchaseOrder/pdf_templates/footer.php
    vtigercrm/branches/5.0.3/modules/Quotes/CreatePDF.php
    vtigercrm/branches/5.0.3/modules/Quotes/pdf_templates/footer.php
    vtigercrm/branches/5.0.3/modules/SalesOrder/CreateSOPDF.php
    vtigercrm/branches/5.0.3/modules/SalesOrder/pdf_templates/footer.php

Modified: vtigercrm/branches/5.0.3/include/fpdf/templates/body.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/fpdf/templates/body.php (original)
+++ vtigercrm/branches/5.0.3/include/fpdf/templates/body.php Wed Dec 27 08:43:45 2006
@@ -6,10 +6,10 @@
 $waterMarkRotate=array("45","50","180");
 $pdf->watermark( $status, $waterMarkPositions, $waterMarkRotate );
 
-$bottom="130";
-$top="80";
+include("include/fpdf/pdfconfig.php");
+
 // blow a bubble around the table
-$Bubble=array("10",$top,"170","$bottom");
+$Bubble=array("10",$body_top,"170","$bottom");
 $pdf->tableWrapper($Bubble);
 
 /* ************ Begin Table Setup ********************** */
@@ -19,7 +19,9 @@
 // correctly
 $prodTable=array("10","60");
 
-if($focus->column_fields["hdnTaxType"] == "individual") {
+//if taxtype is individual
+if($focus->column_fields["hdnTaxType"] == "individual")
+{
 	$colsAlign["Product Name"] = "L";
 	$colsAlign["Description"] = "L";
 	$colsAlign["Qty"] = "R";
@@ -35,7 +37,10 @@
 	$cols["Discount"] = "15";
 	$cols["Tax"] = "20";
 	$cols["Total"] = "25";
-} else {
+}
+else
+{
+	//if taxtype is group
 	$colsAlign["Product Name"] = "L";
 	$colsAlign["Description"] = "L";
 	$colsAlign["Qty"] = "R";
@@ -61,8 +66,9 @@
 
 /* ************* Begin Product Population *************** */
 $ppad=3;
-$y    = $top+10;
-for($i=0;$i<count($product_name);$i++) {
+$y    = $body_top+10;
+for($i=0;$i<count($product_name);$i++)
+{
         $size = $pdf->addProductLine( $y, $line[$i] );
         $y   += $size+$ppad;
 }
@@ -73,17 +79,20 @@
 /* ************* Begin Totals ************************** */
 $t=$bottom+56;
 $pad=6;
-for($i=0;$i<count($total);$i++) {
+for($i=0;$i<count($total);$i++)
+{
         $size = $pdf->addProductLine( $t, $total[$i], $total[$i] );
         $t   += $pad;
 }
 
-
-if($focus->column_fields["hdnTaxType"] != "individual") {
+//Set the x and y positions to place the NetTotal, Discount, S&H charge
+//if taxtype is not individual ie., group tax
+if($focus->column_fields["hdnTaxType"] != "individual")
+{
 	$lineData=array("105",$bottom+37,"94");
 	$pdf->drawLine($lineData);
 	$data= $app_strings['LBL_NET_TOTAL'].":                                                                  ".$price_subtotal."";
-	$pdf->SetXY( 105 , 168 );
+	$pdf->SetXY( 105 , ($nettotal_y+(0*$next_y)) );
 	$pdf->SetFont( "Helvetica", "", 10);
 	$pdf->MultiCell(110, 4, $data);
 
@@ -95,29 +104,32 @@
 		$data= $app_strings['LBL_DISCOUNT'].":   $final_price_discount_percent                                                ".$price_discount."";
 	else
 		$data= $app_strings['LBL_DISCOUNT'].":                                                                  ".$price_discount."";
-	$pdf->SetXY( 105 , 174 );
+	$pdf->SetXY( 105 , ($nettotal_y+(1*$next_y)) );
 	$pdf->SetFont( "Helvetica", "", 10);
 	$pdf->MultiCell(110, 4, $data);
 
 	$lineData=array("105",$bottom+49,"94");
 	$pdf->drawLine($lineData);
 	$data= $app_strings['LBL_TAX'].":  ($group_total_tax_percent %)                                                                  ".$price_salestax."";
-	$pdf->SetXY( 105 , 180 );
+	$pdf->SetXY( 105 , ($nettotal_y+(2*$next_y)) );
 	$pdf->SetFont( "Helvetica", "", 10);
 	$pdf->MultiCell(110, 4, $data);
 
 	$lineData=array("105",$bottom+55,"94");
 	$pdf->drawLine($lineData);
 	$data = $app_strings['LBL_SHIPPING_AND_HANDLING_CHARGES'].":                                  ".$price_shipping;
-	$pdf->SetXY( 105 , 186 );
+	$pdf->SetXY( 105 , ($nettotal_y+(3*$next_y)) );
 	$pdf->SetFont( "Helvetica", "", 10);
 	$pdf->MultiCell(110, 4, $data);
 
-} else {
+}
+else
+{
+	//if taxtype is individual
 	$lineData=array("105",$bottom+43,"94");
 	$pdf->drawLine($lineData);
 	$data= $app_strings['LBL_NET_TOTAL'].":                                                                  ".$price_subtotal."";
-	$pdf->SetXY( 105 , 174 );
+	$pdf->SetXY( 105 , ($nettotal_y+(1*$next_y)) );
 	$pdf->SetFont( "Helvetica", "", 10);
 	$pdf->MultiCell(110, 4, $data);
 
@@ -130,36 +142,37 @@
 	else
 		$data= $app_strings['LBL_DISCOUNT'].":                                                                   ".$price_discount."";
 
-	$pdf->SetXY( 105 , 180 );
+	$pdf->SetXY( 105 , ($nettotal_y+(2*$next_y)) );
 	$pdf->SetFont( "Helvetica", "", 10);
 	$pdf->MultiCell(110, 4, $data);
 
 	$lineData=array("105",$bottom+55,"94");
 	$pdf->drawLine($lineData);
 	$data = $app_strings['LBL_SHIPPING_AND_HANDLING_CHARGES'].":                                  ".$price_shipping;
-	$pdf->SetXY( 105 , 186 );
+	$pdf->SetXY( 105 , ($nettotal_y+(3*$next_y)) );
 	$pdf->SetFont( "Helvetica", "", 10);
 	$pdf->MultiCell(110, 4, $data);
 }
 
+//Set the x and y positions to place the S&H Tax, Adjustment and Grand Total
 $lineData=array("105",$bottom+61,"94");
 $pdf->drawLine($lineData);
 $data = $app_strings['LBL_TAX_FOR_SHIPPING_AND_HANDLING'].":  ($sh_tax_percent %)               ".$price_shipping_tax;
-$pdf->SetXY( 105 , 192 );
+$pdf->SetXY( 105 , ($nettotal_y+(4*$next_y)) );
 $pdf->SetFont( "Helvetica", "", 10);
 $pdf->MultiCell(110, 4, $data);
 
 $lineData=array("105",$bottom+67,"94");
 $pdf->drawLine($lineData);
 $data = $app_strings['LBL_ADJUSTMENT'].":                                                                   ".$price_adjustment;
-$pdf->SetXY( 105 , 198 );
+$pdf->SetXY( 105 , ($nettotal_y+(5*$next_y)) );
 $pdf->SetFont( "Helvetica", "", 10);
 $pdf->MultiCell(110, 4, $data);
 
 $lineData=array("105",$bottom+73,"94");
 $pdf->drawLine($lineData);
 $data = $app_strings['LBL_GRAND_TOTAL'].":(in $currency_symbol)                                                    ".$price_total;
-$pdf->SetXY( 105 , 204 );
+$pdf->SetXY( 105 , ($nettotal_y+(6*$next_y)) );
 $pdf->SetFont( "Helvetica", "", 10);
 $pdf->MultiCell(110, 4, $data);
 

Modified: vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php (original)
+++ vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php Wed Dec 27 08:43:45 2006
@@ -11,17 +11,17 @@
 
 
 require_once('include/fpdf/pdf.php');
+require_once('include/fpdf/pdfconfig.php');
 require_once('modules/Invoice/Invoice.php');
 require_once('include/database/PearDatabase.php');
 
-global $adb,$app_strings,$products_per_page,$focus;
+global $adb,$app_strings,$focus;
 $sql="select currency_symbol from vtiger_currency_info";
 $result = $adb->query($sql);
 $currency_symbol = $adb->query_result($result,0,'currency_symbol');
 
 // would you like and end page?  1 for yes 0 for no
 $endpage="1";
-$products_per_page="6";
 
 $id = $_REQUEST['record'];
 
@@ -215,7 +215,14 @@
 	$pdf->AddPage();
 	include("pdf_templates/header.php");
 	include("include/fpdf/templates/body.php");
-	include("pdf_templates/footer.php");
+
+	//if bottom > 145 then we skip the Description and T&C in every page and display only in lastpage
+	//if you want to display the description and T&C in each page then set the display_desc_tc='true' and bottom <= 145 in pdfconfig.php
+	if($display_desc_tc == 'true')
+	if($bottom <= 145)
+	{
+		include("pdf_templates/footer.php");
+	}
 
 	$page_num++;
 

Modified: vtigercrm/branches/5.0.3/modules/Invoice/pdf_templates/footer.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Invoice/pdf_templates/footer.php (original)
+++ vtigercrm/branches/5.0.3/modules/Invoice/pdf_templates/footer.php Wed Dec 27 08:43:45 2006
@@ -12,8 +12,6 @@
 
 define('USD',"$");
 define('EURO', chr(128) );
-
-$top="215";
 
 $desc=explode("\n",$description);
 $cond=explode("\n",$conditions);

Modified: vtigercrm/branches/5.0.3/modules/PurchaseOrder/CreatePDF.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/PurchaseOrder/CreatePDF.php (original)
+++ vtigercrm/branches/5.0.3/modules/PurchaseOrder/CreatePDF.php Wed Dec 27 08:43:45 2006
@@ -10,6 +10,7 @@
  ********************************************************************************/
 
 require('include/fpdf/pdf.php');
+require_once('include/fpdf/pdfconfig.php');
 require_once('modules/PurchaseOrder/PurchaseOrder.php');
 require_once('include/database/PearDatabase.php');
 
@@ -21,8 +22,6 @@
 
 // would you like and end page?  1 for yes 0 for no
 $endpage="1";
-global $products_per_page;
-$products_per_page="6";
 
 $id = $_REQUEST['record'];
 //retreiving the vtiger_invoice info
@@ -217,7 +216,14 @@
 	$pdf->AddPage();
 	include("pdf_templates/header.php");
 	include("include/fpdf/templates/body.php");
-	include("pdf_templates/footer.php");
+
+	//if bottom > 145 then we skip the Description and T&C in every page and display only in lastpage
+	//if you want to display the description and T&C in each page then set the display_desc_tc='true' and bottom <= 145 in pdfconfig.php
+	if($display_desc_tc == 'true')
+	if($bottom <= 145)
+	{
+		include("pdf_templates/footer.php");
+	}
 
 	$page_num++;
 

Modified: vtigercrm/branches/5.0.3/modules/PurchaseOrder/pdf_templates/footer.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/PurchaseOrder/pdf_templates/footer.php (original)
+++ vtigercrm/branches/5.0.3/modules/PurchaseOrder/pdf_templates/footer.php Wed Dec 27 08:43:45 2006
@@ -12,8 +12,6 @@
 
 define('USD',"$");
 define('EURO', chr(128) );
-
-$top="215";
 
 $desc=explode("\n",$description);
 $cond=explode("\n",$conditions);

Modified: vtigercrm/branches/5.0.3/modules/Quotes/CreatePDF.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Quotes/CreatePDF.php (original)
+++ vtigercrm/branches/5.0.3/modules/Quotes/CreatePDF.php Wed Dec 27 08:43:45 2006
@@ -11,6 +11,7 @@
 
 
 require_once('include/fpdf/pdf.php');
+require_once('include/fpdf/pdfconfig.php');
 require_once('modules/Quotes/Quotes.php');
 require_once('include/database/PearDatabase.php');
 
@@ -22,8 +23,6 @@
 
 // would you like and end page?  1 for yes 0 for no
 $endpage="1";
-global $products_per_page;
-$products_per_page="6";
 
 $focus = new Quotes();
 $focus->retrieve_entity_info($_REQUEST['record'],"Quotes");
@@ -218,7 +217,14 @@
 	$pdf->AddPage();
 	include("pdf_templates/header.php");
 	include("include/fpdf/templates/body.php");
-	include("pdf_templates/footer.php");
+
+	//if bottom > 145 then we skip the Description and T&C in every page and display only in lastpage
+	//if you want to display the description and T&C in each page then set the display_desc_tc='true' and bottom <= 145 in pdfconfig.php
+	if($display_desc_tc == 'true')
+	if($bottom <= 145)
+	{
+		include("pdf_templates/footer.php");
+	}
 
 	$page_num++;
 

Modified: vtigercrm/branches/5.0.3/modules/Quotes/pdf_templates/footer.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Quotes/pdf_templates/footer.php (original)
+++ vtigercrm/branches/5.0.3/modules/Quotes/pdf_templates/footer.php Wed Dec 27 08:43:45 2006
@@ -9,9 +9,6 @@
  *
  ********************************************************************************/
 
-
-
-$top="215";
 
 $desc=explode("\n",$description);
 $cond=explode("\n",$conditions);

Modified: vtigercrm/branches/5.0.3/modules/SalesOrder/CreateSOPDF.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/SalesOrder/CreateSOPDF.php (original)
+++ vtigercrm/branches/5.0.3/modules/SalesOrder/CreateSOPDF.php Wed Dec 27 08:43:45 2006
@@ -11,10 +11,11 @@
 
 
 require('include/fpdf/pdf.php');
+require_once('include/fpdf/pdfconfig.php');
 require_once('modules/SalesOrder/SalesOrder.php');
 require_once('include/database/PearDatabase.php');
 
-global $adb,$app_strings,$products_per_page;
+global $adb,$app_strings;
 
 $sql="select currency_symbol from vtiger_currency_info";
 $result = $adb->query($sql);
@@ -22,7 +23,6 @@
 
 // would you like and end page?  1 for yes 0 for no
 $endpage="1";
-$products_per_page="6";
 
 $id = $_REQUEST['record'];
 //retreiving the vtiger_invoice info
@@ -216,7 +216,14 @@
 	$pdf->AddPage();
 	include("pdf_templates/header.php");
 	include("include/fpdf/templates/body.php");
-	include("pdf_templates/footer.php");
+
+	//if bottom > 145 then we skip the Description and T&C in every page and display only in lastpage
+	//if you want to display the description and T&C in each page then set the display_desc_tc='true' and bottom <= 145 in pdfconfig.php
+	if($display_desc_tc == 'true')
+	if($bottom <= 145)
+	{
+		include("pdf_templates/footer.php");
+	}
 
 	$page_num++;
 

Modified: vtigercrm/branches/5.0.3/modules/SalesOrder/pdf_templates/footer.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/SalesOrder/pdf_templates/footer.php (original)
+++ vtigercrm/branches/5.0.3/modules/SalesOrder/pdf_templates/footer.php Wed Dec 27 08:43:45 2006
@@ -12,8 +12,6 @@
 
 define('USD',"$");
 define('EURO', chr(128) );
-
-$top="215";
 
 $desc=explode("\n",$description);
 $cond=explode("\n",$conditions);




From vtigercrm-commits at vtiger.fosslabs.com  Thu Dec 28 03:30:00 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 28 Dec 2006 08:30:00 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9999 -
 /vtigercrm/branches/5.0.3/modules/Products/language/en_us.lang.php
Message-ID: <20061228083000.2548378A36C@vtiger.fosslabs.com>

Author: richie
Date: Thu Dec 28 01:29:54 2006
New Revision: 9999

Log:
* Fixed the i18n issue for Dozen

Modified:
    vtigercrm/branches/5.0.3/modules/Products/language/en_us.lang.php

Modified: vtigercrm/branches/5.0.3/modules/Products/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Products/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Products/language/en_us.lang.php Thu Dec 28 01:29:54 2006
@@ -197,7 +197,7 @@
 'Box'=>'Box',
 'Carton'=>'Carton',
 'Caton'=>'Caton',
-'Dozen'=>'Dazon',
+'Dozen'=>'Dozen',
 'Each'=>'Each',
 'Hours'=>'Hours',
 'Impressions'=>'Impressions',




From vtigercrm-commits at vtiger.fosslabs.com  Thu Dec 28 06:28:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 28 Dec 2006 11:28:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r10000 -
	/vtigercrm/branches/5.0.3/include/nusoap/nusoap.php
Message-ID: <20061228112810.3ACE6788CDB@vtiger.fosslabs.com>

Author: richie
Date: Thu Dec 28 04:28:06 2006
New Revision: 10000

Log:
* Changed the default encoding to avoid xml parsing error when the content have some special characters like Euro Symbol and German Umlaut characters in customerportal/outlook, etc., ie., in addons and plugins

Modified:
    vtigercrm/branches/5.0.3/include/nusoap/nusoap.php

Modified: vtigercrm/branches/5.0.3/include/nusoap/nusoap.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/nusoap/nusoap.php (original)
+++ vtigercrm/branches/5.0.3/include/nusoap/nusoap.php Thu Dec 28 04:28:06 2006
@@ -130,8 +130,8 @@
 	* @var      string
 	* @access   public
 	*/
-    	//var $soap_defencoding = 'ISO-8859-1';
-	var $soap_defencoding = 'UTF-8';
+    	var $soap_defencoding = 'ISO-8859-1';
+	//var $soap_defencoding = 'UTF-8';
 
 	/**
 	* namespaces in an array of prefix => uri




From vtigercrm-commits at vtiger.fosslabs.com  Fri Dec 29 04:04:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 29 Dec 2006 09:04:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r10001 - in
 /vtigercrm/branches/5.0.3/modules: Calendar/language/ Contacts/language/
 Emails/language/ HelpDesk/language/ Import/language/ Products/language/
 Quotes/language/ Reports/language/ Settings/language/ Users/language/
 Webmails/language/
Message-ID: <20061229090430.6BB5778A3E0@vtiger.fosslabs.com>

Author: richie
Date: Fri Dec 29 02:04:08 2006
New Revision: 10001

Log:
duplicate labels removed

Modified:
    vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php
    vtigercrm/branches/5.0.3/modules/Contacts/language/en_us.lang.php
    vtigercrm/branches/5.0.3/modules/Emails/language/en_us.lang.php
    vtigercrm/branches/5.0.3/modules/HelpDesk/language/en_us.lang.php
    vtigercrm/branches/5.0.3/modules/Import/language/en_us.lang.php
    vtigercrm/branches/5.0.3/modules/Products/language/en_us.lang.php
    vtigercrm/branches/5.0.3/modules/Quotes/language/en_us.lang.php
    vtigercrm/branches/5.0.3/modules/Reports/language/en_us.lang.php
    vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php
    vtigercrm/branches/5.0.3/modules/Users/language/en_us.lang.php
    vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php

Modified: vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php Fri Dec 29 02:04:08 2006
@@ -25,7 +25,6 @@
 'LBL_MODULE_TITLE'=>'Calendar: Home',
 'LBL_MODULE_APPOINTMENT'=>'Calendar: Appointment',
 'LBL_MODULE_APPOINTMENT_DETAIL'=>'Calendar: Appointment Detail',
-'LBL_CONTACT'=>'Contact:',
 'LBL_SAVE'=>'Save',
 'LBL_RESET'=>'Cancel',
 'LBL_LIST_USER_NAME'=>'User Name',
@@ -94,7 +93,6 @@
 'LBL_PREV_MON' => 'Previous Month',
 'LBL_NEXT_MON' => 'Next Month',
 
-'LBL_YEAR'=>'Year',
 'LBL_YEAR_BUTTON_KEY'=>'Y',
 'LBL_MON_BUTTON_TITLE'=>'Year [Alt+Y]',
 'LBL_PREV_YEAR'=>'Previous Year',
@@ -181,16 +179,8 @@
 'LBL_ADDCALL'=>'Call',
 'LBL_ADDMEETING'=>'Meeting',
 'LBL_ADDTODO'=>'To Do',
-'LBL_INVITE'=>'Invite',
-'LBL_REMINDER'=>'Reminder',
-'LBL_SENDREMINDER'=>'Send Reminder',
 'LBL_BEFOREEVENT'=>'before the event starts',
 'LBL_BEFORETASK'=>'before the task starts',
-'LBL_REPEAT'=>'Repeat',
-'LBL_EVENTTYPE'=>'Event Type',
-'LBL_EVENTNAME'=>'Event Name',
-'LBL_EVENTSTAT'=>'Event starts at',
-'LBL_EVENTEDAT'=>'Event ends on',
 'LBL_HRVIEW'=>'Hour View',
 'LBL_LISTVIEW'=>'List View',
 'LBL_WEEKVIEW'=>'Weekly Calendar View',
@@ -213,8 +203,6 @@
 'LBL_EVERYDAY'=>'Every Day',
 'LBL_EVERYWEEK'=>'Every Week',
 'LBL_EVERYMON'=>'Every Month',
-'LBL_REPEATEVENT'=>'Repeat once in every',
-'LBL_DAYS'=>'Day(s)',
 'LBL_WEEKS'=>'Week(s)',
 'LBL_MONTHS'=>'Month(s)',
 'LBL_YEAR'=>'Year',
@@ -230,7 +218,6 @@
 'LBL_ADD_BUTTON'=>'Add',
 'LBL_USERS'=>'Users',
 'LBL_RMV_BUTTON'=>'Remove',
-'LBL_RMD_ON'=>'Remind on',
 'LBL_SDRMD'=>'Send Reminder to',
 'LBL_ENABLE_REPEAT'=>'Enable Repeat',
 'LBL_REPEAT_ONCE'=>'Repeat once in every',

Modified: vtigercrm/branches/5.0.3/modules/Contacts/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Contacts/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Contacts/language/en_us.lang.php Fri Dec 29 02:04:08 2006
@@ -22,7 +22,6 @@
 
 $mod_strings = Array(
 // Mike Crowe Mod --------------------------------------------------------Added for general search
-'LBL_GENERAL_INFORMATION'=>'General Information',
 'LBL_MODULE_NAME'=>'Contacts',
 'LBL_INVITEE'=>'Direct Reports',
 'LBL_MODULE_TITLE'=>'Contacts: Home',
@@ -57,7 +56,6 @@
 'LBL_CREATED_CALL' => 'Created a new call',
 'LBL_CREATED_MEETING' => 'Created a new meeting',
 'LBL_ADDMORE_BUSINESSCARD' =>'Add another business card',
-'LBL_ADD_BUSINESSCARD' => 'Add Business Card',
 
 'LBL_BUSINESSCARD' => 'Business Card',
 

Modified: vtigercrm/branches/5.0.3/modules/Emails/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Emails/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Emails/language/en_us.lang.php Fri Dec 29 02:04:08 2006
@@ -35,8 +35,6 @@
 
 'ERR_DELETE_RECORD'=>"A record number must be specified to delete the vtiger_account.",
 'LBL_DATE_SENT'=>'Date Sent:',
-'LBL_SUBJECT'=>'Subject :',
-'LBL_BODY'=>'Body:',
 'LBL_DATE_AND_TIME'=>'Date & Time Sent:',
 'LBL_DATE'=>'Date Sent:',
 'LBL_TIME'=>'Time Sent:',
@@ -75,7 +73,6 @@
 // Contacts-SubPanelViewContactsAndUsers.php
 'LBL_BULK_MAILS'=>'Bulk Mails',
 'LBL_ATTACHMENT'=>'Attachment',
-'LBL_DESCRIPTION'=>'Description',
 'LBL_UPLOAD'=>'Upload',
 'LBL_FILE_NAME'=>'File Name',
 'LBL_SEND'=>'Send',

Modified: vtigercrm/branches/5.0.3/modules/HelpDesk/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/HelpDesk/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/HelpDesk/language/en_us.lang.php Fri Dec 29 02:04:08 2006
@@ -36,7 +36,6 @@
 'Accounts'=>'Account',
 'Contacts'=>'Contact',
 'Opportunities'=>'Opportunity',
-'LBL_TICKET_INFORMATION'=>'Ticket Information',
 'LBL_CUSTOM_INFORMATION'=>'Custom Information',
 'LBL_DESCRIPTION_INFORMATION'=>'Description Information',
 
@@ -57,7 +56,6 @@
 'LBL_PRIORITY'=>'Priority',
 'LBL_CATEGORY'=>'Category',
 
-'LBL_QUESTION'=>'Question',
 'LBL_ANSWER'=>'Answer',
 'LBL_COMMENTS'=>'Comments',
 

Modified: vtigercrm/branches/5.0.3/modules/Import/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Import/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Import/language/en_us.lang.php Fri Dec 29 02:04:08 2006
@@ -125,7 +125,6 @@
 'LBL_LEADS_NOTE_2'=>'Company Name must be mapped.',
 'LBL_IMPORT_NOW'=>'Import Now',
 'LBL_'=>'',
-'LBL_'=>'',
 'LBL_CANNOT_OPEN'=>'Cannot open the imported file for reading',
 'LBL_NOT_SAME_NUMBER'=>'There were not the same number of fields per line in your file',
 'LBL_NO_LINES'=>'There were no lines in your import file',
@@ -167,7 +166,6 @@
 );
 
 /*$mod_list_strings = Array(
-'contacts_import_fields' => Array(
 	"id"=>"Contact ID"
 	,"first_name"=>"First Name"
 	,"last_name"=>"Last Name"

Modified: vtigercrm/branches/5.0.3/modules/Products/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Products/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Products/language/en_us.lang.php Fri Dec 29 02:04:08 2006
@@ -63,7 +63,6 @@
 'LBL_COLON'=>':',
 
 'LBL_ATTACHMENTS'=>'Attachments',
-'LBL_NEW_ATTACHMENT'=>'New Attachment',
 'LBL_ATTACH_FILE'=>'File Attachment',
 'LBL_DESCRIPTION'=>'Description',
 'LBL_FILE'=>'File Name',
@@ -109,14 +108,12 @@
 'Sales End Date'=>'Sales End Date',
 'Created Time'=>'Created Time',
 'Modified Time'=>'Modified Time',
-'Description'=>'Description',
 'Related To'=>'Related To',
 'Usage Unit'=>'Usage Unit',
 'Handler'=>'Handler',
 'Contact Name'=>'Contact Name',
 'Currency'=>'Currency',
 'Reorder Level'=>'Reorder Level',
-'Website'=>'Website',
 'Tax Class'=>'Tax Class',
 'Mfr PartNo'=>'Mfr Part No',
 'Vendor PartNo'=>'Vendor Part No',
@@ -197,7 +194,7 @@
 'Box'=>'Box',
 'Carton'=>'Carton',
 'Caton'=>'Caton',
-'Dozen'=>'Dozen',
+'Dozen'=>'Dazon',
 'Each'=>'Each',
 'Hours'=>'Hours',
 'Impressions'=>'Impressions',

Modified: vtigercrm/branches/5.0.3/modules/Quotes/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Quotes/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Quotes/language/en_us.lang.php Fri Dec 29 02:04:08 2006
@@ -45,7 +45,6 @@
 //END DON'T CONVERT
 
 'LBL_ACCOUNT'=>'Account:',
-'LBL_ACCOUNT_NAME'=>'Account Name:',
 'LBL_PHONE'=>'Phone:',
 'LBL_WEBSITE'=>'Website:',
 'LBL_FAX'=>'Fax:',

Modified: vtigercrm/branches/5.0.3/modules/Reports/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Reports/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Reports/language/en_us.lang.php Fri Dec 29 02:04:08 2006
@@ -37,7 +37,6 @@
 'LBL_NEW_REP0_HDR4'=>'Report Module and related module once selected cannot be modified later',
 'LBL_CONTINUE_BUTTON'=>'Continue',
 'LBL_NEW_REP1_HDR1'=>'Provide the following report information',
-'LBL_REPORT_TYPE'=>'Report Type',
 'LBL_SELECT_COLUMNS'=>'Select Columns',
 'LBL_SPECIFY_GROUPING'=>'Specify Grouping',
 'LBL_COLUMNS_TO_TOTAL'=>'Choose Columns To Total',
@@ -96,7 +95,6 @@
 'LBL_CLICK_HERE'=>'Click Here',
 'LBL_TO_ADD_NEW_GROUP'=>'to add new folder',
 'LBL_CREATE_NEW'=>'Create New',
-'LBL_REPORT_DETAILS'=>'Report Details',
 'LBL_RELATIVE_MODULE'=>'Relative Module',
 'LBL_REPORT_TYPE'=>'Report Type',
 'LBL_REPORT_DETAILS'=>'Report Details',

Modified: vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php Fri Dec 29 02:04:08 2006
@@ -139,7 +139,6 @@
 
 //Settings/index.php
 
-'LBL_CUSTOM_FIELD_SETTINGS'=>'Custom Field Settings:',
 
 'LBL_PICKLIST_FIELD_SETTINGS'=>'Picklist Field Settings:',
 
@@ -193,7 +192,6 @@
 
 'PicklistFields'=>' Picklist Fields',
 
-'LBL_PICKLIST_EDITOR'=>'Picklist Editor',
 
 'Edit'=>'Edit',
 
@@ -340,8 +338,6 @@
 
 'LBL_CURRENCY_SETTINGS'=>'Currencies',
 
-'LBL_YES'=>'yes',
-'LBL_NO'=>'no',
 
 'LBL_USERNAME'=>'User Name',
 'LBL_PASWRD'=>'Password',
@@ -358,7 +354,6 @@
 
 'LBL_CREATE_AND_MANAGE_USERS'=>'- Create and Manage Users (e.g., admin)',
 
-'LBL_ROLES'=>'Roles',
 
 'LBL_CREATE_AND_MANAGE_USER_ROLES'=>'- Create and Manage user roles (e.g., Administrator, Standard User, etc.)',
 
@@ -761,7 +756,6 @@
 //Added while moving Mail Merge templates from Users to Settings
 'LBL_TEMPLATE_FILE'=>'Template File',
 'LBL_MODULENAMES'=>'Module',
-'LBL_LIST_TOOLS'=>'Tools',
 'LBL_DOWNLOAD'=>'Download',
 'LBL_ADD_TEMPLATE'=>'Add Template',
 'LBL_WORD_TEMPLATES'=>'Mail Merge Templates',
@@ -808,7 +802,6 @@
 'LBL_MESG_VIEW'=>'to view all information / modules of vtiger CRM',
 'LBL_MESG_EDIT'=>'to edit all information / modules of vtiger CRM',
 'LBL_TAB_MESG_OPTION'=>'modules to be shown',
-'LBL_EDIT_PERMISSIONS'=>'Edit Permissions',
 'LBL_CREATE_EDIT'=>'Create/Edit',
 'LBL_VIEW'=>'View',
 'LBL_MANDATORY_MSG'=>'Mandatory Fields',

Modified: vtigercrm/branches/5.0.3/modules/Users/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Users/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Users/language/en_us.lang.php Fri Dec 29 02:04:08 2006
@@ -24,7 +24,6 @@
 'LBL_LIST_FORM_TITLE'=>'User List',
 'LBL_NEW_FORM_TITLE'=>'New User',
 'LBL_CREATE_NEW_USER'=>'Create New User',
-'LBL_USER'=>'Users:',
 'LBL_LOGIN'=>'Login',
 'LBL_USER_ROLE'=>'Role',
 'LBL_LIST_NAME'=>'Name',
@@ -34,7 +33,6 @@
 'LBL_LIST_EMAIL'=>'E-Mail',
 'LBL_LIST_PRIMARY_PHONE'=>'Primary Phone',
 'LBL_LIST_ADMIN'=>'Admin',
-'LBL_LIST_PASSWORD'=>'Password',
 'LBL_LIST_CONFIRM_PASSWORD'=>'Confirm Password',
 'LBL_LIST_USER_NAME_ROLE'=>'User ID , Name & Role',
 'LBL_LIST_SELECT'=>'Select',
@@ -45,10 +43,7 @@
 'LBL_STD_USERS'=>'Standard Users',
 
 'UserName'=>'UserName',
-'Role'=>'Role',
-'Email'=>'Email',
 'Name'=>'Name',
-'Admin'=>'Admin',
 'Tools'=>'Tools',
 
 
@@ -68,16 +63,13 @@
 'LBL_FIRST_NAME'=>'First Name',
 'LBL_LAST_NAME'=>'Last Name',
 'LBL_YAHOO_ID'=>'Yahoo ID',
-'LBL_USER_SETTINGS'=>'User Settings',
 'LBL_THEME'=>'Color Theme',
 'LBL_LANGUAGE'=>'Language',
 'LBL_ADMIN'=>'Admin',
-'LBL_USER_INFORMATION'=>'User Information',
 'LBL_OFFICE_PHONE'=>'Office Phone',
 'LBL_REPORTS_TO'=>'Reports to',
 'LBL_OTHER_PHONE'=>'Other Phone',
 'LBL_OTHER_EMAIL'=>'Other Email',
-'LBL_NOTES'=>'Notes',
 'LBL_DEPARTMENT'=>'Department',
 'LBL_STATUS'=>'Status',
 'LBL_TITLE'=>'Title',
@@ -88,7 +80,6 @@
 'LBL_STATE'=>'State',
 'LBL_POSTAL_CODE'=>'Postal Code',
 'LBL_COUNTRY'=>'Country',
-'LBL_NAME'=>'Name:',
 'LBL_USER_SETTINGS'=>'User Settings',
 'LBL_USER_INFORMATION'=>'User Information',
 'LBL_MOBILE_PHONE'=>'Mobile',
@@ -137,8 +128,6 @@
 
 'LBL_ROLES'=>'Roles',
 'LBL_ROLES_SUBORDINATES'=>'Roles and Subordinates',
-'LBL_ROLE_NAME'=>'Role Name',
-'LBL_CREATE_NEW_ROLE'=>'Create New Role',
 
 'LBL_CREATE_NEW_ROLE'=>'Create New Role',
 'LBL_INDICATES_REQUIRED_FIELD'=>'Indicates Required Field',
@@ -150,7 +139,6 @@
 'LBL_ENTITY'=>'Entity',
 'LBL_CREATE_EDIT'=>'Create/Edit',
 'LBL_DELETE'=>'Delete',
-'LBL_VIEW'=>'View',
 'LBL_LEADS'=>'Leads',
 'LBL_ACCOUNTS'=>'Accounts',
 'LBL_CONTACTS'=>'Contacts',
@@ -174,12 +162,10 @@
 'LBL_UPLOAD'=>'Upload File',
 'LBL_ATTACH_FILE'=>'Attach Mail Merge Template',
 'LBL_EMAIL_TEMPLATES'=>'Email Templates',
-'LBL_TEMPLATE_NAME'=>'Template Name',
 'LBL_TEMPLATE_HEADER'=>'Template',
 'LBL_TEMPLATE_DETAILS'=>'Template Details',
 'LBL_EDIT_TEMPLATE'=>'Edit Template',
 'LBL_TEMPLATE_FILE'=>'Template File',
-'LBL_DESCRIPTION'=>'Description',
 'LBL_EMAIL_TEMPLATES_LIST'=>'Communication Templates > Email Templates',
 'LBL_MAILMERGE_TEMPLATES_LIST'=>' > Communication Templates > Mail Merge Templates',
 'LBL_MAILMERGE_TEMPLATES_ATTACHMENT' => '> Communication Templates > Attach Mail Merge Template',
@@ -514,7 +500,6 @@
 'LBL_MY_DEFAULTS'=>'My Defaults',
 'LBL_MY_DESG'=>'My Designation & Contact Details',
 'LBL_MY_ADDR'=>'My Postal Address',
-'LBL_MY_DETAILS'=>'My Details',
 'LBL_MY_PHOTO'=>'My Photo',
 'LBL_CHANGE_PHOTO'=>'Change Photo...',
 'LBL_CHANGE'=>'Change',

Modified: vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php Fri Dec 29 02:04:08 2006
@@ -75,7 +75,6 @@
 // Contacts-SubPanelViewContactsAndUsers.php
 'LBL_BULK_MAILS'=>'Bulk Mails',
 'LBL_ATTACHMENT'=>'Attachment',
-'LBL_DESCRIPTION'=>'Description',
 'LBL_UPLOAD'=>'Upload',
 'LBL_FILE_NAME'=>'File Name',
 'LBL_SEND'=>'Send',




From vtigercrm-commits at vtiger.fosslabs.com  Fri Dec 29 04:51:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 29 Dec 2006 09:51:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r10002 -
 /vtigercrm/branches/5.0.3/include/fpdf/templates/body.php
Message-ID: <20061229095126.D0022789EC9@vtiger.fosslabs.com>

Author: richie
Date: Fri Dec 29 02:51:22 2006
New Revision: 10002

Log:
proper alignment of data in pdf

Modified:
    vtigercrm/branches/5.0.3/include/fpdf/templates/body.php

Modified: vtigercrm/branches/5.0.3/include/fpdf/templates/body.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/fpdf/templates/body.php (original)
+++ vtigercrm/branches/5.0.3/include/fpdf/templates/body.php Fri Dec 29 02:51:22 2006
@@ -6,10 +6,10 @@
 $waterMarkRotate=array("45","50","180");
 $pdf->watermark( $status, $waterMarkPositions, $waterMarkRotate );
 
-include("include/fpdf/pdfconfig.php");
-
+$bottom="130";
+$top="80";
 // blow a bubble around the table
-$Bubble=array("10",$body_top,"170","$bottom");
+$Bubble=array("10",$top,"170","$bottom");
 $pdf->tableWrapper($Bubble);
 
 /* ************ Begin Table Setup ********************** */
@@ -19,9 +19,7 @@
 // correctly
 $prodTable=array("10","60");
 
-//if taxtype is individual
-if($focus->column_fields["hdnTaxType"] == "individual")
-{
+if($focus->column_fields["hdnTaxType"] == "individual") {
 	$colsAlign["Product Name"] = "L";
 	$colsAlign["Description"] = "L";
 	$colsAlign["Qty"] = "R";
@@ -37,10 +35,7 @@
 	$cols["Discount"] = "15";
 	$cols["Tax"] = "20";
 	$cols["Total"] = "25";
-}
-else
-{
-	//if taxtype is group
+} else {
 	$colsAlign["Product Name"] = "L";
 	$colsAlign["Description"] = "L";
 	$colsAlign["Qty"] = "R";
@@ -66,9 +61,8 @@
 
 /* ************* Begin Product Population *************** */
 $ppad=3;
-$y    = $body_top+10;
-for($i=0;$i<count($product_name);$i++)
-{
+$y    = $top+10;
+for($i=0;$i<count($product_name);$i++) {
         $size = $pdf->addProductLine( $y, $line[$i] );
         $y   += $size+$ppad;
 }
@@ -79,20 +73,17 @@
 /* ************* Begin Totals ************************** */
 $t=$bottom+56;
 $pad=6;
-for($i=0;$i<count($total);$i++)
-{
+for($i=0;$i<count($total);$i++) {
         $size = $pdf->addProductLine( $t, $total[$i], $total[$i] );
         $t   += $pad;
 }
 
-//Set the x and y positions to place the NetTotal, Discount, S&H charge
-//if taxtype is not individual ie., group tax
-if($focus->column_fields["hdnTaxType"] != "individual")
-{
+
+if($focus->column_fields["hdnTaxType"] != "individual") {
 	$lineData=array("105",$bottom+37,"94");
 	$pdf->drawLine($lineData);
-	$data= $app_strings['LBL_NET_TOTAL'].":                                                                  ".$price_subtotal."";
-	$pdf->SetXY( 105 , ($nettotal_y+(0*$next_y)) );
+	$data= $app_strings['LBL_NET_TOTAL'].":                                                               ".$price_subtotal."";
+	$pdf->SetXY( 105 , 168 );
 	$pdf->SetFont( "Helvetica", "", 10);
 	$pdf->MultiCell(110, 4, $data);
 
@@ -101,35 +92,33 @@
 
 	//For alignment
 	if($final_price_discount_percent != '')
-		$data= $app_strings['LBL_DISCOUNT'].":   $final_price_discount_percent                                                ".$price_discount."";
+		$data= $app_strings['LBL_DISCOUNT'].":                                                              $final_price_discount_percent                                                ".$price_discount."";
+
 	else
-		$data= $app_strings['LBL_DISCOUNT'].":                                                                  ".$price_discount."";
-	$pdf->SetXY( 105 , ($nettotal_y+(1*$next_y)) );
+		$data= $app_strings['LBL_DISCOUNT'].":                                                              ".$price_discount."";
+	$pdf->SetXY( 105 , 174 );
 	$pdf->SetFont( "Helvetica", "", 10);
 	$pdf->MultiCell(110, 4, $data);
 
 	$lineData=array("105",$bottom+49,"94");
 	$pdf->drawLine($lineData);
 	$data= $app_strings['LBL_TAX'].":  ($group_total_tax_percent %)                                                                  ".$price_salestax."";
-	$pdf->SetXY( 105 , ($nettotal_y+(2*$next_y)) );
+	$pdf->SetXY( 105 , 180 );
 	$pdf->SetFont( "Helvetica", "", 10);
 	$pdf->MultiCell(110, 4, $data);
 
 	$lineData=array("105",$bottom+55,"94");
 	$pdf->drawLine($lineData);
-	$data = $app_strings['LBL_SHIPPING_AND_HANDLING_CHARGES'].":                                  ".$price_shipping;
-	$pdf->SetXY( 105 , ($nettotal_y+(3*$next_y)) );
+	$data = $app_strings['LBL_SHIPPING_AND_HANDLING_CHARGES'].":                                                              ".$price_shipping;
+	$pdf->SetXY( 105 , 186 );
 	$pdf->SetFont( "Helvetica", "", 10);
 	$pdf->MultiCell(110, 4, $data);
 
-}
-else
-{
-	//if taxtype is individual
+} else {
 	$lineData=array("105",$bottom+43,"94");
 	$pdf->drawLine($lineData);
-	$data= $app_strings['LBL_NET_TOTAL'].":                                                                  ".$price_subtotal."";
-	$pdf->SetXY( 105 , ($nettotal_y+(1*$next_y)) );
+	$data= $app_strings['LBL_NET_TOTAL'].":                                                               ".$price_subtotal."";
+	$pdf->SetXY( 105 , 174 );
 	$pdf->SetFont( "Helvetica", "", 10);
 	$pdf->MultiCell(110, 4, $data);
 
@@ -138,41 +127,40 @@
 
 	//For alignment
 	if($final_price_discount_percent != '')
-		$data= $app_strings['LBL_DISCOUNT'].":   $final_price_discount_percent                                                 ".$price_discount."";
+		$data= $app_strings['LBL_DISCOUNT'].":   $final_price_discount_percent                                                                ".$price_discount."";
 	else
 		$data= $app_strings['LBL_DISCOUNT'].":                                                                   ".$price_discount."";
 
-	$pdf->SetXY( 105 , ($nettotal_y+(2*$next_y)) );
+	$pdf->SetXY( 105 , 180 );
 	$pdf->SetFont( "Helvetica", "", 10);
 	$pdf->MultiCell(110, 4, $data);
 
 	$lineData=array("105",$bottom+55,"94");
 	$pdf->drawLine($lineData);
-	$data = $app_strings['LBL_SHIPPING_AND_HANDLING_CHARGES'].":                                  ".$price_shipping;
-	$pdf->SetXY( 105 , ($nettotal_y+(3*$next_y)) );
+	$data = $app_strings['LBL_SHIPPING_AND_HANDLING_CHARGES'].":                                    ".$price_shipping;
+	$pdf->SetXY( 105 , 186 );
 	$pdf->SetFont( "Helvetica", "", 10);
 	$pdf->MultiCell(110, 4, $data);
 }
 
-//Set the x and y positions to place the S&H Tax, Adjustment and Grand Total
 $lineData=array("105",$bottom+61,"94");
 $pdf->drawLine($lineData);
-$data = $app_strings['LBL_TAX_FOR_SHIPPING_AND_HANDLING'].":  ($sh_tax_percent %)               ".$price_shipping_tax;
-$pdf->SetXY( 105 , ($nettotal_y+(4*$next_y)) );
+$data = $app_strings['LBL_TAX_FOR_SHIPPING_AND_HANDLING'].":  ($sh_tax_percent %)                     ".$price_shipping_tax;
+$pdf->SetXY( 105 , 192 );
 $pdf->SetFont( "Helvetica", "", 10);
 $pdf->MultiCell(110, 4, $data);
 
 $lineData=array("105",$bottom+67,"94");
 $pdf->drawLine($lineData);
-$data = $app_strings['LBL_ADJUSTMENT'].":                                                                   ".$price_adjustment;
-$pdf->SetXY( 105 , ($nettotal_y+(5*$next_y)) );
+$data = $app_strings['LBL_ADJUSTMENT'].":                                                               ".$price_adjustment;
+$pdf->SetXY( 105 , 198 );
 $pdf->SetFont( "Helvetica", "", 10);
 $pdf->MultiCell(110, 4, $data);
 
 $lineData=array("105",$bottom+73,"94");
 $pdf->drawLine($lineData);
-$data = $app_strings['LBL_GRAND_TOTAL'].":(in $currency_symbol)                                                    ".$price_total;
-$pdf->SetXY( 105 , ($nettotal_y+(6*$next_y)) );
+$data = $app_strings['LBL_GRAND_TOTAL'].":(in $currency_symbol)                                                ".$price_total;
+$pdf->SetXY( 105 , 204 );
 $pdf->SetFont( "Helvetica", "", 10);
 $pdf->MultiCell(110, 4, $data);
 




From vtigercrm-commits at vtiger.fosslabs.com  Fri Dec 29 08:01:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 29 Dec 2006 13:01:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r10003 -
 /vtigercrm/branches/5.0.3/Smarty/templates/ListWordTemplates.tpl
Message-ID: <20061229130145.6FD3D78A3EE@vtiger.fosslabs.com>

Author: richie
Date: Fri Dec 29 06:01:40 2006
New Revision: 10003

Log:
broken link fixed

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/ListWordTemplates.tpl

Modified: vtigercrm/branches/5.0.3/Smarty/templates/ListWordTemplates.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/ListWordTemplates.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/ListWordTemplates.tpl Fri Dec 29 06:01:40 2006
@@ -78,11 +78,11 @@
 				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
 	               		<form  name="massdelete" method="POST">
 	    			<input name="idlist" type="hidden">
-    				<input name="module" type="hidden" value="Users">
+    				<input name="module" type="hidden" value="Settings">
     				<input name="parenttab" type="hidden" value="Settings">
     				<input name="action" type="hidden">
 				<tr>
-					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}mailmarge.gif" alt="Users" width="48" height="48" border=0 title="Users"></td>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}mailmarge.gif" alt="Settings" width="48" height="48" border=0 title="Settings"></td>
 					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > {$UMOD.LBL_WORD_TEMPLATES} </b></td>
 				</tr>
 				<tr>
@@ -126,7 +126,7 @@
 						<td class="listTableRow small" valign=top><b>{$template.filename}</b></a></td>
 						<td class="listTableRow small" valign=top>{$template.description}&nbsp;</td>
 				        <td class="listTableRow small" valign=top>{$template.module}</td>
-				        <td class="listTableRow small" valign=top><a href="index.php?module=Users&action=downloadfile&record={$template.templateid}">{$UMOD.LBL_DOWNLOAD}</a></td>
+				        <td class="listTableRow small" valign=top><a href="index.php?module=Settings&action=downloadfile&record={$template.templateid}">{$UMOD.LBL_DOWNLOAD}</a></td>
 			          </tr>
 					{/foreach}
 					</table>