From vtigercrm-commits at vtiger.fosslabs.com  Fri Sep  1 05:35:19 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 01 Sep 2006 12:35:19 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9235 -
	/vtigercrm/trunk/soap/vtigerolservice.php
Message-ID: <20060901123519.AC378748183@vtiger.fosslabs.com>

Author: richie
Date: Fri Sep  1 06:35:09 2006
New Revision: 9235

Log:
Issue in Task Plugin has been fixed --Jeri

Modified:
    vtigercrm/trunk/soap/vtigerolservice.php

Modified: vtigercrm/trunk/soap/vtigerolservice.php
==============================================================================
--- vtigercrm/trunk/soap/vtigerolservice.php (original)
+++ vtigercrm/trunk/soap/vtigerolservice.php Fri Sep  1 06:35:09 2006
@@ -799,11 +799,11 @@
 	{
   		if($task["date_start"] == "0000-00-00" || $task["date_start"] == NULL)
         	{
-		       	$task["startdate"] = "";
+		       	$task["date_start"] = "";
         	}
         	if($task["due_date"] == "0000-00-00" || $task["due_date"] == NULL)
         	{
-		       	$task["duedate"] = "";
+		       	$task["due_date"] = "";
         	}
         
         	if($task["status"] == "Not Started")
@@ -840,8 +840,8 @@
 		$output_list[] = Array(
 						"id" => $task["taskid"],
 						"subject" => $task["subject"],
-						"startdate" => $task["startdate"],
-						"duedate" => $task["duedate"],
+						"startdate" => $task["date_start"],
+						"duedate" => $task["due_date"],
 						"status" => $task["status"],
 						"priority" => $task["priority"],
 						"description" => $task["description"],



From vtigercrm-commits at vtiger.fosslabs.com  Sun Sep  3 20:43:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 03:43:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9236 -
 /vtigercrm/trunk/modules/Settings/CreateCustomField.php
Message-ID: <20060904034359.EF27B6E0E6D@vtiger.fosslabs.com>

Author: saraj
Date: Sun Sep  3 21:43:56 2006
New Revision: 9236

Log:
changes done to make multiselect combo box/picklist values editable --Minnie

Modified:
    vtigercrm/trunk/modules/Settings/CreateCustomField.php

Modified: vtigercrm/trunk/modules/Settings/CreateCustomField.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/CreateCustomField.php (original)
+++ vtigercrm/trunk/modules/Settings/CreateCustomField.php Sun Sep  3 21:43:56 2006
@@ -121,10 +121,7 @@
                 $sel_val = 'selected';
         else
                 $sel_val = '';
-       if($disable_str == 'disabled')
-	    $combo_output.= '<a href="#" onClick="makeFieldSelected(this,'.$i.');" id="field'.$i.'" style="text-decoration:none;background-image:url('.$cfimagecombo[$i].');" class="customMnu" '.$disable_str.'>'.$cftextcombo[$i].'</a>';
-	   else		
-    	$combo_output.= '<a href="javascript:;" onClick="makeFieldSelected(this,'.$i.');" id="field'.$i.'" style="text-decoration:none;background-image:url('.$cfimagecombo[$i].');" class="customMnu" '.$disable_str.'>'.$cftextcombo[$i].'</a>';
+	$combo_output.= '<a href="javascript:void(0);" onClick="makeFieldSelected(this,'.$i.');" id="field'.$i.'" style="text-decoration:none;background-image:url('.$cfimagecombo[$i].');" class="customMnu" '.$disable_str.'>'.$cftextcombo[$i].'</a>';
 
 }
 $output .= '<div id="orgLay" style="display:block;" class="layerPopup"><script language="JavaScript" type="text/javascript" src="include/js/customview.js"></script>
@@ -194,7 +191,7 @@
 							case 15:
 								$output .= '<tr id="picklist">
 									<td class="dataLabel" nowrap="nowrap" align="right" valign="top"><b>'.$mod_strings['LBL_PICK_LIST_VALUES'].'</b></td>
-									<td align="left" valign="top"><textarea name="fldPickList" rows="10" class="txtBox" '.$readonly.'>'.$fldVal.'</textarea></td>
+									<td align="left" valign="top"><textarea name="fldPickList" rows="10" class="txtBox" >'.$fldVal.'</textarea></td>
 									<!--td style="padding-left:10px"><img src="themes/Aqua/images/picklist_hint.gif"/></td-->
 								</tr>';
 								break;



From vtigercrm-commits at vtiger.fosslabs.com  Sun Sep  3 20:50:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 03:50:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9237 -
	/vtigercrm/trunk/modules/Settings/PickList.php
Message-ID: <20060904035041.293B175EB25@vtiger.fosslabs.com>

Author: saraj
Date: Sun Sep  3 21:50:37 2006
New Revision: 9237

Log:
changes done to make multiselect combo box/picklist values editable through picklist editor--Minnie

Modified:
    vtigercrm/trunk/modules/Settings/PickList.php

Modified: vtigercrm/trunk/modules/Settings/PickList.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/PickList.php (original)
+++ vtigercrm/trunk/modules/Settings/PickList.php Sun Sep  3 21:50:37 2006
@@ -66,7 +66,7 @@
 	global $adb;
 	$user_fld = Array();
 	$tabid = getTabid($fldmodule);
-	$query = "select fieldlabel,generatedtype,columnname,fieldname,uitype from vtiger_field where displaytype = 1 and (tabid = ".getTabid($fld_module)." AND uitype IN (15,16, 111)) OR (tabid = ".getTabid($fld_module)." AND fieldname='salutationtype')";
+	$query = "select fieldlabel,generatedtype,columnname,fieldname,uitype from vtiger_field where displaytype = 1 and (tabid = ".getTabid($fld_module)." AND uitype IN (15,16, 111,33)) OR (tabid = ".getTabid($fld_module)." AND fieldname='salutationtype')";
 	$result = $adb->query($query);
 	$noofrows = $adb->num_rows($result);
     if($noofrows > 0)
@@ -129,7 +129,7 @@
 function getPickListModules()
 {
 	global $adb;
-	$query = 'select distinct vtiger_field.fieldname,vtiger_field.tabid,tablabel,uitype from vtiger_field inner join vtiger_tab on vtiger_tab.tabid=vtiger_field.tabid where uitype IN (15,16, 111) and vtiger_field.tabid != 29';
+	$query = 'select distinct vtiger_field.fieldname,vtiger_field.tabid,tablabel,uitype from vtiger_field inner join vtiger_tab on vtiger_tab.tabid=vtiger_field.tabid where uitype IN (15,16, 111,33) and vtiger_field.tabid != 29';
 	$result = $adb->query($query);
 	while($row = $adb->fetch_array($result))
 	{



From vtigercrm-commits at vtiger.fosslabs.com  Sun Sep  3 20:56:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 03:56:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9238 -
 /vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php
Message-ID: <20060904035638.6CA8E761501@vtiger.fosslabs.com>

Author: saraj
Date: Sun Sep  3 21:56:34 2006
New Revision: 9238

Log:
changes done to make multiselect combo box/picklist values editable --Minnie

Modified:
    vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php

Modified: vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php (original)
+++ vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php Sun Sep  3 21:56:34 2006
@@ -286,15 +286,24 @@
 		if($fldType == 'Picklist' || $fldType == 'MultiSelectCombo')
 		{
 			// Creating the PickList Table and Populating Values
-			$qur = "CREATE TABLE vtiger_".$columnName." (
+			if($_REQUEST['fieldid'] == '')
+			{
+				$qur = "CREATE TABLE vtiger_".$columnName." (
 					".$columnName."id int(19) NOT NULL auto_increment,
 					".$columnName." varchar(200) NOT NULL,
 					sortorderid int(19) NOT NULL default '0',
 					presence int(1) NOT NULL default '1',
 				        PRIMARY KEY  (".$columnName."id)
 				)";
-			$adb->query($qur);
-
+				$adb->query($qur);
+			}
+
+			if($_REQUEST['fieldid'] != '' && $mode == 'edit')
+			{
+				$delquery = "DELETE from vtiger_".$columnName;
+				$adb->query($delquery);
+			}
+			$pickArray = Array();
 			$fldPickList =  $_REQUEST['fldPickList'];
 			$pickArray = explode("\n",$fldPickList);
 			$count = count($pickArray);
@@ -309,7 +318,7 @@
 				}
 			}
 		}
-		//Inserting into LeadMapping vtiger_table - Jaguar
+		//Inserting into LeadMapping table - Jaguar
 		if($fldmodule == 'Leads' && $_REQUEST['fieldid'] == '')
 		{
 



From vtigercrm-commits at vtiger.fosslabs.com  Sun Sep  3 21:00:44 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 04:00:44 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9239 -
	/vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
Message-ID: <20060904040044.0F33D71B397@vtiger.fosslabs.com>

Author: saraj
Date: Sun Sep  3 22:00:41 2006
New Revision: 9239

Log:
display for multiselect combo box in EditView has been changed --Minnie

Modified:
    vtigercrm/trunk/Smarty/templates/DisplayFields.tpl

Modified: vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DisplayFields.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DisplayFields.tpl Sun Sep  3 22:00:41 2006
@@ -100,7 +100,7 @@
 				{$fldlabel}
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
-			   <select MULTIPLE name="{$fldname}[]" size="2" tabindex="{$vt_tab}" >
+			   <select MULTIPLE name="{$fldname}[]" size="5" tabindex="{$vt_tab}" >
 				{foreach item=arr from=$fldvalue}
 					{foreach key=sel_value item=value from=$arr}
 						<option value="{$sel_value}" {$value}>{$sel_value}</option>



From vtigercrm-commits at vtiger.fosslabs.com  Sun Sep  3 23:46:14 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 06:46:14 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9240 -
 /vtigercrm/trunk/modules/Import/language/en_us.lang.php
Message-ID: <20060904064615.157B676CD5E@vtiger.fosslabs.com>

Author: saraj
Date: Mon Sep  4 00:46:11 2006
New Revision: 9240

Log:
* Added pobox in import files

Modified:
    vtigercrm/trunk/modules/Import/language/en_us.lang.php

Modified: vtigercrm/trunk/modules/Import/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Import/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Import/language/en_us.lang.php Mon Sep  4 00:46:11 2006
@@ -242,11 +242,13 @@
 	,"assistant"=>"Assistant"
 	,"assistantphone"=>"Assistant Phone"
 	,"mailingstreet"=>"Mailing Address Street"
+	,"mailingpobox"=>"Mailing Address Po Box"
 	,"mailingcity"=>"Mailing Address City"
 	,"mailingstate"=>"Mailing Address State"
 	,"mailingzip"=>"Mailing Address Postalcode"
 	,"mailingcountry"=>"Mailing Address Country"
 	,"otherstreet"=>"Other Address Street"
+	,"otherpobox"=>"Other Address Po Box"
 	,"othercity"=>"Other Address City"
 	,"otherstate"=>"Other Address State"
 	,"otherzip"=>"Other Address Postalcode"
@@ -277,6 +279,7 @@
 	//"billing_address_street_2"=>"Billing Address Street 2",
 	//"billing_address_street_3"=>"Billing Address Street 3",
 	//"billing_address_street_4"=>"Billing Address Street 4",
+	"bill_pobox"=>"Billing Address Po Box",
 	"bill_city"=>"Billing Address City",
 	"bill_state"=>"Billing Address State",
 	"bill_code"=>"Billing Address Postalcode",
@@ -285,6 +288,7 @@
 	//"shipping_address_street_2"=>"Shipping Address Street 2",
 	//"shipping_address_street_3"=>"Shipping Address Street 3",
 	//"shipping_address_street_4"=>"Shipping Address Street 4",
+	"ship_pobox"=>"Shipping Address Po Box",
 	"ship_city"=>"Shipping Address City",
 	"ship_state"=>"Shipping Address State",
 	"ship_code"=>"Shipping Address Postalcode",
@@ -330,6 +334,7 @@
 		"assigned_user_id"=>"Assigned To",
 		"yahooid"=>"Yahoo Id",		
 		"lane"=>"Street",
+		"pobox"=>"Po Box",
 		"code"=>"Postal Code",
 		"city"=>"City",
 		"country"=>"Country",



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep  4 00:07:11 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 07:07:11 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9241 -
	/vtigercrm/trunk/soap/vtigerolservice.php
Message-ID: <20060904070711.DED0376CD85@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep  4 01:06:56 2006
New Revision: 9241

Log:
Issue in Calendar duetime has been fixed --Jeri

Modified:
    vtigercrm/trunk/soap/vtigerolservice.php

Modified: vtigercrm/trunk/soap/vtigerolservice.php
==============================================================================
--- vtigercrm/trunk/soap/vtigerolservice.php (original)
+++ vtigercrm/trunk/soap/vtigerolservice.php Mon Sep  4 01:06:56 2006
@@ -1062,13 +1062,14 @@
 		$expldstartdate = explode("-", $clndr["date_start"]);
 		$expldtimestart = explode(":", $clndr["time_start"]);	
 
-		$expldduedate = explode("-", $clndr["due_date"]);
-
 		//this makes a timestamp out of the exploded date this number is in seconds
 		$startdtm = mktime($expldtimestart[0], $expldtimestart[1], 0, $expldstartdate[1], $expldstartdate[2], $expldstartdate[0]);
 
-		$duedtm = mktime($expldtimestart[0]+$clndr["duration_hours"], $expldtimestart[1]+$clndr["duration_minutes"], 0, $expldduedate[1], $expldduedate[2], $expldduedate[0]);
-
+    $expldduedate = explode("-", $clndr["due_date"]);
+    $expldtimeend = explode(":", $clndr["time_end"]);
+    //this makes a timestamp out of the exploded date this number is in seconds
+		$duedtm = mktime($expldtimeend[0], $expldtimeend[1], 0, $expldduedate[1], $expldduedate[2], $expldduedate[0]);
+		
 		$clndr["date_start"] = date("Y-m-d H:i:s", $startdtm);
 		$clndr["due_date"] = date("Y-m-d H:i:s", $duedtm);
 



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep  4 00:22:20 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 07:22:20 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9242 -
	/vtigercrm/trunk/soap/vtigerolservice.php
Message-ID: <20060904072220.022C875FDBE@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep  4 01:22:07 2006
New Revision: 9242

Log:
Issue in Calendar end time has been fixed --Jeri

Modified:
    vtigercrm/trunk/soap/vtigerolservice.php

Modified: vtigercrm/trunk/soap/vtigerolservice.php
==============================================================================
--- vtigercrm/trunk/soap/vtigerolservice.php (original)
+++ vtigercrm/trunk/soap/vtigerolservice.php Mon Sep  4 01:22:07 2006
@@ -1131,18 +1131,20 @@
 			$stimestart = $atimestart[0].":".$atimestart[1];
 			$stimeend = $atimedue[0].":".$atimedue[1];
 		
-			if( $diff=@get_time_difference($stimestart, $stimeend) )
+			/*if( $diff=@get_time_difference($stimestart, $stimeend) )
 			{
 				$stimeduehr = sprintf('%02d',$diff['hours']);
 				$stimeduemin = sprintf('%02d',$diff['minutes']);
-			}
+			}*/
 
 			$clndr->column_fields[subject] = in_array('subject',$permitted_lists) ? $clndrow["subject"] : "";
 			$clndr->column_fields[date_start]= in_array('date_start',$permitted_lists) ? getDisplayDate(trim($astartdtm[0])) : "";
 			$clndr->column_fields[due_date]= in_array('due_date',$permitted_lists) ? getDisplayDate(trim($aduedtm[0])) : ""; 
 			$clndr->column_fields[time_start]= in_array('time_start',$permitted_lists) ? $stimestart : "";
-			$clndr->column_fields[duration_hours]= in_array('duration_hours',$permitted_lists) ? $stimeduehr : "";        
-			$clndr->column_fields[duration_minutes]= in_array('duration_minutes',$permitted_lists) ? $stimeduemin : "";          
+			$clndr->column_fields[time_end]= in_array('time_end',$permitted_lists) ? $stimeend : "";
+			//$clndr->column_fields[duration_hours]= in_array('duration_hours',$permitted_lists) ? $stimeduehr : "";        
+			//$clndr->column_fields[duration_minutes]= in_array('duration_minutes',$permitted_lists) ? $stimeduemin : "";
+                
 			$clndr->column_fields[location]= in_array('location',$permitted_lists) ? $clndrow["location"] : "";
 			$clndr->column_fields[description]= in_array('description',$permitted_lists) ? $clndrow["description"] : "";
 			$clndr->column_fields[activitytype]="Meeting";



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep  4 00:26:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 07:26:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9243 -
 /vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php
Message-ID: <20060904072655.C27CB760FD4@vtiger.fosslabs.com>

Author: saraj
Date: Mon Sep  4 01:26:51 2006
New Revision: 9243

Log:
changes made to fix the convertlead related issue  --Minnie

Modified:
    vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php

Modified: vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php (original)
+++ vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php Mon Sep  4 01:26:51 2006
@@ -25,9 +25,15 @@
 $potential_amount = $_REQUEST['potential_amount'];
 $potential_sales_stage = $_REQUEST['potential_sales_stage'];
 
-global $log;
+global $log,$current_user;
+require('user_privileges/user_privileges_'.$current_user->id.'.php');
 $log->debug("id = $id \n assigned_user_id = $assigned_user_id \n createpotential = $createpotential \n close date = $close_date \n current user id = $current_user_id \n accountname = $accountname \n module = $module");
 
+$rate_symbol=getCurrencySymbolandCRate($user_info['currency_id']);
+$rate = $rate_symbol['rate'];
+if($potential_amount != '')
+        $potential_amount = convertToDollar($potential_amount,$rate);
+	
 $check_unit = explode("-",$potential_name);
 if($check_unit[1] == "")
         $potential_name = $check_unit[0];



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep  4 01:12:24 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 08:12:24 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9244 -
	/vtigercrm/trunk/soap/vtigerolservice.php
Message-ID: <20060904081224.9319B76CD0A@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep  4 02:11:52 2006
New Revision: 9244

Log:
Issue in Calendar end time has been fixed --Jeri

Modified:
    vtigercrm/trunk/soap/vtigerolservice.php

Modified: vtigercrm/trunk/soap/vtigerolservice.php
==============================================================================
--- vtigercrm/trunk/soap/vtigerolservice.php (original)
+++ vtigercrm/trunk/soap/vtigerolservice.php Mon Sep  4 02:11:52 2006
@@ -1144,7 +1144,7 @@
 			$clndr->column_fields[time_end]= in_array('time_end',$permitted_lists) ? $stimeend : "";
 			//$clndr->column_fields[duration_hours]= in_array('duration_hours',$permitted_lists) ? $stimeduehr : "";        
 			//$clndr->column_fields[duration_minutes]= in_array('duration_minutes',$permitted_lists) ? $stimeduemin : "";
-                
+        
 			$clndr->column_fields[location]= in_array('location',$permitted_lists) ? $clndrow["location"] : "";
 			$clndr->column_fields[description]= in_array('description',$permitted_lists) ? $clndrow["description"] : "";
 			$clndr->column_fields[activitytype]="Meeting";
@@ -1199,19 +1199,20 @@
 			$stimestart = $atimestart[0].":".$atimestart[1];
 			$stimeend = $atimedue[0].":".$atimedue[1];
 		
-			if( $diff=@get_time_difference($stimestart, $stimeend) )
+			/*if( $diff=@get_time_difference($stimestart, $stimeend) )
 			{
 				$stimeduehr = sprintf('%02d',$diff['hours']);
 				$stimeduemin = sprintf('%02d',$diff['minutes']);
-			}
+			}*/
 
 			$clndr->retrieve_entity_info($clndrow["id"],"Calendar");
 			$clndr->column_fields[subject] = in_array('subject',$permitted_lists) ? $clndrow["subject"] : "";
 			$clndr->column_fields[date_start]= in_array('date_start',$permitted_lists) ? getDisplayDate(trim($astartdtm[0])) : "";
 			$clndr->column_fields[due_date]= in_array('due_date',$permitted_lists) ? getDisplayDate(trim($aduedtm[0])) : ""; 
 			$clndr->column_fields[time_start]= in_array('time_start',$permitted_lists) ? $stimestart : "";
-			$clndr->column_fields[duration_hours]= in_array('duration_hours',$permitted_lists) ? $stimeduehr : "";       
-			$clndr->column_fields[duration_minutes]= in_array('duration_minutes',$permitted_lists) ? $stimeduemin : "";              
+			$clndr->column_fields[time_end]= in_array('time_end',$permitted_lists) ? $stimeend : "";
+			//$clndr->column_fields[duration_hours]= in_array('duration_hours',$permitted_lists) ? $stimeduehr : "";       
+			//$clndr->column_fields[duration_minutes]= in_array('duration_minutes',$permitted_lists) ? $stimeduemin : "";              
 			$clndr->column_fields[location]= in_array('location',$permitted_lists) ? $clndrow["location"] : "";
 			$clndr->column_fields[description]= in_array('description',$permitted_lists) ? $clndrow["description"] : "";
 			$clndr->column_fields[activitytype]="Meeting";



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep  4 01:39:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 08:39:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9245 -
	/vtigercrm/trunk/schema/DatabaseSchema.xml
Message-ID: <20060904083957.CC7E676CD77@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep  4 02:39:23 2006
New Revision: 9245

Log:
Spelling mistake in organisationnname has been fixed --Jeri

Modified:
    vtigercrm/trunk/schema/DatabaseSchema.xml

Modified: vtigercrm/trunk/schema/DatabaseSchema.xml
==============================================================================
--- vtigercrm/trunk/schema/DatabaseSchema.xml (original)
+++ vtigercrm/trunk/schema/DatabaseSchema.xml Mon Sep  4 02:39:23 2006
@@ -4683,7 +4683,7 @@
 	</table>
 
 	<table name="vtiger_organizationdetails">
-		<field name="organizationame" type="C" size="60">
+		<field name="organizationname" type="C" size="60">
 			<key />
 		</field>
 		<field name="address" type="C" size="150" />



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep  4 01:45:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 08:45:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9246 - in
 /vtigercrm/trunk/modules: Invoice/CreatePDF.php PurchaseOrder/CreatePDF.php
 Quotes/CreatePDF.php SalesOrder/CreateSOPDF.php
Message-ID: <20060904084502.5B75A76CDCF@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep  4 02:42:47 2006
New Revision: 9246

Log:
organitationame changed to organitationname

Modified:
    vtigercrm/trunk/modules/Invoice/CreatePDF.php
    vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php
    vtigercrm/trunk/modules/Quotes/CreatePDF.php
    vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php

Modified: vtigercrm/trunk/modules/Invoice/CreatePDF.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/CreatePDF.php (original)
+++ vtigercrm/trunk/modules/Invoice/CreatePDF.php Mon Sep  4 02:42:47 2006
@@ -66,7 +66,7 @@
 
 if($num_rows == 1)
 {
-		$org_name = $adb->query_result($result,0,"organizationame");
+		$org_name = $adb->query_result($result,0,"organizationname");
 		$org_address = $adb->query_result($result,0,"address");
 		$org_city = $adb->query_result($result,0,"city");
 		$org_state = $adb->query_result($result,0,"state");

Modified: vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php Mon Sep  4 02:42:47 2006
@@ -65,7 +65,7 @@
 
 if($num_rows == 1)
 {
-		$org_name = $adb->query_result($result,0,"organizationame");
+		$org_name = $adb->query_result($result,0,"organizationname");
 		$org_address = $adb->query_result($result,0,"address");
 		$org_city = $adb->query_result($result,0,"city");
 		$org_state = $adb->query_result($result,0,"state");

Modified: vtigercrm/trunk/modules/Quotes/CreatePDF.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/CreatePDF.php (original)
+++ vtigercrm/trunk/modules/Quotes/CreatePDF.php Mon Sep  4 02:42:47 2006
@@ -65,7 +65,7 @@
 
 if($num_rows == 1)
 {
-		$org_name = $adb->query_result($result,0,"organizationame");
+		$org_name = $adb->query_result($result,0,"organizationname");
 		$org_address = $adb->query_result($result,0,"address");
 		$org_city = $adb->query_result($result,0,"city");
 		$org_state = $adb->query_result($result,0,"state");

Modified: vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php Mon Sep  4 02:42:47 2006
@@ -64,7 +64,7 @@
 
 if($num_rows == 1)
 {
-		$org_name = $adb->query_result($result,0,"organizationame");
+		$org_name = $adb->query_result($result,0,"organizationname");
 		$org_address = $adb->query_result($result,0,"address");
 		$org_city = $adb->query_result($result,0,"city");
 		$org_state = $adb->query_result($result,0,"state");



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep  4 01:45:12 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 08:45:12 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9247 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060904084512.3BD1776CDCF@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep  4 02:44:35 2006
New Revision: 9247

Log:
Spelling mistake in organisationnname has been fixed --Jeri

Modified:
    vtigercrm/trunk/modules/Users/DefaultDataPopulator.php

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Mon Sep  4 02:44:35 2006
@@ -2067,7 +2067,7 @@
 
 		
 	       //Insert into vtiger_organizationdetails vtiger_table 
-	       $this->db->query("insert into vtiger_organizationdetails(organizationame,address,city,state,country,code,phone,fax,website,logoname) values ('vtiger',' 40-41-42, Sivasundar Apartments, Flat D-II, Shastri Street, Velachery','Chennai','Tamil Nadu','India','600 042','+91-44-5202-1990','+91-44-5202-1990','www.vtiger.com','vtiger-crm-logo.jpg')");
+	       $this->db->query("insert into vtiger_organizationdetails(organizationname,address,city,state,country,code,phone,fax,website,logoname) values ('vtiger',' 40-41-42, Sivasundar Apartments, Flat D-II, Shastri Street, Velachery','Chennai','Tamil Nadu','India','600 042','+91-44-5202-1990','+91-44-5202-1990','www.vtiger.com','vtiger-crm-logo.jpg')");
 
   //Insert into vtiger_inventory_tandc vtiger_table
                $this->db->query("insert into vtiger_inventory_tandc values('".$this->db->getUniqueID('vtiger_inventory_tandc')."','Inventory','')");



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep  4 01:46:01 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 08:46:01 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9248 - in
 /vtigercrm/trunk/modules/Settings: EditCompanyDetails.php
 OrganizationConfig.php SaveCompany.php add2db.php
Message-ID: <20060904084601.40A1776CD77@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep  4 02:43:55 2006
New Revision: 9248

Log:
Spelling mistake in organisationnname has been fixed --Jeri

Modified:
    vtigercrm/trunk/modules/Settings/EditCompanyDetails.php
    vtigercrm/trunk/modules/Settings/OrganizationConfig.php
    vtigercrm/trunk/modules/Settings/SaveCompany.php
    vtigercrm/trunk/modules/Settings/add2db.php

Modified: vtigercrm/trunk/modules/Settings/EditCompanyDetails.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/EditCompanyDetails.php (original)
+++ vtigercrm/trunk/modules/Settings/EditCompanyDetails.php Mon Sep  4 02:43:55 2006
@@ -46,7 +46,7 @@
 
 $sql="select * from vtiger_organizationdetails";
 $result = $adb->query($sql);
-$organization_name = $adb->query_result($result,0,'organizationame');
+$organization_name = $adb->query_result($result,0,'organizationname');
 $organization_address= $adb->query_result($result,0,'address');
 $organization_city = $adb->query_result($result,0,'city');
 $organization_state = $adb->query_result($result,0,'state');

Modified: vtigercrm/trunk/modules/Settings/OrganizationConfig.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/OrganizationConfig.php (original)
+++ vtigercrm/trunk/modules/Settings/OrganizationConfig.php Mon Sep  4 02:43:55 2006
@@ -37,7 +37,7 @@
 
 $sql="select * from vtiger_organizationdetails";
 $result = $adb->query($sql);
-$organization_name = $adb->query_result($result,0,'organizationame');
+$organization_name = $adb->query_result($result,0,'organizationname');
 $organization_address= $adb->query_result($result,0,'address');
 $organization_city = $adb->query_result($result,0,'city');
 $organization_state = $adb->query_result($result,0,'state');

Modified: vtigercrm/trunk/modules/Settings/SaveCompany.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/SaveCompany.php (original)
+++ vtigercrm/trunk/modules/Settings/SaveCompany.php Mon Sep  4 02:43:55 2006
@@ -22,9 +22,9 @@
 $organization_fax=$_REQUEST['organization_fax'];
 $organization_website=$_REQUEST['organization_website'];
 
-$sql="select * from vtiger_organizationdetails where organizationame = '".$org_name."'";
+$sql="select * from vtiger_organizationdetails where organizationname = '".$org_name."'";
 $result = $adb->query($sql);
-$org_name = $adb->query_result($result,0,'organizationame');
+$org_name = $adb->query_result($result,0,'organizationname');
 
 if($org_name=='')
 {
@@ -32,7 +32,7 @@
 }
 else
 {
-	$sql="update vtiger_organizationdetails set organizationame = '".$organization_name."', address = '".$organization_address."', city = '".$organization_city."', state = '".$organization_state."',  code = '".$organization_code."', country = '".$organization_country."' ,  phone = '".$organization_phone."' ,  fax = '".$organization_fax."',  website = '".$organization_website."' where organizationame = '".$org_name."'";
+	$sql="update vtiger_organizationdetails set organizationname = '".$organization_name."', address = '".$organization_address."', city = '".$organization_city."', state = '".$organization_state."',  code = '".$organization_code."', country = '".$organization_country."' ,  phone = '".$organization_phone."' ,  fax = '".$organization_fax."',  website = '".$organization_website."' where organizationname = '".$org_name."'";
 }	
 
 

Modified: vtigercrm/trunk/modules/Settings/add2db.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/add2db.php (original)
+++ vtigercrm/trunk/modules/Settings/add2db.php Mon Sep  4 02:43:55 2006
@@ -99,16 +99,16 @@
 		if(!isset($organization_logoname))
 			$organization_logoname="";
 
-		$sql="SELECT * FROM vtiger_organizationdetails WHERE organizationame = ".$adb->quote($org_name);
+		$sql="SELECT * FROM vtiger_organizationdetails WHERE organizationname = ".$adb->quote($org_name);
 		$result = $adb->query($sql);
-		$org_name = from_html($adb->query_result($result,0,'organizationame'));
+		$org_name = from_html($adb->query_result($result,0,'organizationname'));
 		$org_logo = $adb->query_result($result,0,'logoname'); 
 
 
 		if($org_name=='')
 		{
 			$sql="INSERT INTO vtiger_organizationdetails
-				(organizationame, address, city, state, code, country, phone, fax, website, logoname)
+				(organizationname, address, city, state, code, country, phone, fax, website, logoname)
 				VALUES (".$adb->quote($organization_name).
 					",".$adb->quote($organization_address).
 					",".$adb->quote($organization_city).
@@ -143,7 +143,7 @@
 			}
 
 			$sql = "UPDATE vtiger_organizationdetails
-				SET organizationame = ".$adb->quote($organization_name).",
+				SET organizationname = ".$adb->quote($organization_name).",
 					address = ".$adb->quote($organization_address).",
 					city = ".$adb->quote($organization_city).",
 					state = ".$adb->quote($organization_state).",
@@ -153,7 +153,7 @@
 					fax = ".$adb->quote($organization_fax).",
 					website = ".$adb->quote($organization_website).",
 					logoname = ".$adb->quote($organization_logoname)."
-				WHERE organizationame = ".$adb->quote($org_name);
+				WHERE organizationname = ".$adb->quote($org_name);
 		}
 		$adb->query($sql);
 



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep  4 02:21:58 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 09:21:58 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9249 -
 /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php
Message-ID: <20060904092158.1513976CE0B@vtiger.fosslabs.com>

Author: saraj
Date: Mon Sep  4 03:21:53 2006
New Revision: 9249

Log:
* Modified the column organizationame to organizationname

Modified:
    vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php

Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php
==============================================================================
--- vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php (original)
+++ vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php Mon Sep  4 03:21:53 2006
@@ -69,7 +69,7 @@
 		"alter table vtiger_def_org_field ADD PRIMARY KEY (fieldid)",
 		"alter table vtiger_leadgrouprelation ADD PRIMARY KEY (leadid)",
 		"alter table vtiger_leadgrouprelation drop key leadgrouprelation_IDX0",
-		"alter table vtiger_organizationdetails ADD PRIMARY KEY (organizationame)",
+		"alter table vtiger_organizationdetails ADD PRIMARY KEY (organizationname)",
 		"alter table vtiger_profile2field ADD PRIMARY KEY (profileid,fieldid)",
 		"alter table vtiger_profile2standardpermissions ADD PRIMARY KEY (profileid,tabid,Operation)",
 		"alter table vtiger_profile2standardpermissions drop index idx_prof2stad",
@@ -3624,6 +3624,7 @@
 	Execute($alterquery);
 }
 
+Execute("alter table vtiger_organizationdetails change column organizationame  organizationname varchar(60) NOT NULL");
 
 
 



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep  4 02:22:58 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 09:22:58 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9250 -
	/vtigercrm/trunk/soap/thunderbirdplugin.php
Message-ID: <20060904092258.5A3AC76CE0C@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep  4 03:22:23 2006
New Revision: 9250

Log:
Related to multiple when added from thunderbird extn has been fixed --Jeri

Modified:
    vtigercrm/trunk/soap/thunderbirdplugin.php

Modified: vtigercrm/trunk/soap/thunderbirdplugin.php
==============================================================================
--- vtigercrm/trunk/soap/thunderbirdplugin.php (original)
+++ vtigercrm/trunk/soap/thunderbirdplugin.php Mon Sep  4 03:22:23 2006
@@ -184,6 +184,7 @@
 	$email->column_fields[date_start] = $datesent;
 	$email->column_fields[description]  = htmlentities($emailbody);
 	$email->column_fields[activitytype] = 'Emails'; 
+	$email->plugin_save = true;
 	$email->save("Emails");
 
 	$email->set_emails_contact_invitee_relationship($email->id,$contact_ids);
@@ -195,7 +196,7 @@
 	if(isset($camodulerow))
 	{
 		$emailid = $camodulerow["email"];
-		$query = 'insert into vtiger_emaildetails values ('.$email->id.',"","'.$emailid.'","","","","'.$contact_ids."@77|".'","OUTLOOK")';
+		$query = 'insert into vtiger_emaildetails values ('.$email->id.',"","'.$emailid.'","","","","'.$contact_ids."@77|".'","THUNDERBIRD")';
 		$adb->query($query);
 	}
 	return $email->id;



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep  4 02:53:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 09:53:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9251 -
	/vtigercrm/trunk/modules/Emails/Email.php
Message-ID: <20060904095359.55F9376CE10@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep  4 03:53:14 2006
New Revision: 9251

Log:
Email ListView made to order by date_sent asc --Jeri

Modified:
    vtigercrm/trunk/modules/Emails/Email.php

Modified: vtigercrm/trunk/modules/Emails/Email.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/Email.php (original)
+++ vtigercrm/trunk/modules/Emails/Email.php Mon Sep  4 03:53:14 2006
@@ -72,7 +72,7 @@
 	var $sortby_fields = Array('subject','date_start','smownerid');
 
 	//Added these variables which are used as default order by and sortorder in ListView
-	var $default_order_by = 'subject';
+	var $default_order_by = 'date_start';
 	var $default_sort_order = 'ASC';
 
 	/** This function will set the columnfields for Email module 



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep  4 04:31:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 11:31:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9252 - in
 /vtigercrm/trunk/include/utils: DetailViewUtils.php EditViewUtils.php
Message-ID: <20060904113137.BD98F76CE0F@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep  4 05:31:16 2006
New Revision: 9252

Log:
Ajax edit provided for multi selection combo box --Jeri

Modified:
    vtigercrm/trunk/include/utils/DetailViewUtils.php
    vtigercrm/trunk/include/utils/EditViewUtils.php

Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/DetailViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/DetailViewUtils.php Mon Sep  4 05:31:16 2006
@@ -120,6 +120,34 @@
 				$chk_val = '';
 			}
 			$options[] = array($pickListValue=>$chk_val );	
+		}
+		$label_fld ["options"] = $options;
+	}
+	elseif($uitype == 33) //uitype 33 added for multiselector picklist - Jeri
+	{
+	     $label_fld[] = $mod_strings[$fieldlabel];
+	     $label_fld[] = str_ireplace(' |##| ',' , ',$col_fields[$fieldname]);
+	     
+		$pick_query="select * from vtiger_".$fieldname;
+		$pickListResult = $adb->query($pick_query);
+		$noofpickrows = $adb->num_rows($pickListResult);
+
+		$options = array();
+		$selected_entries = Array();
+		$selected_entries = explode(' |##| ',$col_fields[$fieldname]);
+		for($j = 0; $j < $noofpickrows; $j++)
+		{
+			$pickListValue = $adb->query_result($pickListResult,$j,strtolower($fieldname));
+      $chk_val = '';
+      foreach($selected_entries as $selected_entries_value)
+      {
+        if(trim($selected_entries_value) == trim($pickListValue))
+        {
+          $chk_val = 'selected';
+          break;
+        }
+      }
+			$options[] = array($pickListValue=>$chk_val);	
 		}
 		$label_fld ["options"] = $options;
 	}

Modified: vtigercrm/trunk/include/utils/EditViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/EditViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/EditViewUtils.php Mon Sep  4 05:31:16 2006
@@ -159,7 +159,7 @@
 		$noofoptions = $adb->num_rows($multiselect_result);
 		$options = array();
 		$found = false;
-		$valur_arr = explode(' , ',$value);
+		$valur_arr = explode(' |##| ',$value);
 		for($j = 0; $j < $noofoptions; $j++)
 		{
 			$multiselect_combo = $adb->query_result($multiselect_result,$j,strtolower($fieldname));



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep  4 04:33:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 11:33:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9253 -
	/vtigercrm/trunk/data/CRMEntity.php
Message-ID: <20060904113341.5E78276CE16@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep  4 05:33:14 2006
New Revision: 9253

Log:
Ajax edit provided for multi selection combo box --Jeri

Modified:
    vtigercrm/trunk/data/CRMEntity.php

Modified: vtigercrm/trunk/data/CRMEntity.php
==============================================================================
--- vtigercrm/trunk/data/CRMEntity.php (original)
+++ vtigercrm/trunk/data/CRMEntity.php Mon Sep  4 05:33:14 2006
@@ -583,21 +583,14 @@
 			  }
 			  elseif($uitype == 33)
 			  {
-				$j = 0;
-				$field_list = '';
-				if(is_array($this->column_fields[$fieldname]) && count($this->column_fields[$fieldname]) > 0)
-				{
-					foreach($this->column_fields[$fieldname] as $key=>$multivalue)
-					{
-						if($j != 0)
-						{
-							$field_list .= ' , ';
-						}
-						$field_list .= $multivalue;
-						$j++;
-					}
-				}
-				$fldvalue = $field_list;
+  				if(is_array($this->column_fields[$fieldname]))
+  				{
+  				  $field_list = implode(' |##| ',$this->column_fields[$fieldname]);
+  				}else
+  				{
+  				  $field_list = $this->column_fields[$fieldname];
+          		}
+  				$fldvalue = $field_list;
 			  }
 			  elseif($uitype == 5 || $uitype == 6 || $uitype ==23)
 			  {



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep  4 04:36:20 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 11:36:20 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9254 -
	/vtigercrm/trunk/include/js/dtlviewajax.js
Message-ID: <20060904113620.5860C76CE19@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep  4 05:36:06 2006
New Revision: 9254

Log:
Ajax edit provided for multi selection combo box --Jeri

Modified:
    vtigercrm/trunk/include/js/dtlviewajax.js

Modified: vtigercrm/trunk/include/js/dtlviewajax.js
==============================================================================
--- vtigercrm/trunk/include/js/dtlviewajax.js (original)
+++ vtigercrm/trunk/include/js/dtlviewajax.js Mon Sep  4 05:36:06 2006
@@ -113,6 +113,7 @@
 	var dtlView = "dtlview_"+ fieldLabel;
 	var editArea = "editarea_"+ fieldLabel;
 	var groupurl = "";
+	
 	if(globaluitype == 53)
 	{
 		if(typeof(document.DetailView.assigntype[0]) != 'undefined')
@@ -134,10 +135,22 @@
 			var groupurl = "&assigned_group_name="+group_name+"&assigntype=T"
 		}
 
-	}else
+	}if(globaluitype == 33)
+	{
+	  var txtBox= "txtbox_"+ fieldLabel;
+	  var oMulSelect = $(txtBox);
+	  var r = new Array();
+	  for (iter=0;iter < oMulSelect.options.length ; iter++)
+	  {
+      if (oMulSelect.options[iter].selected)
+        r[r.length] = oMulSelect.options[iter].value;
+      }
+	}
+  else
 	{
 		var txtBox= "txtbox_"+ fieldLabel;
 	}
+	
 	var popupTxt= "popuptxt_"+ fieldLabel;      
 	var hdTxt = "hdtxt_"+ fieldLabel;
 
@@ -162,8 +175,7 @@
 		{
 			tagValue = "0";
 		}
-	}
-	if(uitype == '156')
+	}else	if(uitype == '156')
 	{
 		if(document.getElementById(txtBox).checked == true)
 		{
@@ -172,7 +184,10 @@
 		{
 			tagValue = "off";
 		}
-	}
+	}else if(uitype == '33')
+	{
+			tagValue = r.join(" |##| ");
+  	}
 
 
 	var data = "file=DetailViewAjax&module=" + module + "&action=" + module + "Ajax&record=" + crmId+"&recordid=" + crmId ;
@@ -183,17 +198,17 @@
                         method: 'post',
                         postBody: data,
                         onComplete: function(response) {
-				if(response.responseText.indexOf(":#:FAILURE")>-1)
-				{
-					alert("Error while Editing");
-				}
-				else if(response.responseText.indexOf(":#:SUCCESS")>-1)
-     				{
-					$("vtbusy_info").style.display="none";
-     				}
-                       	}
+                  				if(response.responseText.indexOf(":#:FAILURE")>-1)
+                  				{
+                  					alert("Error while Editing");
+                  				}
+                  				else if(response.responseText.indexOf(":#:SUCCESS")>-1)
+                       		{
+                  					$("vtbusy_info").style.display="none";
+                       		}
+                        }
                 }
-        );
+            );
 	if(uitype == '13' || uitype == '104')
 	{
 		getObj(dtlView).innerHTML = "<a href=\"mailto:"+ tagValue+"\" target=\"_blank\">"+tagValue+"&nbsp;</a>";
@@ -296,7 +311,10 @@
 		{
 			getObj(dtlView).innerHTML = popObj.value;
 		}
-	}else
+	}else if(uitype == '33')
+  {
+       getObj(dtlView).innerHTML = r.join(" , ");
+  }else
 	{
 		getObj(dtlView).innerHTML = tagValue;
 	}



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep  4 04:38:20 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 11:38:20 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9255 - in
 /vtigercrm/trunk/Smarty/templates: DetailViewUI.tpl DisplayFields.tpl
Message-ID: <20060904113820.4490476CE0F@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep  4 05:38:03 2006
New Revision: 9255

Log:
Ajax edit provided for multi selection combo box --Jeri

Modified:
    vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
    vtigercrm/trunk/Smarty/templates/DisplayFields.tpl

Modified: vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl Mon Sep  4 05:38:03 2006
@@ -47,6 +47,20 @@
                     								{/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-->
+                                          <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 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>

Modified: vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DisplayFields.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DisplayFields.tpl Mon Sep  4 05:38:03 2006
@@ -100,7 +100,7 @@
 				{$fldlabel}
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
-			   <select MULTIPLE name="{$fldname}[]" size="5" tabindex="{$vt_tab}" >
+			   <select MULTIPLE name="{$fldname}[]" size="4" style="width:160px;" tabindex="{$vt_tab}" >
 				{foreach item=arr from=$fldvalue}
 					{foreach key=sel_value item=value from=$arr}
 						<option value="{$sel_value}" {$value}>{$sel_value}</option>



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep  4 06:37:18 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 13:37:18 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9256 -
	/vtigercrm/trunk/include/database/PearDatabase.php
Message-ID: <20060904133718.2801D76CE0F@vtiger.fosslabs.com>

Author: saraj
Date: Mon Sep  4 07:37:10 2006
New Revision: 9256

Log:
Fixes made for HTML tag vulnerabilities

Modified:
    vtigercrm/trunk/include/database/PearDatabase.php

Modified: vtigercrm/trunk/include/database/PearDatabase.php
==============================================================================
--- vtigercrm/trunk/include/database/PearDatabase.php (original)
+++ vtigercrm/trunk/include/database/PearDatabase.php Mon Sep  4 07:37:10 2006
@@ -441,7 +441,9 @@
 	$result->Move($row);
 	$rowdata = $this->change_key_case($result->FetchRow());
 	//$this->println($rowdata);
-	$coldata = strip_selected_tags($rowdata[$col],'script');
+	//Commented strip_selected_tags and added to_html function for HTML tags vulnerability
+	//$coldata = strip_selected_tags($rowdata[$col],'script');
+	$coldata = to_html($rowdata[$col]);
 	//$this->println("ADODB query_result ". $coldata);
 	return $coldata;
     }



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep  4 07:58:24 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 14:58:24 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9257 - in /vtigercrm/trunk:
 Smarty/templates/Inventory/ modules/Products/ themes/woodspice/
Message-ID: <20060904145824.8362D76CE36@vtiger.fosslabs.com>

Author: saraj
Date: Mon Sep  4 08:58:15 2006
New Revision: 9257

Log:
* Modified to display the discount, tax divs in the mouse click area

Modified:
    vtigercrm/trunk/Smarty/templates/Inventory/InventoryCreateView.tpl
    vtigercrm/trunk/Smarty/templates/Inventory/InventoryEditView.tpl
    vtigercrm/trunk/Smarty/templates/Inventory/ProductDetails.tpl
    vtigercrm/trunk/Smarty/templates/Inventory/ProductDetailsEditView.tpl
    vtigercrm/trunk/modules/Products/InventoryTaxAjax.php
    vtigercrm/trunk/themes/woodspice/style.css

Modified: vtigercrm/trunk/Smarty/templates/Inventory/InventoryCreateView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Inventory/InventoryCreateView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Inventory/InventoryCreateView.tpl Mon Sep  4 08:58:15 2006
@@ -188,6 +188,9 @@
 </table>
 </form>
 
+<!-- This div is added to get the left and top values to show the tax details-->
+<div id="tax_container" style="display:none; position:absolute; z-index:1px;"></div>
+
 <script>
 
 

Modified: vtigercrm/trunk/Smarty/templates/Inventory/InventoryEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Inventory/InventoryEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Inventory/InventoryEditView.tpl Mon Sep  4 08:58:15 2006
@@ -171,6 +171,9 @@
 </table>
 </form>
 
+<!-- This div is added to get the left and top values to show the tax details-->
+<div id="tax_container" style="display:none; position:absolute; z-index:1px;"></div>
+
 <script>	
         var fieldname = new Array({$VALIDATION_DATA_FIELDNAME})
 

Modified: vtigercrm/trunk/Smarty/templates/Inventory/ProductDetails.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Inventory/ProductDetails.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Inventory/ProductDetails.tpl Mon Sep  4 08:58:15 2006
@@ -21,7 +21,7 @@
 //  window.onmousemove= displayCoords;
 //  window.onclick = fnRevert;
   
-function displayCoords(event,obj,mode,curr_row) 
+function displayCoords(currObj,obj,mode,curr_row) 
 {ldelim}
 	if(mode != 'discount_final' && mode != 'sh_tax_div_title' && mode != 'group_tax_div_title')
 	{ldelim}
@@ -38,6 +38,10 @@
 	{ldelim}
 		document.getElementById("discount_div_title"+curr_row).innerHTML = '<b>Set Discount for : '+document.getElementById("productTotal"+curr_row).innerHTML+'</b>';
 	{rdelim}
+	else if(mode == 'tax')
+	{ldelim}
+		document.getElementById("tax_div_title"+curr_row).innerHTML = "<b>Set Tax for "+document.getElementById("totalAfterDiscount"+curr_row).innerHTML+'</b>';
+	{rdelim}
 	else if(mode == 'discount_final')
 	{ldelim}
 		document.getElementById("discount_div_title_final").innerHTML = '<b>Set Discount for : '+document.getElementById("netTotal").innerHTML+'</b>';
@@ -52,19 +56,23 @@
 		document.getElementById("group_tax_div_title").innerHTML = '<b>Set Group Tax for : '+net_total_after_discount+'</b>';
 	{rdelim}
 
-	var move_Element = document.getElementById(obj).style;
-	if(!event)
-	{ldelim}
-		move_Element.left = e.pageX +'px' ;
-		move_Element.top = e.pageY + 'px';	
-	{rdelim}
-	else
-	{ldelim}
-		move_Element.left = event.clientX +'px' ;
-		move_Element.top = event.clientY + 'px';	
-	{rdelim}
-
-	move_Element.display = 'block';
+	fnvshobj(currObj,'tax_container');
+	if(document.all)
+	{ldelim}
+		var divleft = document.getElementById("tax_container").style.left;
+		var divabsleft = divleft.substring(0,divleft.length-2);
+		document.getElementById(obj).style.left = eval(divabsleft) - 120;
+
+		var divtop = document.getElementById("tax_container").style.top;
+		var divabstop =  divtop.substring(0,divtop.length-2);
+		document.getElementById(obj).style.top = eval(divabstop) - 200;
+	{rdelim}else
+	{ldelim}
+		document.getElementById(obj).style.left =  document.getElementById("tax_container").left;
+		document.getElementById(obj).style.top = document.getElementById("tax_container").top;
+	{rdelim}
+	document.getElementById(obj).style.display = "block";
+
 {rdelim}
   
 	function doNothing(){ldelim}
@@ -177,7 +185,7 @@
 		   </tr>
 		   <tr>
 			<td align="right" style="padding:5px;" nowrap>
-				(-)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(event,'discount_div1','discount','1')" >{$APP.LBL_DISCOUNT}</a> : </b>
+				(-)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(this,'discount_div1','discount','1')" >{$APP.LBL_DISCOUNT}</a> : </b>
 				<div class="discountUI" id="discount_div1">
 					<input type="hidden" id="discount_type1" name="discount_type1" value="">
 					<table width="100%" border="0" cellpadding="5" cellspacing="0" class="small">
@@ -208,7 +216,7 @@
 		   </tr>
 		   <tr id="individual_tax_row1" class="TaxShow">
 			<td align="right" style="padding:5px;" nowrap>
-				(+)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(event,'tax_div1','tax','1')" >{$APP.LBL_TAX} </a> : </b>
+				(+)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(this,'tax_div1','tax','1')" >{$APP.LBL_TAX} </a> : </b>
 				<div class="discountUI" id="tax_div1">
 				</div>
 			</td>
@@ -269,13 +277,14 @@
 
    <!-- Product Details Final Total Discount, Tax and Shipping&Hanling  - Starts -->
    <tr valign="top">
-	<td width="88%" class="crmTableRow small lineOnTop" align="right"><b>{$APP.LBL_NET_TOTAL}</b></td>
+	<td width="88%" colspan="2" class="crmTableRow small lineOnTop" align="right"><b>{$APP.LBL_NET_TOTAL}</b></td>
 	<td width="12%" id="netTotal" class="crmTableRow small lineOnTop" align="right">0.00</td>
    </tr>
 
    <tr valign="top">
+	<td class="crmTableRow small lineOnTop" width="60%" style="border-right:1px #dadada;">&nbsp;</td>
 	<td class="crmTableRow small lineOnTop" align="right">
-		(-)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(event,'discount_div_final','discount_final','1')">{$APP.LBL_DISCOUNT}</a>
+		(-)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(this,'discount_div_final','discount_final','1')">{$APP.LBL_DISCOUNT}</a>
 		<!-- Popup Discount DIV -->
 		<div class="discountUI" id="discount_div_final">
 			<input type="hidden" id="discount_type_final" name="discount_type_final" value="">
@@ -306,8 +315,9 @@
 
    <!-- Group Tax - starts -->
    <tr id="group_tax_row" valign="top" class="TaxHide">
+	<td class="crmTableRow small lineOnTop" style="border-right:1px #dadada;">&nbsp;</td>
 	<td class="crmTableRow small lineOnTop" align="right">
-		(+)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(event,'group_tax_div','group_tax_div_title',''); calcGroupTax();" >{$APP.LBL_TAX}</a></b>
+		(+)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(this,'group_tax_div','group_tax_div_title',''); calcGroupTax();" >{$APP.LBL_TAX}</a></b>
 				<!-- Pop Div For Group TAX -->
 				<div class="discountUI" id="group_tax_div">
 					<table width="100%" border="0" cellpadding="5" cellspacing="0" class="small">
@@ -322,7 +332,7 @@
 						<td align="left" class="lineOnTop">
 							<input type="text" class="small" size="5" name="{$tax_detail.taxname}_group_percentage" id="group_tax_percentage{$smarty.foreach.group_tax_loop.iteration}" value="{$tax_detail.percentage}" onBlur="calcGroupTax()">&nbsp;%
 						</td>
-						<td align="center" class="lineOnTop">{$tax_detail.taxname}</td>
+						<td align="center" class="lineOnTop">{$tax_detail.taxlabel}</td>
 						<td align="right" class="lineOnTop">
 							<input type="text" class="small" size="6" name="{$tax_detail.taxname}_group_amount" id="group_tax_amount{$smarty.foreach.group_tax_loop.iteration}" style="cursor:pointer;" value="0.00" readonly>
 						</td>
@@ -343,6 +353,7 @@
 
 
    <tr valign="top">
+	<td class="crmTableRow small" style="border-right:1px #dadada;">&nbsp;</td>
 	<td class="crmTableRow small" align="right">
 		(+)&nbsp;<b>{$APP.LBL_SHIPPING_AND_HANDLING_CHARGES} </b>
 	</td>
@@ -352,8 +363,9 @@
    </tr>
 
    <tr valign="top">
+	<td class="crmTableRow small" style="border-right:1px #dadada;">&nbsp;</td>
 	<td class="crmTableRow small" align="right">
-		(+)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(event,'shipping_handling_div','sh_tax_div_title',''); calcSHTax();" >{$APP.LBL_TAX_FOR_SHIPPING_AND_HANDLING} </a></b>
+		(+)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(this,'shipping_handling_div','sh_tax_div_title',''); calcSHTax();" >{$APP.LBL_TAX_FOR_SHIPPING_AND_HANDLING} </a></b>
 
 				<!-- Pop Div For Shipping and Handlin TAX -->
 				<div class="discountUI" id="shipping_handling_div">
@@ -386,6 +398,7 @@
 	<td id="shipping_handling_tax" class="crmTableRow small" align="right">0.00</td>
    </tr>
    <tr valign="top">
+	<td class="crmTableRow small" style="border-right:1px #dadada;">&nbsp;</td>
 	<td class="crmTableRow small" align="right">
 		{$APP.LBL_ADJUSTMENT}
 		<select id="adjustmentType" name="adjustmentType" class=small onchange="calcTotal();">
@@ -398,6 +411,7 @@
 	</td>
    </tr>
    <tr valign="top">
+	<td class="crmTableRow big lineOnTop" style="border-right:1px #dadada;">&nbsp;</td>
 	<td class="crmTableRow big lineOnTop" align="right"><b>{$APP.LBL_GRAND_TOTAL}</b></td>
 	<td id="grandTotal" name="grandTotal" class="crmTableRow big lineOnTop" align="right">&nbsp;</td>
    </tr>

Modified: vtigercrm/trunk/Smarty/templates/Inventory/ProductDetailsEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Inventory/ProductDetailsEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Inventory/ProductDetailsEditView.tpl Mon Sep  4 08:58:15 2006
@@ -22,7 +22,7 @@
 //  window.onmousemove= displayCoords;
 //  window.onclick = fnRevert;
   
-function displayCoords(event,obj,mode,curr_row) 
+function displayCoords(currObj,obj,mode,curr_row) 
 {ldelim}
 	if(mode != 'discount_final' && mode != 'sh_tax_div_title' && mode != 'group_tax_div_title')
 	{ldelim}
@@ -39,6 +39,10 @@
 	{ldelim}
 		document.getElementById("discount_div_title"+curr_row).innerHTML = '<b>Set Discount for : '+document.getElementById("productTotal"+curr_row).innerHTML+'</b>';
 	{rdelim}
+	else if(mode == 'tax')
+	{ldelim}
+		document.getElementById("tax_div_title"+curr_row).innerHTML = "<b>Set Tax for "+document.getElementById("totalAfterDiscount"+curr_row).innerHTML+'</b>';
+	{rdelim}
 	else if(mode == 'discount_final')
 	{ldelim}
 		document.getElementById("discount_div_title_final").innerHTML = '<b>Set Discount for : '+document.getElementById("netTotal").innerHTML+'</b>';
@@ -53,19 +57,23 @@
 		document.getElementById("group_tax_div_title").innerHTML = '<b>Set Group Tax for : '+net_total_after_discount+'</b>';
 	{rdelim}
 
-	var move_Element = document.getElementById(obj).style;
-	if(!event)
-	{ldelim}
-		move_Element.left = e.pageX +'px' ;
-		move_Element.top = e.pageY + 'px';	
-	{rdelim}
-	else
-	{ldelim}
-		move_Element.left = event.clientX +'px' ;
-		move_Element.top = event.clientY + 'px';	
-	{rdelim}
-
-	move_Element.display = 'block';
+	fnvshobj(currObj,'tax_container');
+	if(document.all)
+	{ldelim}
+		var divleft = document.getElementById("tax_container").style.left;
+		var divabsleft = divleft.substring(0,divleft.length-2);
+		document.getElementById(obj).style.left = eval(divabsleft) - 120;
+
+		var divtop = document.getElementById("tax_container").style.top;
+		var divabstop =  divtop.substring(0,divtop.length-2);
+		document.getElementById(obj).style.top = eval(divabstop);
+	{rdelim}else
+	{ldelim}
+		document.getElementById(obj).style.left =  document.getElementById("tax_container").left;
+		document.getElementById(obj).style.top = document.getElementById("tax_container").top;
+	{rdelim}
+	document.getElementById(obj).style.display = "block";
+
 {rdelim}
   
 	function doNothing(){ldelim}
@@ -198,7 +206,7 @@
 		   </tr>
 		   <tr>
 			<td align="right" style="padding:5px;" nowrap>
-				(-)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(event,'discount_div{$row_no}','discount','{$row_no}')" >{$APP.LBL_DISCOUNT}</a> : </b>
+				(-)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(this,'discount_div{$row_no}','discount','{$row_no}')" >{$APP.LBL_DISCOUNT}</a> : </b>
 				<div class="discountUI" id="discount_div{$row_no}">
 					<input type="hidden" id="discount_type{$row_no}" name="discount_type{$row_no}" value="{$data.$discount_type}">
 					<table width="100%" border="0" cellpadding="5" cellspacing="0" class="small">
@@ -229,12 +237,12 @@
 		   </tr>
 		   <tr id="individual_tax_row{$row_no}" class="TaxShow">
 			<td align="right" style="padding:5px;" nowrap>
-				(+)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(event,'tax_div{$row_no}','tax','{$row_no}')" >{$APP.LBL_TAX} </a> : </b>
+				(+)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(this,'tax_div{$row_no}','tax','{$row_no}')" >{$APP.LBL_TAX} </a> : </b>
 				<div class="discountUI" id="tax_div{$row_no}">
 					<!-- we will form the table with all taxes -->
 					<table width="100%" border="0" cellpadding="5" cellspacing="0" class="small">
 					   <tr>
-						<td nowrap align="left" >Set Tax for : {$data.$totalAfterDiscount}</td>
+						<td id="tax_div_title{$row_no}" nowrap align="left" ><b>Set Tax for : {$data.$totalAfterDiscount}</b></td>
 						<td>&nbsp;</td>
 						<td align="right"><img src="{$IMAGE_PATH}close.gif" border="0" onClick="fnHidePopDiv('tax_div{$row_no}')" style="cursor:pointer;"></td>
 					   </tr>
@@ -317,13 +325,14 @@
 
    <!-- Product Details Final Total Discount, Tax and Shipping&Hanling  - Starts -->
    <tr valign="top">
-	<td width="88%" class="crmTableRow small lineOnTop" align="right"><b>{$APP.LBL_NET_TOTAL}</b></td>
+	<td width="88%" colspan="2" class="crmTableRow small lineOnTop" align="right"><b>{$APP.LBL_NET_TOTAL}</b></td>
 	<td width="12%" id="netTotal" class="crmTableRow small lineOnTop" align="right">0.00</td>
    </tr>
 
    <tr valign="top">
+	<td class="crmTableRow small lineOnTop" width="60%" style="border-right:1px #dadada;">&nbsp;</td>
 	<td class="crmTableRow small lineOnTop" align="right">
-		(-)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(event,'discount_div_final','discount_final','1')">{$APP.LBL_DISCOUNT}</a>
+		(-)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(this,'discount_div_final','discount_final','1')">{$APP.LBL_DISCOUNT}</a>
 
 		<!-- Popup Discount DIV -->
 		<div class="discountUI" id="discount_div_final">
@@ -356,8 +365,9 @@
 
    <!-- Group Tax - starts -->
    <tr id="group_tax_row" valign="top" class="TaxHide">
+	<td class="crmTableRow small lineOnTop" style="border-right:1px #dadada;">&nbsp;</td>
 	<td class="crmTableRow small lineOnTop" align="right">
-		(+)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(event,'group_tax_div','group_tax_div_title',''); calcGroupTax();" >{$APP.LBL_TAX}</a></b>
+		(+)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(this,'group_tax_div','group_tax_div_title',''); calcGroupTax();" >{$APP.LBL_TAX}</a></b>
 
 				<!-- Pop Div For Group TAX -->
 				<div class="discountUI" id="group_tax_div">
@@ -396,6 +406,7 @@
 
 
    <tr valign="top">
+	<td class="crmTableRow small" style="border-right:1px #dadada;">&nbsp;</td>
 	<td class="crmTableRow small" align="right">
 		(+)&nbsp;<b>{$APP.LBL_SHIPPING_AND_HANDLING_CHARGES} </b>
 	</td>
@@ -406,8 +417,9 @@
 
 
    <tr valign="top">
+	<td class="crmTableRow small" style="border-right:1px #dadada;">&nbsp;</td>
 	<td class="crmTableRow small" align="right">
-		(+)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(event,'shipping_handling_div','sh_tax_div_title',''); calcSHTax();" >{$APP.LBL_TAX_FOR_SHIPPING_AND_HANDLING} </a></b>
+		(+)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(this,'shipping_handling_div','sh_tax_div_title',''); calcSHTax();" >{$APP.LBL_TAX_FOR_SHIPPING_AND_HANDLING} </a></b>
 
 				<!-- Pop Div For Shipping and Handlin TAX -->
 				<div class="discountUI" id="shipping_handling_div">
@@ -442,6 +454,7 @@
 
 
    <tr valign="top">
+	<td class="crmTableRow small" style="border-right:1px #dadada;">&nbsp;</td>
 	<td class="crmTableRow small" align="right">
 		{$APP.LBL_ADJUSTMENT}
 		<select id="adjustmentType" name="adjustmentType" class=small onchange="calcTotal();">
@@ -456,6 +469,7 @@
 
 
    <tr valign="top">
+	<td class="crmTableRow big lineOnTop" style="border-right:1px #dadada;">&nbsp;</td>
 	<td class="crmTableRow big lineOnTop" align="right"><b>{$APP.LBL_GRAND_TOTAL}</b></td>
 	<td id="grandTotal" name="grandTotal" class="crmTableRow big lineOnTop" align="right">{$FINAL.grandTotal}</td>
    </tr>

Modified: vtigercrm/trunk/modules/Products/InventoryTaxAjax.php
==============================================================================
--- vtigercrm/trunk/modules/Products/InventoryTaxAjax.php (original)
+++ vtigercrm/trunk/modules/Products/InventoryTaxAjax.php Mon Sep  4 08:58:15 2006
@@ -24,7 +24,7 @@
 $tax_div = '
 		<table width="100%" border="0" cellpadding="5" cellspacing="0" class="small">
 		   <tr>
-			<td nowrap align="left" >Set Tax for : '.$product_total.'</td>
+			<td id="tax_div_title'.$rowid.'" nowrap align="left" ><b>Set Tax for : '.$product_total.'</b></td>
 			<td>&nbsp;</td>
 			<td align="right"><img src="'.$image_path.'close.gif" border="0" onClick="fnHidePopDiv(\'tax_div'.$rowid.'\')" style="cursor:pointer;"></td>
 		   </tr>

Modified: vtigercrm/trunk/themes/woodspice/style.css
==============================================================================
--- vtigercrm/trunk/themes/woodspice/style.css (original)
+++ vtigercrm/trunk/themes/woodspice/style.css Mon Sep  4 08:58:15 2006
@@ -3135,7 +3135,7 @@
 
 .discountUI{
 	border:3px solid #CCCCCC;
-	width:200px;
+	width:250px;
 	padding:5px;
 	position:absolute;
 	background-color:#FFFFFF;



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep  4 08:08:36 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 15:08:36 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9258 -
 /vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl
Message-ID: <20060904150836.395A7707DB4@vtiger.fosslabs.com>

Author: saraj
Date: Mon Sep  4 09:08:32 2006
New Revision: 9258

Log:
changes made to fix the calendar related issue  --Minnie

Modified:
    vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl

Modified: vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl Mon Sep  4 09:08:32 2006
@@ -90,7 +90,7 @@
                                                                 <input title="{$APP.LBL_DUPLICATE_BUTTON_TITLE}" accessKey="{$APP.LBL_DUPLICATE_BUTTON_KEY}" class="crmbutton small create" onclick="this.form.return_module.value='{$MODULE}'; this.form.return_action.value='DetailView'; this.form.isDuplicate.value='true';this.form.module.value='{$MODULE}'; this.form.action.value='EditView'" type="submit" name="Duplicate" value="{$APP.LBL_DUPLICATE_BUTTON_LABEL}">&nbsp;
                                                                 {/if}
 								{if $DELETE eq 'permitted'}
-                                                                <input title="{$APP.LBL_DELETE_BUTTON_TITLE}" accessKey="{$APP.LBL_DELETE_BUTTON_KEY}" class="crmbutton small delete" onclick="this.form.return_module.value='{$MODULE}'; this.form.return_action.value='index'; this.form.action.value='Delete'; return confirm('{$APP.NTC_DELETE_CONFIRMATION}')" type="submit" name="Delete" value="{$APP.LBL_DELETE_BUTTON_LABEL}">&nbsp;
+                                                                <input title="{$APP.LBL_DELETE_BUTTON_TITLE}" accessKey="{$APP.LBL_DELETE_BUTTON_KEY}" class="crmbutton small delete" onclick="this.form.return_module.value='{$MODULE}'; {if $VIEWTYPE eq 'calendar'} this.form.return_action.value='index'; {else} this.form.return_action.value='ListView'; {/if}  this.form.action.value='Delete'; return confirm('{$APP.NTC_DELETE_CONFIRMATION}')" type="submit" name="Delete" value="{$APP.LBL_DELETE_BUTTON_LABEL}">&nbsp;
                                                                 {/if}
 
 							</td>



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep  4 08:19:25 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 15:19:25 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9259 -
	/vtigercrm/trunk/modules/Calendar/DetailView.php
Message-ID: <20060904151925.6F455707DB4@vtiger.fosslabs.com>

Author: saraj
Date: Mon Sep  4 09:19:21 2006
New Revision: 9259

Log:
changes made to fix the calendar related issue  --Minnie

Modified:
    vtigercrm/trunk/modules/Calendar/DetailView.php

Modified: vtigercrm/trunk/modules/Calendar/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/DetailView.php (original)
+++ vtigercrm/trunk/modules/Calendar/DetailView.php Mon Sep  4 09:19:21 2006
@@ -259,7 +259,7 @@
 $smarty->assign("NAME", $focus->name);
 $smarty->assign("BLOCKS", $act_data);
 $smarty->assign("LABEL", $fldlabel);
-
+$smarty->assign("VIEWTYPE", $_REQUEST['viewtype']);
 $smarty->assign("CUSTOMFIELD", $cust_fld);
 $smarty->assign("ACTIVITYDATA", $data);
 $smarty->assign("ID", $_REQUEST['record']);



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep  4 09:51:12 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 16:51:12 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9260 -
 /vtigercrm/trunk/log4php/appenders/LoggerAppenderFile.php
Message-ID: <20060904165112.0756F76CE42@vtiger.fosslabs.com>

Author: saraj
Date: Mon Sep  4 10:51:09 2006
New Revision: 9260

Log:
removed read permission for log files

Modified:
    vtigercrm/trunk/log4php/appenders/LoggerAppenderFile.php

Modified: vtigercrm/trunk/log4php/appenders/LoggerAppenderFile.php
==============================================================================
--- vtigercrm/trunk/log4php/appenders/LoggerAppenderFile.php (original)
+++ vtigercrm/trunk/log4php/appenders/LoggerAppenderFile.php Mon Sep  4 10:51:09 2006
@@ -75,6 +75,10 @@
         $fileName = $this->getFile();
         LoggerLog::debug("LoggerAppenderFile::activateOptions() opening file '{$fileName}'");
         $this->fp = @fopen($fileName, ($this->getAppend()? 'a':'w'));
+
+	// Denying read option for log file. Added for Vulnerability fix
+	if (is_readable($fileName)) chmod ($fileName,0222);
+
         if ($this->fp) {
             if ($this->getAppend())
                 fseek($this->fp, 0, SEEK_END);
@@ -177,4 +181,4 @@
         } 
     }
 }
-?>
+?>



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep  4 10:58:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 17:58:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9261 -
	/vtigercrm/trunk/include/utils/DetailViewUtils.php
Message-ID: <20060904175850.EA10F76CDE0@vtiger.fosslabs.com>

Author: saraj
Date: Mon Sep  4 11:58:46 2006
New Revision: 9261

Log:
line break issue fixed

Modified:
    vtigercrm/trunk/include/utils/DetailViewUtils.php

Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/DetailViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/DetailViewUtils.php Mon Sep  4 11:58:46 2006
@@ -159,7 +159,7 @@
 	}
 	elseif($uitype == 19)
 	{
-		$col_fields[$fieldname]= make_clickable(nl2br($col_fields[$fieldname]));
+		$col_fields[$fieldname]= make_clickable(str_replace("&lt;br /&gt;","<br>",$col_fields[$fieldname]));
 		$label_fld[] = $mod_strings[$fieldlabel];
 		$label_fld[] = $col_fields[$fieldname];
 	}



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 00:53:15 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 07:53:15 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9262 -
 /vtigercrm/trunk/themes/woodspice/images/set-IcoTwoTabConfig.gif
Message-ID: <20060905075315.C9BD676521E@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 01:53:10 2006
New Revision: 9262

Log:
Image added for single pane view -- ahmed

Added:
    vtigercrm/trunk/themes/woodspice/images/set-IcoTwoTabConfig.gif   (with props)



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 00:56:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 07:56:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9263 - in
 /vtigercrm/trunk/Smarty/templates: DefModuleView.tpl Settings.tpl
Message-ID: <20060905075638.AEDE376521D@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 01:56:34 2006
New Revision: 9263

Log:
Icon added for single pane view -- ahmed

Modified:
    vtigercrm/trunk/Smarty/templates/DefModuleView.tpl
    vtigercrm/trunk/Smarty/templates/Settings.tpl

Modified: vtigercrm/trunk/Smarty/templates/DefModuleView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DefModuleView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DefModuleView.tpl Tue Sep  5 01:56:34 2006
@@ -31,7 +31,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}" alt="{$MOD.LBL_DEFAULT_MODULE_VIEW}" width="48" height="48" border=0 title="{$MOD.LBL_DEFAULT_MODULE_VIEW}"></td>
+					<td width=50 rowspan=2 valign=top><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}"></td>
 					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > {$MOD.LBL_DEFAULT_MODULE_VIEW}</b></td>
 				</tr>
 				<tr>

Modified: vtigercrm/trunk/Smarty/templates/Settings.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings.tpl Tue Sep  5 01:56:34 2006
@@ -162,7 +162,7 @@
 					<!-- 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}" alt="{$MOD.LBL_DEFAULT_MODULE_VIEW}" width="48" height="48" border=0 title="{$MOD.LBL_DEFAULT_MODULE_VIEW}"></a></td>
+						<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>
 					</tr>
 					<tr>



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 02:18:36 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 09:18:36 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9264 -
	/vtigercrm/trunk/modules/Calendar/calendarLayout.php
Message-ID: <20060905091836.EC3AC765A43@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 03:18:32 2006
New Revision: 9264

Log:
changes made to fix the calendar related issue  --Minnie

Modified:
    vtigercrm/trunk/modules/Calendar/calendarLayout.php

Modified: vtigercrm/trunk/modules/Calendar/calendarLayout.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/calendarLayout.php (original)
+++ vtigercrm/trunk/modules/Calendar/calendarLayout.php Tue Sep  5 03:18:32 2006
@@ -909,10 +909,15 @@
 				$endtemp_date = (($date_format == 'dd-mm-yyyy')?(date('d-m-Y',$endtemp_ts)):(($date_format== 'mm-dd-yyyy')?(date('m-d-Y',$endtemp_ts)):(($date_format == 'yyyy-mm-dd')?(date('Y-m-d', $endtemp_ts)):(''))));
 			}
 			$cal['slice'] = $cal['calendar']->month_array[$cal['calendar']->slices[$count]];
+			$monthclass = dateCheck($cal['slice']->start_time->get_formatted_date());
+			if($monthclass != '')
+				$monthclass = 'calSel';
+			else
+				$monthclass = 'dvtCellLabel';
 			//to display dates in month
 			if ($cal['slice']->start_time->getMonth() == $cal['calendar']->date_time->getMonth())
 			{
-				$monthview_layout .= '<td class="dvtCellLabel" width="14%" onMouseOver="cal_show(\'create_'.$temp_date.''.$time_arr['starthour'].'\')" onMouseOut="fnHide_Event(\'create_'.$temp_date.''.$time_arr['starthour'].'\')">';
+				$monthview_layout .= '<td class="'.$monthclass.'" width="14%" onMouseOver="cal_show(\'create_'.$temp_date.''.$time_arr['starthour'].'\')" onMouseOut="fnHide_Event(\'create_'.$temp_date.''.$time_arr['starthour'].'\')">';
 				$monthview_layout .= '<a href="index.php?module=Calendar&action=index&view='.$cal['slice']->getView().''.$cal['slice']->start_time->get_date_str().'&parenttab='.$category.'">';
 				$monthview_layout .= $cal['slice']->start_time->get_Date();
 				$monthview_layout .= '</a>';
@@ -1125,7 +1130,7 @@
 				</tr>';
 			$eventlayer .= '<tr><td>';
 			$eventlayer .= '</td>
-				<td><a href="index.php?action=DetailView&module=Calendar&record='.$id.'&activity_mode=Events&parenttab='.$category.'"><span class="orgTab">'.$subject.'</span></a></td>
+				<td><a href="index.php?action=DetailView&module=Calendar&record='.$id.'&activity_mode=Events&viewtype=calendar&parenttab='.$category.'"><span class="orgTab">'.$subject.'</span></a></td>
 				</tr>
 				<tr><td>'.$action_str.'</td><td>('.$user.' | '.$eventstatus.' | '.$priority.')</td>
 			</table>
@@ -1196,7 +1201,7 @@
 				</tr>
 				<tr>
 					<td>&nbsp;</td>
-					<td><a href="index.php?action=DetailView&module=Calendar&record='.$id.'&activity_mode=Events&parenttab='.$category.'"><span class="orgTab">'.$subject.'</span></a></td>
+					<td><a href="index.php?action=DetailView&module=Calendar&record='.$id.'&activity_mode=Events&viewtype=calendar&parenttab='.$category.'"><span class="orgTab">'.$subject.'</span></a></td>
 				</tr>
 				<tr><td>'.$action_str.'</td><td>('.$user.' | '.$eventstatus.' | '.$priority.')</td>
 			</table>
@@ -1260,7 +1265,7 @@
 					<table border="0" cellpadding="1" cellspacing="0" width="100%">
 						<tr>
 							<td><img src="'.$image.'" align="middle" border="0"></td>
-							<td width="100%"><a href="index.php?action=DetailView&module=Calendar&record='.$id.'&activity_mode=Events&parenttab='.$category.'"><span class="orgTab"><small>'.$start_hour.' - '.$end_hour.'</small></span></td>
+							<td width="100%"><a href="index.php?action=DetailView&module=Calendar&record='.$id.'&activity_mode=Events&viewtype=calendar&parenttab='.$category.'"><span class="orgTab"><small>'.$start_hour.' - '.$end_hour.'</small></span></td>
 						</tr>
 					</table>
                                 </div><br>';
@@ -1372,7 +1377,7 @@
 			$contactname = getContactName($contact_id);
 			$contact_data = "<b>".$contactname."</b>,";
 		}
-		$more_link = "<a href='index.php?action=DetailView&module=Calendar&record=".$id."&activity_mode=Events&parenttab=".$category."' class='webMnu'>[".$mod_strings['LBL_MORE']."...]</a>";
+		$more_link = "<a href='index.php?action=DetailView&module=Calendar&record=".$id."&activity_mode=Events&viewtype=calendar&parenttab=".$category."' class='webMnu'>[".$mod_strings['LBL_MORE']."...]</a>";
 		$type = $adb->query_result($result,$i,"activitytype");
 		if($type == 'Call')
 			$image_tag = "<img src='".$calendar['IMAGE_PATH']."Calls.gif' align='middle'>&nbsp;".$type;
@@ -1472,7 +1477,7 @@
                 $id = $adb->query_result($result,$i,"activityid");
                 $subject = $adb->query_result($result,$i,"subject");
 		$status = $adb->query_result($result,$i,"status");
-		$more_link = "<a href='index.php?action=DetailView&module=Calendar&record=".$id."&activity_mode=Task&parenttab=".$category."' class='webMnu'>".$subject."</a>";
+		$more_link = "<a href='index.php?action=DetailView&module=Calendar&record=".$id."&activity_mode=Task&viewtype=calendar&parenttab=".$category."' class='webMnu'>".$subject."</a>";
 		$element['tododetail'] = $more_link;
 		$element['status'] = $adb->query_result($result,$i,"status");
 		if(isPermitted("Calendar","EditView") == "yes")
@@ -1656,13 +1661,14 @@
 	//labels of listview header
 	if($cal['view'] == 'day')
 	{
+		$colspan = 7;
 		$header = Array('0'=>'#','1'=>$mod_strings['LBL_TIME'],'2'=>$mod_strings['LBL_LIST_DUE_DATE'],
 				'3'=>$mod_strings['LBL_TODO'],'4'=>$mod_strings['LBL_STATUS'],'5'=>$mod_strings['LBL_ACTION'],'6'=>$mod_strings['LBL_ASSINGEDTO'],);
 		$header_width = Array('0'=>'5%','1'=>'10%','2'=>'10%','3'=>'38%','4'=>'10%','5'=>'10%', '6'=>'15%', );
 	}
 	else
 	{
-		
+		$colspan = 8;
 	        $header = Array('0'=>'#',
                         '1'=>$mod_strings['LBL_TIME'],
 			'2'=>$mod_strings['LBL_APP_START_DATE'],
@@ -1724,7 +1730,7 @@
         }
         else
         {
-		$list_view .="<tr><td style='background-color:#efefef;height:340px' align='center' colspan='6'>";
+		$list_view .="<tr><td style='background-color:#efefef;height:340px' align='center' colspan='".$colspan."'>";
 		$list_view .="<div style='border: 3px solid rgb(153, 153, 153); background-color: rgb(255, 255, 255); width: 45%; position: relative; z-index: 5000;'>
 			<table border='0' cellpadding='5' cellspacing='0' width='98%'>
 			<tr>



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 02:38:07 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 09:38:07 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9265 -
	/vtigercrm/trunk/modules/HelpDesk/Popup.php
Message-ID: <20060905093807.21C867660AA@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 03:38:02 2006
New Revision: 9265

Log:
Popup added for Trouble tickets  --Minnie

Added:
    vtigercrm/trunk/modules/HelpDesk/Popup.php



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 02:43:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 09:43:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9266 - in
 /vtigercrm/trunk/include: js/dtlviewajax.js utils/DetailViewUtils.php
Message-ID: <20060905094350.681FF76CDC2@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep  5 03:42:17 2006
New Revision: 9266

Log:
fieldvalues of multiselect combo box are seperated by comma and space

Modified:
    vtigercrm/trunk/include/js/dtlviewajax.js
    vtigercrm/trunk/include/utils/DetailViewUtils.php

Modified: vtigercrm/trunk/include/js/dtlviewajax.js
==============================================================================
--- vtigercrm/trunk/include/js/dtlviewajax.js (original)
+++ vtigercrm/trunk/include/js/dtlviewajax.js Tue Sep  5 03:42:17 2006
@@ -312,9 +312,9 @@
 			getObj(dtlView).innerHTML = popObj.value;
 		}
 	}else if(uitype == '33')
-  {
-       getObj(dtlView).innerHTML = r.join(" , ");
-  }else
+  	{
+       		getObj(dtlView).innerHTML = r.join(", ");
+	}else
 	{
 		getObj(dtlView).innerHTML = tagValue;
 	}

Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/DetailViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/DetailViewUtils.php Tue Sep  5 03:42:17 2006
@@ -126,7 +126,7 @@
 	elseif($uitype == 33) //uitype 33 added for multiselector picklist - Jeri
 	{
 	     $label_fld[] = $mod_strings[$fieldlabel];
-	     $label_fld[] = str_ireplace(' |##| ',' , ',$col_fields[$fieldname]);
+	     $label_fld[] = str_ireplace(' |##| ',', ',$col_fields[$fieldname]);
 	     
 		$pick_query="select * from vtiger_".$fieldname;
 		$pickListResult = $adb->query($pick_query);



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 02:50:54 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 09:50:54 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9267 -
	/vtigercrm/trunk/modules/HelpDesk/HelpDesk.php
Message-ID: <20060905095054.A419676CD73@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 03:50:50 2006
New Revision: 9267

Log:
changes made to add Popup for Trouble tickets  --Minnie

Modified:
    vtigercrm/trunk/modules/HelpDesk/HelpDesk.php

Modified: vtigercrm/trunk/modules/HelpDesk/HelpDesk.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/HelpDesk.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/HelpDesk.php Tue Sep  5 03:50:50 2006
@@ -40,7 +40,7 @@
 				);
 
 	var $list_fields_name = Array(
-					'Ticket ID'=>'',
+					'Ticket ID'=>'crmid',
 					'Subject'=>'ticket_title',	  			
 					'Related to'=>'parent_id',	  			
 					'Status'=>'ticketstatus',
@@ -67,6 +67,14 @@
 					'modifiedtime',
 					'createdtime'
 				);
+	var $search_fields = Array(
+		'Ticket ID' => Array('crmentity'=>'crmid'),
+		'Subject' => Array('troubletickets'=>'title')
+		);
+	var $search_fields_name = Array(
+		'Ticket ID' => '',
+		'Subject'=>'ticket_title',
+		);
 
 	//Added these variables which are used as default order by and sortorder in ListView
 	var $default_order_by = 'crmid';



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 02:53:10 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 09:53:10 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9268 -
	/vtigercrm/trunk/modules/HelpDesk/HelpDesk.js
Message-ID: <20060905095310.BFBD276CD73@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 03:53:07 2006
New Revision: 9268

Log:
Popup related js added --Minnie

Modified:
    vtigercrm/trunk/modules/HelpDesk/HelpDesk.js

Modified: vtigercrm/trunk/modules/HelpDesk/HelpDesk.js
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/HelpDesk.js (original)
+++ vtigercrm/trunk/modules/HelpDesk/HelpDesk.js Tue Sep  5 03:53:07 2006
@@ -58,3 +58,13 @@
                 getObj("assign_team").style.display="block"
         }
 }
+
+function set_return(product_id, product_name) {
+        window.opener.document.EditView.parent_name.value = product_name;
+        window.opener.document.EditView.parent_id.value = product_id;
+}
+
+function set_return_todo(product_id, product_name) {
+        window.opener.document.createTodo.task_parent_name.value = product_name;
+        window.opener.document.createTodo.task_parent_id.value = product_id;
+}



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 03:09:31 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 10:09:31 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9269 -
	/vtigercrm/trunk/include/utils/DetailViewUtils.php
Message-ID: <20060905100931.07D3E76CD72@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 04:09:27 2006
New Revision: 9269

Log:
added nl2br for uitype 19 in detailview

Modified:
    vtigercrm/trunk/include/utils/DetailViewUtils.php

Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/DetailViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/DetailViewUtils.php Tue Sep  5 04:09:27 2006
@@ -159,7 +159,7 @@
 	}
 	elseif($uitype == 19)
 	{
-		$col_fields[$fieldname]= make_clickable(str_replace("&lt;br /&gt;","<br>",$col_fields[$fieldname]));
+		$col_fields[$fieldname]= make_clickable(str_replace("&lt;br /&gt;","<br>",nl2br($col_fields[$fieldname])));
 		$label_fld[] = $mod_strings[$fieldlabel];
 		$label_fld[] = $col_fields[$fieldname];
 	}



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 03:10:51 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 10:10:51 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9270 -
 /vtigercrmoutlook/trunk/resources/images/vtiger-crm.gif
Message-ID: <20060905101051.A73B876CD33@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep  5 04:10:18 2006
New Revision: 9270

Log:
Image modified for Outlook Plugin --Jeri

Modified:
    vtigercrmoutlook/trunk/resources/images/vtiger-crm.gif

Modified: vtigercrmoutlook/trunk/resources/images/vtiger-crm.gif
==============================================================================
Binary files - no diff available.



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 03:24:04 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 10:24:04 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9271 -
	/vtigercrmoutlook/trunk/vtigercrmoladdin/source/
Message-ID: <20060905102404.D8BB676CE56@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep  5 04:22:35 2006
New Revision: 9271

Log:
Files modified to ignore Contacts without lastname,Logout option added, --Jeri

Modified:
    vtigercrmoutlook/trunk/vtigercrmoladdin/source/clsOlkAddIn.cls
    vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmAbout.frm
    vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmAbout.frx
    vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmAddMsg.frm
    vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmAddMsg.frx
    vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmConflict.frx
    vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmLogin.frx
    vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmOlForum.frx
    vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmPref.frx
    vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmSync.frm
    vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmSync.frx
    vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmSyncDetails.frm
    vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmSyncDetails.frx
    vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmSyncStatus.frx
    vtigercrmoutlook/trunk/vtigercrmoladdin/source/modDoSync.bas
    vtigercrmoutlook/trunk/vtigercrmoladdin/source/modTasks.bas
    vtigercrmoutlook/trunk/vtigercrmoladdin/source/service.DCA
    vtigercrmoutlook/trunk/vtigercrmoladdin/source/vtigeroladdin.vbw

Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/clsOlkAddIn.cls
==============================================================================
--- vtigercrmoutlook/trunk/vtigercrmoladdin/source/clsOlkAddIn.cls (original)
+++ vtigercrmoutlook/trunk/vtigercrmoladdin/source/clsOlkAddIn.cls Tue Sep  5 04:22:35 2006
@@ -45,6 +45,8 @@
 Attribute oVtForums.VB_VarHelpID = -1
 Private WithEvents oPref As Office.CommandBarButton
 Attribute oPref.VB_VarHelpID = -1
+Private WithEvents oLogout As Office.CommandBarButton
+Attribute oLogout.VB_VarHelpID = -1
 Private WithEvents oAddEmailsButton As Office.CommandBarButton
 Attribute oAddEmailsButton.VB_VarHelpID = -1
 
@@ -91,6 +93,7 @@
     Set oVtHelp = Nothing
     Set oVtForums = Nothing
     Set oPref = Nothing
+    Set oLogout = Nothing
     Set oAddEmailsButton = Nothing
     Set oSContactsMenu = Nothing
     Set oSyncContacts = Nothing
@@ -175,6 +178,11 @@
         "&Preferences", "Pref", "Preferences for vtigerCRM Add-In", 0, True, msoButtonCaption)
         oPref.Enabled = False
                     
+        Set oLogout = CreateAddInPopupButton(gstrProgID, cmbControl, _
+        "&Logout", "Logout", "Logout", 0, True, msoButtonCaption)
+        oLogout.Enabled = True
+        
+        
         If oHelpCmdBar Is Nothing Then
             Set oHelpCmdBar = cmbControl.Controls.Add(Type:=msoControlPopup, Parameter:=7)
             With oHelpCmdBar
@@ -249,6 +257,19 @@
     frmLogin.Show vbModal
 End Sub
 
+Private Sub oLogout_Click(ByVal Ctrl As Office.CommandBarButton, CancelDefault As Boolean)
+    oLogin.Enabled = True
+    oPref.Enabled = False
+    oSCalendarMenu.Enabled = False
+    oSTaskMenu.Enabled = False
+    oSContactsMenu.Enabled = False
+    oSyncCalendar.Enabled = False
+    oSyncContacts.Enabled = False
+    oSyncTask.Enabled = False
+    oAddEmailsButton.Enabled = False
+    oAddEmailsMenu.Enabled = False
+End Sub
+
 Private Sub oPref_Click(ByVal Ctrl As Office.CommandBarButton, CancelDefault As Boolean)
     frmPref.Show vbModal
 End Sub

Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmAbout.frm
==============================================================================
Binary files - no diff available.

Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmAbout.frx
==============================================================================
Binary files - no diff available.

Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmAddMsg.frm
==============================================================================
Binary files - no diff available.

Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmAddMsg.frx
==============================================================================
Binary files - no diff available.

Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmConflict.frx
==============================================================================
Binary files - no diff available.

Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmLogin.frx
==============================================================================
Binary files - no diff available.

Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmOlForum.frx
==============================================================================
Binary files - no diff available.

Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmPref.frx
==============================================================================
Binary files - no diff available.

Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmSync.frm
==============================================================================
Binary files - no diff available.

Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmSync.frx
==============================================================================
Binary files - no diff available.

Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmSyncDetails.frm
==============================================================================
Binary files - no diff available.

Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmSyncDetails.frx
==============================================================================
Binary files - no diff available.

Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmSyncStatus.frx
==============================================================================
Binary files - no diff available.

Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/modDoSync.bas
==============================================================================
Binary files - no diff available.

Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/modTasks.bas
==============================================================================
Binary files - no diff available.

Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/service.DCA
==============================================================================
Binary files - no diff available.

Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/vtigeroladdin.vbw
==============================================================================
Binary files - no diff available.



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 04:21:52 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 11:21:52 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9272 -
	/vtigercrm/trunk/include/utils/SearchUtils.php
Message-ID: <20060905112152.E43E176CE92@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 05:21:48 2006
New Revision: 9272

Log:
changes made search string with quotes. Fixes #2063

Modified:
    vtigercrm/trunk/include/utils/SearchUtils.php

Modified: vtigercrm/trunk/include/utils/SearchUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/SearchUtils.php (original)
+++ vtigercrm/trunk/include/utils/SearchUtils.php Tue Sep  5 05:21:48 2006
@@ -205,7 +205,7 @@
         }
         if(isset($_REQUEST['search_text']) && $_REQUEST['search_text']!="")
         {
-                $search_string=ltrim(rtrim($_REQUEST['search_text']));
+                $search_string=addslashes(ltrim(rtrim($_REQUEST['search_text'])));
         }
         if(isset($_REQUEST['searchtype']) && $_REQUEST['searchtype']!="")
         {



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 04:54:32 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 11:54:32 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9273 -
	/vtigercrm/trunk/modules/HelpDesk/HelpDesk.php
Message-ID: <20060905115432.D5D0276CEAD@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 05:54:28 2006
New Revision: 9273

Log:
table name has been changed in search_fields array --Minnie

Modified:
    vtigercrm/trunk/modules/HelpDesk/HelpDesk.php

Modified: vtigercrm/trunk/modules/HelpDesk/HelpDesk.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/HelpDesk.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/HelpDesk.php Tue Sep  5 05:54:28 2006
@@ -40,7 +40,7 @@
 				);
 
 	var $list_fields_name = Array(
-					'Ticket ID'=>'crmid',
+					'Ticket ID'=>'',
 					'Subject'=>'ticket_title',	  			
 					'Related to'=>'parent_id',	  			
 					'Status'=>'ticketstatus',
@@ -68,8 +68,8 @@
 					'createdtime'
 				);
 	var $search_fields = Array(
-		'Ticket ID' => Array('crmentity'=>'crmid'),
-		'Subject' => Array('troubletickets'=>'title')
+		'Ticket ID' => Array('vtiger_crmentity'=>'crmid'),
+		'Subject' => Array('vtiger_troubletickets'=>'title')
 		);
 	var $search_fields_name = Array(
 		'Ticket ID' => '',



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 05:08:48 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 12:08:48 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9274 -
	/vtigercrm/trunk/Popup.php
Message-ID: <20060905120848.8930076CEBE@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 06:08:44 2006
New Revision: 9274

Log:
changes made to add popup for trouble tickets --Minnie

Modified:
    vtigercrm/trunk/Popup.php

Modified: vtigercrm/trunk/Popup.php
==============================================================================
--- vtigercrm/trunk/Popup.php (original)
+++ vtigercrm/trunk/Popup.php Tue Sep  5 06:08:44 2006
@@ -183,6 +183,15 @@
                 $alphabetical = AlphabeticalSearch($currentModule,'Popup','user_name','true','basic',$popuptype,"","","");
 		if (isset($_REQUEST['select'])) $smarty->assign("SELECT",'enable');
                 break;	
+	case 'HelpDesk':
+		require_once("modules/$currentModule/HelpDesk.php");
+		$focus = new HelpDesk();
+		$smarty->assign("SINGLE_MOD",'HelpDesk');
+		if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] !='')
+		$smarty->assign("RETURN_MODULE",$_REQUEST['return_module']);
+		$alphabetical = AlphabeticalSearch($currentModule,'Popup','ticket_title','true','basic',$popuptype,"","","");
+		if (isset($_REQUEST['select'])) $smarty->assign("SELECT",'enable');
+		break;
 
 
 }



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 05:10:58 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 12:10:58 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9275 -
	/vtigercrm/trunk/Smarty/templates/EditViewHidden.tpl
Message-ID: <20060905121058.3DCE076CEBD@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 06:10:54 2006
New Revision: 9275

Log:
ticket_id field has been removed from hidden fields of Calendar --Minnie

Modified:
    vtigercrm/trunk/Smarty/templates/EditViewHidden.tpl

Modified: vtigercrm/trunk/Smarty/templates/EditViewHidden.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/EditViewHidden.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/EditViewHidden.tpl Tue Sep  5 06:10:54 2006
@@ -40,7 +40,6 @@
 
 {elseif $MODULE eq 'Calendar'}
 	<input type="hidden" name="activity_mode" value="{$ACTIVITY_MODE}">
-	<input type="hidden" name="ticket_id" value="{$TICKETID}">
 	<input type="hidden" name="product_id" value="{$PRODUCTID}">
 
 {elseif $MODULE eq 'PurchaseOrder' || $MODULE eq 'SalesOrder' || $MODULE eq 'Invoice' || $MODULE eq 'Quotes'}



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 05:15:35 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 12:15:35 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9276 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060905121535.B1D9676CEBF@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 06:15:31 2006
New Revision: 9276

Log:
Demo Data populated for Groups & Profile Desc added -- Ahmed

Modified:
    vtigercrm/trunk/modules/Users/DefaultDataPopulator.php

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Tue Sep  5 06:15:31 2006
@@ -44,6 +44,10 @@
 		$profile2_id = $this->db->getUniqueID("vtiger_profile");
 		$profile3_id = $this->db->getUniqueID("vtiger_profile");
 		$profile4_id = $this->db->getUniqueID("vtiger_profile");
+
+		$group1_id = $this->db->getUniqueID("vtiger_groups");
+		$group2_id = $this->db->getUniqueID("vtiger_groups");
+		$group3_id = $this->db->getUniqueID("vtiger_groups");
 
                 $this->db->query("insert into vtiger_role values('H".$role1_id."','Organisation','H".$role1_id."',0)");
                 $this->db->query("insert into vtiger_role values('H".$role2_id."','CEO','H".$role1_id."::H".$role2_id."',1)");
@@ -915,14 +919,30 @@
 
 
                 // Insert End
-                
+		
+		//Inserting into vtiger_groups table
+		$this->db->query("insert into vtiger_groups values ('".$group1_id."','Team Selling','Group Related to Sales')");	
+		$this->db->query("insert into vtiger_group2role values ('".$group1_id."','H".$role4_id."')");	
+		$this->db->query("insert into vtiger_group2rs values ('".$group1_id."','H".$role5_id."')");	
+		$this->db->query("insert into vtiger_users2group values ('".$group1_id."',2)");	
+
+		$this->db->query("insert into vtiger_groups values ('".$group2_id."','Marketing Group','Group Related to Marketing Activities')");	
+		$this->db->query("insert into vtiger_group2role values ('".$group2_id."','H".$role2_id."')");	
+		$this->db->query("insert into vtiger_group2rs values ('".$group2_id."','H".$role3_id."')");	
+		$this->db->query("insert into vtiger_users2group values ('".$group2_id."',1)");	
+		$this->db->query("insert into vtiger_users2group values ('".$group2_id."',2)");	
+
+		$this->db->query("insert into vtiger_groups values ('".$group3_id."','Support Group','Group Related to providing Support to Customers')");
+		$this->db->query("insert into vtiger_group2role values ('".$group3_id."','H".$role3_id."')");
+		$this->db->query("insert into vtiger_group2rs values ('".$group3_id."','H".$role3_id."')");
+		$this->db->query("insert into vtiger_users2group values ('".$group3_id."',2)");	
 
 		//New Security Start
 		//Inserting into vtiger_profile vtiger_table
-		$this->db->query("insert into vtiger_profile values ('".$profile1_id."','Administrator',null)");	
-		$this->db->query("insert into vtiger_profile values ('".$profile2_id."','Sales Profile',null)");
-		$this->db->query("insert into vtiger_profile values ('".$profile3_id."','Support Profile',null)");
-		$this->db->query("insert into vtiger_profile values ('".$profile4_id."','Guest Profile',null)");
+		$this->db->query("insert into vtiger_profile values ('".$profile1_id."','Administrator','Admin Profile')");	
+		$this->db->query("insert into vtiger_profile values ('".$profile2_id."','Sales Profile','Profile Related to Sales')");
+		$this->db->query("insert into vtiger_profile values ('".$profile3_id."','Support Profile','Profile Related to Support')");
+		$this->db->query("insert into vtiger_profile values ('".$profile4_id."','Guest Profile','Guest Profile for Test Users')");
 		
 		//Inserting into vtiger_profile2gloabal permissions
 		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile1_id."',1,0)");



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 05:15:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 12:15:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9277 -
	/vtigercrm/trunk/modules/Calendar/addEventUI.php
Message-ID: <20060905121555.97BC176CEBF@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 06:15:51 2006
New Revision: 9277

Log:
changes made to relate trouble tickets --Minnie

Modified:
    vtigercrm/trunk/modules/Calendar/addEventUI.php

Modified: vtigercrm/trunk/modules/Calendar/addEventUI.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/addEventUI.php (original)
+++ vtigercrm/trunk/modules/Calendar/addEventUI.php Tue Sep  5 06:15:51 2006
@@ -537,24 +537,25 @@
 				<div id="addEventRelatedtoUI" style="display:none;width:100%">
 					<table width="100%" cellpadding="5" cellspacing="0" border="0" bgcolor="#FFFFFF">
 						<tr>
-							<td><b><?php echo $mod_strings['LBL_RELATEDTO']?> :</b></td>
+							<td><b><?php echo $mod_strings['LBL_RELATEDTO']?></b></td>
 							<td>
 								<input name="parent_id" value="" type="hidden">
 								<select name="parent_type" class="small" id="parent_type" onChange="document.EditView.parent_name.value='';">
 									<option value="Leads"><?php echo $app_strings['Leads']?></option>
 									<option value="Accounts"><?php echo $app_strings['Accounts']?></option>
 									<option value="Potentials"><?php echo $app_strings['Potentials']?></option>
+									<option value="HelpDesk"><?php echo $app_strings['HelpDesk']?></option>
 								</select>
 							</td>
 							<td>
 								<div id="eventrelatedto" align="left">
 								<input type="text" readonly="readonly" class="calTxt small" value="" name="parent_name">&nbsp;
-								<input type="button" name="selectparent" class="crmButton small edit" value="Change..." onclick="return window.open('index.php?module='+document.EditView.parent_type.value+'&action=Popup','test','width=640,height=602,resizable=0,scrollbars=0,top=150,left=200');">
+							<input type="button" name="selectparent" class="crmButton small edit" value="<?php echo $mod_strings['LBL_SELECT']; ?>" onclick="return window.open('index.php?module='+document.EditView.parent_type.value+'&action=Popup','test','width=640,height=602,resizable=0,scrollbars=0,top=150,left=200');">
 								</div>
 							</td>
 						</tr>
 						<tr>
-						<td><b><?php echo $app_strings['Contacts'] ?>:</b></td>
+						<td><b><?php echo $app_strings['Contacts'] ?></b></td>
 							<td colspan="2">
 								<input name="contactidlist" id="contactidlist" value="" type="hidden">
 								<textarea rows="5" name="contactlist" readonly="readonly" class="calTxt"></textarea>&nbsp;
@@ -726,7 +727,7 @@
 		<div id="addTaskRelatedtoUI" style="display:none;width:100%">
 			<table width="100%" cellpadding="5" cellspacing="0" border="0">
 			<tr>
-				<td><b><?php echo $mod_strings['LBL_RELATEDTO']?> :</b></td>
+				<td><b><?php echo $mod_strings['LBL_RELATEDTO']?></b></td>
 				<td>
 					<input name="task_parent_id" type="hidden" value="">
 						<select name="task_parent_type" class="small" id="task_parent_type" onChange="document.createTodo.task_parent_name.value='';document.createTodo.task_parent_id.value=''">
@@ -737,7 +738,8 @@
 						<option value="PurchaseOrder"><?php echo $app_strings['PurchaseOrder']?></option>
 						<option value="SalesOrder"><?php echo $app_strings['SalesOrder']?></option>
 						<option value="Invoice"><?php echo $app_strings['Invoice']?></option>
-						<option value="Campaigns"><?php echo $app_strings['Campaigns']?></option></select>
+						<option value="Campaigns"><?php echo $app_strings['Campaigns']?></option>
+						<option value="HelpDesk"><?php echo $app_strings['HelpDesk']?></option></select>
 						</select>
 				</td>
 				<td>
@@ -748,7 +750,7 @@
 				</td>
 			</tr>
 			<tr>
-			<td><b><?php echo $mod_strings['LBL_CONTACT'] ?> :</b></td>
+			<td><b><?php echo $mod_strings['LBL_CONTACT_NAME'] ?></b></td>
 			<td colspan="2">
 				<input name="task_contact_name" id="contact_name" readonly type="text" class="calTxt" value=""><input name="task_contact_id" id="contact_id" type="hidden" value="">&nbsp;
 				<input type="button" onclick="return window.open('index.php?module=Contacts&action=Popup&html=Popup_picker&popuptype=specific&form=EditView','test','width=640,height=602,resizable=0,scrollbars=0');" class="crmButton small edit" name="selectcnt" value="<?php echo $mod_strings['LBL_SELECT_CONTACT'] ; ?>">



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 05:20:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 12:20:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9278 -
	/vtigercrm/trunk/modules/Calendar/Save.php
Message-ID: <20060905122045.E1BAB76CEC5@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 06:20:40 2006
New Revision: 9278

Log:
changes made to relate trouble tickets --Minnie

Modified:
    vtigercrm/trunk/modules/Calendar/Save.php

Modified: vtigercrm/trunk/modules/Calendar/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/Save.php (original)
+++ vtigercrm/trunk/modules/Calendar/Save.php Tue Sep  5 06:20:40 2006
@@ -100,10 +100,8 @@
 else $return_action = "DetailView";
 if(isset($_REQUEST['return_id']) && $_REQUEST['return_id'] != "") $return_id = $_REQUEST['return_id'];
 
-if($_REQUEST['mode'] != 'edit' && (($_REQUEST['return_module'] == 'HelpDesk') || ($_REQUEST['return_module']== 'Products')  ))
-{
-	if($_REQUEST['ticket_id'] != '')
-		$crmid = $_REQUEST['ticket_id'];
+if($_REQUEST['mode'] != 'edit' && $_REQUEST['return_module'] == 'Products')
+{
 	if($_REQUEST['product_id'] != '')
 		$crmid = $_REQUEST['product_id'];
 	if($crmid != $_REQUEST['parent_id'])



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 05:24:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 12:24:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9279 -
	/vtigercrm/trunk/include/language/en_us.lang.php
Message-ID: <20060905122457.9999F76CEBF@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 06:24:53 2006
New Revision: 9279

Log:
label added --Minnie

Modified:
    vtigercrm/trunk/include/language/en_us.lang.php

Modified: vtigercrm/trunk/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/include/language/en_us.lang.php (original)
+++ vtigercrm/trunk/include/language/en_us.lang.php Tue Sep  5 06:24:53 2006
@@ -877,6 +877,8 @@
  // Added Invoice in activity parent type selection / Related list
 'COMBO_INVOICES'=>'Invoice',
 'LBL_INVOICE_NAME'=>'Invoice',
+'LBL_HELPDESK_NAME'=>'Trouble Ticket',
+'LBL_CAMPAIGN_NAME'=>'Campaign Name',
 
 'LBL_NEW_INVOICE_BUTTON_TITLE'=>'New Invoice [Alt+I]',
 'LBL_NEW_INVOICE_BUTTON_KEY'=>'I',



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 05:41:48 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 12:41:48 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9280 -
	/vtigercrm/trunk/include/utils/ListViewUtils.php
Message-ID: <20060905124148.03E3276CE92@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 06:41:44 2006
New Revision: 9280

Log:
code added to include HelpDesk as one of the parent modules for Activities  --Minnie

Modified:
    vtigercrm/trunk/include/utils/ListViewUtils.php

Modified: vtigercrm/trunk/include/utils/ListViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/ListViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/ListViewUtils.php Tue Sep  5 06:41:44 2006
@@ -2520,6 +2520,17 @@
                 $parent_result = $adb->query($parent_query);
                 $parent_name = $adb->query_result($parent_result,0,"lastname")." ".$adb->query_result($parent_result,0,"firstname");
         }
+	if($parent_module == 'HelpDesk')
+	{
+		$parent_query = "SELECT title FROM vtiger_troubletickets WHERE ticketid=".$parent_id;
+		$parent_result = $adb->query($parent_query);
+		$parent_name = $adb->query_result($parent_result,0,"title");
+		if(strlen($parent_name) > 25)
+		{
+			$parent_name = substr($parent_name,0,25).'...';
+		}
+	}
+
 	//added by rdhital for better emails - Raju
 	if ($parent_module == 'Multiple')
 	{



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 05:45:47 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 12:45:47 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9281 -
	/vtigercrm/trunk/include/utils/SearchUtils.php
Message-ID: <20060905124547.862F476CE29@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 06:45:43 2006
New Revision: 9281

Log:
changes made to fix popup search related issue  --Minnie

Modified:
    vtigercrm/trunk/include/utils/SearchUtils.php

Modified: vtigercrm/trunk/include/utils/SearchUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/SearchUtils.php (original)
+++ vtigercrm/trunk/include/utils/SearchUtils.php Tue Sep  5 06:45:43 2006
@@ -118,7 +118,10 @@
                 }
 		else
                 {
-                        $fieldname = $focus->list_fields_name[$name];
+			if( $focus->list_fields_name[$name] == '')
+				$fieldname = 'crmid';
+			else
+				$fieldname = $focus->list_fields_name[$name];
                 }
 
                 if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] ==0 || in_array($fieldname,$field))



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 05:55:07 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 12:55:07 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9282 -
	/vtigercrm/trunk/include/utils/DetailViewUtils.php
Message-ID: <20060905125507.E827176CEBF@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 06:55:02 2006
New Revision: 9282

Log:
changes made to display Campaign and Trouble tickets in activities detailview --Minnie

Modified:
    vtigercrm/trunk/include/utils/DetailViewUtils.php

Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/DetailViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/DetailViewUtils.php Tue Sep  5 06:55:02 2006
@@ -639,6 +639,26 @@
 
 				$label_fld[] = '<a href="index.php?module='.$parent_module.'&action=DetailView&record='.$value.'">'.$invoicename.'</a>';
                         }
+			elseif($parent_module == "Campaigns")
+			{
+				$label_fld[] = $app_strings['LBL_CAMPAIGN_NAME'];
+				$sql = "select * from  vtiger_campaign where campaignid=".$value;
+				$result = $adb->query($sql);
+				$campaignname = $adb->query_result($result,0,"campaignname");
+				$label_fld[] = '<a href="index.php?module='.$parent_module.'&action=DetailView&record='.$value.'">'.$campaignname.'</a>';
+			}
+			elseif($parent_module == "HelpDesk")
+			{
+				$label_fld[] = $app_strings['LBL_HELPDESK_NAME'];
+				$sql = "select * from  vtiger_troubletickets where ticketid=".$value;
+				$result = $adb->query($sql);
+				$tickettitle = $adb->query_result($result,0,"title");
+				if(strlen($tickettitle) > 25)
+				{
+					$tickettitle = substr($tickettitle,0,25).'...';
+				}
+				$label_fld[] = '<a href="index.php?module='.$parent_module.'&action=DetailView&record='.$value.'">'.$tickettitle.'</a>';
+			}
 
 		}
 		else



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 06:07:21 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 13:07:21 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9283 -
	/vtigercrm/trunk/include/utils/EditViewUtils.php
Message-ID: <20060905130721.A403A76CEDA@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 07:07:17 2006
New Revision: 9283

Log:
changes made to display Trouble tickets in activities edit/creteview --Minnie

Modified:
    vtigercrm/trunk/include/utils/EditViewUtils.php

Modified: vtigercrm/trunk/include/utils/EditViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/EditViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/EditViewUtils.php Tue Sep  5 07:07:17 2006
@@ -758,6 +758,23 @@
 					$parent_name = $adb->query_result($result,0,"campaignname");
 					$campaign_selected = "selected";
 				}
+				if($parent_module == "HelpDesk")
+				{
+					$sql = "select title from vtiger_troubletickets where ticketid=".$value;
+					$result = $adb->query($sql);
+					$parent_name = $adb->query_result($result,0,"title");
+					$ticket_selected = "selected";
+				}
+			}
+			elseif($act_mode == "Events")
+			{
+				if($parent_module == "HelpDesk")
+				{
+					$sql = "select title from vtiger_troubletickets where ticketid=".$value;
+					$result = $adb->query($sql);
+					$parent_name = $adb->query_result($result,0,"title");
+					$ticket_selected = "selected";
+				}
 			}
 
 		}
@@ -770,7 +787,8 @@
                                 $app_strings['COMBO_PORDER'],
                                 $app_strings['COMBO_SORDER'],
                                 $app_strings['COMBO_INVOICES'],
-				$app_strings['COMBO_CAMPAIGNS']
+				$app_strings['COMBO_CAMPAIGNS'],
+				$app_strings['COMBO_HELPDESK']
                                         );
 			$editview_label[] = array($lead_selected,
                                 $account_selected,
@@ -779,10 +797,25 @@
                                 $purchase_selected,
                                 $sales_selected,
                                 $invoice_selected,
-				$campaign_selected
+				$campaign_selected,
+				$ticket_selected
                                         );
-                        $editview_label[] = array("Leads&action=Popup","Accounts&action=Popup","Potentials&action=Popup","Quotes&action=Popup","PurchaseOrder&action=Popup","SalesOrder&action=Popup","Invoice&action=Popup","Campaigns&action=Popup");
+                        $editview_label[] = array("Leads&action=Popup","Accounts&action=Popup","Potentials&action=Popup","Quotes&action=Popup","PurchaseOrder&action=Popup","SalesOrder&action=Popup","Invoice&action=Popup","Campaigns&action=Popup","HelpDesk&action=Popup");
                 }
+		elseif($act_mode == "Events")
+		{
+			$editview_label[] = array($app_strings['COMBO_LEADS'],
+				$app_strings['COMBO_ACCOUNTS'],
+				$app_strings['COMBO_POTENTIALS'],
+				$app_strings['COMBO_HELPDESK']
+			);
+			$editview_label[] = array($lead_selected,
+				$account_selected,
+				$potential_selected,
+				$ticket_selected
+			);
+			$editview_label[] = array("Leads&action=Popup","Accounts&action=Popup","Potentials&action=Popup","HelpDesk&action=Popup");
+		}
                 else
                 {
                         $editview_label[] = array($app_strings['COMBO_LEADS'],



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 06:13:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 13:13:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9284 -
 /vtigercrm/trunk/modules/Settings/LeadCustomFieldMapping.php
Message-ID: <20060905131330.1A44576CED8@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 07:13:27 2006
New Revision: 9284

Log:
changes made to put validation for custom field mapping --Minnie

Modified:
    vtigercrm/trunk/modules/Settings/LeadCustomFieldMapping.php

Modified: vtigercrm/trunk/modules/Settings/LeadCustomFieldMapping.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/LeadCustomFieldMapping.php (original)
+++ vtigercrm/trunk/modules/Settings/LeadCustomFieldMapping.php Tue Sep  5 07:13:27 2006
@@ -31,7 +31,7 @@
 {
 	global $adb;
 	$accountcf=Array();
-	$sql="select fieldid,fieldlabel from vtiger_field,vtiger_tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Accounts'";
+	$sql="select fieldid,fieldlabel,uitype,typeofdata from vtiger_field,vtiger_tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Accounts'";
 	$result = $adb->query($sql);
 	$noofrows = $adb->num_rows($result);
 	
@@ -39,7 +39,8 @@
 	{
         	$account_field['fieldid']=$adb->query_result($result,$i,"fieldid");
 	        $account_field['fieldlabel']=$adb->query_result($result,$i,"fieldlabel");
-
+		$account_field['typeofdata']=$adb->query_result($result,$i,"typeofdata");
+		$account_field['fieldtype']=getCustomFieldTypeName($adb->query_result($result,$i,"uitype"));
 		if($account_field['fieldid']==$accountid)
 			$account_field['selected'] = "selected";
 		else
@@ -60,13 +61,15 @@
 {	
 	global $adb;	
 	$contactcf=Array();
-	$sql="select fieldid,fieldlabel from vtiger_field,vtiger_tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Contacts'";
+	$sql="select fieldid,fieldlabel,uitype,typeofdata from vtiger_field,vtiger_tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Contacts'";
 	$result = $adb->query($sql);
 	$noofrows = $adb->num_rows($result);
 	for($i=0; $i<$noofrows; $i++)
 	{
 		$contact_field['fieldid']=$adb->query_result($result,$i,"fieldid");
 		$contact_field['fieldlabel']=$adb->query_result($result,$i,"fieldlabel");
+		$contact_field['typeofdata']=$adb->query_result($result,$i,"typeofdata");
+		$contact_field['fieldtype']=getCustomFieldTypeName($adb->query_result($result,$i,"uitype"));
 	
                 if($contact_field['fieldid']==$contactid)
                         $contact_field['selected']="selected";
@@ -88,13 +91,15 @@
 {
 	global $adb;	
 	$potentialcf=Array();
-	$sql="select fieldid,fieldlabel from vtiger_field,vtiger_tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Potentials'";
+	$sql="select fieldid,fieldlabel,uitype,typeofdata from vtiger_field,vtiger_tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Potentials'";
 	$result = $adb->query($sql);
 	$noofrows = $adb->num_rows($result);
 	for($i=0; $i<$noofrows; $i++)
 	{
 		$potential_field['fieldid']=$adb->query_result($result,$i,"fieldid");
 		$potential_field['fieldlabel']=$adb->query_result($result,$i,"fieldlabel");
+		$potential_field['typeofdata']=$adb->query_result($result,$i,"typeofdata");
+		$potential_field['fieldtype']=getCustomFieldTypeName($adb->query_result($result,$i,"uitype"));
 
 		if($potential_field['fieldid']==$potentialid)
 			 $potential_field['selected']="selected";
@@ -115,7 +120,7 @@
 {
 	global $adb;
 
-	$convert_sql="select vtiger_convertleadmapping.*,uitype,fieldlabel from vtiger_convertleadmapping left join vtiger_field on vtiger_field.fieldid = vtiger_convertleadmapping.leadfid";
+	$convert_sql="select vtiger_convertleadmapping.*,uitype,fieldlabel,typeofdata from vtiger_convertleadmapping left join vtiger_field on vtiger_field.fieldid = vtiger_convertleadmapping.leadfid";
 	$convert_result = $adb->query($convert_sql);
 
 	$no_rows = $adb->num_rows($convert_result);
@@ -127,13 +132,13 @@
 		$potentialid=$adb->query_result($convert_result,$j,"potentialfid");
 		$lead_field['sno'] = $j+1;
 		$lead_field['leadid'] = $adb->query_result($convert_result,$j,"fieldlabel"); 
+		$lead_field['typeofdata']=$adb->query_result($convert_result,$j,"typeofdata");
 		$lead_field['fieldtype'] = getCustomFieldTypeName($adb->query_result($convert_result,$j,"uitype"));; 
 		$lead_field['account'] = getAccountCustomValues($leadid,$accountid);
 		$lead_field['contact'] = getContactCustomValues($leadid,$contactid);
 		$lead_field['potential'] = getPotentialCustomValues($leadid,$potentialid);
 		$leadcf[]= $lead_field;
 	}
-
 	return $leadcf;
 }
 



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 06:15:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 13:15:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9285 -
 /vtigercrm/trunk/Smarty/templates/CustomFieldMapping.tpl
Message-ID: <20060905131541.7EB0176CED8@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 07:15:37 2006
New Revision: 9285

Log:
changes made to put validation for custom field mapping --Minnie

Modified:
    vtigercrm/trunk/Smarty/templates/CustomFieldMapping.tpl

Modified: vtigercrm/trunk/Smarty/templates/CustomFieldMapping.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/CustomFieldMapping.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/CustomFieldMapping.tpl Tue Sep  5 07:15:37 2006
@@ -60,39 +60,57 @@
 					<td class="colHeader small" valign="top" width="23%">{$APP.Contacts}</td>
 					<td class="colHeader small" valign="top" width="24%">{$APP.Potentials}</td>
 				</tr>
-				{foreach key=leadcf item=cfarray from=$CUSTOMFIELDMAPPING}
+				{foreach key=leadcf item=cfarray name=cfarray from=$CUSTOMFIELDMAPPING}
 				<tr>
 					<td class="listTableRow small">{$cfarray.sno}</td>
 					<td class="listTableRow small">{$cfarray.leadid}</td>
 					<td class="listTableRow small">{$cfarray.fieldtype}</td>
 					{foreach item=acc_cf key=fldnameacc from=$cfarray.account}
 					<td class="listTableRow small">
-						<select name='{$fldnameacc}'>
+						<select name='{$fldnameacc}' id='{$fldnameacc}' onChange='return validateTypeforCFMapping("{$cfarray.fieldtype}","{$cfarray.typeofdata}","{$fldnameacc}",this);' >
 						<option value='None'>{$APP.LBL_NONE}</option>
 						{foreach item=element from=$acc_cf}
 							<option value="{$element.fieldid}" {$element.selected}>{$element.fieldlabel}</option>
 						{/foreach}
 						</select>
+						{if $smarty.foreach.cfarray.index eq 0}
+							{foreach item=element from=$acc_cf}
+								<input type='hidden' name='{$element.fieldid}_type' id='{$element.fieldid}_type' value='{$element.fieldtype}'>
+								<input type='hidden' name='{$element.fieldid}_typeofdata' id='{$element.fieldid}_typeofdata' value='{$element.typeofdata}'>
+							{/foreach}
+						{/if}
 					</td>
 					{/foreach}
 					{foreach item=con_cf key=fldnamecon from=$cfarray.contact}
                     <td class="listTableRow small">
-                        <select name='{$fldnamecon}'>
+                        <select name='{$fldnamecon}' id='{$fldnamecon}' onChange='return validateTypeforCFMapping("{$cfarray.fieldtype}","{$cfarray.typeofdata}","{$fldnamecon}",this);'>
 						<option value='None'>{$APP.LBL_NONE}</option>
 						{foreach item=element from=$con_cf}
 							<option value="{$element.fieldid}" {$element.selected}>{$element.fieldlabel}</option>
 						{/foreach}
                         </select>
+					{if $smarty.foreach.cfarray.index eq 0}
+						{foreach item=element from=$con_cf}
+                                                	<input type='hidden' name='{$element.fieldid}_type' id='{$element.fieldid}_type' value='{$element.fieldtype}' >
+                                                	<input type='hidden' name='{$element.fieldid}_typeofdata' id='{$element.fieldid}_typeofdata' value='{$element.typeofdata}'>
+						{/foreach}
+                                        {/if}
 					</td>
 				  	{/foreach}
 					{foreach item=pot_cf key=fldnamepot from=$cfarray.potential}
 					<td class="listTableRow small">
-						<select name='{$fldnamepot}'>
+						<select name='{$fldnamepot}' id='{$fldnamepot}' onChange='return validateTypeforCFMapping("{$cfarray.fieldtype}","{$cfarray.typeofdata}","{$fldnamepot}",this);'>
 						<option value='None'>{$APP.LBL_NONE}</option>
 						{foreach item=element from=$pot_cf}
 							<option value="{$element.fieldid}" {$element.selected}>{$element.fieldlabel}</option>
 						{/foreach}
                         </select>
+					{if $smarty.foreach.cfarray.index eq 0}
+						{foreach item=element from=$pot_cf}
+	                                        	<input type='hidden' name='{$element.fieldid}_type' id='{$element.fieldid}_type' value='{$element.fieldtype}'>
+        	                                        <input type='hidden' name='{$element.fieldid}_typeofdata' id='{$element.fieldid}_typeofdata' value='{$element.typeofdata}'>
+						{/foreach}
+                                        {/if}
 					</td>
 				    {/foreach}
 				</tr>



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 07:39:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 14:39:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9286 -
 /vtigercrm/trunk/modules/Settings/language/en_us.lang.php
Message-ID: <20060905143941.6BD3676CEAA@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 08:39:37 2006
New Revision: 9286

Log:
label added --Minnie

Modified:
    vtigercrm/trunk/modules/Settings/language/en_us.lang.php

Modified: vtigercrm/trunk/modules/Settings/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Settings/language/en_us.lang.php Tue Sep  5 08:39:37 2006
@@ -714,6 +714,11 @@
 'LBL_ENABLE_SINGLEPANE_VIEW'=>'Enable Singlepane View',
 
 'LBL_CLEAR_DATA'=>'Clear Data',
+'LBL_LENGTHALERT'=>'Sorry, you can cannot map fields with different character size. Kindly map the data with same or more character size.',
+'LBL_DECIMALALERT'=>'Sorry, you can cannot map fields with different decimal places. Kindly map the data with same or more decimal places.',
+'LBL_TYPEALERT_1'=>'Sorry, you cannot map the',
+'LBL_WITH'=>'with',
+'LBL_TYPEALERT_2'=>'data type. Kindly map the same data types.',
 );
 
 



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 07:41:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 14:41:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9287 -
	/vtigercrm/trunk/include/js/customview.js
Message-ID: <20060905144151.1C50F76CED0@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 08:41:47 2006
New Revision: 9287

Log:
mapping validation script added --Minnie

Modified:
    vtigercrm/trunk/include/js/customview.js

Modified: vtigercrm/trunk/include/js/customview.js
==============================================================================
--- vtigercrm/trunk/include/js/customview.js (original)
+++ vtigercrm/trunk/include/js/customview.js Tue Sep  5 08:41:47 2006
@@ -321,3 +321,72 @@
                 document.location.href=url;
 }
 
+function validateTypeforCFMapping(leadtype,leadtypeofdata,field_name,cf_form)
+{
+	var combo_val = cf_form.options[cf_form.selectedIndex].value;
+	if(combo_val != 'None')
+	{
+		var type = document.getElementById(combo_val+"_type").value;
+		var typeofdata = document.getElementById(combo_val+"_typeofdata").value;
+		if(leadtype == type)
+		{
+			if(leadtypeofdata == typeofdata)
+			{
+				return true;
+			}
+			else
+			{
+				var lead_tod = leadtypeofdata.split("~");
+				var tod = typeofdata.split("~");
+				switch (lead_tod[0]) {
+                	                case "V"  :
+						if(lead_tod[3] <= tod[3])
+							return true;
+						else
+						{
+							alert(alertmessage[3]);
+							document.getElementById(field_name).value = 'None';
+							return false;
+						}
+						break;
+					case "N"  :
+						if(lead_tod[2].indexOf(",")>0)
+						{
+							var lead_dec = lead_tod[2].split(",");
+							var dec = tod[2].split(",");
+						
+						}
+						else
+						{
+							var lead_dec = lead_tod[2].split("~");
+                	                                var dec = tod[2].split("~");
+						}
+						if(lead_dec[0] <= dec[0])
+						{
+							if(lead_dec[1] <= dec[1])
+								return true;
+							else
+							{
+								alert(alertmessage[4]);
+								document.getElementById(field_name).value = 'None';
+								return false;
+							}
+						}
+						else
+						{
+							alert(alertmessage[3]);
+							document.getElementById(field_name).value = 'None';
+							return false;
+						}
+						break;
+				}	
+			}
+		}
+		else
+		{
+			alert(alertmessage[0]+" "+leadtype+" "+alertmessage[1]+" "+type+" "+alertmessage[2]);
+			document.getElementById(field_name).value = 'None';
+			return false;
+		}
+	}
+}



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 07:43:22 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 14:43:22 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9288 -
 /vtigercrm/trunk/Smarty/templates/CustomFieldMapping.tpl
Message-ID: <20060905144322.40A9076CED0@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 08:43:18 2006
New Revision: 9288

Log:
alertmessage array added --Minnie

Modified:
    vtigercrm/trunk/Smarty/templates/CustomFieldMapping.tpl

Modified: vtigercrm/trunk/Smarty/templates/CustomFieldMapping.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/CustomFieldMapping.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/CustomFieldMapping.tpl Tue Sep  5 08:43:18 2006
@@ -143,3 +143,6 @@
         </tr>
 </tbody>
 </table>
+<script>
+	var alertmessage = new Array("{$MOD.LBL_TYPEALERT_1}","{$MOD.LBL_WITH}","{$MOD.LBL_TYPEALERT_2}","{$MOD.LBL_LENGTHALERT}","{$MOD.LBL_DECIMALALERT}");
+</script>



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 08:46:29 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 15:46:29 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9289 - in /vtigercrm/trunk:
 include/fpdf/pdf.php include/fpdf/templates/body.php
 modules/Invoice/CreatePDF.php
Message-ID: <20060905154630.11B1A76CEED@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 09:46:21 2006
New Revision: 9289

Log:
* Modified to display the Product and Tax details for Invoice

Modified:
    vtigercrm/trunk/include/fpdf/pdf.php
    vtigercrm/trunk/include/fpdf/templates/body.php
    vtigercrm/trunk/modules/Invoice/CreatePDF.php

Modified: vtigercrm/trunk/include/fpdf/pdf.php
==============================================================================
--- vtigercrm/trunk/include/fpdf/pdf.php (original)
+++ vtigercrm/trunk/include/fpdf/pdf.php Tue Sep  5 09:46:21 2006
@@ -305,14 +305,16 @@
 			break;
 	  		case 'Qty':
 	  		case 'Price':
-	  		case 'Tax':
 				if($taxtype == "individual")
 					$this->Line( $colX, $y1, $colX, (($y1+$y2)-37));
 				else
 					$this->Line( $colX, $y1, $colX, (($y1+$y2)-43));
 			break;
 	  		default:
-				$this->Line( $colX, $y1, $colX, ($y1+$y2));
+				if($taxtype == "individual" && $lib == 'Discount')
+					$this->Line( $colX, $y1, $colX, (($y1+$y2)-37));
+				else
+					$this->Line( $colX, $y1, $colX, ($y1+$y2));
 	  		break;
 		}
 	}

Modified: vtigercrm/trunk/include/fpdf/templates/body.php
==============================================================================
--- vtigercrm/trunk/include/fpdf/templates/body.php (original)
+++ vtigercrm/trunk/include/fpdf/templates/body.php Tue Sep  5 09:46:21 2006
@@ -24,13 +24,15 @@
 	$colsAlign["Description"] = "L";
 	$colsAlign["Qty"] = "R";
 	$colsAlign["Price"] = "R";
+	$colsAlign["Discount"] = "R";
 	$colsAlign["Tax"] = "R";
 	$colsAlign["Total"] = "R";
 
 	$cols["Product Name"] = "25";
-	$cols["Description"] = "80";
-	$cols["Qty"] = "15";
+	$cols["Description"] = "70";
+	$cols["Qty"] = "10";
 	$cols["Price"] = "25";
+	$cols["Discount"] = "15";
 	$cols["Tax"] = "20";
 	$cols["Total"] = "25";
 } else {
@@ -38,12 +40,14 @@
 	$colsAlign["Description"] = "L";
 	$colsAlign["Qty"] = "R";
 	$colsAlign["Price"] = "R";
+	$colsAlign["Discount"] = "R";
 	$colsAlign["Total"] = "R";
 
 	$cols["Product Name"] = "25";
-	$cols["Description"] = "80";
-	$cols["Qty"] = "20";
+	$cols["Description"] = "70";
+	$cols["Qty"] = "15";
 	$cols["Price"] = "30";
+	$cols["Discount"] = "20";
 	$cols["Total"] = "30";
 }
 
@@ -76,77 +80,77 @@
 
 
 if($focus->column_fields["hdnTaxType"] != "individual") {
-	$lineData=array("115",$bottom+37,"84");
+	$lineData=array("105",$bottom+37,"94");
 	$pdf->drawLine($lineData);
-	$data= $app_strings['LBL_NET_TOTAL'].":                                                ".$price_subtotal."";
-	$pdf->SetXY( 119 , 168 );
+	$data= $app_strings['LBL_NET_TOTAL'].":                                                                   ".$price_subtotal."";
+	$pdf->SetXY( 105 , 168 );
 	$pdf->SetFont( "Helvetica", "", 10);
-	$pdf->MultiCell(119, 4, $data);
+	$pdf->MultiCell(110, 4, $data);
 
-	$lineData=array("115",$bottom+43,"84");
+	$lineData=array("105",$bottom+43,"94");
 	$pdf->drawLine($lineData);
-	$data= $app_strings['LBL_DISCOUNT'].":                                                ".$price_discount."";
-	$pdf->SetXY( 119 , 174 );
+	$data= $app_strings['LBL_DISCOUNT'].":                                                                      ".$price_discount."";
+	$pdf->SetXY( 105 , 174 );
 	$pdf->SetFont( "Helvetica", "", 10);
-	$pdf->MultiCell(119, 4, $data);
+	$pdf->MultiCell(110, 4, $data);
 
-	$lineData=array("115",$bottom+49,"84");
+	$lineData=array("105",$bottom+49,"94");
 	$pdf->drawLine($lineData);
-	$data= $app_strings['LBL_TAX'].":                                                         ".$price_salestax."";
-	$pdf->SetXY( 119 , 180 );
+	$data= $app_strings['LBL_TAX'].":  ($group_total_tax_percent %)                                                               ".$price_salestax."";
+	$pdf->SetXY( 105 , 180 );
 	$pdf->SetFont( "Helvetica", "", 10);
-	$pdf->MultiCell(119, 4, $data);
+	$pdf->MultiCell(110, 4, $data);
 
-	$lineData=array("115",$bottom+55,"84");
+	$lineData=array("105",$bottom+55,"94");
 	$pdf->drawLine($lineData);
-	$data = $app_strings['LBL_SHIPPING_AND_HANDLING_CHARGES'].":               ".$price_shipping;
-	$pdf->SetXY( 119 , 186 );
+	$data = $app_strings['LBL_SHIPPING_AND_HANDLING_CHARGES'].":                                     ".$price_shipping;
+	$pdf->SetXY( 105 , 186 );
 	$pdf->SetFont( "Helvetica", "", 10);
-	$pdf->MultiCell(119, 4, $data);
+	$pdf->MultiCell(110, 4, $data);
 
 } else {
-	$lineData=array("115",$bottom+43,"84");
+	$lineData=array("105",$bottom+43,"94");
 	$pdf->drawLine($lineData);
-	$data= $app_strings['LBL_NET_TOTAL'].":                                                ".$price_subtotal."";
-	$pdf->SetXY( 119 , 174 );
+	$data= $app_strings['LBL_NET_TOTAL'].":                                                                   ".$price_subtotal."";
+	$pdf->SetXY( 105 , 174 );
 	$pdf->SetFont( "Helvetica", "", 10);
-	$pdf->MultiCell(119, 4, $data);
+	$pdf->MultiCell(110, 4, $data);
 
-	$lineData=array("115",$bottom+49,"84");
+	$lineData=array("105",$bottom+49,"94");
 	$pdf->drawLine($lineData);
-	$data= $app_strings['LBL_DISCOUNT'].":                                                ".$price_discount."";
-	$pdf->SetXY( 119 , 180 );
+	$data= $app_strings['LBL_DISCOUNT'].":                                                                      ".$price_discount."";
+	$pdf->SetXY( 105 , 180 );
 	$pdf->SetFont( "Helvetica", "", 10);
-	$pdf->MultiCell(119, 4, $data);
+	$pdf->MultiCell(110, 4, $data);
 
-	$lineData=array("115",$bottom+55,"84");
+	$lineData=array("105",$bottom+55,"94");
 	$pdf->drawLine($lineData);
-	$data = $app_strings['LBL_SHIPPING_AND_HANDLING_CHARGES'].":               ".$price_shipping;
-	$pdf->SetXY( 119 , 186 );
+	$data = $app_strings['LBL_SHIPPING_AND_HANDLING_CHARGES'].":                                   ".$price_shipping;
+	$pdf->SetXY( 105 , 186 );
 	$pdf->SetFont( "Helvetica", "", 10);
-	$pdf->MultiCell(119, 4, $data);
+	$pdf->MultiCell(110, 4, $data);
 }
 
-$lineData=array("115",$bottom+61,"84");
+$lineData=array("105",$bottom+61,"94");
 $pdf->drawLine($lineData);
-$data = $app_strings['LBL_TAX_FOR_SHIPPING_AND_HANDLING'].":         ".$price_shipping_tax;
-$pdf->SetXY( 119 , 192 );
+$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(119, 4, $data);
+$pdf->MultiCell(110, 4, $data);
 
-$lineData=array("115",$bottom+67,"84");
+$lineData=array("105",$bottom+67,"94");
 $pdf->drawLine($lineData);
-$data = $app_strings['LBL_ADJUSTMENT'].":                                            ".$price_adjustment;
-$pdf->SetXY( 119 , 198 );
+$data = $app_strings['LBL_ADJUSTMENT'].":                                                                    ".$price_adjustment;
+$pdf->SetXY( 105 , 198 );
 $pdf->SetFont( "Helvetica", "", 10);
-$pdf->MultiCell(119, 4, $data);
+$pdf->MultiCell(110, 4, $data);
 
-$lineData=array("115",$bottom+73,"84");
+$lineData=array("105",$bottom+73,"94");
 $pdf->drawLine($lineData);
-$data = $app_strings['LBL_GRAND_TOTAL'].":                                           ".$price_total;
-$pdf->SetXY( 119 , 204 );
+$data = $app_strings['LBL_GRAND_TOTAL'].":(in $currency_symbol)                                                  ".$price_total;
+$pdf->SetXY( 105 , 204 );
 $pdf->SetFont( "Helvetica", "", 10);
-$pdf->MultiCell(119, 4, $data);
+$pdf->MultiCell(110, 4, $data);
 
 /* ************** End Totals *********************** */
 

Modified: vtigercrm/trunk/modules/Invoice/CreatePDF.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/CreatePDF.php (original)
+++ vtigercrm/trunk/modules/Invoice/CreatePDF.php Tue Sep  5 09:46:21 2006
@@ -78,90 +78,113 @@
 		$logo_name = $adb->query_result($result,0,"logoname");
 }
 
-//getting the Total Array
-$price_subtotal = $currency_symbol.number_format($focus->column_fields["hdnSubTotal"],2,'.',',');
-$price_salestax = $focus->column_fields["txtTax"]."%";
-if($price_salestax != "")
-	$price_salestax = $currency_symbol."0.00";
-
+
+
+
+
+//NOTE : Removed currency symbols and added with Grand Total text. it is enough to show the currency symbol in one place
+
+//we can also get the NetTotal, Final Discount Amount/Percent, Adjustment and GrandTotal from the array $associated_products[1]['final_details']
+
+//getting the Net Total
+$price_subtotal = number_format($focus->column_fields["hdnSubTotal"],2,'.',',');
+
+//Final discount amount/percentage
 $discount_amount = $focus->column_fields["hdnDiscountAmount"];
 $discount_percent = $focus->column_fields["hdnDiscountPercent"];
 
-$price_shipping = $currency_symbol.number_format($focus->column_fields["hdnS_H_Amount"],2,'.',',');
-if($price_shipping > 0 || price_shipping == "")
-	$price_shipping = $currency_symbol."0.00";
-
-$q = "SELECT * FROM vtiger_inventoryshippingrel WHERE id='".$focus->column_fields["record_id"]."'";
-$shrs = $adb->query($q);
-$shtax1 = $adb->query_result($shrs,'0','shtax1'); 
-$shtax2 = $adb->query_result($shrs,'0','shtax2'); 
-$shtax3 = $adb->query_result($shrs,'0','shtax3'); 
-if($shtax1 != "")
-	$price_shipping_tax = number_format($shtax1,2,'.',',')."%";
-if($shtax2 != "")
-	$price_shipping_tax = number_format($shtax2,2,'.',',')."%";
-if($shtax3 != "")
-	$price_shipping_tax = number_format($shtax3,2,'.',',')."%";
-
-
 if($discount_amount != "")
-	$price_discount = $currency_symbol.number_format($discount_amount,2,'.',',');
+	$price_discount = number_format($discount_amount,2,'.',',');
 else if($discount_percent != "")
 	$price_discount = $discount_percent."%";
 else
-	$price_discount = $currency_symbol."0.00";
-
-
-$price_adjustment = $currency_symbol.number_format($focus->column_fields["txtAdjustment"],2,'.',',');
-$price_total = $currency_symbol.number_format($focus->column_fields["hdnGrandTotal"],2,'.',',');
-
-//getting the Product Data
-$query="select vtiger_products.productname, vtiger_products.productid, vtiger_products.unit_price, vtiger_products.product_description, vtiger_inventoryproductrel.* from vtiger_inventoryproductrel inner join vtiger_products on vtiger_products.productid=vtiger_inventoryproductrel.productid where id=".$id;
-
-global $result;
-$result = $adb->query($query);
-$num_products=$adb->num_rows($result);
-for($i=0;$i<$num_products;$i++) {
-	$product_name[$i]=$adb->query_result($result,$i,'productname');
-	$prod_description[$i]=$adb->query_result($result,$i,'product_description');
-	$product_id[$i]=$adb->query_result($result,$i,'productid');
-	$qty[$i]=$adb->query_result($result,$i,'quantity');
-
-	$unit_price[$i]= $currency_symbol.number_format($adb->query_result($result,$i,'unit_price'),2,'.',',');
-	$list_price[$i]= $currency_symbol.number_format(StripLastZero($adb->query_result($result,$i,'listprice')),2,'.',',');
-	$list_pricet[$i]= $adb->query_result($result,$i,'listprice');
-	$prod_total[$i]= $qty[$i]*$list_pricet[$i];
-
+	$price_discount = "0.00";
+
+//Adjustment
+$price_adjustment = number_format($focus->column_fields["txtAdjustment"],2,'.',',');
+//Grand Total
+$price_total = number_format($focus->column_fields["hdnGrandTotal"],2,'.',',');
+
+
+//get the Associated Products for this Invoice
+$focus->id = $focus->column_fields["record_id"];
+$associated_products = getAssociatedProducts("Invoice",$focus);
+$num_products = count($associated_products);
+
+//This $final_details array will contain the final total, discount, Group Tax, S&H charge, S&H taxes and adjustment
+$final_details = $associated_products[1]['final_details'];
+
+//To calculate the group tax amount
+if($final_details['taxtype'] == 'group')
+{
+	$group_tax_total = $final_details['tax_totalamount'];
+	$price_salestax = number_format($group_tax_total,2,'.',',');
+
+	$group_total_tax_percent = '0.00';
+	$group_tax_details = $final_details['taxes'];
+	for($i=0;$i<count($group_tax_details);$i++)
+	{
+		$group_total_tax_percent = $group_total_tax_percent+$group_tax_details[$i]['percentage'];
+	}
+}
+
+//S&H amount
+$sh_amount = $final_details['shipping_handling_charge'];
+$price_shipping = number_format($sh_amount,2,'.',',');
+
+//S&H taxes
+$sh_tax_details = $final_details['sh_taxes'];
+$sh_tax_percent = '0.00';
+for($i=0;$i<count($sh_tax_details);$i++)
+{
+	$sh_tax_percent = $sh_tax_percent + $sh_tax_details[$i]['percentage'];
+}
+$sh_tax_amount = $final_details['shtax_totalamount'];
+$price_shipping_tax = number_format($sh_tax_amount,2,'.',',');
+
+
+//This is to get all prodcut details as row basis
+for($i=1,$j=$i-1;$i<=$num_products;$i++,$j++)
+{
+	$product_name[$i] = $associated_products[$i]['productName'.$i];
+	$prod_description[$i] = $associated_products[$i]['productDescription'.$i];
+	$product_id[$i] = $associated_products[$i]['hdnProductId'.$i];
+	$qty[$i] = $associated_products[$i]['qty'.$i];
+	$unit_price[$i] = number_format($associated_products[$i]['unitPrice'.$i],2,'.',',');
+	$list_price[$i] = number_format($associated_products[$i]['listPrice'.$i],2,'.',',');
+	$list_pricet[$i] = $associated_products[$i]['listPrice'.$i];
+	$discount_total[$i] = $associated_products[$i]['discountTotal'.$i];
+	
+	$taxable_total = $qty[$i]*$list_pricet[$i]-$discount_total[$i];
+
+	$producttotal = $taxable_total;
 	$total_taxes = '0.00';
-	if($focus->column_fields["hdnTaxType"] == "individual") {
-		$q = "SELECT * FROM vtiger_inventoryproductrel WHERE id='".$focus->column_fields["record_id"]."' AND productid='".$product_id[$i]."'";
-		$trs = $adb->query($q);
-		$tax1 = $adb->query_result($trs,'0','tax1'); 
-		$tax2 = $adb->query_result($trs,'0','tax2'); 
-		$tax3 = $adb->query_result($trs,'0','tax3'); 
-		$taxable_total = ($adb->query_result($trs,'0','listprice') * $adb->query_result($trs,'0','quantity')); 
-
-		if($tax1 != "" && $tax1 > 0) {
-			$total_taxes = (($taxable_total*$tax1)/100);
-			$prod_total[$i] = ($prod_total[$i]+$total_taxes);
+	if($focus->column_fields["hdnTaxType"] == "individual")
+	{
+		$total_tax_percent = '0.00';
+		//This loop is to get all tax percentage and then calculate the total of all taxes
+		for($tax_count=0;$tax_count<count($associated_products[$i]['taxes']);$tax_count++)
+		{
+			$tax_percent = $associated_products[$i]['taxes'][$tax_count]['percentage'];
+			$total_tax_percent = $total_tax_percent+$tax_percent;
+			$tax_amount = (($taxable_total*$tax_percent)/100);
+			$total_taxes = $total_taxes+$tax_amount;
 		}
-		if($tax2 != "" && $tax2 > 0) {
-			$total_taxes = (($taxable_total*$tax2)/100);
-			$prod_total[$i] = ($prod_total[$i]+$total_taxes);
-		}
-		if($tax3 != "" && $tax3 > 0) {
-			$total_taxes = (($taxable_total*$tax3)/100);
-			$prod_total[$i] = ($prod_total[$i]+$total_taxes);
-		}
-		$product_line[$i]["Tax"] = $total_taxes."%";
-	}
-	$product_line[$i]["Product Name"] = $product_name[$i];
-	$product_line[$i]["Description"] = $prod_description[$i];
-	$product_line[$i]["Qty"] = $qty[$i];
-	$product_line[$i]["Price"] = $list_price[$i];
-	$product_line[$i]["Total"] = $currency_symbol.number_format($prod_total[$i],"2",".",",");
-}
-
+		$producttotal = $taxable_total+$total_taxes;
+		$product_line[$j]["Tax"] = number_format($total_taxes,2,'.',',')."\n ($total_tax_percent %) ";
+	}
+	$prod_total[$i] = number_format($producttotal,2,'.',',');
+
+	$product_line[$j]["Product Name"] = $product_name[$i];
+	$product_line[$j]["Description"] = $prod_description[$i];
+	$product_line[$j]["Qty"] = $qty[$i];
+	$product_line[$j]["Price"] = $list_price[$i];
+	$product_line[$j]["Discount"] = $discount_total[$i];
+	$product_line[$j]["Total"] = $prod_total[$i];
+}
+
+//echo '<pre>Product Details ==>';print_r($product_line);echo '</pre>';
+//echo '<pre>';print_r($associated_products);echo '</pre>';
 
 // ************************ END POPULATE DATA ***************************8
 



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 08:49:34 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 15:49:34 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9290 -
	/vtigercrm/trunk/include/utils/EditViewUtils.php
Message-ID: <20060905154935.1621176CEEE@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 09:49:30 2006
New Revision: 9290

Log:
* Added product_description and unitprice in the getAssociatedProducts function as these fields are needed for Export to PDF functionality

Modified:
    vtigercrm/trunk/include/utils/EditViewUtils.php

Modified: vtigercrm/trunk/include/utils/EditViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/EditViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/EditViewUtils.php Tue Sep  5 09:49:30 2006
@@ -1384,27 +1384,27 @@
 	
 	if($module == 'Quotes')
 	{
-		$query="select vtiger_products.productname, vtiger_products.unit_price, vtiger_products.qtyinstock, vtiger_inventoryproductrel.* from vtiger_inventoryproductrel inner join vtiger_products on vtiger_products.productid=vtiger_inventoryproductrel.productid where id=".$focus->id." ORDER BY sequence_no";
+		$query="select vtiger_products.productname, vtiger_products.product_description, vtiger_products.unit_price, vtiger_products.qtyinstock, vtiger_inventoryproductrel.* from vtiger_inventoryproductrel inner join vtiger_products on vtiger_products.productid=vtiger_inventoryproductrel.productid where id=".$focus->id." ORDER BY sequence_no";
 	}
 	elseif($module == 'PurchaseOrder')
 	{
-		$query="select vtiger_products.productname, vtiger_products.unit_price, vtiger_products.qtyinstock, vtiger_inventoryproductrel.* from vtiger_inventoryproductrel inner join vtiger_products on vtiger_products.productid=vtiger_inventoryproductrel.productid where id=".$focus->id." ORDER BY sequence_no";
+		$query="select vtiger_products.productname, vtiger_products.product_description, vtiger_products.unit_price, vtiger_products.qtyinstock, vtiger_inventoryproductrel.* from vtiger_inventoryproductrel inner join vtiger_products on vtiger_products.productid=vtiger_inventoryproductrel.productid where id=".$focus->id." ORDER BY sequence_no";
 	}
 	elseif($module == 'SalesOrder')
 	{
-		$query="select vtiger_products.productname, vtiger_products.unit_price, vtiger_products.qtyinstock, vtiger_inventoryproductrel.* from vtiger_inventoryproductrel inner join vtiger_products on vtiger_products.productid=vtiger_inventoryproductrel.productid where id=".$focus->id." ORDER BY sequence_no";
+		$query="select vtiger_products.productname, vtiger_products.product_description, vtiger_products.unit_price, vtiger_products.qtyinstock, vtiger_inventoryproductrel.* from vtiger_inventoryproductrel inner join vtiger_products on vtiger_products.productid=vtiger_inventoryproductrel.productid where id=".$focus->id." ORDER BY sequence_no";
 	}
 	elseif($module == 'Invoice')
 	{
-		$query="select vtiger_products.productname, vtiger_products.unit_price, vtiger_products.qtyinstock, vtiger_inventoryproductrel.* from vtiger_inventoryproductrel inner join vtiger_products on vtiger_products.productid=vtiger_inventoryproductrel.productid where id=".$focus->id." ORDER BY sequence_no";
+		$query="select vtiger_products.productname, vtiger_products.product_description, vtiger_products.unit_price, vtiger_products.qtyinstock, vtiger_inventoryproductrel.* from vtiger_inventoryproductrel inner join vtiger_products on vtiger_products.productid=vtiger_inventoryproductrel.productid where id=".$focus->id." ORDER BY sequence_no";
 	}
 	elseif($module == 'Potentials')
 	{
-		$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_products.qtyinstock,vtiger_seproductsrel.* from vtiger_products inner join vtiger_seproductsrel on vtiger_seproductsrel.productid=vtiger_products.productid where crmid=".$seid;
+		$query="select vtiger_products.productname, vtiger_products.product_description, vtiger_products.unit_price,vtiger_products.qtyinstock,vtiger_seproductsrel.* from vtiger_products inner join vtiger_seproductsrel on vtiger_seproductsrel.productid=vtiger_products.productid where crmid=".$seid;
 	}
 	elseif($module == 'Products')
 	{
-		$query="select vtiger_products.productid,vtiger_products.productname,vtiger_products.unit_price,vtiger_products.qtyinstock,vtiger_crmentity.* from vtiger_products inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_products.productid where vtiger_crmentity.deleted=0 and productid=".$seid;
+		$query="select vtiger_products.productid, vtiger_products.productname, vtiger_products.product_description, vtiger_products.unit_price,vtiger_products.qtyinstock,vtiger_crmentity.* from vtiger_products inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_products.productid where vtiger_crmentity.deleted=0 and productid=".$seid;
 	}
 
 	$result = $adb->query($query);
@@ -1413,6 +1413,7 @@
 	{
 		$hdnProductId = $adb->query_result($result,$i-1,'productid');
 		$productname=$adb->query_result($result,$i-1,'productname');
+		$productdescription=$adb->query_result($result,$i-1,'product_description');
 		$comment=$adb->query_result($result,$i-1,'comment');
 		$qtyinstock=$adb->query_result($result,$i-1,'qtyinstock');
 		$qty=$adb->query_result($result,$i-1,'quantity');
@@ -1435,6 +1436,7 @@
 
 		$product_Detail[$i]['hdnProductId'.$i] = $hdnProductId;
 		$product_Detail[$i]['productName'.$i]= $productname;
+		$product_Detail[$i]['productDescription'.$i]= $productdescription;
 		$product_Detail[$i]['comment'.$i]= $comment;
 
 		if($module != 'PurchaseOrder' && $focus->object_name != 'Order')
@@ -1445,6 +1447,7 @@
 		$productTotal = getConvertedPriceFromDollar($productTotal);
 		$product_Detail[$i]['qty'.$i]=$qty;
 		$product_Detail[$i]['listPrice'.$i]=$listprice;
+		$product_Detail[$i]['unitPrice'.$i]=$unitprice;
 		$product_Detail[$i]['productTotal'.$i]=$productTotal;
 
 		$discount_percent=$adb->query_result($result,$i-1,'discount_percent');



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 09:57:15 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 16:57:15 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9291 -
	/vtigercrm/trunk/themes/woodspice/style.css
Message-ID: <20060905165716.2DED376CE29@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 10:57:12 2006
New Revision: 9291

Log:
CSS added for disabling window during recalculate -- ahmed

Modified:
    vtigercrm/trunk/themes/woodspice/style.css

Modified: vtigercrm/trunk/themes/woodspice/style.css
==============================================================================
--- vtigercrm/trunk/themes/woodspice/style.css (original)
+++ vtigercrm/trunk/themes/woodspice/style.css Tue Sep  5 10:57:12 2006
@@ -3135,7 +3135,7 @@
 
 .discountUI{
 	border:3px solid #CCCCCC;
-	width:250px;
+	width:200px;
 	padding:5px;
 	position:absolute;
 	background-color:#FFFFFF;
@@ -3347,3 +3347,67 @@
 .bgwhite{
 	background-color:white;
 }
+
+/* Recalculate Disabling Window */
+
+.veil{
+   background: url(images/searchUIBg.gif) ;
+    height: 100%;
+    width: 100%;
+    top: 0px;
+    left: 0px;
+    overflow: hidden;
+    z-index: 10000;
+    Filter: Alpha(opacity = 70);
+    -moz-opacity: 0.7;
+    text-align: center;
+    vertical-align: middle;
+    position: absolute;
+}
+
+.veil_new{
+   background: url(images/searchUIBg.gif) ;
+    height: 100%;
+    width: 100%;
+    top: 0px;
+    left: 0px;
+    overflow: hidden;
+    z-index: 50000;
+    Filter: Alpha(opacity = 70);
+    -moz-opacity: 0.7;
+    text-align: center;
+    vertical-align: middle;
+    position: absolute;
+}
+
+.optioncontainer{
+    vertical-align: middle;   
+    height: 100%;
+    width: 100%;   
+    position: absolute;
+    z-index: 90000;   
+}
+
+
+.options{
+    	vertical-align: middle;   
+	margin-left: 25%;
+	margin-top: 16%;
+	color: #FFFFFF;
+	width:650px;
+	background-color: Black;
+	border: 2px solid #222;	
+    	position: relative;
+	text-align: left;
+    	z-index: 80000;   
+}
+
+.options h2{
+	color: White;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	border-bottom: 1px solid #373D4C;
+	margin: 0;
+	font-weight: normal;
+}
+
+/* Recalculate Disable Ends */



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 09:59:06 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 16:59:06 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9293 -
 /vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl
Message-ID: <20060905165906.78E3E76CEFA@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 10:59:02 2006
New Revision: 9293

Log:
Disabled window during recalculate -- ahmed

Modified:
    vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl

Modified: vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl Tue Sep  5 10:59:02 2006
@@ -58,14 +58,14 @@
 			  	<!-- GLOBAL ACCESS MODULE -->
 		  		<div id="globaldiv">
 				<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
-				<form action="index.php" method="post" name="new" id="form">
+				<form action="index.php" method="post" name="new" id="orgSharingform">
 				<input type="hidden" name="module" value="Users">
 				<input type="hidden" name="action" value="OrgSharingEditView">
 				<input type="hidden" name="parenttab" value="Settings">
 				<tr>
 					<td class="big"><strong>1. {$CMOD.LBL_GLOBAL_ACCESS_PRIVILEGES}</strong></td>
 					<td class="small" align=right>
-						<input class="crmButton small cancel" title="{$CMOD.LBL_RECALCULATE_BUTTON}"  type="submit" name="recalculate" value="{$CMOD.LBL_RECALCULATE_BUTTON}" onclick="this.form.action.value='RecalculateSharingRules'; return confirm('Recalculate Sharing Rules will calculate the sharing rules for the whole organization. This Operation will take some time. Do you want to contunue? ')">	
+						<input class="crmButton small cancel" title="{$CMOD.LBL_RECALCULATE_BUTTON}"  type="button" name="recalculate" value="{$CMOD.LBL_RECALCULATE_BUTTON}" onclick="return freezeBackground();">	
 	&nbsp;<input class="crmButton small edit" type="submit" name="Edit" value="{$CMOD.LBL_CHANGE} {$CMOD.LBL_PRIVILEGES}" ></td>
 					</td>
 				</tr>
@@ -192,6 +192,34 @@
 </tbody>
 </table>
 <div id="tempdiv" style="display:block;position:absolute;width:400px;"></div>
+
+<!-- For Disabling Window -->
+<div id="confId"  class='veil_new' style="display:none;">
+<table class="options" border="0" cellpadding="18" cellspacing="0">
+<tr>
+	<td class="big" align="center">
+		<h2>{$CMOD.LBL_RECALC_MSG}</h2>
+	</td>
+	<br>
+	<tr>
+		<td align="center"><input type="button" value="{$CMOD.LBL_YES}" onclick="return disableStyle('confId');">&nbsp;&nbsp;<input type="button" value="&nbsp;{$CMOD.LBL_NO}&nbsp;" onclick="$('freeze').style.display='none';$('confId').style.display='none'; "></td>
+	</tr>
+</tr>
+</table>
+</div>
+
+<div id="divId" class="veil_new" style="display:none;top:0px;left:0px;">
+<table class="optioncontainer" border="0" cellpadding="18" cellspacing="0">
+<tbody><tr>
+		<td class="big" align="center">
+		    <img src="{$IMAGE_PATH}plsWaitAnimated.gif">
+		</td>
+	</tr>
+</tbody>
+</table>
+</div>
+
+
 <script>
 function callEditDiv(obj,modulename,mode,id)
 {ldelim}
@@ -258,5 +286,26 @@
 			{rdelim}
 		{rdelim}
 	
+	function disableStyle(id)
+	{ldelim}
+			$('orgSharingform').action.value = 'RecalculateSharingRules';
+			$('orgSharingform').submit();
+ 			$(id).style.display = 'none';
+			$('divId').style.display = 'block';
+	{rdelim}
+
+	function freezeBackground()
+	{ldelim}
+	    var oFreezeLayer = document.createElement("DIV");
+	    oFreezeLayer.id = "freeze";
+	    oFreezeLayer.className = "veil";
+
+	     if (browser_ie) oFreezeLayer.style.height = (document.body.offsetHeight + (document.body.scrollHeight - document.body.offsetHeight)) + "px";
+	     else if (browser_nn4 || browser_nn6) oFreezeLayer.style.height = document.body.offsetHeight + "px";
+
+	    oFreezeLayer.style.width = "100%";
+	    document.body.appendChild(oFreezeLayer);
+	    document.getElementById('confId').style.display = 'block';
+	{rdelim}
 
 </script>



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 10:01:32 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 17:01:32 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9294 -
	/vtigercrm/trunk/themes/woodspice/style.css
Message-ID: <20060905170132.ECE8976CEF1@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 11:01:29 2006
New Revision: 9294

Log:
style.css file updated -- ahmed

Modified:
    vtigercrm/trunk/themes/woodspice/style.css

Modified: vtigercrm/trunk/themes/woodspice/style.css
==============================================================================
--- vtigercrm/trunk/themes/woodspice/style.css (original)
+++ vtigercrm/trunk/themes/woodspice/style.css Tue Sep  5 11:01:29 2006
@@ -3135,7 +3135,7 @@
 
 .discountUI{
 	border:3px solid #CCCCCC;
-	width:200px;
+	width:250px;
 	padding:5px;
 	position:absolute;
 	background-color:#FFFFFF;



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 09:57:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 16:57:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9292 -
 /vtigercrm/trunk/modules/Users/language/en_us.lang.php
Message-ID: <20060905165750.2A9D176CE29@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 10:57:46 2006
New Revision: 9292

Log:
Lang strings updated -- ahmed

Modified:
    vtigercrm/trunk/modules/Users/language/en_us.lang.php

Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Users/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Users/language/en_us.lang.php Tue Sep  5 10:57:46 2006
@@ -589,6 +589,14 @@
 'LBL_DELETE_PROFILE'=>'Delete Profile',
 'LBL_TRANSFER_ROLES_TO_PROFILE'=>'Transfer Roles to Profile',
 'LBL_PROFILE_TO_BE_DELETED'=>'Profile to be Deteted',
+
+//Added for disabling window Recalculate
+
+'LBL_RECALC_MSG'=>'Are you sure, you wish to Recalculate Sharing Access?',
+'LBL_YES'=>'Yes',
+'LBL_NO'=>'No',
+
+
 );
 
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 10:52:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 17:52:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9295 - in
 /vtigercrm/trunk/modules: PurchaseOrder/CreatePDF.php Quotes/CreatePDF.php
 SalesOrder/CreateSOPDF.php
Message-ID: <20060905175238.A5FC476CEEA@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 11:52:32 2006
New Revision: 9295

Log:
* Modified to display the product and tax details

Modified:
    vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php
    vtigercrm/trunk/modules/Quotes/CreatePDF.php
    vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php

Modified: vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php Tue Sep  5 11:52:32 2006
@@ -78,62 +78,114 @@
 		$logo_name = $adb->query_result($result,0,"logoname");
 }
 
-//getting the Total Array
-$price_subtotal = $currency_symbol.number_format(StripLastZero($focus->column_fields["hdnSubTotal"]),2,'.',',');
-$price_tax = $currency_symbol.number_format(StripLastZero($focus->column_fields["txtTax"]),2,'.',',');
-$price_adjustment = $currency_symbol.number_format(StripLastZero($focus->column_fields["txtAdjustment"]),2,'.',',');
-$price_total = $currency_symbol.number_format(StripLastZero($focus->column_fields["hdnGrandTotal"]),2,'.',',');
-
-//getting the Product Data
-$query="select vtiger_products.productname, vtiger_products.unit_price, vtiger_products.product_description, vtiger_inventoryproductrel.* from vtiger_inventoryproductrel inner join vtiger_products on vtiger_products.productid=vtiger_inventoryproductrel.productid where id=".$id;
-
-global $result;
-$result = $adb->query($query);
-$num_products=$adb->num_rows($result);
-for($i=0;$i<$num_products;$i++) {
-	$product_name[$i]=$adb->query_result($result,$i,'productname');
-	$prod_description[$i]=$adb->query_result($result,$i,'product_description');
-	$product_id[$i]=$adb->query_result($result,$i,'productid');
-	$qty[$i]=$adb->query_result($result,$i,'quantity');
-
-	$unit_price[$i]= $currency_symbol.number_format($adb->query_result($result,$i,'unit_price'),2,'.',',');
-	$list_price[$i]= $currency_symbol.number_format(StripLastZero($adb->query_result($result,$i,'listprice')),2,'.',',');
-	$list_pricet[$i]= $adb->query_result($result,$i,'listprice');
-	$prod_total[$i]= $qty[$i]*$list_pricet[$i];
-
-        $total_taxes = '0.00';
-        if($product_taxes == "true") {
-                $q = "SELECT * FROM vtiger_inventoryproductrel WHERE id='".$focus->column_fields["record_id"]."' AND productid='".$product_id[$i]."' AND tax2 IS NOT NULL";
-                $trs = $adb->query($q);
-                $tax = $adb->query_result($trs,'0','tax2');
-                $taxable_total = ($adb->query_result($trs,'0','listprice') * $adb->query_result($trs,'0','quantity'));
-                if($tax != "") {
-                        $total_taxes = ($taxable_total/$tax);
-                        $prod_total[$i] = ($prod_total[$i]+$total_taxes);
-                }
-        }
-
-        $product_line[] = array( "Product Name"    => $product_name[$i],
-                "Description"  => $prod_description[$i],
-                "Qty"     => $qty[$i],
-                "List Price"      => $list_price[$i],
-                "Unit Price" => $unit_price[$i],
-                "Tax" => $currency_symbol.$total_taxes,
-                "Total" => $currency_symbol.$prod_total[$i]
-        );
-}
-
-	$total[]=array("Unit Price" => $app_strings['LBL_SUB_TOTAL'],
-		"Total" => $price_subtotal);
-
-	$total[]=array("Unit Price" => $app_strings['LBL_ADJUSTMENT'],
-		"Total" => $price_adjustment);
-
-	$total[]=array("Unit Price" => $app_strings['LBL_TAX'],
-		"Total" => $price_tax);
-
-	$total[]=array("Unit Price" => $app_strings['LBL_GRAND_TOTAL'],
-		"Total" => $price_total);
+//Population of Product Details - Starts
+
+//we can cut and paste the following lines in a file and include that file here is enough. For that we have to put a new common file. we will do this later
+//NOTE : Removed currency symbols and added with Grand Total text. it is enough to show the currency symbol in one place
+
+//we can also get the NetTotal, Final Discount Amount/Percent, Adjustment and GrandTotal from the array $associated_products[1]['final_details']
+
+//getting the Net Total
+$price_subtotal = number_format($focus->column_fields["hdnSubTotal"],2,'.',',');
+
+//Final discount amount/percentage
+$discount_amount = $focus->column_fields["hdnDiscountAmount"];
+$discount_percent = $focus->column_fields["hdnDiscountPercent"];
+
+if($discount_amount != "")
+	$price_discount = number_format($discount_amount,2,'.',',');
+else if($discount_percent != "")
+	$price_discount = $discount_percent."%";
+else
+	$price_discount = "0.00";
+
+//Adjustment
+$price_adjustment = number_format($focus->column_fields["txtAdjustment"],2,'.',',');
+//Grand Total
+$price_total = number_format($focus->column_fields["hdnGrandTotal"],2,'.',',');
+
+
+//get the Associated Products for this Invoice
+$focus->id = $focus->column_fields["record_id"];
+$associated_products = getAssociatedProducts("PurchaseOrder",$focus);
+$num_products = count($associated_products);
+
+//This $final_details array will contain the final total, discount, Group Tax, S&H charge, S&H taxes and adjustment
+$final_details = $associated_products[1]['final_details'];
+
+//To calculate the group tax amount
+if($final_details['taxtype'] == 'group')
+{
+	$group_tax_total = $final_details['tax_totalamount'];
+	$price_salestax = number_format($group_tax_total,2,'.',',');
+
+	$group_total_tax_percent = '0.00';
+	$group_tax_details = $final_details['taxes'];
+	for($i=0;$i<count($group_tax_details);$i++)
+	{
+		$group_total_tax_percent = $group_total_tax_percent+$group_tax_details[$i]['percentage'];
+	}
+}
+
+//S&H amount
+$sh_amount = $final_details['shipping_handling_charge'];
+$price_shipping = number_format($sh_amount,2,'.',',');
+
+//S&H taxes
+$sh_tax_details = $final_details['sh_taxes'];
+$sh_tax_percent = '0.00';
+for($i=0;$i<count($sh_tax_details);$i++)
+{
+	$sh_tax_percent = $sh_tax_percent + $sh_tax_details[$i]['percentage'];
+}
+$sh_tax_amount = $final_details['shtax_totalamount'];
+$price_shipping_tax = number_format($sh_tax_amount,2,'.',',');
+
+
+//This is to get all prodcut details as row basis
+for($i=1,$j=$i-1;$i<=$num_products;$i++,$j++)
+{
+	$product_name[$i] = $associated_products[$i]['productName'.$i];
+	$prod_description[$i] = $associated_products[$i]['productDescription'.$i];
+	$product_id[$i] = $associated_products[$i]['hdnProductId'.$i];
+	$qty[$i] = $associated_products[$i]['qty'.$i];
+	$unit_price[$i] = number_format($associated_products[$i]['unitPrice'.$i],2,'.',',');
+	$list_price[$i] = number_format($associated_products[$i]['listPrice'.$i],2,'.',',');
+	$list_pricet[$i] = $associated_products[$i]['listPrice'.$i];
+	$discount_total[$i] = $associated_products[$i]['discountTotal'.$i];
+	
+	$taxable_total = $qty[$i]*$list_pricet[$i]-$discount_total[$i];
+
+	$producttotal = $taxable_total;
+	$total_taxes = '0.00';
+	if($focus->column_fields["hdnTaxType"] == "individual")
+	{
+		$total_tax_percent = '0.00';
+		//This loop is to get all tax percentage and then calculate the total of all taxes
+		for($tax_count=0;$tax_count<count($associated_products[$i]['taxes']);$tax_count++)
+		{
+			$tax_percent = $associated_products[$i]['taxes'][$tax_count]['percentage'];
+			$total_tax_percent = $total_tax_percent+$tax_percent;
+			$tax_amount = (($taxable_total*$tax_percent)/100);
+			$total_taxes = $total_taxes+$tax_amount;
+		}
+		$producttotal = $taxable_total+$total_taxes;
+		$product_line[$j]["Tax"] = number_format($total_taxes,2,'.',',')."\n ($total_tax_percent %) ";
+	}
+	$prod_total[$i] = number_format($producttotal,2,'.',',');
+
+	$product_line[$j]["Product Name"] = $product_name[$i];
+	$product_line[$j]["Description"] = $prod_description[$i];
+	$product_line[$j]["Qty"] = $qty[$i];
+	$product_line[$j]["Price"] = $list_price[$i];
+	$product_line[$j]["Discount"] = $discount_total[$i];
+	$product_line[$j]["Total"] = $prod_total[$i];
+}
+//echo '<pre>Product Details ==>';print_r($product_line);echo '</pre>';
+//echo '<pre>';print_r($associated_products);echo '</pre>';
+
+
+//Population of Product Details - Ends
 
 
 // ************************ END POPULATE DATA ***************************8

Modified: vtigercrm/trunk/modules/Quotes/CreatePDF.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/CreatePDF.php (original)
+++ vtigercrm/trunk/modules/Quotes/CreatePDF.php Tue Sep  5 11:52:32 2006
@@ -78,67 +78,115 @@
 		$logo_name = $adb->query_result($result,0,"logoname");
 }
 
-//getting the Total Array
-$price_subtotal = $currency_symbol.number_format(StripLastZero($focus->column_fields["hdnSubTotal"]),2,'.',',');
-$price_tax = $currency_symbol.number_format(StripLastZero($focus->column_fields["txtTax"]),2,'.',',');
-$price_adjustment = $currency_symbol.number_format(StripLastZero($focus->column_fields["txtAdjustment"]),2,'.',',');
-$price_total = $currency_symbol.number_format(StripLastZero($focus->column_fields["hdnGrandTotal"]),2,'.',',');
-
-//getting the Product Data
-// DG 15 Aug 2006
-// Add "ORDER BY sequence_no to preserve add order in printed version
-// Seems not to be strictly necessary as the upstream ORDER BY in EditView appears to produce this behaviour by default
-// Having this here makes sure though. 
-$query="select vtiger_products.productname, vtiger_products.unit_price, vtiger_products.product_description, vtiger_inventoryproductrel.* from vtiger_inventoryproductrel inner join vtiger_products on vtiger_products.productid=vtiger_inventoryproductrel.productid where id=".$quote_id." ORDER BY sequence_no";
-//$query="select vtiger_products.productname, vtiger_products.unit_price, vtiger_products.product_description, vtiger_inventoryproductrel.* from vtiger_inventoryproductrel inner join vtiger_products on vtiger_products.productid=vtiger_inventoryproductrel.productid where id=".$quote_id;
-
-global $result;
-$result = $adb->query($query);
-$num_products=$adb->num_rows($result);
-for($i=0;$i<$num_products;$i++) {
-	$product_name[$i]=$adb->query_result($result,$i,'productname');
-	$prod_description[$i]=$adb->query_result($result,$i,'product_description');
-	$product_id[$i]=$adb->query_result($result,$i,'productid');
-	$qty[$i]=$adb->query_result($result,$i,'quantity');
-
-	$unit_price[$i]= $currency_symbol.number_format($adb->query_result($result,$i,'unit_price'),2,'.',',');
-	$list_price[$i]= $currency_symbol.number_format(StripLastZero($adb->query_result($result,$i,'listprice')),2,'.',',');
-	$list_pricet[$i]= $adb->query_result($result,$i,'listprice');
-	$prod_total[$i]= $qty[$i]*$list_pricet[$i];
-
-        $total_taxes = '0.00';
-        if($product_taxes == "true") {
-                $q = "SELECT * FROM vtiger_inventoryproductrel WHERE id='".$focus->column_fields["record_id"]."' AND productid='".$product_id[$i]."' AND tax2 IS NOT NULL";
-                $trs = $adb->query($q);
-                $tax = $adb->query_result($trs,'0','tax2');
-                $taxable_total = ($adb->query_result($trs,'0','listprice') * $adb->query_result($trs,'0','quantity'));
-                if($tax != "") {
-                        $total_taxes = ($taxable_total/$tax);
-                        $prod_total[$i] = ($prod_total[$i]+$total_taxes);
-                }
-        }
-
-        $product_line[] = array( "Product Name"    => $product_name[$i],
-                "Description"  => $prod_description[$i],
-                "Qty"     => $qty[$i],
-                "List Price"      => $list_price[$i],
-                "Unit Price" => $unit_price[$i],
-                "Tax" => $currency_symbol.$total_taxes,
-                "Total" => $currency_symbol.$prod_total[$i]
-        );
-}
-
-	$total[]=array("Unit Price" => $app_strings['LBL_SUB_TOTAL'],
-		"Total" => $price_subtotal);
-
-	$total[]=array("Unit Price" => $app_strings['LBL_ADJUSTMENT'],
-		"Total" => $price_adjustment);
-
-	$total[]=array("Unit Price" => $app_strings['LBL_TAX'],
-		"Total" => $price_tax);
-
-	$total[]=array("Unit Price" => $app_strings['LBL_GRAND_TOTAL'],
-		"Total" => $price_total);
+
+//Population of Product Details - Starts
+
+//we can cut and paste the following lines in a file and include that file here is enough. For that we have to put a new common file. we will do this later
+//NOTE : Removed currency symbols and added with Grand Total text. it is enough to show the currency symbol in one place
+
+//we can also get the NetTotal, Final Discount Amount/Percent, Adjustment and GrandTotal from the array $associated_products[1]['final_details']
+
+//getting the Net Total
+$price_subtotal = number_format($focus->column_fields["hdnSubTotal"],2,'.',',');
+
+//Final discount amount/percentage
+$discount_amount = $focus->column_fields["hdnDiscountAmount"];
+$discount_percent = $focus->column_fields["hdnDiscountPercent"];
+
+if($discount_amount != "")
+	$price_discount = number_format($discount_amount,2,'.',',');
+else if($discount_percent != "")
+	$price_discount = $discount_percent."%";
+else
+	$price_discount = "0.00";
+
+//Adjustment
+$price_adjustment = number_format($focus->column_fields["txtAdjustment"],2,'.',',');
+//Grand Total
+$price_total = number_format($focus->column_fields["hdnGrandTotal"],2,'.',',');
+
+
+//get the Associated Products for this Invoice
+$focus->id = $focus->column_fields["record_id"];
+$associated_products = getAssociatedProducts("Quotes",$focus);
+$num_products = count($associated_products);
+
+//This $final_details array will contain the final total, discount, Group Tax, S&H charge, S&H taxes and adjustment
+$final_details = $associated_products[1]['final_details'];
+
+//To calculate the group tax amount
+if($final_details['taxtype'] == 'group')
+{
+	$group_tax_total = $final_details['tax_totalamount'];
+	$price_salestax = number_format($group_tax_total,2,'.',',');
+
+	$group_total_tax_percent = '0.00';
+	$group_tax_details = $final_details['taxes'];
+	for($i=0;$i<count($group_tax_details);$i++)
+	{
+		$group_total_tax_percent = $group_total_tax_percent+$group_tax_details[$i]['percentage'];
+	}
+}
+
+//S&H amount
+$sh_amount = $final_details['shipping_handling_charge'];
+$price_shipping = number_format($sh_amount,2,'.',',');
+
+//S&H taxes
+$sh_tax_details = $final_details['sh_taxes'];
+$sh_tax_percent = '0.00';
+for($i=0;$i<count($sh_tax_details);$i++)
+{
+	$sh_tax_percent = $sh_tax_percent + $sh_tax_details[$i]['percentage'];
+}
+$sh_tax_amount = $final_details['shtax_totalamount'];
+$price_shipping_tax = number_format($sh_tax_amount,2,'.',',');
+
+
+//This is to get all prodcut details as row basis
+for($i=1,$j=$i-1;$i<=$num_products;$i++,$j++)
+{
+	$product_name[$i] = $associated_products[$i]['productName'.$i];
+	$prod_description[$i] = $associated_products[$i]['productDescription'.$i];
+	$product_id[$i] = $associated_products[$i]['hdnProductId'.$i];
+	$qty[$i] = $associated_products[$i]['qty'.$i];
+	$unit_price[$i] = number_format($associated_products[$i]['unitPrice'.$i],2,'.',',');
+	$list_price[$i] = number_format($associated_products[$i]['listPrice'.$i],2,'.',',');
+	$list_pricet[$i] = $associated_products[$i]['listPrice'.$i];
+	$discount_total[$i] = $associated_products[$i]['discountTotal'.$i];
+	
+	$taxable_total = $qty[$i]*$list_pricet[$i]-$discount_total[$i];
+
+	$producttotal = $taxable_total;
+	$total_taxes = '0.00';
+	if($focus->column_fields["hdnTaxType"] == "individual")
+	{
+		$total_tax_percent = '0.00';
+		//This loop is to get all tax percentage and then calculate the total of all taxes
+		for($tax_count=0;$tax_count<count($associated_products[$i]['taxes']);$tax_count++)
+		{
+			$tax_percent = $associated_products[$i]['taxes'][$tax_count]['percentage'];
+			$total_tax_percent = $total_tax_percent+$tax_percent;
+			$tax_amount = (($taxable_total*$tax_percent)/100);
+			$total_taxes = $total_taxes+$tax_amount;
+		}
+		$producttotal = $taxable_total+$total_taxes;
+		$product_line[$j]["Tax"] = number_format($total_taxes,2,'.',',')."\n ($total_tax_percent %) ";
+	}
+	$prod_total[$i] = number_format($producttotal,2,'.',',');
+
+	$product_line[$j]["Product Name"] = $product_name[$i];
+	$product_line[$j]["Description"] = $prod_description[$i];
+	$product_line[$j]["Qty"] = $qty[$i];
+	$product_line[$j]["Price"] = $list_price[$i];
+	$product_line[$j]["Discount"] = $discount_total[$i];
+	$product_line[$j]["Total"] = $prod_total[$i];
+}
+//echo '<pre>Product Details ==>';print_r($product_line);echo '</pre>';
+//echo '<pre>';print_r($associated_products);echo '</pre>';
+
+
+//Population of Product Details - Ends
 
 
 // ************************ END POPULATE DATA ***************************8

Modified: vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php Tue Sep  5 11:52:32 2006
@@ -77,90 +77,115 @@
 		$logo_name = $adb->query_result($result,0,"logoname");
 }
 
-//getting the Total Array
-$price_subtotal = $currency_symbol.number_format($focus->column_fields["hdnSubTotal"],2,'.',',');
-$price_salestax = $focus->column_fields["txtTax"]."%";
-if($price_salestax != "")
-        $price_salestax = $currency_symbol."0.00";
-
+//Population of Product Details - Starts
+
+//we can cut and paste the following lines in a file and include that file here is enough. For that we have to put a new common file. we will do this later
+//NOTE : Removed currency symbols and added with Grand Total text. it is enough to show the currency symbol in one place
+
+//we can also get the NetTotal, Final Discount Amount/Percent, Adjustment and GrandTotal from the array $associated_products[1]['final_details']
+
+//getting the Net Total
+$price_subtotal = number_format($focus->column_fields["hdnSubTotal"],2,'.',',');
+
+//Final discount amount/percentage
 $discount_amount = $focus->column_fields["hdnDiscountAmount"];
 $discount_percent = $focus->column_fields["hdnDiscountPercent"];
 
-$price_shipping = $currency_symbol.number_format($focus->column_fields["hdnS_H_Amount"],2,'.',',');
-if($price_shipping > 0 || price_shipping == "")
-        $price_shipping = $currency_symbol."0.00";
-
-$q = "SELECT * FROM vtiger_inventoryshippingrel WHERE id='".$focus->column_fields["record_id"]."'";
-$shrs = $adb->query($q);
-$shtax1 = $adb->query_result($shrs,'0','shtax1');
-$shtax2 = $adb->query_result($shrs,'0','shtax2');
-$shtax3 = $adb->query_result($shrs,'0','shtax3');
-if($shtax1 != "" && $shtax1 != "0.00")
-        $price_shipping_tax = number_format($shtax1,2,'.',',')."%";
-if($shtax2 != "" && $shtax2 != "0.00")
-        $price_shipping_tax = number_format($shtax2,2,'.',',')."%";
-if($shtax3 != "" && $shtax3 != "0.00")
-        $price_shipping_tax = number_format($shtax3,2,'.',',')."%";
-
-
 if($discount_amount != "")
-        $price_discount = $currency_symbol.number_format($discount_amount,2,'.',',');
+	$price_discount = number_format($discount_amount,2,'.',',');
 else if($discount_percent != "")
-        $price_discount = $discount_percent."%";
+	$price_discount = $discount_percent."%";
 else
-        $price_discount = $currency_symbol."0.00";
-
-
-$price_adjustment = $currency_symbol.number_format($focus->column_fields["txtAdjustment"],2,'.',',');
-$price_total = $currency_symbol.number_format($focus->column_fields["hdnGrandTotal"],2,'.',',');
-
-//getting the Product Data
-$query="select vtiger_products.productname, vtiger_products.unit_price, vtiger_products.product_description, vtiger_inventoryproductrel.* from vtiger_inventoryproductrel inner join vtiger_products on vtiger_products.productid=vtiger_inventoryproductrel.productid where id=".$id;
-
-global $result;
-$result = $adb->query($query);
-$num_products=$adb->num_rows($result);
-for($i=0;$i<$num_products;$i++) {
-	$product_name[$i]=$adb->query_result($result,$i,'productname');
-	$prod_description[$i]=$adb->query_result($result,$i,'product_description');
-	$product_id[$i]=$adb->query_result($result,$i,'productid');
-	$qty[$i]=$adb->query_result($result,$i,'quantity');
-
-	$unit_price[$i]= $currency_symbol.number_format($adb->query_result($result,$i,'unit_price'),2,'.',',');
-	$list_price[$i]= $currency_symbol.number_format(StripLastZero($adb->query_result($result,$i,'listprice')),2,'.',',');
-	$list_pricet[$i]= $adb->query_result($result,$i,'listprice');
-	$prod_total[$i]= $qty[$i]*$list_pricet[$i];
-
-        $total_taxes = '0.00';
-        if($focus->column_fields["hdnTaxType"] == "individual") {
-                $q = "SELECT * FROM vtiger_inventoryproductrel WHERE id='".$focus->column_fields["record_id"]."' AND productid='".$product_id[$i]."'";
-                $trs = $adb->query($q);
-                $tax1 = $adb->query_result($trs,'0','tax1');
-                $tax2 = $adb->query_result($trs,'0','tax2');
-                $tax3 = $adb->query_result($trs,'0','tax3');
-                $taxable_total = ($adb->query_result($trs,'0','listprice') * $adb->query_result($trs,'0','quantity'));
-
-                if($tax1 != "" && $tax1 > 0) {
-                        $total_taxes = (($taxable_total*$tax1)/100);
-                        $prod_total[$i] = ($prod_total[$i]+$total_taxes);
-                }
-                if($tax2 != "" && $tax2 > 0) {
-                        $total_taxes = (($taxable_total*$tax2)/100);
-                        $prod_total[$i] = ($prod_total[$i]+$total_taxes);
-                }
-                if($tax3 != "" && $tax3 > 0) {
-                        $total_taxes = (($taxable_total*$tax3)/100);
-                        $prod_total[$i] = ($prod_total[$i]+$total_taxes);
-                }
-                $product_line[$i]["Tax"] = $total_taxes."%";
-        }
-        $product_line[$i]["Product Name"] = $product_name[$i];
-        $product_line[$i]["Description"] = $prod_description[$i];
-        $product_line[$i]["Qty"] = $qty[$i];
-        $product_line[$i]["Price"] = $list_price[$i];
-        $product_line[$i]["Total"] = $currency_symbol.number_format($prod_total[$i],"2",".",",");
-
-}
+	$price_discount = "0.00";
+
+//Adjustment
+$price_adjustment = number_format($focus->column_fields["txtAdjustment"],2,'.',',');
+//Grand Total
+$price_total = number_format($focus->column_fields["hdnGrandTotal"],2,'.',',');
+
+
+//get the Associated Products for this Invoice
+$focus->id = $focus->column_fields["record_id"];
+$associated_products = getAssociatedProducts("SalesOrder",$focus);
+$num_products = count($associated_products);
+
+//This $final_details array will contain the final total, discount, Group Tax, S&H charge, S&H taxes and adjustment
+$final_details = $associated_products[1]['final_details'];
+
+//To calculate the group tax amount
+if($final_details['taxtype'] == 'group')
+{
+	$group_tax_total = $final_details['tax_totalamount'];
+	$price_salestax = number_format($group_tax_total,2,'.',',');
+
+	$group_total_tax_percent = '0.00';
+	$group_tax_details = $final_details['taxes'];
+	for($i=0;$i<count($group_tax_details);$i++)
+	{
+		$group_total_tax_percent = $group_total_tax_percent+$group_tax_details[$i]['percentage'];
+	}
+}
+
+//S&H amount
+$sh_amount = $final_details['shipping_handling_charge'];
+$price_shipping = number_format($sh_amount,2,'.',',');
+
+//S&H taxes
+$sh_tax_details = $final_details['sh_taxes'];
+$sh_tax_percent = '0.00';
+for($i=0;$i<count($sh_tax_details);$i++)
+{
+	$sh_tax_percent = $sh_tax_percent + $sh_tax_details[$i]['percentage'];
+}
+$sh_tax_amount = $final_details['shtax_totalamount'];
+$price_shipping_tax = number_format($sh_tax_amount,2,'.',',');
+
+
+//This is to get all prodcut details as row basis
+for($i=1,$j=$i-1;$i<=$num_products;$i++,$j++)
+{
+	$product_name[$i] = $associated_products[$i]['productName'.$i];
+	$prod_description[$i] = $associated_products[$i]['productDescription'.$i];
+	$product_id[$i] = $associated_products[$i]['hdnProductId'.$i];
+	$qty[$i] = $associated_products[$i]['qty'.$i];
+	$unit_price[$i] = number_format($associated_products[$i]['unitPrice'.$i],2,'.',',');
+	$list_price[$i] = number_format($associated_products[$i]['listPrice'.$i],2,'.',',');
+	$list_pricet[$i] = $associated_products[$i]['listPrice'.$i];
+	$discount_total[$i] = $associated_products[$i]['discountTotal'.$i];
+	
+	$taxable_total = $qty[$i]*$list_pricet[$i]-$discount_total[$i];
+
+	$producttotal = $taxable_total;
+	$total_taxes = '0.00';
+	if($focus->column_fields["hdnTaxType"] == "individual")
+	{
+		$total_tax_percent = '0.00';
+		//This loop is to get all tax percentage and then calculate the total of all taxes
+		for($tax_count=0;$tax_count<count($associated_products[$i]['taxes']);$tax_count++)
+		{
+			$tax_percent = $associated_products[$i]['taxes'][$tax_count]['percentage'];
+			$total_tax_percent = $total_tax_percent+$tax_percent;
+			$tax_amount = (($taxable_total*$tax_percent)/100);
+			$total_taxes = $total_taxes+$tax_amount;
+		}
+		$producttotal = $taxable_total+$total_taxes;
+		$product_line[$j]["Tax"] = number_format($total_taxes,2,'.',',')."\n ($total_tax_percent %) ";
+	}
+	$prod_total[$i] = number_format($producttotal,2,'.',',');
+
+	$product_line[$j]["Product Name"] = $product_name[$i];
+	$product_line[$j]["Description"] = $prod_description[$i];
+	$product_line[$j]["Qty"] = $qty[$i];
+	$product_line[$j]["Price"] = $list_price[$i];
+	$product_line[$j]["Discount"] = $discount_total[$i];
+	$product_line[$j]["Total"] = $prod_total[$i];
+}
+//echo '<pre>Product Details ==>';print_r($product_line);echo '</pre>';
+//echo '<pre>';print_r($associated_products);echo '</pre>';
+
+
+//Population of Product Details - Ends
+
 
 // ************************ END POPULATE DATA ***************************8
 



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 10:54:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 17:54:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9296 - in
 /vtigercrmoutlook/trunk/vtigercrmoladdin/source: frmAbout.frm
 frmSyncDetails.frm modDoSync.bas service.DCA vtigeroladdin.vbp
 vtigeroladdin.vbw
Message-ID: <20060905175437.CCFD876CEAA@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep  5 11:54:21 2006
New Revision: 9296

Log:
Contacts without lastname and calendar with out subject are not synchronised --Jeri

Modified:
    vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmAbout.frm
    vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmSyncDetails.frm
    vtigercrmoutlook/trunk/vtigercrmoladdin/source/modDoSync.bas
    vtigercrmoutlook/trunk/vtigercrmoladdin/source/service.DCA
    vtigercrmoutlook/trunk/vtigercrmoladdin/source/vtigeroladdin.vbp
    vtigercrmoutlook/trunk/vtigercrmoladdin/source/vtigeroladdin.vbw

Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmAbout.frm
==============================================================================
Binary files - no diff available.

Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmSyncDetails.frm
==============================================================================
Binary files - no diff available.

Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/modDoSync.bas
==============================================================================
Binary files - no diff available.

Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/service.DCA
==============================================================================
Binary files - no diff available.

Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/vtigeroladdin.vbp
==============================================================================
Binary files - no diff available.

Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/vtigeroladdin.vbw
==============================================================================
Binary files - no diff available.



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 11:22:52 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 18:22:52 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9297 -
	/vtigercrm/trunk/jscalendar/lang/calendar-de.js
Message-ID: <20060905182252.EF26676CEFE@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 12:22:49 2006
New Revision: 9297

Log:
i18n issue for jscalendar fix given by frank integrated -- ahmed

Modified:
    vtigercrm/trunk/jscalendar/lang/calendar-de.js

Modified: vtigercrm/trunk/jscalendar/lang/calendar-de.js
==============================================================================
--- vtigercrm/trunk/jscalendar/lang/calendar-de.js (original)
+++ vtigercrm/trunk/jscalendar/lang/calendar-de.js Tue Sep  5 12:22:49 2006
@@ -3,16 +3,7 @@
 // Feel free to use / redistribute under the GNU LGPL.
 // ** I18N
 
-// short day names
-Calendar._SDN = new Array
-("So",
- "Mo",
- "Di",
- "Mi",
- "Do",
- "Fr",
- "Sa",
- "So");
+
 
 // full day names
 Calendar._DN = new Array
@@ -24,6 +15,17 @@
  "Freitag",
  "Samstag",
  "Sonntag");
+ 
+// short day names
+Calendar._SDN = new Array
+("So",
+ "Mo",
+ "Di",
+ "Mi",
+ "Do",
+ "Fr",
+ "Sa",
+ "So"); 
 
 // short day names only use 2 letters instead of 3
 Calendar._SDN_len = 2;
@@ -32,7 +34,8 @@
 Calendar._MN = new Array
 ("Januar",
  "Februar",
- "M\u00e4rz",
+ "M?rz",
+// "M\u00e4rz",
  "April",
  "Mai",
  "Juni",
@@ -47,7 +50,8 @@
 Calendar._SMN = new Array
 ("Jan",
  "Feb",
- "M\u00e4r",
+ "M?r",
+// "M\u00e4r",
  "Apr",
  "Mai",
  "Jun",
@@ -60,42 +64,50 @@
 
 // tooltips
 Calendar._TT = {};
+Calendar._TT["INFO"] = "?ber den Kalender";
 
 Calendar._TT["ABOUT"] =
-"DHTML Datum/Zeit Selector\n" +
+"DHTML Date/Time Selector\n" +
 "(c) dynarch.com 2002-2003\n" + // don't translate this this ;-)
-"Donwload neueste Version: http://dynarch.com/mishoo/calendar.epl\n" +
+"For latest version visit: http://dynarch.com/mishoo/calendar.epl\n" +
 "Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
 "\n\n" +
 "Datumsauswahl:\n" +
-"- Jahr ausw\u00e4hlen mit \xab und \xbb\n" +
-"- Monat ausw\u00e4hlen mit " + String.fromCharCode(0x2039) + " und " + String.fromCharCode(0x203a) + "\n" +
-"- Fr Auswahl aus Liste Maustaste gedr\u00fcckt halten.";
+"- Benutze die \xab, \xbb Buttons um das Jahr auszuw?hlen\n" +
+"- Benutze die " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " Buttons um einen Monat auszuw?hlen\n" +
+"- F?r eine schnellere Auswahl, halte die Maus ?ber einen dieser Buttons gedr?ckt.";
 
 Calendar._TT["ABOUT_TIME"] = "\n\n" +
-"Zeit w\u00e4hlen:\n" +
-"- Stunde/Minute weiter mit Mausklick\n" +
-"- Stunde/Minute zurck mit Shift-Mausklick\n" +
-"- oder f\u00fcr schnellere Auswahl nach links oder rechts ziehen.";
+"Time selection:\n" +
+"- Click on any of the time parts to increase it\n" +
+"- or Shift-click to decrease it\n" +
+"- or click and drag for faster selection.";
 
+Calendar._TT["PREV_YEAR"] = "Vorheriges Jahr (halte f?r Men?)";
+Calendar._TT["PREV_MONTH"] = "Vorheriger Monat (halte f?r Men?)";
+Calendar._TT["GO_TODAY"] = "Heute";
+Calendar._TT["NEXT_MONTH"] = "N?chster Monat (halte f?r Men?)";
+Calendar._TT["NEXT_YEAR"] = "N?chstes Jahr (halte f?r Men?)";
+Calendar._TT["SEL_DATE"] = "Datum ausw?hlen";
+Calendar._TT["DRAG_TO_MOVE"] = "Zum Verschieben festhalten";
+Calendar._TT["PART_TODAY"] = " (heute)";
 
-Calendar._TT["TOGGLE"] = "Ersten Tag der Woche w\u00e4hlen";
-Calendar._TT["PREV_YEAR"] = "Jahr zur\u00fcck (halten -> Auswahlmen\u00fc)";
-Calendar._TT["PREV_MONTH"] = "Monat zur\u00fcck (halten -> Auswahlmen\u00fc)";
-Calendar._TT["GO_TODAY"] = "Gehe zum heutigen Datum";
-Calendar._TT["NEXT_MONTH"] = "Monat vor (halten -> Auswahlmen\u00fc)";
-Calendar._TT["NEXT_YEAR"] = "Jahr vor (halten -> Auswahlmen\u00fc)";
-Calendar._TT["SEL_DATE"] = "Datum ausw\u00e4hlen";
-Calendar._TT["DRAG_TO_MOVE"] = "Klicken und halten um zu verschieben";
-Calendar._TT["PART_TODAY"] = " (heute)";
-Calendar._TT["MON_FIRST"] = "Wochenanzeige mit Montag beginnen";
-Calendar._TT["SUN_FIRST"] = "Wochenanzeige mit Sonntag beginnen";
-Calendar._TT["CLOSE"] = "Schlie\u00dfen";
-Calendar._TT["TODAY"] = "Heute";
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "%s zuerst anzeigen";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
 Calendar._TT["WEEKEND"] = "0,6";
 
+Calendar._TT["CLOSE"] = "Schliessen";
+Calendar._TT["TODAY"] = "Heute";
+Calendar._TT["TIME_PART"] = "(Shift-)Klick oder festhalten um Wert zu ?ndern";
+
 // date formats
-Calendar._TT["DEF_DATE_FORMAT"] = "dd-mm-y";
-Calendar._TT["TT_DATE_FORMAT"] = "Datum ausw\u00e4hlen";
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
 
-Calendar._TT["WK"] = "KW";
+Calendar._TT["WK"] = "wk";
+Calendar._TT["TIME"] = "Zeit:";



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 13:17:35 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 20:17:35 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9298 -
	/vtigercrm/trunk/modules/Users/Authenticate.php
Message-ID: <20060905201735.CBE4D76CF0E@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep  5 14:17:27 2006
New Revision: 9298

Log:
Removed the writing of security info in session

Modified:
    vtigercrm/trunk/modules/Users/Authenticate.php

Modified: vtigercrm/trunk/modules/Users/Authenticate.php
==============================================================================
--- vtigercrm/trunk/modules/Users/Authenticate.php (original)
+++ vtigercrm/trunk/modules/Users/Authenticate.php Tue Sep  5 14:17:27 2006
@@ -69,20 +69,10 @@
         $loghistory=new LoginHistory();
         $Signin = $loghistory->user_login($focus->column_fields["user_name"],$usip,$intime);
 
-	// save the user information into the session
-	// go to the home screen
 	//Security related entries start
 	require_once('include/utils/UserInfoUtil.php');
-	$profileid = fetchUserProfileId($focus->id);	
 
 	createUserPrivilegesfile($focus->id);
-		
-	$_SESSION['authenticated_user_profileid'] = $profileid;
-	setGlobalProfilePermission2Session($profileid);
-        setPermittedTabs2Session($profileid);
-	setPermittedActions2Session($profileid);
-	setPermittedDefaultSharingAction2Session($profileid);
-	
 	
 	//Security related entries end
 	header("Location: index.php?action=index&module=Home");



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 13:20:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 20:20:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9299 -
	/vtigercrm/trunk/modules/Users/User.php
Message-ID: <20060905202002.996EF76CF48@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep  5 14:19:54 2006
New Revision: 9299

Log:
Removed unwanted variables

Modified:
    vtigercrm/trunk/modules/Users/User.php

Modified: vtigercrm/trunk/modules/Users/User.php
==============================================================================
--- vtigercrm/trunk/modules/Users/User.php (original)
+++ vtigercrm/trunk/modules/Users/User.php Tue Sep  5 14:19:54 2006
@@ -45,51 +45,13 @@
 	var $db;
 	// Stored fields
 	var $id;
-	var $user_name;
-	var $user_password;
-	var $cal_color;
-	var $hour_format;
-	var $start_hour;
-	var $end_hour;
-	var $first_name;
-	var $last_name;
-	var $date_entered;
-	var $date_modified;
-	var $modified_user_id;
-	var $description;
-	var $phone_home;
-	var $phone_mobile;
-	var $phone_work;
-	var $currency_id;
-	var $phone_other;
-	var $phone_fax;
-	var $email1;
-	var $email2;
-	var $yahoo_id;
-	var $address_street;
-	var $address_city;
-	var $address_state;
-	var $address_postalcode;
-	var $address_country;
-	var $tz;
-	var $holidays;
-	var $namedays;
-	var $workdays;
-	var $weekstart;
-	var $status;
-	var $title;
-	var $department;
 	var $authenticated = false;
 	var $error_string;
 	var $is_admin;
-	var $date_format;
 	var $deleted;
 	var $homeorder;
 
-	var $reports_to_name;
-	var $reports_to_id;
-
-	var $module_id='id';
+
 	var $tab_name = Array('vtiger_users','vtiger_attachments','vtiger_user2role');	
 	var $tab_name_index = Array('vtiger_users'=>'id','vtiger_attachments'=>'attachmentsid','vtiger_user2role'=>'userid');
 	var $column_fields = Array('user_name'=>'','is_admin' =>'','user_password'=>'','confirm_password'=>'',
@@ -146,10 +108,6 @@
 
 	var $object_name = "User";
 	var $user_preferences;
-	var $activity_view;
-	var $lead_view;
-	var $tagcloud;
-	var $imagename;
 	var $defhomeview;
 	var $homeorder_array = array('ALVT','HDB','PLVT','QLTQ','CVLVT','HLT','OLV','GRT','OLTSO','ILTI','MNL','OLTPO','LTFAQ');
 



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 16:02:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 23:02:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9300 -
	/vtigercrm/trunk/soap/wordplugin.php
Message-ID: <20060905230250.0187E76D02E@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep  5 17:02:43 2006
New Revision: 9300

Log:
Issue in WordPlugin has been fixed --Jeri

Modified:
    vtigercrm/trunk/soap/wordplugin.php

Modified: vtigercrm/trunk/soap/wordplugin.php
==============================================================================
--- vtigercrm/trunk/soap/wordplugin.php (original)
+++ vtigercrm/trunk/soap/wordplugin.php Tue Sep  5 17:02:43 2006
@@ -16,6 +16,7 @@
 
 $log = &LoggerManager::getLogger('wordplugin');
 
+error_reporting(0);
 $NAMESPACE = 'http://www.vtiger.com/vtigercrm/';
 $server = new soap_server;
 $accessDenied = "You are not permitted to perform this action";
@@ -321,24 +322,31 @@
 
 function create_session($user_name, $password)
 { 
-  	global $adb;
+  	global $adb,$log;
 	require_once('modules/Users/User.php');
 	$objuser = new User();
 	if($password != "" && $user_name != '')
 	{
 		$objuser->column_fields['user_name'] = $user_name;
-		$objuser->load_user($password);
-		if($objuser->is_authenticated())
+		$encrypted_password = $objuser->encrypt_password($password);
+		$query = "select id from vtiger_users where user_name='$user_name' and user_password='$encrypted_password'";
+		$result = $adb->query($query);
+		if($adb->num_rows($result) > 0)
 		{
-		  return "TempSessionID";
+			$return_access = "TempSessionID";
+			$log->debug("Logged in sucessfully from wordplugin");
 		}else
 		{
-			return "false";
+			$return_access = "false";
+			$log->debug("Logged in failure from wordplugin");
 		}
 	}else
 	{
-			return "false";
-	}
+		$return_access = "false";
+		$log->debug("Logged in failure from wordplugin");
+     }
+   return $return_access;
+		
 }
 
 function end_session($user_name)
@@ -349,6 +357,6 @@
 
 
 
-$server->service($HTTP_RAW_POST_DATA); 
+$server->service(utf8_encode($HTTP_RAW_POST_DATA)); 
 exit(); 
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 22:18:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 06 Sep 2006 05:18:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9301 -
 /vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php
Message-ID: <20060906051857.A9BCA76D064@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 23:18:54 2006
New Revision: 9301

Log:
V~0 and C~0 changed to V~O and C~O  --Minnie

Modified:
    vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php

Modified: vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php (original)
+++ vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php Tue Sep  5 23:18:54 2006
@@ -212,19 +212,19 @@
         {	 
                  $uitype = 56;	 
                  $type = "C(3) default 0"; //adodb type	 
-                 $uichekdata='C~0';	 
+                 $uichekdata='C~O';	 
         }
 	elseif($fldType == 'TextArea')	 
         {	 
                  $uitype = 21;	 
                  $type = "X"; //adodb type	 
-                 $uichekdata='V~0';	 
+                 $uichekdata='V~O';	 
         }
 	elseif($fldType == 'MultiSelectCombo')
 	{
 		 $uitype = 33;
 		 $type = "X"; //adodb type
-		 $uichekdata='V~0';
+		 $uichekdata='V~O';
 	}
 	// No Decimal Pleaces Handling
 



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 22:31:19 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 06 Sep 2006 05:31:19 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9302 -
	/vtigercrm/trunk/modules/Calendar/addEventUI.php
Message-ID: <20060906053120.11BED76D06B@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 23:31:15 2006
New Revision: 9302

Log:
location field has been added --Minnie

Modified:
    vtigercrm/trunk/modules/Calendar/addEventUI.php

Modified: vtigercrm/trunk/modules/Calendar/addEventUI.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/addEventUI.php (original)
+++ vtigercrm/trunk/modules/Calendar/addEventUI.php Tue Sep  5 23:31:15 2006
@@ -228,6 +228,10 @@
 			<tr>
 				<td valign="top" align="right"><b><?php echo $mod_strings['Description']?></b></td>
 				<td align="left"><textarea style = "width:100%; height : 60px;" name="description"></textarea></td>
+			</tr>
+			<tr>
+				<td nowrap align="right"><b><?php echo $mod_strings['Location']?></b></td>
+				<td align="left"><input name="location" type="text" class="textbox" value="" style="width:50%"></td>
 			</tr>
 			<tr>
 				<td colspan=2 width=80% align="center">



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 22:35:18 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 06 Sep 2006 05:35:18 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9303 - in
 /vtigercrm/trunk/Smarty/templates: ActivityDetailView.tpl
 ActivityEditView.tpl
Message-ID: <20060906053518.99CAB76D074@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 23:35:14 2006
New Revision: 9303

Log:
location field has been added --Minnie

Modified:
    vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl
    vtigercrm/trunk/Smarty/templates/ActivityEditView.tpl

Modified: vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl Tue Sep  5 23:35:14 2006
@@ -123,6 +123,10 @@
 								<td align="right" width="20%" nowrap valign="top"><b>{$LABEL.description}</b></td>
 								<td valign="top" align="left" colspan="3" height="60px">{$ACTIVITYDATA.description}</td>
 							 </tr>
+							 <tr>
+                                                                <td width="20%" align="right"><b>{$LABEL.location}</b></td>
+                                                                <td valign="top" align="left" colspan="3">{$ACTIVITYDATA.location}</td>
+                                                         </tr>
 							 <tr>
 								<td colspan=2 width=80% align="center">
 								<table border=0 cellspacing=0 cellpadding=3 width=80%>

Modified: vtigercrm/trunk/Smarty/templates/ActivityEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ActivityEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ActivityEditView.tpl Tue Sep  5 23:35:14 2006
@@ -129,6 +129,10 @@
                         					<td valign="top" nowrap align="right"><b>{$LABEL.description}</b></td>
 								<td align="left"><textarea style="width:100%; height : 60px;" name="description">{$ACTIVITYDATA.description}</textarea></td>
                 					</tr>
+							<tr>
+								<td valign="top" nowrap align="right"><b>{$LABEL.location}</b></td>
+								 <td align="left"><input type="text" class="textbox" name="location" id ="location" value="{$ACTIVITYDATA.location}" style="width:50%"></td>
+							</tr>
 							<tr>
 								<td colspan=2 width=80% align="center">
                                 				<table border=0 cellspacing=0 cellpadding=3 width=80%>
@@ -392,7 +396,7 @@
 											</tr>
 											<tr>
 												<td nowrap align=right>
-													{$MOD.LBL_SDRMD} :
+													{$MOD.LBL_SDRMD}
 												</td>
 												<td >
 													<input type=text name="toemail" class=textbox style="width:90%" value="{$USEREMAILID}">
@@ -407,7 +411,7 @@
 									<table border=0 cellspacing=0 cellpadding=2  width=100%>
 										<tr>
 											<td nowrap align=right width=20% valign=top>
-												<strong>{$MOD.LBL_REPEAT} :</strong>
+												<strong>{$MOD.LBL_REPEAT}</strong>
 											</td>
 											<td nowrap width=80% valign=top>
 												<table border=0 cellspacing=0 cellpadding=0>
@@ -515,7 +519,7 @@
 						<div id="addEventRelatedtoUI" style="display:none;width:100%">
 						<table width="100%" cellpadding="5" cellspacing="0" border="0">
 							<tr>
-								<td><b>{$MOD.LBL_RELATEDTO} :</b></td>
+								<td><b>{$MOD.LBL_RELATEDTO}</b></td>
 								<td>
 									<input name="parent_id" type="hidden" value="{$secondvalue.parent_id}">
 									<select name="parent_type" class="small" id="parent_type" onChange="document.EditView.parent_name.value='';document.EditView.parent_id.value=''">
@@ -532,7 +536,7 @@
 								</td>
 							</tr>
 							<tr>
-								<td><b>{$APP.Contacts} :</b></td>
+								<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">
@@ -730,7 +734,7 @@
 			<div id="addTaskRelatedtoUI" style="display:none;width:100%">
            		     <table width="100%" cellpadding="5" cellspacing="0" border="0">
                 	     <tr>
-                        	     <td><b>{$MOD.LBL_RELATEDTO} :</b></td>
+                        	     <td><b>{$MOD.LBL_RELATEDTO}</b></td>
                                      <td>
 					<input name="parent_id" type="hidden" value="{$secondvalue.parent_id}">
                                              <select name="parent_type" class="small" id="parent_type" onChange="document.EditView.parent_name.value='';document.EditView.parent_id.value=''">
@@ -747,7 +751,7 @@
                                      </td>
 			     </tr>
 			     <tr>
-                                     <td><b>{$LABEL.contact_id} :</b></td>
+                                     <td><b>{$LABEL.contact_id}</b></td>
 				     <td colspan="2">
 						<input name="contact_name" readonly type="text" class="calTxt" value="{$ACTIVITYDATA.contact_id}"><input name="contact_id" type="hidden" value="{$secondvalue.contact_id}">&nbsp;
 						<input type="button" onclick="return window.open('index.php?module=Contacts&action=Popup&html=Popup_picker&popuptype=specific&form=EditView','test','width=640,height=602,resizable=0,scrollbars=0');" class="crmButton small edit" name="selectcnt" value="Select Contact">



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 22:38:07 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 06 Sep 2006 05:38:07 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9304 -
	/vtigercrm/trunk/modules/Calendar/DetailView.php
Message-ID: <20060906053807.59D2A76D074@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 23:38:03 2006
New Revision: 9304

Log:
location field has been added --Minnie

Modified:
    vtigercrm/trunk/modules/Calendar/DetailView.php

Modified: vtigercrm/trunk/modules/Calendar/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/DetailView.php (original)
+++ vtigercrm/trunk/modules/Calendar/DetailView.php Tue Sep  5 23:38:03 2006
@@ -152,6 +152,7 @@
 	$data['visibility'] = $finaldata['visibility'];
 	$data['eventstatus'] = $finaldata['eventstatus'];
 	$data['activitytype'] = $finaldata['activitytype'];
+	$data['location'] = $finaldata['location'];
 	//Calculating reminder time
 	$rem_days = 0;
 	$rem_hrs = 0;



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 23:06:53 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 06 Sep 2006 06:06:53 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9305 -
 /vtigercrm/tags/vtigercrm-4.2.4/modules/Leads/LeadConvertToEntities.php
Message-ID: <20060906060653.B4D9976D085@vtiger.fosslabs.com>

Author: allanbush
Date: Wed Sep  6 00:06:51 2006
New Revision: 9305

Log:
Reverted changeset:9127 as that change was not part of the 4.2.4 release.

Modified:
    vtigercrm/tags/vtigercrm-4.2.4/modules/Leads/LeadConvertToEntities.php

Modified: vtigercrm/tags/vtigercrm-4.2.4/modules/Leads/LeadConvertToEntities.php
==============================================================================
--- vtigercrm/tags/vtigercrm-4.2.4/modules/Leads/LeadConvertToEntities.php (original)
+++ vtigercrm/tags/vtigercrm-4.2.4/modules/Leads/LeadConvertToEntities.php Wed Sep  6 00:06:51 2006
@@ -279,7 +279,7 @@
 $adb->query($sql_insert_contact);
 
 
-$sql_insert_contactsubdetails = "INSERT INTO contactsubdetails (contactsubscriptionid,homephone,otherphone,leadsource) VALUES (".$contact_id.",'','',".$adb->quote($row['leadsource']).")";
+$sql_insert_contactsubdetails = "INSERT INTO contactsubdetails (contactsubscriptionid,homephone,otherphone,leadsource) VALUES (".$contact_id.",'','','".$adb->quote($row['leadsource'])."')";
 
 $adb->query($sql_insert_contactsubdetails);
 



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 23:41:46 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 06 Sep 2006 06:41:46 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9306 -
 /vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php
Message-ID: <20060906064146.AD2F976D05D@vtiger.fosslabs.com>

Author: saraj
Date: Wed Sep  6 00:41:42 2006
New Revision: 9306

Log:
T added

Modified:
    vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php

Modified: vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php (original)
+++ vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php Wed Sep  6 00:41:42 2006
@@ -946,6 +946,7 @@
                                 , 'Q'
                                 , 'R'
                                 , 'S'
+                                , 'T'
                                 , 'U'
                                 , 'V'
                                 , 'W'



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 23:43:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 06 Sep 2006 06:43:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9307 -
 /vtigercrm/branches/4.2/modules/Reports/ReportColumns.php
Message-ID: <20060906064357.422A776D05D@vtiger.fosslabs.com>

Author: allanbush
Date: Wed Sep  6 00:43:54 2006
New Revision: 9307

Log:
Fixed typo in $fieldlabel variable name.  Refs #1989.

Modified:
    vtigercrm/branches/4.2/modules/Reports/ReportColumns.php

Modified: vtigercrm/branches/4.2/modules/Reports/ReportColumns.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Reports/ReportColumns.php (original)
+++ vtigercrm/branches/4.2/modules/Reports/ReportColumns.php Wed Sep  6 00:43:54 2006
@@ -99,7 +99,7 @@
 			{
 				foreach($ogReport->sec_module_columnslist[$secmodule[$i]][$key] as $field=>$fieldlabel)
 				{
-					if(isset($mod_strings[$fieldlable]))
+					if(isset($mod_strings[$fieldlabel]))
 					{
 					$shtml .= "<option value=\"".$field."\">".$mod_strings[$fieldlabel]."</option>";
 					}else



From allan.bush+vtiger_dev at gmail.com  Tue Sep  5 23:49:44 2006
From: allan.bush+vtiger_dev at gmail.com (Allan Bush)
Date: Tue, 5 Sep 2006 23:49:44 -0700
Subject: [Vtigercrm-commits] [vtiger-commits] r9306 -
	/vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php
In-Reply-To: <20060906064146.AD2F976D05D@vtiger.fosslabs.com>
References: <20060906064146.AD2F976D05D@vtiger.fosslabs.com>
Message-ID: <3bec26390609052349x22d5cfaex6edb8583b046417c@mail.gmail.com>

Umm yeah,

so exactly 35 minutes after I fixed your last fuck up  you do the same
damn thing again.

I understand that english isn't your first language, but please try
and make an effort to understand what's going on.

Does anyone have saraj's personally email address? so I can try and
resolve this problem directly.

Mike, can we just revoke commit privileges to everyone in the tags
directory?  I'm not sure how we'd create tags then though...

On 9/5/06, vtigercrm-commits at vtiger.fosslabs.com
<vtigercrm-commits at vtiger.fosslabs.com> wrote:
> Author: saraj
> Date: Wed Sep  6 00:41:42 2006
> New Revision: 9306
>
> Log:
> T added
>
> Modified:
>     vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php
>
> Modified: vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php
> ==============================================================================
> --- vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php (original)
> +++ vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php Wed Sep  6 00:41:42 2006
> @@ -946,6 +946,7 @@
>                                  , 'Q'
>                                  , 'R'
>                                  , 'S'
> +                                , 'T'
>                                  , 'U'
>                                  , 'V'
>                                  , 'W'
>
>
> _______________________________________________
> vtigercrm-commits mailing list
> vtigercrm-commits at lists.vtigercrm.com
> http://lists.vtigercrm.com/mailman/listinfo/vtigercrm-commits
>

From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 23:51:42 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 06 Sep 2006 06:51:42 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9308 -
 /vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php
Message-ID: <20060906065142.B35A276D05D@vtiger.fosslabs.com>

Author: allanbush
Date: Wed Sep  6 00:51:40 2006
New Revision: 9308

Log:
Reverted changeset:9306 as that change was not part of the 4.2.4 release.

Modified:
    vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php

Modified: vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php (original)
+++ vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php Wed Sep  6 00:51:40 2006
@@ -946,7 +946,6 @@
                                 , 'Q'
                                 , 'R'
                                 , 'S'
-                                , 'T'
                                 , 'U'
                                 , 'V'
                                 , 'W'



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep  6 00:16:33 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 06 Sep 2006 07:16:33 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9309 - in
 /vtigercrm/branches/4.2/include/php_writeexcel:
 class.writeexcel_format.inc.php class.writeexcel_formula.inc.php
Message-ID: <20060906071633.DDEAE76D0AD@vtiger.fosslabs.com>

Author: allanbush
Date: Wed Sep  6 01:16:30 2006
New Revision: 9309

Log:
Fixed php errors using php5 with excel exports.  Closes #2040.  This patch is a little more refined then r8681 which was used on the trunk.

Modified:
    vtigercrm/branches/4.2/include/php_writeexcel/class.writeexcel_format.inc.php
    vtigercrm/branches/4.2/include/php_writeexcel/class.writeexcel_formula.inc.php

Modified: vtigercrm/branches/4.2/include/php_writeexcel/class.writeexcel_format.inc.php
==============================================================================
--- vtigercrm/branches/4.2/include/php_writeexcel/class.writeexcel_format.inc.php (original)
+++ vtigercrm/branches/4.2/include/php_writeexcel/class.writeexcel_format.inc.php Wed Sep  6 01:16:30 2006
@@ -119,7 +119,7 @@
      */
     function copy($other) {
         $xf = $this->_xf_index;   // Backup XF index
-        $this = $other;           // Copy properties
+        $this[] = clone($other);  // Copy properties
         $this->_xf_index = $xf;   // Restore XF index
     }
 

Modified: vtigercrm/branches/4.2/include/php_writeexcel/class.writeexcel_formula.inc.php
==============================================================================
--- vtigercrm/branches/4.2/include/php_writeexcel/class.writeexcel_formula.inc.php (original)
+++ vtigercrm/branches/4.2/include/php_writeexcel/class.writeexcel_formula.inc.php Wed Sep  6 01:16:30 2006
@@ -150,7 +150,7 @@
 
 function set_ext_sheet($key, $value) {
 
-    $this->_ext_sheets->$key = $value;
+    $this->_ext_sheets[$key] = $value;
 }
 
 function isError($data) {



From richie at vtiger.com  Wed Sep  6 00:26:37 2006
From: richie at vtiger.com (Richie)
Date: Wed, 06 Sep 2006 00:26:37 -0700
Subject: [Vtigercrm-commits] [Vtigercrm-developers]
	[vtiger-commits]	r9306
	-	/vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php
In-Reply-To: <3bec26390609052349x22d5cfaex6edb8583b046417c@mail.gmail.com>
References: <20060906064146.AD2F976D05D@vtiger.fosslabs.com>
	<3bec26390609052349x22d5cfaex6edb8583b046417c@mail.gmail.com>
Message-ID: <10d8205736e.-2386127368813020782.8080687821603972621@@vtiger.com>

Allan, 
 
Be warned that you are using abusive language and causing disrespect to 
a member of the community. 
 
We always try and make an effort to understand what is going on regardless of English being our first or last language. 
 
Whatever be the issue, I think, we can deal it like mature and mannered people. 
 
You have done a good job on vtiger-4.2.x but that does not give you the liberty 
to treat people like dirt. 
 
I expect everyone on the list to be couth enough to treat others with respect. Do you not think it would have been better to for saraj's email address so that you could resolve the problem personally instead of what you have done now? 
 
You are good technically, but you need to be a good human being too, which incidentally is most important in life. 
 
Please apologise to saraj on this mailing list and let us get on with it. 
 
If you want to talk to me in person, call me at 18777884437 
or 
Give me your number. I will call you now. 
 
Richie




---- Allan Bush&lt;allan.bush+vtiger_dev at gmail.com&gt; wrote ---- 

  Umm yeah,

so exactly 35 minutes after I fixed your last fuck up you do the same
damn thing again.

I understand that english isn't your first language, but please try
and make an effort to understand what's going on.

Does anyone have saraj's personally email address? so I can try and
resolve this problem directly.

Mike, can we just revoke commit privileges to everyone in the tags
directory? I'm not sure how we'd create tags then though...

On 9/5/06, vtigercrm-commits at vtiger.fosslabs.com
&lt;vtigercrm-commits at vtiger.fosslabs.com&gt; wrote:
&gt; Author: saraj
&gt; Date: Wed Sep 6 00:41:42 2006
&gt; New Revision: 9306
&gt;
&gt; Log:
&gt; T added
&gt;
&gt; Modified:
&gt; vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php
&gt;
&gt; Modified: vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php
&gt; ==============================================================================
&gt; --- vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php (original)
&gt; +++ vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php Wed Sep 6 00:41:42 2006
&gt; @@ -946,6 +946,7 @@
&gt; , 'Q'
&gt; , 'R'
&gt; , 'S'
&gt; + , 'T'
&gt; , 'U'
&gt; , 'V'
&gt; , 'W'
&gt;
&gt;
&gt; _______________________________________________
&gt; vtigercrm-commits mailing list
&gt; vtigercrm-commits at lists.vtigercrm.com
&gt; http://lists.vtigercrm.com/mailman/listinfo/vtigercrm-commits
&gt;
_______________________________________________
Get started with creating presentations online - http://zohoshow.com?vt
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20060906/a0c46610/attachment.html

From richie at vtiger.com  Wed Sep  6 00:27:54 2006
From: richie at vtiger.com (Richie)
Date: Wed, 06 Sep 2006 00:27:54 -0700
Subject: [Vtigercrm-commits] [Vtigercrm-developers]
	[vtiger-commits]	r9306
	-	/vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php
In-Reply-To: <3bec26390609052349x22d5cfaex6edb8583b046417c@mail.gmail.com>
References: <20060906064146.AD2F976D05D@vtiger.fosslabs.com>
	<3bec26390609052349x22d5cfaex6edb8583b046417c@mail.gmail.com>
Message-ID: <10d82069f66.5974971160233137988.-5465377170316991356@@vtiger.com>

Mike, 
Please put Allan's request on hold. Kindly maintain status quo till further notice please. 
 
I expect this fire to die down fast. 
 
Richie




---- Allan Bush&lt;allan.bush+vtiger_dev at gmail.com&gt; wrote ---- 

  Umm yeah,

so exactly 35 minutes after I fixed your last fuck up you do the same
damn thing again.

I understand that english isn't your first language, but please try
and make an effort to understand what's going on.

Does anyone have saraj's personally email address? so I can try and
resolve this problem directly.

Mike, can we just revoke commit privileges to everyone in the tags
directory? I'm not sure how we'd create tags then though...

On 9/5/06, vtigercrm-commits at vtiger.fosslabs.com
&lt;vtigercrm-commits at vtiger.fosslabs.com&gt; wrote:
&gt; Author: saraj
&gt; Date: Wed Sep 6 00:41:42 2006
&gt; New Revision: 9306
&gt;
&gt; Log:
&gt; T added
&gt;
&gt; Modified:
&gt; vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php
&gt;
&gt; Modified: vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php
&gt; ==============================================================================
&gt; --- vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php (original)
&gt; +++ vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php Wed Sep 6 00:41:42 2006
&gt; @@ -946,6 +946,7 @@
&gt; , 'Q'
&gt; , 'R'
&gt; , 'S'
&gt; + , 'T'
&gt; , 'U'
&gt; , 'V'
&gt; , 'W'
&gt;
&gt;
&gt; _______________________________________________
&gt; vtigercrm-commits mailing list
&gt; vtigercrm-commits at lists.vtigercrm.com
&gt; http://lists.vtigercrm.com/mailman/listinfo/vtigercrm-commits
&gt;
_______________________________________________
Get started with creating presentations online - http://zohoshow.com?vt
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20060906/066e5e13/attachment.html

From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep  6 00:29:35 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 06 Sep 2006 07:29:35 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9310 -
 /vtigercrm/branches/4.2/modules/Orders/PopupSalesOrder.php
Message-ID: <20060906072935.47CD776D0AD@vtiger.fosslabs.com>

Author: allanbush
Date: Wed Sep  6 01:29:32 2006
New Revision: 9310

Log:
Fixed query error in sales order popup.  Closes #2027.

Modified:
    vtigercrm/branches/4.2/modules/Orders/PopupSalesOrder.php

Modified: vtigercrm/branches/4.2/modules/Orders/PopupSalesOrder.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Orders/PopupSalesOrder.php (original)
+++ vtigercrm/branches/4.2/modules/Orders/PopupSalesOrder.php Wed Sep  6 01:29:32 2006
@@ -238,10 +238,10 @@
 $focus->list_mode="search";
 $focus->popup_type=$popuptype;
 
-$listview_header = getSearchListViewHeader($focus,"SalesOrder",$url_string,$sorder,$order_by);
+$listview_header = getSearchListViewHeader($focus,"Orders",$url_string,$sorder,$order_by);
 $xtpl->assign("LISTHEADER", $listview_header);
 
-$listview_entries = getSearchListViewEntries($focus,"SalesOrder",$list_result,$navigation_array);
+$listview_entries = getSearchListViewEntries($focus,"Orders",$list_result,$navigation_array);
 $xtpl->assign("LISTENTITY", $listview_entries);
 
 if($order_by !='')



From allan.bush+vtiger_dev at gmail.com  Wed Sep  6 00:34:59 2006
From: allan.bush+vtiger_dev at gmail.com (Allan Bush)
Date: Wed, 6 Sep 2006 00:34:59 -0700
Subject: [Vtigercrm-commits] [Vtigercrm-developers] [vtiger-commits]
	r9306 -
	/vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php
In-Reply-To: <6850184341801969779@unknownmsgid>
References: <20060906064146.AD2F976D05D@vtiger.fosslabs.com>
	<3bec26390609052349x22d5cfaex6edb8583b046417c@mail.gmail.com>
	<6850184341801969779@unknownmsgid>
Message-ID: <3bec26390609060034y6f147f7ehe1d129ecb4fdbf4f@mail.gmail.com>

Sorry I may have been a little out of line, I just get frustrated
sometimes having to redo work because of people not paying attentions
to my requests for changes.

Regardless of the tone of my request, there is no reason to every make
changes (other then adding new tags) to anything in the tags folder
and as such making it readonly is probably a good idea.

On 9/6/06, Richie <richie at vtiger.com> wrote:
>
> Mike,
> Please put Allan's request on hold. Kindly maintain status quo till further
> notice please.
>
> I expect this fire to die down fast.
>
> Richie
>
>
>
>
> ---- Allan Bush<allan.bush+vtiger_dev at gmail.com> wrote ----
>
>
>  Umm yeah,
>
> so exactly 35 minutes after I fixed your last fuck up you do the same
> damn thing again.
>
> I understand that english isn't your first language, but please try
> and make an effort to understand what's going on.
>
> Does anyone have saraj's personally email address? so I can try and
> resolve this problem directly.
>
> Mike, can we just revoke commit privileges to everyone in the tags
> directory? I'm not sure how we'd create tags then though...
>
> On 9/5/06, vtigercrm-commits at vtiger.fosslabs.com
> <vtigercrm-commits at vtiger.fosslabs.com> wrote:
> > Author: saraj
> > Date: Wed Sep 6 00:41:42 2006
> > New Revision: 9306
> >
> > Log:
> > T added
> >
> > Modified:
> >
> vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php
> >
> > Modified:
> vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php
> >
> ==============================================================================
> > ---
> vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php
> (original)
> > +++
> vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php
> Wed Sep 6 00:41:42 2006
> > @@ -946,6 +946,7 @@
> > , 'Q'
> > , 'R'
> > , 'S'
> > + , 'T'
> > , 'U'
> > , 'V'
> > , 'W'
> >
> >
> > _______________________________________________
> > vtigercrm-commits mailing list
> > vtigercrm-commits at lists.vtigercrm.com
> >
> http://lists.vtigercrm.com/mailman/listinfo/vtigercrm-commits
> >
> _______________________________________________
> Get started with creating presentations online - http://zohoshow.com?vt
>
>
> _______________________________________________
> Get started with creating presentations online - http://zohoshow.com?vt
>
>

From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep  6 00:57:03 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 06 Sep 2006 07:57:03 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9311 - in
 /vtigercrm/branches/4.2/modules/Reports: ReportRun.php Reports.php
Message-ID: <20060906075703.8403776D0B2@vtiger.fosslabs.com>

Author: allanbush
Date: Wed Sep  6 01:57:00 2006
New Revision: 9311

Log:
Adds Sales Orders to the list of modules reports can be created for.  Closes #94.

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

Modified: vtigercrm/branches/4.2/modules/Reports/ReportRun.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Reports/ReportRun.php (original)
+++ vtigercrm/branches/4.2/modules/Reports/ReportRun.php Wed Sep  6 01:57:00 2006
@@ -1072,6 +1072,7 @@
 				inner join crmentity crmentityQuotes on crmentityQuotes.crmid=quotes.quoteid 
 				inner join quotesbillads on quotes.quoteid=quotesbillads.quotebilladdressid 
 				inner join quotesshipads on quotes.quoteid=quotesshipads.quoteshipaddressid 
+				inner join quotescf on quotes.quoteid=quotescf.quoteid 
 				left join users usersQuotes on usersQuotes.id = crmentityQuotes.smownerid
 				left join users usersRel1 on usersRel1.id = quotes.inventorymanager
 				left join potential potentialRel on potentialRel.potentialid = quotes.potentialid
@@ -1087,6 +1088,7 @@
 				inner join crmentity crmentityOrders on crmentityOrders.crmid=purchaseorder.purchaseorderid 
 				inner join pobillads on purchaseorder.purchaseorderid=pobillads.pobilladdressid 
 				inner join poshipads on purchaseorder.purchaseorderid=poshipads.poshipaddressid 
+				inner join purchaseordercf on purchaseorder.purchaseorderid=purchaseordercf.purchaseorderid 
 				left join users usersOrders on usersOrders.id = crmentityOrders.smownerid 
 				left join vendor vendorRel on vendorRel.vendorid = purchaseorder.vendorid 
 				left join contactdetails contactdetailsOrders on contactdetailsOrders.contactid = purchaseorder.contactid 
@@ -1100,11 +1102,29 @@
 				inner join crmentity crmentityInvoice on crmentityInvoice.crmid=invoice.invoiceid 
 				inner join invoicebillads on invoice.invoiceid=invoicebillads.invoicebilladdressid 
 				inner join invoiceshipads on invoice.invoiceid=invoiceshipads.invoiceshipaddressid 
+				inner join invoicecf on invoice.invoiceid=invoicecf.invoiceid 
 				left join users usersInvoice on usersInvoice.id = crmentityInvoice.smownerid
 				left join account accountInvoice on accountInvoice.accountid = invoice.accountid
 				".$this->getRelatedModulesQuery($module,$this->secondarymodule)."
 				where crmentityInvoice.deleted=0";
 		}
+
+		if($module == "SalesOrder")
+		{
+			$query = "from salesorder 
+				inner join crmentity as crmentitySalesOrder on crmentitySalesOrder.crmid=salesorder.salesorderid 
+				inner join sobillads on salesorder.salesorderid=sobillads.sobilladdressid 
+				inner join soshipads on salesorder.salesorderid=soshipads.soshipaddressid 
+				left join salesordercf on salesorder.salesorderid = salesordercf.salesorderid  
+				left join contactdetails as contactdetailsSalesOrder on contactdetailsSalesOrder.contactid = salesorder.contactid 
+				left join quotes as quotesSalesOrder on quotesSalesOrder.quoteid = salesorder.quoteid                           
+				left join account as accountSalesOrder on accountSalesOrder.accountid = salesorder.accountid
+				left join potential as potentialRel on potentialRel.potentialid = salesorder.potentialid 
+				left join users as usersSalesOrder on usersSalesOrder.id = crmentitySalesOrder.smownerid 
+				where crmentitySalesOrder.deleted=0";
+
+		}       
+
 
 		$vtlog->logthis("ReportRun :: Successfully returned getReportsQuery".$module,"info");
 		return $query;

Modified: vtigercrm/branches/4.2/modules/Reports/Reports.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Reports/Reports.php (original)
+++ vtigercrm/branches/4.2/modules/Reports/Reports.php Wed Sep  6 01:57:00 2006
@@ -33,7 +33,7 @@
 			    "m"=>"less or equal",
 			    "h"=>"greater or equal");
 
-$report_modules = Array('Leads','Accounts','Contacts','Potentials','Products','HelpDesk','Quotes','Orders','Invoice','Activities');
+$report_modules = Array('Leads','Accounts','Contacts','Potentials','Products','HelpDesk','Quotes','Orders','Invoice','Activities','SalesOrder');
 
 $related_modules = Array('Leads'=>Array(''),
 			 'Accounts'=>Array('Potentials','Contacts','Products','Quotes','Invoice'),
@@ -44,6 +44,7 @@
 			 'HelpDesk'=>Array('Products'),
 			 'Quotes'=>Array('Accounts','Contacts','Potentials'),
 			 'Orders'=>Array('Contacts'),
+			 'SalesOrder'=>Array(),
 			 'Invoice'=>Array('Accounts')
 			);
 
@@ -102,6 +103,7 @@
 				 "HelpDesk"=>Array("Information"=>'1,2',"Custom Information"=>5,"Description"=>3,"Solution"=>4),//patch2
 				 "Quotes"=>Array("Information"=>1,"Address"=>2,"Description"=>3,"Custom Information"=>5),
 				 "Orders"=>Array("Information"=>1,"Address"=>2,"Description"=>3,"Custom Information"=>5),
+				 "SalesOrder"=>Array("Information"=>1,"Address"=>2,"Description"=>3,"Custom Information"=>5),
 				 "Invoice"=>Array("Information"=>1,"Address"=>2,"Description"=>3,"Custom Information"=>5)
 				);
 



From philip at vtiger.com  Wed Sep  6 01:03:26 2006
From: philip at vtiger.com (Philip)
Date: Wed, 06 Sep 2006 01:03:26 -0700
Subject: [Vtigercrm-commits] [Vtigercrm-developers]
	[vtiger-commits]	r9306
	-	/vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php
In-Reply-To: <3bec26390609060034y6f147f7ehe1d129ecb4fdbf4f@mail.gmail.com>
References: <20060906064146.AD2F976D05D@vtiger.fosslabs.com>	<3bec26390609052349x22d5cfaex6edb8583b046417c@mail.gmail.com>	<6850184341801969779@unknownmsgid>
	<3bec26390609060034y6f147f7ehe1d129ecb4fdbf4f@mail.gmail.com>
Message-ID: <10d822725ef.-2963427893705069027.-4819865131191860493@@vtiger.com>

I apologize, for not checking in the file in the right branch.  Henceforth i'll make sure that the 4.2.4 fixes are 
checked into the 4.2.4.1 branch, if the fix has not been done. 

So,  shall i revert the changes that has been done in the r9306 version?

Philip 


---- On Wed, 06 Sep 2006 Allan Bush <allan.bush+vtiger_dev at gmail.com> wrote ---- 

Sorry I may have been a little out of line, I just get frustrated
sometimes having to redo work because of people not paying attentions
to my requests for changes.

Regardless of the tone of my request, there is no reason to every make
changes (other then adding new tags) to anything in the tags folder
and as such making it readonly is probably a good idea.

On 9/6/06, Richie <richie at vtiger.com> wrote:
>
> Mike,
> Please put Allan's request on hold. Kindly maintain status quo till further
> notice please.
>
> I expect this fire to die down fast.
>
> Richie
>
>
>
>
> ---- Allan Bush<allan.bush+vtiger_dev at gmail.com> wrote ----
>
>
>  Umm yeah,
>
> so exactly 35 minutes after I fixed your last fuck up you do the same
> damn thing again.
>
> I understand that english isn't your first language, but please try
> and make an effort to understand what's going on.
>
> Does anyone have saraj's personally email address? so I can try and
> resolve this problem directly.
>
> Mike, can we just revoke commit privileges to everyone in the tags
> directory? I'm not sure how we'd create tags then though...
>
> On 9/5/06, vtigercrm-commits at vtiger.fosslabs.com
> <vtigercrm-commits at vtiger.fosslabs.com> wrote:
> > Author: saraj
> > Date: Wed Sep 6 00:41:42 2006
> > New Revision: 9306
> >
> > Log:
> > T added
> >
> > Modified:
> >
> vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php
> >
> > Modified:
> vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php
> >
> ==============================================================================
> > ---
> vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php
> (original)
> > +++
> vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php
> Wed Sep 6 00:41:42 2006
> > @@ -946,6 +946,7 @@
> > , 'Q'
> > , 'R'
> > , 'S'
> > + , 'T'
> > , 'U'
> > , 'V'
> > , 'W'
> >
> >
> > _______________________________________________
> > vtigercrm-commits mailing list
> > vtigercrm-commits at lists.vtigercrm.com
> >
> http://lists.vtigercrm.com/mailman/listinfo/vtigercrm-commits
> >
> _______________________________________________
> Get started with creating presentations online - http://zohoshow.com?vt
>
>
> _______________________________________________
> Get started with creating presentations online - http://zohoshow.com?vt
>
>
_______________________________________________
Get started with creating presentations online - http://zohoshow.com?vt 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20060906/272fbccf/attachment.html

From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep  6 02:44:07 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 06 Sep 2006 09:44:07 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9312 - in
 /vtigercrm/trunk/themes/woodspice/images: cal12x12Shared.gif
 cal16x16Shared.jpg
Message-ID: <20060906094407.6EF8676D068@vtiger.fosslabs.com>

Author: saraj
Date: Wed Sep  6 03:44:02 2006
New Revision: 9312

Log:
images added  --Minnie

Added:
    vtigercrm/trunk/themes/woodspice/images/cal12x12Shared.gif   (with props)
    vtigercrm/trunk/themes/woodspice/images/cal16x16Shared.jpg   (with props)



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep  6 02:50:47 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 06 Sep 2006 09:50:47 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9313 -
 /vtigercrm/trunk/themes/woodspice/images/plsWaitAnimated.gif
Message-ID: <20060906095047.D6C3176D0AA@vtiger.fosslabs.com>

Author: saraj
Date: Wed Sep  6 03:50:43 2006
New Revision: 9313

Log:
Image added for background freeze in recalculate sharing access -- ahmed

Added:
    vtigercrm/trunk/themes/woodspice/images/plsWaitAnimated.gif   (with props)



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep  6 02:50:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 06 Sep 2006 09:50:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9314 -
	/vtigercrm/trunk/modules/Calendar/calendarLayout.php
Message-ID: <20060906095050.12A9876D0B8@vtiger.fosslabs.com>

Author: saraj
Date: Wed Sep  6 03:50:46 2006
New Revision: 9314

Log:
changes made to differentiate shared events form others --Minnie

Modified:
    vtigercrm/trunk/modules/Calendar/calendarLayout.php

Modified: vtigercrm/trunk/modules/Calendar/calendarLayout.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/calendarLayout.php (original)
+++ vtigercrm/trunk/modules/Calendar/calendarLayout.php Wed Sep  6 03:50:46 2006
@@ -1106,6 +1106,7 @@
 			$end_hour = $value['endhour'] .':'.$value['endmin'].''.$value['endfmt'];
 			$account_name = $act[$i]->accountname;
 			$eventstatus = $act[$i]->eventstatus;
+			$shared = $act[$i]->shared;
 			$color = $act[$i]->color;
 			$image = $cal['IMAGE_PATH'].''.$act[$i]->image_name;
 			$height = $rowspan * 75;
@@ -1129,6 +1130,10 @@
 					<td width="100%"><b>'.$start_hour.' - '.$end_hour.'</b></td>
 				</tr>';
 			$eventlayer .= '<tr><td>';
+			if($shared)
+				$eventlayer .= '<img src="'.$cal['IMAGE_PATH'].'cal12x12Shared.gif" align="middle" border="0">';
+			else
+				$eventlayer .= '&nbsp;';
 			$eventlayer .= '</td>
 				<td><a href="index.php?action=DetailView&module=Calendar&record='.$id.'&activity_mode=Events&viewtype=calendar&parenttab='.$category.'"><span class="orgTab">'.$subject.'</span></a></td>
 				</tr>
@@ -1185,6 +1190,7 @@
 			$end_hour = $value['endhour'] .':'.$value['endmin'].''.$value['endfmt'];
                         $account_name = $act[$i]->accountname;
 			$eventstatus = $act[$i]->eventstatus;
+			$shared = $act[$i]->shared;
 			$user = $act[$i]->owner;
 			$priority = $act[$i]->priority;
                         $image = $cal['IMAGE_PATH'].''.$act[$i]->image_name;
@@ -1200,7 +1206,13 @@
 					<td width="100%"><b>'.$start_hour.' - '.$end_hour.'</b></td>
 				</tr>
 				<tr>
-					<td>&nbsp;</td>
+					<td>';
+			if($shared)
+				$eventlayer .= '<img src="'.$cal['IMAGE_PATH'].'cal12x12Shared.gif" align="middle" border="0">';
+			else
+				$eventlayer .= '&nbsp;';
+			$eventlayer .= '	
+				</td>
 					<td><a href="index.php?action=DetailView&module=Calendar&record='.$id.'&activity_mode=Events&viewtype=calendar&parenttab='.$category.'"><span class="orgTab">'.$subject.'</span></a></td>
 				</tr>
 				<tr><td>'.$action_str.'</td><td>('.$user.' | '.$eventstatus.' | '.$priority.')</td>



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep  6 02:51:16 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 06 Sep 2006 09:51:16 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9315 -
	/vtigercrm/trunk/modules/Calendar/Appointment.php
Message-ID: <20060906095116.56E7076D0AA@vtiger.fosslabs.com>

Author: saraj
Date: Wed Sep  6 03:51:12 2006
New Revision: 9315

Log:
changes made to differentiate shared events form others --Minnie

Modified:
    vtigercrm/trunk/modules/Calendar/Appointment.php

Modified: vtigercrm/trunk/modules/Calendar/Appointment.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/Appointment.php (original)
+++ vtigercrm/trunk/modules/Calendar/Appointment.php Wed Sep  6 03:51:12 2006
@@ -36,6 +36,7 @@
 	var $formatted_datetime;
 	var $duration_min;
 	var $duration_hour;
+	var $shared = false;
 
 	function Appointment()
 	{
@@ -127,7 +128,7 @@
          */
 	function readResult($act_array, $view)
 	{
-		global $adb;
+		global $adb,$current_user;
 		$format_sthour='';
                 $format_stmin='';
 		$this->description       = $act_array["description"];
@@ -150,6 +151,11 @@
 		{
 			$this->assignedto ="user";
 			$this->ownerid = $act_array["smownerid"];
+			if(!is_admin($current_user))
+			{
+				if($act_array["smownerid"] != $current_user->id)
+					$this->shared = true;
+			}
 			$this->owner   = getUserName($act_array["smownerid"]);
 			$query="SELECT cal_color FROM vtiger_users where id = ".$this->ownerid;
 			$result=$adb->query($query);



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep  6 03:40:18 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 06 Sep 2006 10:40:18 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9316 - in
 /vtigercrm/trunk/Smarty/templates: Header.tpl QuickCreate.tpl
 QuickCreateHidden.tpl
Message-ID: <20060906104018.DA1CF76D0B8@vtiger.fosslabs.com>

Author: saraj
Date: Wed Sep  6 04:40:13 2006
New Revision: 9316

Log:
changes made to integrate enddate and time in event quickcreate form --Minnie

Modified:
    vtigercrm/trunk/Smarty/templates/Header.tpl
    vtigercrm/trunk/Smarty/templates/QuickCreate.tpl
    vtigercrm/trunk/Smarty/templates/QuickCreateHidden.tpl

Modified: vtigercrm/trunk/Smarty/templates/Header.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Header.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Header.tpl Wed Sep  6 04:40:13 2006
@@ -210,6 +210,7 @@
 						$("qcform").style.display="inline";
 					        $("qcform").innerHTML = response.responseText;
 						eval($("date_calpopup").innerHTML);
+						eval($("date_calpopup23").innerHTML);
 						eval($("qcform"));
                                         {rdelim}
                 {rdelim}

Modified: vtigercrm/trunk/Smarty/templates/QuickCreate.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/QuickCreate.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/QuickCreate.tpl Wed Sep  6 04:40:13 2006
@@ -217,7 +217,13 @@
                                                                 {/if}
                                                         {/if}
 							{elseif $uitype eq 23 || $uitype eq 5 || $uitype eq 6}
-							<td width="20%" class="cellLabel" align=right>{$fldlabel}</td>
+							<td width="20%" class="cellLabel" align=right>
+							{if $uitype eq 23 && $QCMODULE eq 'Event'}
+                                                                {$APP.LBL_EVENT_ENDDATE}
+                                                        {else}
+                                                                {$fldlabel}
+                                                        {/if}
+                                                        </td>
 							<td width="30%" align=left class="cellText">
 							   {foreach key=date_value item=time_value from=$fldvalue}
 								{assign var=date_val value="$date_value"}
@@ -228,6 +234,12 @@
 							{if $uitype eq 6}
 							   <input name="time_start" style="border:1px solid #bababa;" size="5" maxlength="5" type="text" value="{$time_val}">
 							{/if}
+							{if $uitype eq 23 && $QCMODULE eq 'Event'}
+                                                           <input name="time_end" style="border:1px solid #bababa;" size="5" maxlength="5" type="text" value="{$time_val}">
+                                                            <script id="date_calpopup23">
+                                                                getCalendarPopup('jscal_trigger_{$fldname}','jscal_field_{$fldname}','{$dateFormat}');
+                                                             </script>
+                                                        {/if}
 							{foreach key=date_format item=date_str from=$secondvalue}
                                                                 {assign var=dateFormat value="$date_format"}
 							        {assign var=dateStr value="$date_str"}
@@ -378,10 +390,18 @@
 </td>
 </tr>
 </table>
+{if $QCMODULE eq 'Event'}
+<SCRIPT id="qcvalidate">
+        var qcfieldname = new Array('subject','date_start','eventstatus','activitytype','due_date','time_end');
+        var qcfieldlabel = new Array('Subject','Start Date & Time','Status','Activity Type','End Date & Time','End Date & Time');
+        var qcfielddatatype = new Array('V~M','DT~M~time_start','V~O','V~O','D~M~OTH~GE~date_start~Start Date & Time','T~M');
+</SCRIPT>
+{else}
 <SCRIPT id="qcvalidate">
         var qcfieldname = new Array({$VALIDATION_DATA_FIELDNAME});
         var qcfieldlabel = new Array({$VALIDATION_DATA_FIELDLABEL});
         var qcfielddatatype = new Array({$VALIDATION_DATA_FIELDDATATYPE});
 </SCRIPT>
+{/if}
 </form>
 </body>

Modified: vtigercrm/trunk/Smarty/templates/QuickCreateHidden.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/QuickCreateHidden.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/QuickCreateHidden.tpl Wed Sep  6 04:40:13 2006
@@ -42,14 +42,12 @@
 	<input type="hidden" name="activity_mode" value="{$ACTIVITY_MODE}">
 	<input type="hidden" name="assigned_user_id" value="{$USERID}">
 	<input type="hidden" name="action" value="Save">
-	<input type="hidden" name="due_date" value="">
 {elseif $MODULE eq 'Events'}
         <input type="hidden" name="module" value="Calendar">
         <input type="hidden" name="record" value="">
         <input type="hidden" name="activity_mode" value="{$ACTIVITY_MODE}">
         <input type="hidden" name="assigned_user_id" value="{$USERID}">
         <input type="hidden" name="action" value="Save">
-        <input type="hidden" name="due_date" value="">
 {elseif $MODULE eq 'HelpDesk'}
 	<input type="hidden" name="module" value="{$MODULE}">
         <input type="hidden" name="return_module" value="HelpDesk">



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep  6 03:43:23 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 06 Sep 2006 10:43:23 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9317 -
	/vtigercrm/trunk/include/language/en_us.lang.php
Message-ID: <20060906104323.2B33E76D0B8@vtiger.fosslabs.com>

Author: saraj
Date: Wed Sep  6 04:43:19 2006
New Revision: 9317

Log:
label added  --Minnie

Modified:
    vtigercrm/trunk/include/language/en_us.lang.php

Modified: vtigercrm/trunk/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/include/language/en_us.lang.php (original)
+++ vtigercrm/trunk/include/language/en_us.lang.php Wed Sep  6 04:43:19 2006
@@ -731,6 +731,7 @@
 'Category'=>'Category',
 
 'Price Book Name'=>'Price Book Name',
+'LBL_EVENT_ENDDATE'=>'End Date & Time',
 
 //Added after 4 GA
 'LBL_CUSTOM_INFORMATION'=>'Custom Information',



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep  6 03:51:56 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 06 Sep 2006 10:51:56 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9318 -
	/vtigercrm/trunk/include/utils/EditViewUtils.php
Message-ID: <20060906105156.7C4D476D0B8@vtiger.fosslabs.com>

Author: saraj
Date: Wed Sep  6 04:51:52 2006
New Revision: 9318

Log:
changes made for event enddate and time --Minnie

Modified:
    vtigercrm/trunk/include/utils/EditViewUtils.php

Modified: vtigercrm/trunk/include/utils/EditViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/EditViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/EditViewUtils.php Wed Sep  6 04:51:52 2006
@@ -112,7 +112,12 @@
 		$fieldvalue[] = array($disp_value => $curr_time) ;
 		if($uitype == 5 || $uitype == 23)
 		{
-			$fieldvalue[] = array($date_format=>$current_user->date_format);
+			if($module_name == 'Events' && $uitype == 23)
+			{
+				$fieldvalue[] = array($date_format=>$current_user->date_format.' '.$app_strings['YEAR_MONTH_DATE']);
+			}
+			else
+				$fieldvalue[] = array($date_format=>$current_user->date_format);
 		}
 		else
 		{



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep  6 03:55:44 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 06 Sep 2006 10:55:44 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9319 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060906105544.0334D76D067@vtiger.fosslabs.com>

Author: saraj
Date: Wed Sep  6 04:55:41 2006
New Revision: 9319

Log:
changes made to integrate enddate and time in event quickcreate form --Minnie

Modified:
    vtigercrm/trunk/modules/Users/DefaultDataPopulator.php

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Wed Sep  6 04:55:41 2006
@@ -553,11 +553,11 @@
  $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'date_start','vtiger_activity',1,'6','date_start','Start Date & Time',1,0,0,100,3,41,1,'DT~M~time_start',0,2,'BAS')");
  $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'time_start','vtiger_activity',1,'2','time_start','Time Start',1,0,0,100,4,41,3,'T~M',1,null,'BAS')");
 
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'due_date','vtiger_activity',1,'23','due_date','End Date',1,0,0,100,5,41,1,'D~M~OTH~GE~date_start~Start Date & Time',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'due_date','vtiger_activity',1,'23','due_date','End Date',1,0,0,100,5,41,1,'D~M~OTH~GE~date_start~Start Date & Time',0,5,'BAS')");
  $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'time_end','vtiger_activity',1,'2','time_end','End Time',1,0,0,100,5,41,3,'T~M',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'recurringtype','vtiger_recurringevents',1,'15','recurringtype','Recurrence',1,0,0,100,6,41,1,'O~O',1,null,'BAS')");
   
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'duration_hours','vtiger_activity',1,'63','duration_hours','Duration',1,0,0,100,7,41,1,'I~M',0,5,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'duration_hours','vtiger_activity',1,'63','duration_hours','Duration',1,0,0,100,7,41,1,'I~M',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'duration_minutes','vtiger_activity',1,'15','duration_minutes','Duration Minutes',1,0,0,100,8,41,3,'O~O',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'crmid','vtiger_seactivityrel',1,'66','parent_id','Related To',1,0,0,100,9,41,1,'I~O',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'eventstatus','vtiger_activity',1,'111','eventstatus','Status',1,0,0,100,10,41,1,'V~O',0,3,'BAS')");



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep  6 04:10:08 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 06 Sep 2006 11:10:08 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9320 - in /vtigercrm/trunk:
 Smarty/templates/Inventory/ProductDetails.tpl
 Smarty/templates/Inventory/ProductDetailsEditView.tpl
 include/js/Inventory.js modules/Products/InventoryTaxAjax.php
Message-ID: <20060906111008.792DD76D0B8@vtiger.fosslabs.com>

Author: saraj
Date: Wed Sep  6 05:09:59 2006
New Revision: 9320

Log:
* Modified to calculate the taxes when we change discount and listprice

Modified:
    vtigercrm/trunk/Smarty/templates/Inventory/ProductDetails.tpl
    vtigercrm/trunk/Smarty/templates/Inventory/ProductDetailsEditView.tpl
    vtigercrm/trunk/include/js/Inventory.js
    vtigercrm/trunk/modules/Products/InventoryTaxAjax.php

Modified: vtigercrm/trunk/Smarty/templates/Inventory/ProductDetails.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Inventory/ProductDetails.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Inventory/ProductDetails.tpl Wed Sep  6 05:09:59 2006
@@ -180,7 +180,7 @@
 		<table width="100%" cellpadding="0" cellspacing="0">
 		   <tr>
 			<td align="right">
-				<input id="listPrice1" name="listPrice1" value="{$UNIT_PRICE}" type="text" class="small " style="width:70px" onBlur="calcTotal()"/>&nbsp;<img src="{$IMAGE_PATH}pricebook.gif" onclick="priceBookPickList(this,1)">
+				<input id="listPrice1" name="listPrice1" value="{$UNIT_PRICE}" type="text" class="small " style="width:70px" onBlur="calcTotal(); callTaxCalc(1);"/>&nbsp;<img src="{$IMAGE_PATH}pricebook.gif" onclick="priceBookPickList(this,1)">
 			</td>
 		   </tr>
 		   <tr>
@@ -194,16 +194,16 @@
 						<td align="right"><img src="{$IMAGE_PATH}close.gif" border="0" onClick="fnHidePopDiv('discount_div1')" style="cursor:pointer;"></td>
 					   </tr>
 					   <tr>
-						<td align="left" class="lineOnTop"><input type="radio" name="discount1" checked onclick="setDiscount(this,1)">&nbsp; {$APP.LBL_ZERO_DISCOUNT}</td>
+						<td align="left" class="lineOnTop"><input type="radio" name="discount1" checked onclick="setDiscount(this,1); callTaxCalc(1);">&nbsp; {$APP.LBL_ZERO_DISCOUNT}</td>
 						<td class="lineOnTop">&nbsp;</td>
 					   </tr>
 					   <tr>
-						<td align="left"><input type="radio" name="discount1" onclick="setDiscount(this,1)">&nbsp; % {$APP.LBL_OF_PRICE}</td>
-						<td align="right"><input type="text" class="small" size="2" id="discount_percentage1" name="discount_percentage1" value="0" style="visibility:hidden" onBlur="setDiscount(this,1)">&nbsp;%</td>
-					   </tr>
-					   <tr>
-						<td align="left" nowrap><input type="radio" name="discount1" onclick="setDiscount(this,1)">&nbsp;{$APP.LBL_DIRECT_PRICE_REDUCTION}</td>
-						<td align="right"><input type="text" id="discount_amount1" name="discount_amount1" size="5" value="0" style="visibility:hidden" onBlur="setDiscount(this,1)"></td>
+						<td align="left"><input type="radio" name="discount1" onclick="setDiscount(this,1); callTaxCalc(1);">&nbsp; % {$APP.LBL_OF_PRICE}</td>
+						<td align="right"><input type="text" class="small" size="2" id="discount_percentage1" name="discount_percentage1" value="0" style="visibility:hidden" onBlur="setDiscount(this,1); callTaxCalc(1);">&nbsp;%</td>
+					   </tr>
+					   <tr>
+						<td align="left" nowrap><input type="radio" name="discount1" onclick="setDiscount(this,1); callTaxCalc(1);">&nbsp;{$APP.LBL_DIRECT_PRICE_REDUCTION}</td>
+						<td align="right"><input type="text" id="discount_amount1" name="discount_amount1" size="5" value="0" style="visibility:hidden" onBlur="setDiscount(this,1); callTaxCalc(1);"></td>
 					   </tr>
 					</table>
 				</div>

Modified: vtigercrm/trunk/Smarty/templates/Inventory/ProductDetailsEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Inventory/ProductDetailsEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Inventory/ProductDetailsEditView.tpl Wed Sep  6 05:09:59 2006
@@ -201,7 +201,7 @@
 		<table width="100%" cellpadding="0" cellspacing="0">
 		   <tr>
 			<td align="right">
-				<input id="{$listPrice}" name="{$listPrice}" value="{$data.$listPrice}" type="text" class="small " style="width:70px" onBlur="calcTotal()"/>&nbsp;<img src="{$IMAGE_PATH}pricebook.gif" onclick="priceBookPickList(this,'{$row_no}')">
+				<input id="{$listPrice}" name="{$listPrice}" value="{$data.$listPrice}" type="text" class="small " style="width:70px" onBlur="calcTotal(); callTaxCalc('{$row_no}');"/>&nbsp;<img src="{$IMAGE_PATH}pricebook.gif" onclick="priceBookPickList(this,'{$row_no}')">
 			</td>
 		   </tr>
 		   <tr>
@@ -215,16 +215,16 @@
 						<td align="right"><img src="{$IMAGE_PATH}close.gif" border="0" onClick="fnHidePopDiv('discount_div{$row_no}')" style="cursor:pointer;"></td>
 					   </tr>
 					   <tr>
-						<td align="left" class="lineOnTop"><input type="radio" name="discount{$row_no}" {$data.$checked_discount_zero} onclick="setDiscount(this,'{$row_no}')">&nbsp; {$APP.LBL_ZERO_DISCOUNT}</td>
+						<td align="left" class="lineOnTop"><input type="radio" name="discount{$row_no}" {$data.$checked_discount_zero} onclick="setDiscount(this,'{$row_no}'); callTaxCalc('{$row_no}');">&nbsp; {$APP.LBL_ZERO_DISCOUNT}</td>
 						<td class="lineOnTop">&nbsp;</td>
 					   </tr>
 					   <tr>
-						<td align="left"><input type="radio" name="discount{$row_no}" onclick="setDiscount(this,'{$row_no}')" {$data.$checked_discount_percent}>&nbsp; % {$APP.LBL_OF_PRICE}</td>
-						<td align="right"><input type="text" class="small" size="2" id="discount_percentage{$row_no}" name="discount_percentage{$row_no}" value="{$data.$discount_percent}" {$data.$style_discount_percent} onBlur="setDiscount(this,'{$row_no}')">&nbsp;%</td>
-					   </tr>
-					   <tr>
-						<td align="left" nowrap><input type="radio" name="discount{$row_no}" onclick="setDiscount(this,'{$row_no}')" {$data.$checked_discount_amount}>&nbsp;{$APP.LBL_DIRECT_PRICE_REDUCTION}</td>
-						<td align="right"><input type="text" id="discount_amount{$row_no}" name="discount_amount{$row_no}" size="5" value="{$data.$discount_amount}" {$data.$style_discount_amount} onBlur="setDiscount(this,{$row_no})"></td>
+						<td align="left"><input type="radio" name="discount{$row_no}" onclick="setDiscount(this,'{$row_no}'); callTaxCalc('{$row_no}');" {$data.$checked_discount_percent}>&nbsp; % {$APP.LBL_OF_PRICE}</td>
+						<td align="right"><input type="text" class="small" size="2" id="discount_percentage{$row_no}" name="discount_percentage{$row_no}" value="{$data.$discount_percent}" {$data.$style_discount_percent} onBlur="setDiscount(this,'{$row_no}'); callTaxCalc('{$row_no}');">&nbsp;%</td>
+					   </tr>
+					   <tr>
+						<td align="left" nowrap><input type="radio" name="discount{$row_no}" onclick="setDiscount(this,'{$row_no}'); callTaxCalc('{$row_no}');" {$data.$checked_discount_amount}>&nbsp;{$APP.LBL_DIRECT_PRICE_REDUCTION}</td>
+						<td align="right"><input type="text" id="discount_amount{$row_no}" name="discount_amount{$row_no}" size="5" value="{$data.$discount_amount}" {$data.$style_discount_amount} onBlur="setDiscount(this,{$row_no}); callTaxCalc('{$row_no}');"></td>
 					   </tr>
 					</table>
 				</div>
@@ -240,7 +240,7 @@
 				(+)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(this,'tax_div{$row_no}','tax','{$row_no}')" >{$APP.LBL_TAX} </a> : </b>
 				<div class="discountUI" id="tax_div{$row_no}">
 					<!-- we will form the table with all taxes -->
-					<table width="100%" border="0" cellpadding="5" cellspacing="0" class="small">
+					<table width="100%" border="0" cellpadding="5" cellspacing="0" class="small" id="tax_table{$row_no}">
 					   <tr>
 						<td id="tax_div_title{$row_no}" nowrap align="left" ><b>Set Tax for : {$data.$totalAfterDiscount}</b></td>
 						<td>&nbsp;</td>
@@ -249,11 +249,13 @@
 
 					{foreach key=tax_row_no item=tax_data from=$data.taxes}
 					   {assign var="taxname" value=$tax_data.taxname|cat:"_percentage"|cat:$row_no}
+					   {assign var="tax_id_name" value="hidden_tax"|cat:$tax_row_no+1|cat:"_percentage"|cat:$row_no}
 					   {assign var="taxlabel" value=$tax_data.taxlabel|cat:"_percentage"|cat:$row_no}
 					   {assign var="popup_tax_rowname" value="popup_tax_row"|cat:$row_no}
 					   <tr>
 						<td align="left" class="lineOnTop">
 							<input type="text" class="small" size="5" name="{$taxname}" id="{$taxname}" value="{$tax_data.percentage}" onBlur="calcCurrentTax('{$taxname}',{$row_no},{$tax_row_no})">&nbsp;%
+							<input type="hidden" id="{$tax_id_name}" value="{$taxname}">
 						</td>
 						<td align="center" class="lineOnTop">{$tax_data.taxlabel}</td>
 						<td align="right" class="lineOnTop">

Modified: vtigercrm/trunk/include/js/Inventory.js
==============================================================================
--- vtigercrm/trunk/include/js/Inventory.js (original)
+++ vtigercrm/trunk/include/js/Inventory.js Wed Sep  6 05:09:59 2006
@@ -480,7 +480,7 @@
 	
 	//List Price with Discount, Total after Discount and Tax labels
 	colfive.className = "crmTableRow small"
-	colfive.innerHTML='<table width="100%" cellpadding="0" cellspacing="0"><tr><td align="right"><input id="listPrice'+count+'" name="listPrice'+count+'" value="0.00" type="text" class="small " style="width:70px" onBlur="calcTotal()"/>&nbsp;<img src="'+image_path+'pricebook.gif" onclick="priceBookPickList(this,'+count+')"></td></tr><tr><td align="right" style="padding:5px;" nowrap>		(-)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(event,\'discount_div'+count+'\',\'discount\','+count+')" >Discount</a> : </b><div class=\"discountUI\" id=\"discount_div'+count+'"><input type="hidden" id="discount_type'+count+'" name="discount_type'+count+'" value=""><table width="100%" border="0" cellpadding="5" cellspacing="0" class="small"><tr><td id="discount_div_title'+count+'" nowrap align="left" ></td><td align="right"><img src="'+image_path+'close.gif" border="0" onClick="fnHidePopDiv(\'discount_div'+count+'\')" style="cursor:pointer;"></td></tr><tr><td align="left" class="lineOnTop"><input type="radio" name="discount'+count+'" checked onclick="setDiscount(this,'+count+')">&nbsp; Zero Discount</td><td class="lineOnTop">&nbsp;</td></tr><tr><td align="left"><input type="radio" name="discount'+count+'" onclick="setDiscount(this,'+count+')">&nbsp; % of Price </td><td align="right"><input type="text" class="small" size="2" id="discount_percentage'+count+'" name="discount_percentage'+count+'" value="0" style="visibility:hidden" onBlur="setDiscount(this,'+count+')">&nbsp;%</td></tr><tr><td align="left" nowrap><input type="radio" name="discount'+count+'" onclick="setDiscount(this,'+count+')">&nbsp; Direct Price Redunction</td><td align="right"><input type="text" id="discount_amount'+count+'" name="discount_amount'+count+'" size="5" value="0" style="visibility:hidden" onBlur="setDiscount(this,'+count+')"></td></tr></table></div></td></tr><tr> <td align="right" style="padding:5px;" nowrap><b>Total After Discount :</b></td></tr><tr id="individual_tax_row'+count+'" class="TaxShow"><td align="right" style="padding:5px;" nowrap>(+)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(event,\'tax_div'+count+'\',\'tax\','+count+')" >Tax </a> : </b><div class="discountUI" id="tax_div'+count+'"></div></td></tr></table> ';
+	colfive.innerHTML='<table width="100%" cellpadding="0" cellspacing="0"><tr><td align="right"><input id="listPrice'+count+'" name="listPrice'+count+'" value="0.00" type="text" class="small " style="width:70px" onBlur="calcTotal(); callTaxCalc('+count+');"/>&nbsp;<img src="'+image_path+'pricebook.gif" onclick="priceBookPickList(this,'+count+')"></td></tr><tr><td align="right" style="padding:5px;" nowrap>		(-)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(event,\'discount_div'+count+'\',\'discount\','+count+')" >Discount</a> : </b><div class=\"discountUI\" id=\"discount_div'+count+'"><input type="hidden" id="discount_type'+count+'" name="discount_type'+count+'" value=""><table width="100%" border="0" cellpadding="5" cellspacing="0" class="small"><tr><td id="discount_div_title'+count+'" nowrap align="left" ></td><td align="right"><img src="'+image_path+'close.gif" border="0" onClick="fnHidePopDiv(\'discount_div'+count+'\')" style="cursor:pointer;"></td></tr><tr><td align="left" class="lineOnTop"><input type="radio" name="discount'+count+'" checked onclick="setDiscount(this,'+count+'); callTaxCalc('+count+');">&nbsp; Zero Discount</td><td class="lineOnTop">&nbsp;</td></tr><tr><td align="left"><input type="radio" name="discount'+count+'" onclick="setDiscount(this,'+count+'); callTaxCalc('+count+');">&nbsp; % of Price </td><td align="right"><input type="text" class="small" size="2" id="discount_percentage'+count+'" name="discount_percentage'+count+'" value="0" style="visibility:hidden" onBlur="setDiscount(this,'+count+'); callTaxCalc('+count+');">&nbsp;%</td></tr><tr><td align="left" nowrap><input type="radio" name="discount'+count+'" onclick="setDiscount(this,'+count+'); callTaxCalc('+count+');">&nbsp; Direct Price Redunction</td><td align="right"><input type="text" id="discount_amount'+count+'" name="discount_amount'+count+'" size="5" value="0" style="visibility:hidden" onBlur="setDiscount(this,'+count+'); callTaxCalc('+count+');"></td></tr></table></div></td></tr><tr> <td align="right" style="padding:5px;" nowrap><b>Total After Discount :</b></td></tr><tr id="individual_tax_row'+count+'" class="TaxShow"><td align="right" style="padding:5px;" nowrap>(+)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(event,\'tax_div'+count+'\',\'tax\','+count+')" >Tax </a> : </b><div class="discountUI" id="tax_div'+count+'"></div></td></tr></table> ';
 
 	//Total and Discount, Total after Discount and Tax details
 	colsix.className = "crmTableRow small"
@@ -578,6 +578,20 @@
 	calcTotal();
 }
 
+//This function is added to call the tax calculation function
+function callTaxCalc(curr_row)
+{
+	//when we change discount or list price, we have to calculate the taxes again before calculate the total
+	tax_count = eval(document.getElementById('tax_table'+curr_row).rows.length-1);//subtract the title tr length
+
+	for(var i=0, j=i+1;i<tax_count;i++,j++)
+	{
+		var tax_hidden_name = "hidden_tax"+j+"_percentage"+curr_row;
+		var tax_name = document.getElementById(tax_hidden_name).value;
+		calcCurrentTax(tax_name,curr_row,i);
+	}
+}
+
 function calcCurrentTax(tax_name, curr_row, tax_row)
 {
 	//we should calculate the tax amount only for the total After Discount

Modified: vtigercrm/trunk/modules/Products/InventoryTaxAjax.php
==============================================================================
--- vtigercrm/trunk/modules/Products/InventoryTaxAjax.php (original)
+++ vtigercrm/trunk/modules/Products/InventoryTaxAjax.php Wed Sep  6 05:09:59 2006
@@ -22,7 +22,7 @@
 
 
 $tax_div = '
-		<table width="100%" border="0" cellpadding="5" cellspacing="0" class="small">
+		<table width="100%" border="0" cellpadding="5" cellspacing="0" class="small" id="tax_table'.$rowid.'">
 		   <tr>
 			<td id="tax_div_title'.$rowid.'" nowrap align="left" ><b>Set Tax for : '.$product_total.'</b></td>
 			<td>&nbsp;</td>
@@ -31,12 +31,13 @@
 	   ';
 
 $net_tax_total = 0.00;
-for($i=0;$i<count($tax_details);$i++)
+for($i=0,$j=$i+1;$i<count($tax_details);$i++,$j++)
 {
 	$tax_name = $tax_details[$i]['taxname'];
 	$tax_label = $tax_details[$i]['taxlabel'];
 	$tax_percentage = $tax_details[$i]['percentage'];
 	$tax_name_percentage = $tax_name."_percentage".$rowid;
+	$tax_id_name = "hidden_tax".$j."_percentage".$rowid;//used to store the tax name, used in function callTaxCalc
 	$tax_name_total = "popup_tax_row".$rowid;//$tax_name."_total".$rowid;
 	$tax_total = $product_total*$tax_percentage/100.00;
 
@@ -45,6 +46,7 @@
 		   <tr>
 			<td align="left" class="lineOnTop">
 				<input type="text" class="small" size="5" name="'.$tax_name_percentage.'" id="'.$tax_name_percentage.'" value="'.$tax_percentage.'" onBlur="calcCurrentTax(\''.$tax_name_percentage.'\','.$rowid.','.$i.')">&nbsp;%
+				<input type="hidden" id="'.$tax_id_name.'" value="'.$tax_name_percentage.'">
 			</td>
 			<td align="center" class="lineOnTop">'.$tax_label.'</td>
 			<td align="right" class="lineOnTop">
@@ -54,12 +56,13 @@
 	    ';
 }
 
+$tax_div .= '</table>';
+
 if($associated_tax_count == 0)
 {
-	$tax_div .= '<tr><td colspan="3" align="left" class="lineOnTop">No taxes associated with this product.</td></tr>';
+	$tax_div .= '<div align="left" class="lineOnTop" width="100%">No taxes associated with this product.</div>';
 }
 
-$tax_div .= '</table>';
 $tax_div .= '<input type="hidden" id="hdnTaxTotal'.$rowid.'" name="hdnTaxTotal'.$rowid.'" value="'.$net_tax_total.'">';
 
 echo $tax_div;



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep  6 04:52:10 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 06 Sep 2006 11:52:10 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9321 - in
 /vtigercrm/trunk/Smarty/templates/Inventory: ProductDetails.tpl
 ProductDetailsEditView.tpl
Message-ID: <20060906115211.1783776D067@vtiger.fosslabs.com>

Author: saraj
Date: Wed Sep  6 05:52:04 2006
New Revision: 9321

Log:
* Modified to calculate the group taxes when we change the discount 

Modified:
    vtigercrm/trunk/Smarty/templates/Inventory/ProductDetails.tpl
    vtigercrm/trunk/Smarty/templates/Inventory/ProductDetailsEditView.tpl

Modified: vtigercrm/trunk/Smarty/templates/Inventory/ProductDetails.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Inventory/ProductDetails.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Inventory/ProductDetails.tpl Wed Sep  6 05:52:04 2006
@@ -294,16 +294,16 @@
 				<td align="right"><img src="{$IMAGE_PATH}close.gif" border="0" onClick="fnHidePopDiv('discount_div_final')" style="cursor:pointer;"></td>
 			   </tr>
 			   <tr>
-				<td align="left" class="lineOnTop"><input type="radio" name="discount_final" checked onclick="setDiscount(this,'_final')">&nbsp; {$APP.LBL_ZERO_DISCOUNT}</td>
+				<td align="left" class="lineOnTop"><input type="radio" name="discount_final" checked onclick="setDiscount(this,'_final'); calcGroupTax();">&nbsp; {$APP.LBL_ZERO_DISCOUNT}</td>
 				<td class="lineOnTop">&nbsp;</td>
 			   </tr>
 			   <tr>
-				<td align="left"><input type="radio" name="discount_final" onclick="setDiscount(this,'_final')">&nbsp; % {$APP.LBL_OF_PRICE}</td>
-				<td align="right"><input type="text" class="small" size="2" id="discount_percentage_final" name="discount_percentage_final" value="0" style="visibility:hidden" onBlur="setDiscount(this,'_final')">&nbsp;%</td>
+				<td align="left"><input type="radio" name="discount_final" onclick="setDiscount(this,'_final'); calcGroupTax();">&nbsp; % {$APP.LBL_OF_PRICE}</td>
+				<td align="right"><input type="text" class="small" size="2" id="discount_percentage_final" name="discount_percentage_final" value="0" style="visibility:hidden" onBlur="setDiscount(this,'_final'); calcGroupTax();">&nbsp;%</td>
 			   </tr>
 			   <tr>
-				<td align="left" nowrap><input type="radio" name="discount_final" onclick="setDiscount(this,'_final')">&nbsp;{$APP.LBL_DIRECT_PRICE_REDUCTION}</td>
-				<td align="right"><input type="text" id="discount_amount_final" name="discount_amount_final" size="5" value="0" style="visibility:hidden" onBlur="setDiscount(this,'_final')"></td>
+				<td align="left" nowrap><input type="radio" name="discount_final" onclick="setDiscount(this,'_final'); calcGroupTax();">&nbsp;{$APP.LBL_DIRECT_PRICE_REDUCTION}</td>
+				<td align="right"><input type="text" id="discount_amount_final" name="discount_amount_final" size="5" value="0" style="visibility:hidden" onBlur="setDiscount(this,'_final'); calcGroupTax();"></td>
 			   </tr>
 			</table>
 		</div>

Modified: vtigercrm/trunk/Smarty/templates/Inventory/ProductDetailsEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Inventory/ProductDetailsEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Inventory/ProductDetailsEditView.tpl Wed Sep  6 05:52:04 2006
@@ -345,16 +345,16 @@
 				<td align="right"><img src="{$IMAGE_PATH}close.gif" border="0" onClick="fnHidePopDiv('discount_div_final')" style="cursor:pointer;"></td>
 			   </tr>
 			   <tr>
-				<td align="left" class="lineOnTop"><input type="radio" name="discount_final" checked onclick="setDiscount(this,'_final')">&nbsp; {$APP.LBL_ZERO_DISCOUNT}</td>
+				<td align="left" class="lineOnTop"><input type="radio" name="discount_final" checked onclick="setDiscount(this,'_final'); calcGroupTax();">&nbsp; {$APP.LBL_ZERO_DISCOUNT}</td>
 				<td class="lineOnTop">&nbsp;</td>
 			   </tr>
 			   <tr>
-				<td align="left"><input type="radio" name="discount_final" onclick="setDiscount(this,'_final')" {$FINAL.checked_discount_percentage_final}>&nbsp; % {$APP.LBL_OF_PRICE}</td>
-				<td align="right"><input type="text" class="small" size="2" id="discount_percentage_final" name="discount_percentage_final" value="{$FINAL.discount_percentage_final}" {$FINAL.style_discount_percentage_final} onBlur="setDiscount(this,'_final')">&nbsp;%</td>
+				<td align="left"><input type="radio" name="discount_final" onclick="setDiscount(this,'_final'); calcGroupTax();" {$FINAL.checked_discount_percentage_final}>&nbsp; % {$APP.LBL_OF_PRICE}</td>
+				<td align="right"><input type="text" class="small" size="2" id="discount_percentage_final" name="discount_percentage_final" value="{$FINAL.discount_percentage_final}" {$FINAL.style_discount_percentage_final} onBlur="setDiscount(this,'_final'); calcGroupTax();">&nbsp;%</td>
 			   </tr>
 			   <tr>
-				<td align="left" nowrap><input type="radio" name="discount_final" onclick="setDiscount(this,'_final')" {$FINAL.checked_discount_amount_final}>&nbsp;{$APP.LBL_DIRECT_PRICE_REDUCTION}</td>
-				<td align="right"><input type="text" id="discount_amount_final" name="discount_amount_final" size="5" value="{$FINAL.discount_amount_final}" {$FINAL.style_discount_amount_final} onBlur="setDiscount(this,'_final')"></td>
+				<td align="left" nowrap><input type="radio" name="discount_final" onclick="setDiscount(this,'_final'); calcGroupTax();" {$FINAL.checked_discount_amount_final}>&nbsp;{$APP.LBL_DIRECT_PRICE_REDUCTION}</td>
+				<td align="right"><input type="text" id="discount_amount_final" name="discount_amount_final" size="5" value="{$FINAL.discount_amount_final}" {$FINAL.style_discount_amount_final} onBlur="setDiscount(this,'_final'); calcGroupTax();"></td>
 			   </tr>
 			</table>
 		</div>



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep  6 08:57:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 06 Sep 2006 15:57:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9323 -
 /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php
Message-ID: <20060906155738.324DF74815B@vtiger.fosslabs.com>

Author: saraj
Date: Wed Sep  6 09:57:34 2006
New Revision: 9323

Log:
* Added query to change the tablename in customview from activity to crmentity for the description fields

Modified:
    vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php

Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php
==============================================================================
--- vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php (original)
+++ vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php Wed Sep  6 09:57:34 2006
@@ -3606,6 +3606,10 @@
 		}
 	}
 }
+//we have to change the table name from activity to crmentity for customview activity description 
+Execute('update vtiger_cvcolumnlist set columnname="vtiger_crmentity:description:description:Calendar_Description:V" where columnname="vtiger_activity:description:description:Calendar_Description:V"');
+//we have to change the table name (alias) from activity to crmentiryCalendar for reports activity description
+Execute('update vtiger_selectcolumn set columnname="vtiger_crmentityCalendar:description:Calendar_Description:description:V" where columnname="vtiger_activity:description:Calendar_Description:description:V"');
 //changes made for CustomView and Reports - Activities changed to Calendar -- Ends
 
 Execute("update vtiger_field set uitype = 16 where tabid=2 and uitype=111 and columnname='sales_stage'");



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep  6 23:22:06 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 06:22:06 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9324 -
	/vtigercrm/trunk/Smarty/templates/DetailView.tpl
Message-ID: <20060907062207.20F3A76D0DF@vtiger.fosslabs.com>

Author: richie
Date: Thu Sep  7 00:21:49 2006
New Revision: 9324

Log:
Issue in DetailView Template Merge has been fixed --Jeri

Modified:
    vtigercrm/trunk/Smarty/templates/DetailView.tpl

Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailView.tpl Thu Sep  7 00:21:49 2006
@@ -401,6 +401,11 @@
 			<!-- Mail Merge-->
 				<br>
 				{if $MERGEBUTTON eq 'permitted'}
+				<form action="index.php" method="post" name="TemplateMerge" id="form">
+				<input type="hidden" name="module" value="{$MODULE}">
+				<input type="hidden" name="parenttab" value="{$CATEGORY}">
+				<input type="hidden" name="record" value="{$ID}">
+				<input type="hidden" name="action">
   				<table border=0 cellspacing=0 cellpadding=0 width=100% class="rightMailMerge">
       				<tr>
       					   <td class="rightMailMergeHeader"><b>{$WORDTEMPLATEOPTIONS}</b></td>
@@ -412,6 +417,7 @@
       					  </td>
       				</tr>
   				</table>
+				</form>
 				{/if}
 			</td>
 		</tr>



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep  6 23:23:36 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 06:23:36 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9325 -
 /vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl
Message-ID: <20060907062336.4F9DB76D0DE@vtiger.fosslabs.com>

Author: richie
Date: Thu Sep  7 00:23:10 2006
New Revision: 9325

Log:
Issue in in Listwordtemplates has been fixed --jeri

Modified:
    vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl

Modified: vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl Thu Sep  7 00:23:10 2006
@@ -13,6 +13,8 @@
 <script>
 function massDelete()
 {ldelim}
+	if(typeof(document.massdelete.selected_id) == 'undefined')
+		return false;
         x = document.massdelete.selected_id.length;
         idstring = "";
 
@@ -53,7 +55,7 @@
        {rdelim}
 		if(confirm("Are you sure you want to delete the selected "+xx+" records ?"))
 		{ldelim}
-	        document.massdelete.action="index.php?module=Users&action=deletewordtemplate&return_module=Users&return_action=listwordtemplates";
+	        	document.massdelete.action.value= "deletewordtemplate";
 		{rdelim}
 		else
 		{ldelim}
@@ -78,7 +80,7 @@
 	    			<input name="idlist" type="hidden">
     				<input name="module" type="hidden" value="Users">
     				<input name="parenttab" type="hidden" value="Settings">
-    				<input name="action" type="hidden" value="deletewordtemplate">
+    				<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 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>
@@ -120,7 +122,7 @@
 					{foreach item=template name=mailmerge from=$WORDTEMPLATES}
 					<tr>
 						<td class="listTableRow small" valign=top>{$smarty.foreach.mailmerge.iteration}</td>
-						<td class="listTableRow small" valign=top><input type="checkbox" class=small name="selected_id" value="{$template.templateid}" onClick=toggleSelectAll(this.name,"selectall")></td>
+						<td class="listTableRow small" valign=top><input type="checkbox" class=small name="selected_id" value="{$template.templateid}"></td>
 						<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>



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep  6 23:35:08 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 06:35:08 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9326 -
 /vtigercrm/trunk/modules/Users/deletewordtemplate.php
Message-ID: <20060907063508.096E076D0DF@vtiger.fosslabs.com>

Author: richie
Date: Thu Sep  7 00:34:50 2006
New Revision: 9326

Log:
Parenttab added after deleting wordtemplates--Jeri

Modified:
    vtigercrm/trunk/modules/Users/deletewordtemplate.php

Modified: vtigercrm/trunk/modules/Users/deletewordtemplate.php
==============================================================================
--- vtigercrm/trunk/modules/Users/deletewordtemplate.php (original)
+++ vtigercrm/trunk/modules/Users/deletewordtemplate.php Thu Sep  7 00:34:50 2006
@@ -1,27 +1,26 @@
-<?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.
-*
- ********************************************************************************/
-
- $idlist = $_REQUEST['idlist'];
- $id_array=explode(';', $idlist);
-
- for($i=0; $i < count($id_array)-1; $i++)
- {
-
-	         $sql = "delete from vtiger_wordtemplates where templateid=".$id_array[$i];
-	         $adb->query($sql);
-
- }
- header("Location:index.php?module=Users&action=listwordtemplates");
- 			 
-
-?>
-
-
+<?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.
+*
+ ********************************************************************************/
+ $idlist = $_REQUEST['idlist'];
+ $id_array=explode(';', $idlist);
+
+ for($i=0; $i < count($id_array)-1; $i++)
+ {
+
+	         $sql = "delete from vtiger_wordtemplates where templateid=".$id_array[$i];
+	         $adb->query($sql);
+
+ }
+ header("Location:index.php?module=Users&action=listwordtemplates&parenttab=Settings");
+ 			 
+
+?>
+
+



From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 00:12:31 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 07:12:31 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9327 -
 /vtigercrm/trunk/modules/Settings/BackupServerConfig.php
Message-ID: <20060907071232.146FD76D0E6@vtiger.fosslabs.com>

Author: richie
Date: Thu Sep  7 01:12:20 2006
New Revision: 9327

Log:
Enable disable added for backup config--Jeri

Modified:
    vtigercrm/trunk/modules/Settings/BackupServerConfig.php

Modified: vtigercrm/trunk/modules/Settings/BackupServerConfig.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/BackupServerConfig.php (original)
+++ vtigercrm/trunk/modules/Settings/BackupServerConfig.php Thu Sep  7 01:12:20 2006
@@ -9,10 +9,11 @@
 *
  ********************************************************************************/
 
+require_once('user_privileges/enable_backup.php');
 require_once('Smarty_setup.php');
 
 global $mod_strings;
-global $app_strings;
+global $app_strings, $enable_backup;
 global $app_list_strings;
 global $adb;
 global $theme;
@@ -55,6 +56,13 @@
 $smarty->assign("APP", $app_strings);
 $smarty->assign("CMOD", $mod_strings);
 
+if($enable_backup == 'true')	
+	$backup_status = 'enabled';
+else
+	$backup_status = 'disabled';
+
+$smarty->assign("BACKUP_STATUS", $backup_status);
+
 if($_REQUEST['ajax'] == 'true')
 	$smarty->display("Settings/BackupServerContents.tpl");
 else



From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 00:23:27 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 07:23:27 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9328 -
 /vtigercrm/trunk/modules/Settings/language/en_us.lang.php
Message-ID: <20060907072327.1D70B76D0E9@vtiger.fosslabs.com>

Author: richie
Date: Thu Sep  7 01:23:10 2006
New Revision: 9328

Log:
Language string updated --Jeri

Modified:
    vtigercrm/trunk/modules/Settings/language/en_us.lang.php

Modified: vtigercrm/trunk/modules/Settings/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Settings/language/en_us.lang.php Thu Sep  7 01:23:10 2006
@@ -719,6 +719,8 @@
 'LBL_TYPEALERT_1'=>'Sorry, you cannot map the',
 'LBL_WITH'=>'with',
 'LBL_TYPEALERT_2'=>'data type. Kindly map the same data types.',
+'LBL_ENABLE'=>'Enable',
+
 );
 
 



From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 00:24:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 07:24:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9329 -
 /vtigercrm/trunk/modules/Settings/SaveEnableBackup.php
Message-ID: <20060907072440.0433F76D0E9@vtiger.fosslabs.com>

Author: richie
Date: Thu Sep  7 01:24:29 2006
New Revision: 9329

Log:
File added to enable back up server config --Jeri

Added:
    vtigercrm/trunk/modules/Settings/SaveEnableBackup.php



From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 00:26:20 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 07:26:20 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9330 -
	/vtigercrm/trunk/modules/Users/Logout.php
Message-ID: <20060907072620.8A0B776D0DC@vtiger.fosslabs.com>

Author: richie
Date: Thu Sep  7 01:26:13 2006
New Revision: 9330

Log:
Backup config checked from flat file --Jeri

Modified:
    vtigercrm/trunk/modules/Users/Logout.php

Modified: vtigercrm/trunk/modules/Users/Logout.php
==============================================================================
--- vtigercrm/trunk/modules/Users/Logout.php (original)
+++ vtigercrm/trunk/modules/Users/Logout.php Thu Sep  7 01:26:13 2006
@@ -1,106 +1,109 @@
-<?php
-/*********************************************************************************
- * The contents of this file are subject to the SugarCRM Public License Version 1.1.2
- * ("License"); You may not use this file except in compliance with the 
- * License. You may obtain a copy of the License at http://www.sugarcrm.com/SPL
- * Software distributed under the License is distributed on an  "AS IS"  basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
- * the specific language governing rights and limitations under the License.
- * The Original Code is:  SugarCRM Open Source
- * The Initial Developer of the Original Code is SugarCRM, Inc.
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.;
- * All Rights Reserved.
- * Contributor(s): ______________________________________.
- ********************************************************************************/
-/*********************************************************************************
- * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Users/Logout.php,v 1.8 2005/03/21 04:51:21 ray Exp $
- * Description:  TODO: To be written.
- ********************************************************************************/
-
-require_once('include/logging.php');
-require_once('database/DatabaseConnection.php');
-require_once('modules/Users/LoginHistory.php');
-require_once('modules/Users/User.php');
-require_once('config.php');
-require_once('include/db_backup/backup.php');
-require_once('include/db_backup/ftp.php');
-require_once('include/database/PearDatabase.php');
-
-$ftpserver = '';
-$ftpuser = '';
-$ftppassword = '';
-global $adb;
-$query = "select * from vtiger_systems where server_type='backup'";
-$result = $adb->query($query);
-$num_rows = $adb->num_rows($result);
-if($num_rows > 0)
-{
-	$ftpserver = $adb->query_result($result,0,'server');
-	$ftpuser = $adb->query_result($result,0,'server_username');
-	$ftppassword = $adb->query_result($result,0,'server_password');
-}
-
-
-//Taking the Backup of DB
-	$currenttime=date("Ymd_His");
-	if($ftpserver != '' && $ftpuser != '' && $ftppassword != '')
-	{	$backupFileName="backup_".$currenttime.".sql";
-		save_structure($backupFileName, $root_directory);
-		$source_file=$backupFileName;	
-		ftpBackupFile($source_file, $ftpserver, $ftpuser, $ftppassword);
-		if(file_exists($source_file)) unlink($source_file);	
-		
-	}
-
-// Recording Logout Info
-	$usip=$_SERVER['REMOTE_ADDR'];
-        $outtime=date("Y/m/d H:i:s");
-        $loghistory=new LoginHistory();
-        $loghistory->user_logout($current_user->user_name,$usip,$outtime);
-
-
-$local_log =& LoggerManager::getLogger('Logout');
-
-//Calendar Logout
-//include('modules/Calendar/logout.php');
-
-// clear out the autthenticating flag
-session_destroy();
-
-define("IN_LOGIN", true);
-	
-// define('IN_PHPBB', true);
-// include($phpbb_root_path . 'extension.inc');
-// include($phpbb_root_path . 'common.'.$phpEx);
-
-//
-// Set page ID for session management
-//
-//$userdata = session_pagestart($user_ip, PAGE_LOGIN);
-//init_userprefs($userdata);
-//
-// End session management
-//
-
-// session id check
-/*
-if (!empty($HTTP_POST_VARS['sid']) || !empty($HTTP_GET_VARS['sid']))
-{
-        $sid = (!empty($HTTP_POST_VARS['sid'])) ? $HTTP_POST_VARS['sid'] : $HTTP_GET_VARS['sid'];
-}
-else
-{
-        $sid = '';
-}
-if( $userdata['session_logged_in'] )
-	{
-		if( $userdata['session_logged_in'] )
-		{
-			session_end($userdata['session_id'], $userdata['user_id']);
-		}
-
-	}
-*/
-// go to the login screen.
-header("Location: index.php?action=Login&module=Users");
-?>
+<?php
+/*********************************************************************************
+ * The contents of this file are subject to the SugarCRM Public License Version 1.1.2
+ * ("License"); You may not use this file except in compliance with the 
+ * License. You may obtain a copy of the License at http://www.sugarcrm.com/SPL
+ * Software distributed under the License is distributed on an  "AS IS"  basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
+ * the specific language governing rights and limitations under the License.
+ * The Original Code is:  SugarCRM Open Source
+ * The Initial Developer of the Original Code is SugarCRM, Inc.
+ * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.;
+ * All Rights Reserved.
+ * Contributor(s): ______________________________________.
+ ********************************************************************************/
+/*********************************************************************************
+ * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Users/Logout.php,v 1.8 2005/03/21 04:51:21 ray Exp $
+ * Description:  TODO: To be written.
+ ********************************************************************************/
+
+require_once('include/logging.php');
+require_once('database/DatabaseConnection.php');
+require_once('modules/Users/LoginHistory.php');
+require_once('modules/Users/User.php');
+require_once('config.php');
+require_once('include/db_backup/backup.php');
+require_once('include/db_backup/ftp.php');
+require_once('include/database/PearDatabase.php');
+require_once('user_privileges/enable_backup.php');
+
+global $adb, $enable_backup;
+
+if($enable_backup == 'true')
+{
+	$ftpserver = '';
+	$ftpuser = '';
+	$ftppassword = '';
+	$query = "select * from vtiger_systems where server_type='backup'";
+	$result = $adb->query($query);
+	$num_rows = $adb->num_rows($result);
+	if($num_rows > 0)
+	{
+		$ftpserver = $adb->query_result($result,0,'server');
+		$ftpuser = $adb->query_result($result,0,'server_username');
+		$ftppassword = $adb->query_result($result,0,'server_password');
+	}
+
+	//Taking the Backup of DB
+	$currenttime=date("Ymd_His");
+	if($ftpserver != '' && $ftpuser != '' && $ftppassword != '')
+	{	$backupFileName="backup_".$currenttime.".sql";
+	save_structure($backupFileName, $root_directory);
+	$source_file=$backupFileName;	
+	ftpBackupFile($source_file, $ftpserver, $ftpuser, $ftppassword);
+	if(file_exists($source_file)) unlink($source_file);	
+
+	}
+}
+// Recording Logout Info
+	$usip=$_SERVER['REMOTE_ADDR'];
+        $outtime=date("Y/m/d H:i:s");
+        $loghistory=new LoginHistory();
+        $loghistory->user_logout($current_user->user_name,$usip,$outtime);
+
+
+$local_log =& LoggerManager::getLogger('Logout');
+
+//Calendar Logout
+//include('modules/Calendar/logout.php');
+
+// clear out the autthenticating flag
+session_destroy();
+
+define("IN_LOGIN", true);
+	
+// define('IN_PHPBB', true);
+// include($phpbb_root_path . 'extension.inc');
+// include($phpbb_root_path . 'common.'.$phpEx);
+
+//
+// Set page ID for session management
+//
+//$userdata = session_pagestart($user_ip, PAGE_LOGIN);
+//init_userprefs($userdata);
+//
+// End session management
+//
+
+// session id check
+/*
+if (!empty($HTTP_POST_VARS['sid']) || !empty($HTTP_GET_VARS['sid']))
+{
+        $sid = (!empty($HTTP_POST_VARS['sid'])) ? $HTTP_POST_VARS['sid'] : $HTTP_GET_VARS['sid'];
+}
+else
+{
+        $sid = '';
+}
+if( $userdata['session_logged_in'] )
+	{
+		if( $userdata['session_logged_in'] )
+		{
+			session_end($userdata['session_id'], $userdata['user_id']);
+		}
+
+	}
+*/
+// go to the login screen.
+header("Location: index.php?action=Login&module=Users");
+?>



From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 00:43:58 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 07:43:58 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9331 -
	/vtigercrm/trunk/user_privileges/enable_backup.php
Message-ID: <20060907074358.16EFD76D0E4@vtiger.fosslabs.com>

Author: richie
Date: Thu Sep  7 01:43:46 2006
New Revision: 9331

Log:
File added for backup config--Jeri

Added:
    vtigercrm/trunk/user_privileges/enable_backup.php



From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 00:54:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 07:54:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9332 -
	/vtigercrm/trunk/modules/Users/profilePrivileges.php
Message-ID: <20060907075402.F210676D0F0@vtiger.fosslabs.com>

Author: richie
Date: Thu Sep  7 01:53:54 2006
New Revision: 9332

Log:
Fields disabled if it is not enabled in global privileges --Jeri

Modified:
    vtigercrm/trunk/modules/Users/profilePrivileges.php

Modified: vtigercrm/trunk/modules/Users/profilePrivileges.php
==============================================================================
--- vtigercrm/trunk/modules/Users/profilePrivileges.php (original)
+++ vtigercrm/trunk/modules/Users/profilePrivileges.php Thu Sep  7 01:53:54 2006
@@ -388,7 +388,7 @@
 //Field privileges		
 $modArr=getFieldModuleAccessArray();
 
- 
+
 $no_of_mod=sizeof($modArr);
 for($i=0;$i<$no_of_mod; $i++)
 {
@@ -399,6 +399,19 @@
 }
 $smarty->assign("PRI_FIELD_LIST",$privilege_fld);	
 $smarty->assign("MODE",$mode);
+
+$disable_field_array = Array();
+$sql_disablefield = "select * from vtiger_def_org_field";
+$result = $adb->query($sql_disablefield);
+$noofrows=$adb->num_rows($result);
+for($i=0; $i<$noofrows; $i++)
+{
+	$FieldId = $adb->query_result($result,$i,'fieldid');
+	$Visible = $adb->query_result($result,$i,'visible');
+
+	$disable_field_array[$FieldId] = $Visible;
+}
+
 if($mode=='view')
 {
 	$fieldListResult = getProfile2AllFieldList($modArr,$profileId);
@@ -446,7 +459,11 @@
 			$mandatory = '';
 			$readonly = '';
 			$field=array();
-
+			if($disable_field_array[$fieldListResult[$module_name][$j][4]] == 1)
+			{
+				$mandatory = '<font color="blue">*</font>';
+				$readonly = 'disabled';
+			}
 			if($uitype == 2 || $uitype == 6 || $uitype == 22 || $uitype == 73 || $uitype == 24 || $uitype == 81 || $uitype == 50 || $uitype == 23 || $uitype == 16)
 			{
 				$mandatory = '<font color="red">*</font>';
@@ -491,6 +508,11 @@
 				$readonly = '';
 				$field=array();
 
+				if($disable_field_array[$fieldListResult[$module_name][$j][4]] == 1)
+				{
+					$mandatory = '<font color="blue">*</font>';
+					$readonly = 'disabled';
+				}
 				if($uitype == 2 || $uitype == 6 || $uitype == 22 || $uitype == 73 || $uitype == 24 || $uitype == 81 || $uitype == 50 || $uitype == 23 || $uitype == 16)
 				{
 					$mandatory = '<font color="red">*</font>';
@@ -532,6 +554,11 @@
 				$readonly = '';
 				$field=array();
 
+				if($disable_field_array[$fieldListResult[$module_name][$j][4]] == 1)
+				{
+					$mandatory = '<font color="blue">*</font>';
+					$readonly = 'disabled';
+				}
 				if($uitype == 2 || $uitype == 6 || $uitype == 22 || $uitype == 73 || $uitype == 24 || $uitype == 81 || $uitype == 50 || $uitype == 23 || $uitype == 16)
 				{
 					$mandatory = '<font color="red">*</font>';



From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 00:54:48 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 07:54:48 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9333 -
 /vtigercrm/trunk/modules/Users/language/en_us.lang.php
Message-ID: <20060907075448.A39B576D0FC@vtiger.fosslabs.com>

Author: richie
Date: Thu Sep  7 01:54:30 2006
New Revision: 9333

Log:
Language string updated --Jeri

Modified:
    vtigercrm/trunk/modules/Users/language/en_us.lang.php

Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Users/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Users/language/en_us.lang.php Thu Sep  7 01:54:30 2006
@@ -596,6 +596,8 @@
 'LBL_YES'=>'Yes',
 'LBL_NO'=>'No',
 
+'LBL_MANDATORY_MSG'=>'Mandatory Fields',
+'LBL_DISABLE_FIELD_MSG'=>'Fields Disabled from Global Field Access Settings',
 
 );
 



From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 00:54:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 07:54:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9334 -
	/vtigercrm/trunk/modules/Calendar/EditView.php
Message-ID: <20060907075455.A542C76D0F0@vtiger.fosslabs.com>

Author: saraj
Date: Thu Sep  7 01:54:48 2006
New Revision: 9334

Log:
changes made for weekly recurring events  --Minnie

Modified:
    vtigercrm/trunk/modules/Calendar/EditView.php

Modified: vtigercrm/trunk/modules/Calendar/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/EditView.php (original)
+++ vtigercrm/trunk/modules/Calendar/EditView.php Thu Sep  7 01:54:48 2006
@@ -95,9 +95,16 @@
 	    $value['repeat_frequency'] = $adb->query_result($res,0,'recurringfreq');
 	    $recurringinfo =  explode("::",$adb->query_result($res,0,'recurringinfo'));
 	    $value['eventrecurringtype'] = $recurringinfo[0];
-	    if($recurringinfo[0] == 'Monthly')
+	    if($recurringinfo[0] == 'Weekly')
 	    {
-		    $monthrpt_str = '';
+		   for($i=0;$i<6;$i++)
+		   {
+			   $label = 'week'.$recurringinfo[$i+1];
+			   $value[$label] = 'checked';
+		   }
+	    }
+	    elseif($recurringinfo[0] == 'Monthly')
+	    {
 		    $value['repeatMonth'] = $recurringinfo[1];
 		    if($recurringinfo[1] == 'date')
 		    {



From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 00:55:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 07:55:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9335 - in
 /vtigercrm/trunk/Smarty/templates: EditProfile.tpl ProfileDetailView.tpl
Message-ID: <20060907075549.72FFD76D0F0@vtiger.fosslabs.com>

Author: richie
Date: Thu Sep  7 01:55:37 2006
New Revision: 9335

Log:
Fields disabled if it is not enabled in global privileges --Jeri

Modified:
    vtigercrm/trunk/Smarty/templates/EditProfile.tpl
    vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl

Modified: vtigercrm/trunk/Smarty/templates/EditProfile.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/EditProfile.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/EditProfile.tpl Thu Sep  7 01:55:37 2006
@@ -246,6 +246,14 @@
 			</table>
 		</td>
                 </tr>
+		<table border="0" cellpadding="2" cellspacing="0">
+			<tr>
+				<td align="left"><font color="red" size=5>*</font>{$CMOD.LBL_MANDATORY_MSG}</td>
+			</tr>
+			<tr>
+				<td align="left"><font color="blue" size=5>*</font>{$CMOD.LBL_DISABLE_FIELD_MSG}</td>
+			</tr>
+		</table>
 		<tr>
 		<td style="border-top: 2px dotted rgb(204, 204, 204);" align="right">
 		<!-- wizard buttons -->

Modified: vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl Thu Sep  7 01:55:37 2006
@@ -235,6 +235,14 @@
 			</table>
 		</td>
                 </tr>
+		<table border="0" cellpadding="2" cellspacing="0">
+			<tr>
+				<td align="left"><font color="red" size=5>*</font>{$CMOD.LBL_MANDATORY_MSG}</td>
+			</tr>
+			<tr>
+				<td align="left"><font color="blue" size=5>*</font>{$CMOD.LBL_DISABLE_FIELD_MSG}</td>
+			</tr>
+		</table>
 		<tr>
 		<td style="border-top: 2px dotted rgb(204, 204, 204);" align="right">
 		<!-- wizard buttons -->
@@ -244,6 +252,7 @@
 				<td><input type="submit" value="{$APP.LBL_EDIT_BUTTON_LABEL}" class="crmButton small edit" name="edit"></td>
 				<td>&nbsp;</td>
 			</tr>
+			
 		</tbody>
 		</table>
 		</td>



From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 00:56:48 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 07:56:48 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9336 -
	/vtigercrm/trunk/modules/Calendar/addEventUI.php
Message-ID: <20060907075648.D177176D0F0@vtiger.fosslabs.com>

Author: saraj
Date: Thu Sep  7 01:56:42 2006
New Revision: 9336

Log:
changes made to fix calendar related issue  --Minnie

Modified:
    vtigercrm/trunk/modules/Calendar/addEventUI.php

Modified: vtigercrm/trunk/modules/Calendar/addEventUI.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/addEventUI.php (original)
+++ vtigercrm/trunk/modules/Calendar/addEventUI.php Thu Sep  7 01:56:42 2006
@@ -177,7 +177,7 @@
 	<script type="text/javascript" src="jscalendar/calendar.js"></script>
 	<script type="text/javascript" src="jscalendar/lang/calendar-<? echo $app_strings['LBL_JSCALENDAR_LANG'] ?>.js"></script>
 	<script type="text/javascript" src="jscalendar/calendar-setup.js"></script>
-	<div class="calAddEvent layerPopup" style="display:none" id="addEvent" align=center>
+	<div class="calAddEvent layerPopup" style="display:none;width:500px;left:200px;" id="addEvent" align=center>
 	<form name="EditView" onSubmit="return check_form();" method="POST" action="index.php">
 	<input type="hidden" name="return_action" value="index">
 	<input type="hidden" name="return_module" value="Calendar">
@@ -604,7 +604,7 @@
 				<a href="" id="pending" onClick="fninvsh('eventcalAction')" class="calMnu">- <?php echo $mod_strings['LBL_NOTHELD']?></a>
 				<span style="border-top:1px dashed #CCCCCC;width:99%;display:block;"></span>
 				<a href="" id="postpone" onClick="fninvsh('eventcalAction')" class="calMnu">- <?php echo $mod_strings['LBL_POSTPONE']?></a>
-				<a href="" id="changeowner" onClick="fninvsh('eventcalAction')" class="calMnu">- <?php echo $mod_strings['LBL_CHANGEOWNER']?></a>
+				<a href="" id="changeowner" onClick="fnvshobj(this,'act_changeowner');fninvsh('eventcalAction')" class="calMnu">- <?php echo $mod_strings['LBL_CHANGEOWNER']?></a>
 				<a href="" id="actdelete" onclick ="fninvsh('eventcalAction');return confirm('Are you sure?');" class="calMnu">- <?php echo $mod_strings['LBL_DEL']?></a>
 			</td>
 		</tr>
@@ -832,7 +832,7 @@
                                 <a href="" id="taskpending" onClick="fninvsh('taskcalAction');" class="calMnu">- <?php echo $mod_strings['LBL_DEFERRED']?></a>
                                 <span style="border-top:1px dashed #CCCCCC;width:99%;display:block;"></span>
                                 <a href="" id="taskpostpone" onClick="fninvsh('taskcalAction');" class="calMnu">- <?php echo $mod_strings['LBL_POSTPONE']?></a>
-                                <a href="" id="taskchangeowner" onClick="fninvsh('taskcalAction');" class="calMnu">- <?php echo $mod_strings['LBL_CHANGEOWNER']?></a>
+                                <a href="" id="taskchangeowner" onClick="fnvshobj(this,'act_changeowner'); fninvsh('taskcalAction');" class="calMnu">- <?php echo $mod_strings['LBL_CHANGEOWNER']?></a>
                                 <a href="" id="taskactdelete" onClick ="fninvsh('taskcalAction');return confirm('Are you sure?');" class="calMnu">- <?php echo $mod_strings['LBL_DEL']?></a>
                         </td>
                 </tr>



From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 00:57:25 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 07:57:25 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9337 -
	/vtigercrm/trunk/modules/Calendar/DetailView.php
Message-ID: <20060907075725.4113176D0F0@vtiger.fosslabs.com>

Author: saraj
Date: Thu Sep  7 01:57:19 2006
New Revision: 9337

Log:
changes made for weekly recurring events  --Minnie

Modified:
    vtigercrm/trunk/modules/Calendar/DetailView.php

Modified: vtigercrm/trunk/modules/Calendar/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/DetailView.php (original)
+++ vtigercrm/trunk/modules/Calendar/DetailView.php Thu Sep  7 01:57:19 2006
@@ -174,7 +174,23 @@
 		$data['repeat_frequency'] = $adb->query_result($res,0,'recurringfreq');
 		$recurringinfo =  explode("::",$adb->query_result($res,0,'recurringinfo'));
 		$data['recurringtype'] = $recurringinfo[0];
-		if($recurringinfo[0] == 'Monthly')
+		if($recurringinfo[0] == 'Weekly')
+		{
+			$weekrpt_str = '';
+			if(count($recurringinfo) > 1)
+			{
+				$weekrpt_str .= 'on ';
+				for($i=1;$i<count($recurringinfo);$i++)
+				{
+					$label = 'LBL_DAY'.$recurringinfo[$i];
+					if($i != 1)
+						$weekrpt_str .= ', ';
+					$weekrpt_str .= $mod_strings[$label];
+				}
+			}
+			$data['repeat_str'] = $weekrpt_str;
+		}
+		elseif($recurringinfo[0] == 'Monthly')
 		{   
 			$monthrpt_str = '';
 			$data['repeatMonth'] = $recurringinfo[1];  
@@ -214,7 +230,7 @@
 
 				$monthrpt_str .= 'on '.$mod_strings[$recurringinfo[2]].' '.$day;
 			}
-			$data['repeat_month_str'] = $monthrpt_str;
+			$data['repeat_str'] = $monthrpt_str;
 		}
 	}
 	else 



From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 01:01:01 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 08:01:01 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9338 -
	/vtigercrm/trunk/modules/Calendar/calendarLayout.php
Message-ID: <20060907080101.0CE8476D0F0@vtiger.fosslabs.com>

Author: saraj
Date: Thu Sep  7 02:00:55 2006
New Revision: 9338

Log:
changes made to fix calendar related issue  --Minnie

Modified:
    vtigercrm/trunk/modules/Calendar/calendarLayout.php

Modified: vtigercrm/trunk/modules/Calendar/calendarLayout.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/calendarLayout.php (original)
+++ vtigercrm/trunk/modules/Calendar/calendarLayout.php Thu Sep  7 02:00:55 2006
@@ -734,9 +734,9 @@
 
 		$js_string = "";
 		if(isPermitted("Calendar","EditView") == "yes")
-		              $js_string = 'onClick="gshow(\'addEvent\',\'call\',\''.$sttemp_date.'\',\''.$endtemp_date.'\',\''.$time_arr['starthour'].'\',\''.$time_arr['startmin'].'\',\''.$time_arr['startfmt'].'\',\''.$time_arr['endhour'].'\',\''.$time_arr['endmin'].'\',\''.$time_arr['endfmt'].'\',\'hourview\',\'event\')"';
+		              $js_string = 'onClick="fnvshobj(this,\'addEvent\'); gshow(\'addEvent\',\'call\',\''.$sttemp_date.'\',\''.$endtemp_date.'\',\''.$time_arr['starthour'].'\',\''.$time_arr['startmin'].'\',\''.$time_arr['startfmt'].'\',\''.$time_arr['endhour'].'\',\''.$time_arr['endmin'].'\',\''.$time_arr['endfmt'].'\',\'hourview\',\'event\')"';
 		$dayview_layout .= '<tr>
-					<td class="lvtCol" valign=top height="75"  width="10%" '.$js_string.'>'.$hour.''.$sub_str.'</td>';
+					<td style="cursor:pointer;" class="lvtCol" valign=top height="75"  width="10%" '.$js_string.'>'.$hour.''.$sub_str.'</td>';
 		//To display events in Dayview
 		$dayview_layout .= getdayEventLayer($cal,$cal['calendar']->slices[$i],$no_of_rows);
 		$dayview_layout .= '</tr>';
@@ -844,7 +844,7 @@
 			$weekview_layout .= '<td class="cellNormal" onMouseOver="cal_show(\'create_'.$sttemp_date.''.$time_arr['starthour'].''.$time_arr['startfmt'].'\')" onMouseOut="fnHide_Event(\'create_'.$sttemp_date.''.$time_arr['starthour'].''.$time_arr['startfmt'].'\')"  style="height: 40px;" bgcolor="white" valign="top" width="12%" align=right vlign=top>';
 			$weekview_layout .= '<div id="create_'.$sttemp_date.''.$time_arr['starthour'].''.$time_arr['startfmt'].'" style="visibility: hidden;">';
 			if(isPermitted("Calendar","EditView") == "yes")
-		                        $weekview_layout .='<img onClick="gshow(\'addEvent\',\'call\',\''.$sttemp_date.'\',\''.$endtemp_date.'\',\''.$time_arr['starthour'].'\',\''.$time_arr['startmin'].'\',\''.$time_arr['startfmt'].'\',\''.$time_arr['endhour'].'\',\''.$time_arr['endmin'].'\',\''.$time_arr['endfmt'].'\',\'hourview\',\'event\')" src="'.$cal['IMAGE_PATH'].'cal_add.gif" border="0">';
+		                        $weekview_layout .='<img onClick="fnvshobj(this,\'addEvent\'); gshow(\'addEvent\',\'call\',\''.$sttemp_date.'\',\''.$endtemp_date.'\',\''.$time_arr['starthour'].'\',\''.$time_arr['startmin'].'\',\''.$time_arr['startfmt'].'\',\''.$time_arr['endhour'].'\',\''.$time_arr['endmin'].'\',\''.$time_arr['endfmt'].'\',\'hourview\',\'event\')" src="'.$cal['IMAGE_PATH'].'cal_add.gif" border="0">';
 					
                         $weekview_layout .='</div>';
 			//To display events in WeekView
@@ -923,7 +923,7 @@
 				$monthview_layout .= '</a>';
 				$monthview_layout .= '<div id="create_'.$temp_date.''.$time_arr['starthour'].'" style="visibility:hidden;">';
 				if(isPermitted("Calendar","EditView") == "yes")
-                                $monthview_layout .='<a onClick="gshow(\'addEvent\',\'call\',\''.$temp_date.'\',\''.$endtemp_date.'\',\''.$time_arr['starthour'].'\',\''.$time_arr['startmin'].'\',\''.$time_arr['startfmt'].'\',\''.$time_arr['endhour'].'\',\''.$time_arr['endmin'].'\',\''.$time_arr['endfmt'].'\',\'hourview\',\'event\')" href="javascript:void(0)"><img src="'.$cal['IMAGE_PATH'].'cal_add.gif" border="0"></a>';
+                                $monthview_layout .='<a onClick="fnvshobj(this,\'addEvent\'); gshow(\'addEvent\',\'call\',\''.$temp_date.'\',\''.$endtemp_date.'\',\''.$time_arr['starthour'].'\',\''.$time_arr['startmin'].'\',\''.$time_arr['startfmt'].'\',\''.$time_arr['endhour'].'\',\''.$time_arr['endmin'].'\',\''.$time_arr['endfmt'].'\',\'hourview\',\'event\')" href="javascript:void(0)"><img src="'.$cal['IMAGE_PATH'].'cal_add.gif" border="0"></a>';
                                 $monthview_layout .= '  </div></td>';
 			}
 			else



From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 01:04:47 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 08:04:47 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9339 -
	/vtigercrm/trunk/modules/Calendar/calendarLayout.php
Message-ID: <20060907080447.D532176D0F0@vtiger.fosslabs.com>

Author: saraj
Date: Thu Sep  7 02:04:42 2006
New Revision: 9339

Log:
changes made to fix calendar related issue  --Minnie

Modified:
    vtigercrm/trunk/modules/Calendar/calendarLayout.php

Modified: vtigercrm/trunk/modules/Calendar/calendarLayout.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/calendarLayout.php (original)
+++ vtigercrm/trunk/modules/Calendar/calendarLayout.php Thu Sep  7 02:04:42 2006
@@ -917,7 +917,7 @@
 			//to display dates in month
 			if ($cal['slice']->start_time->getMonth() == $cal['calendar']->date_time->getMonth())
 			{
-				$monthview_layout .= '<td class="'.$monthclass.'" width="14%" onMouseOver="cal_show(\'create_'.$temp_date.''.$time_arr['starthour'].'\')" onMouseOut="fnHide_Event(\'create_'.$temp_date.''.$time_arr['starthour'].'\')">';
+				$monthview_layout .= '<td style="text-align:left;" class="'.$monthclass.'" width="14%" onMouseOver="cal_show(\'create_'.$temp_date.''.$time_arr['starthour'].'\')" onMouseOut="fnHide_Event(\'create_'.$temp_date.''.$time_arr['starthour'].'\')">';
 				$monthview_layout .= '<a href="index.php?module=Calendar&action=index&view='.$cal['slice']->getView().''.$cal['slice']->start_time->get_date_str().'&parenttab='.$category.'">';
 				$monthview_layout .= $cal['slice']->start_time->get_Date();
 				$monthview_layout .= '</a>';



From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 01:06:53 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 08:06:53 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9340 -
	/vtigercrm/trunk/include/utils/RecurringType.php
Message-ID: <20060907080653.4833F76D103@vtiger.fosslabs.com>

Author: saraj
Date: Thu Sep  7 02:06:47 2006
New Revision: 9340

Log:
changes made for weekly recurring events  --Minnie

Modified:
    vtigercrm/trunk/include/utils/RecurringType.php

Modified: vtigercrm/trunk/include/utils/RecurringType.php
==============================================================================
--- vtigercrm/trunk/include/utils/RecurringType.php (original)
+++ vtigercrm/trunk/include/utils/RecurringType.php Thu Sep  7 02:06:47 2006
@@ -42,12 +42,10 @@
 			'month' => $end_date[1],
 			'year'  => $end_date[0]
 		);
-		//echo '<pre>';print_r($end_date);echo '</pre>';
 		$this->recur_type = $repeat_arr['type'];
 		$this->recur_freq = $repeat_arr['repeat_frequency'];
 		$this->startdate = new DateTime($start_date,true);
 		$this->enddate = new DateTime($end_date,true);
-		//echo '<pre>';print_r($this->startdate);echo '</pre>';die;
 		if($repeat_arr['sun_flag'])
 		{
 			$this->dayofweek_to_rpt[] = 0;
@@ -81,7 +79,6 @@
 			$this->rptmonth_datevalue = $repeat_arr['repeatmonth_date'];
 		$this->rptmonth_daytype = $repeat_arr['repeatmonth_daytype'];
 		$this->recurringdates = $this->getRecurringDates();
-		//echo '<pre>';print_r($this);echo '</pre>';die;
 	}
 
 	/**
@@ -109,20 +106,6 @@
 			}
 			elseif($this->recur_type == 'Weekly')
 			{
-				//echo '<pre>';print_r($this);echo '</pre>';die;
-				$recurringDates[] = $tempdate;
-				$st_date = explode("-",$tempdate);
-				if(isset($this->recur_freq))
-					$index = $this->recur_freq * 7;
-				else
-					$index = 7;
-				$date_arr = Array(
-					'day'   => $st_date[2] + $index,
-					'month' => $st_date[1],
-					'year'  => $st_date[0]
-				);
-				$tempdateObj = new DateTime($date_arr,true);
-				/*$recurringDates[] = $tempdate;
 				$st_date = explode("-",$tempdate);
 				$date_arr = Array(
 					'day'   => $st_date[2],
@@ -130,28 +113,57 @@
 					'year'  => $st_date[0]
 				);
 				$tempdateObj = new DateTime($date_arr,true);
-				$firstdayofweekObj = $tempdateObj->getThisweekDaysbyIndex(0);
-				$date_arr = Array(
-					'day'   => $firstdayofweekObj->day+$this->dayofweek_to_rpt[0],
-					'month' => $st_date[1],
-					'year'  => $st_date[0]
-				);
-				$firstrptObj = new DateTime($date_arr,true);
-				
-				if(isset($this->recur_freq) && $this->recur_freq != null)
-					$index = $st_date[2] + ($this->recur_freq -1) ;
+				if(isset($this->dayofweek_to_rpt) && $this->dayofweek_to_rpt != null)
+				{
+					$weekstartObj = $tempdateObj->getThisweekDaysbyIndex(0);
+					if($weekstartObj->get_formatted_date() >= $this->startdate->get_formatted_date())
+					{
+						for($i=0;$i<count($this->dayofweek_to_rpt);$i++)
+						{
+							$repeatdateObj = $weekstartObj->getThisweekDaysbyIndex($this->dayofweek_to_rpt[$i]);
+							if($repeatdateObj->get_formatted_date() <= $enddate)
+								$recurringDates[] = $repeatdateObj->get_formatted_date();
+						}
+						if(isset($this->recur_freq))
+							$index = $this->recur_freq * 7;
+						else
+						        $index = 7;
+						$date_arr = Array(
+							'day'   => $st_date[2] + $index,
+							'month' => $st_date[1],
+							'year'  => $st_date[0]
+						);
+						$tempdateObj = new DateTime($date_arr,true);
+					}
+					else
+					{
+						if(isset($this->recur_freq))
+							$index = $this->recur_freq * 7;
+						else
+							$index = 7;
+						$date_arr = Array(
+							'day'   => $st_date[2] + $index,
+							'month' => $st_date[1],
+							'year'  => $st_date[0]
+						);
+						$tempdateObj = new DateTime($date_arr,true);
+						
+					}
+				}
 				else
-					$index = $st_date[2] - 1 ;
-				$index = $st_date[2] - 1 ;
-				$tempdateObj = $this->startdate->getThismonthDaysbyIndex($index,'',$st_date[1],$st_date[0]);
-				if(in_array($tempdateObj->dayofweek_inshort,$this->repeatdays))
-				{
-					$tempdate = $tempdateObj->get_formatted_date();
-				}
-				else
-				{
-				}
-				//echo '<pre>';print_r($this);echo '</pre>';die;*/
+				{
+					$recurringDates[] = $tempdateObj->get_formatted_date();
+					if(isset($this->recur_freq))
+						$index = $this->recur_freq * 7;
+					else
+						$index = 7;
+					$date_arr = Array(
+						'day'   => $st_date[2] + $index,
+						'month' => $st_date[1],
+						'year'  => $st_date[0]
+					);
+					$tempdateObj = new DateTime($date_arr,true);
+				}
 				$tempdate = $tempdateObj->get_formatted_date();
 			}
 			elseif($this->recur_type == 'Monthly')



From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 01:10:13 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 08:10:13 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9341 -
	/vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
Message-ID: <20060907081013.BD30572A555@vtiger.fosslabs.com>

Author: saraj
Date: Thu Sep  7 02:10:08 2006
New Revision: 9341

Log:
changes made to do wordwrapping for description and multiselect combobox --Minnie

Modified:
    vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl

Modified: vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl Thu Sep  7 02:10:08 2006
@@ -51,7 +51,13 @@
                     							</div>
                							</td>
                                           {elseif $keyid eq '33'}<!--Multi Select Combo box-->
-                                          <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}</span>
+						<!--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}
@@ -116,7 +122,11 @@
 						{if $label eq $MOD.LBL_ADD_COMMENT}
 							{assign var=keyval value=''}
 						{/if}
-                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}</span>
+							{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}">
+							{$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}



From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 01:12:07 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 08:12:07 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9342 -
 /vtigercrm/trunk/Smarty/templates/ActivityEditView.tpl
Message-ID: <20060907081207.C058F76D0DC@vtiger.fosslabs.com>

Author: saraj
Date: Thu Sep  7 02:12:02 2006
New Revision: 9342

Log:
changes made for weekly recurring events  --Minnie

Modified:
    vtigercrm/trunk/Smarty/templates/ActivityEditView.tpl

Modified: vtigercrm/trunk/Smarty/templates/ActivityEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ActivityEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ActivityEditView.tpl Thu Sep  7 02:12:02 2006
@@ -422,17 +422,22 @@
 														{assign var=rptstyle value='style="display:block"'}
 														{if $ACTIVITYDATA.eventrecurringtype eq 'Daily'}
 															{assign var=rptmonthstyle value='style="display:none"'}
+															{assign var=rptweekstyle value='style="display:none"'}
 														{elseif $ACTIVITYDATA.eventrecurringtype eq 'Weekly'}
 															{assign var=rptmonthstyle value='style="display:none"'}
+															{assign var=rptweekstyle value='style="display:block"'}
 														{elseif $ACTIVITYDATA.eventrecurringtype eq 'Monthly'}
 															{assign var=rptmonthstyle value='style="display:block"'}
+															{assign var=rptweekstyle value='style="display:none"'}
 														{elseif $ACTIVITYDATA.eventrecurringtype eq 'Yearly'}
 															{assign var=rptmonthstyle value='style="display:none"'}
+															{assign var=rptweekstyle value='style="display:none"'}
 														{/if}
 													<input type="checkbox" name="recurringcheck" onClick="showhide('repeatOptions')" checked>
 													{else}
 														{assign var=rptstyle value='style="display:none"'}
 														{assign var=rptmonthstyle value='style="display:none"'}
+														{assign var=rptweekstyle value='style="display:none"'}
 													<input type="checkbox" name="recurringcheck" onClick="showhide('repeatOptions')">
 													{/if}
 													</td>
@@ -454,16 +459,16 @@
 													</td>
 												</tr>
 												</table>
-												<div id="repeatWeekUI" style="display:none;">
+												<div id="repeatWeekUI" {$rptweekstyle}>
 												<table border=0 cellspacing=0 cellpadding=2>
 												<tr>
-													<td><input name="sun_flag" value="sunday" type="checkbox"></td><td>Sun</td>
-													<td><input name="mon_flag" value="monday" type="checkbox"></td><td>Mon</td>
-													<td><input name="tue_flag" value="tuesday" type="checkbox"></td><td>Tue</td>
-													<td><input name="wed_flag" value="wednesday" type="checkbox"></td><td>Wed</td>
-													<td><input name="thu_flag" value="thursday" type="checkbox"></td><td>Thu</td>
-													<td><input name="fri_flag" value="friday" type="checkbox"></td><td>Fri</td>
-													<td><input name="sat_flag" value="saturday" type="checkbox"></td><td>Sat</td>
+													<td><input name="sun_flag" value="sunday" {$ACTIVITYDATA.week0} type="checkbox"></td><td>Sun</td>
+													<td><input name="mon_flag" value="monday" {$ACTIVITYDATA.week1} type="checkbox"></td><td>Mon</td>
+													<td><input name="tue_flag" value="tuesday" {$ACTIVITYDATA.week2} type="checkbox"></td><td>Tue</td>
+													<td><input name="wed_flag" value="wednesday" {$ACTIVITYDATA.week3} type="checkbox"></td><td>Wed</td>
+													<td><input name="thu_flag" value="thursday" {$ACTIVITYDATA.week4} type="checkbox"></td><td>Thu</td>
+													<td><input name="fri_flag" value="friday" {$ACTIVITYDATA.week5} type="checkbox"></td><td>Fri</td>
+													<td><input name="sat_flag" value="saturday" {$ACTIVITYDATA.week6} type="checkbox"></td><td>Sat</td>
 												</tr>
 												</table>
 												</div>



From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 01:12:34 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 08:12:34 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9343 -
 /vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl
Message-ID: <20060907081234.610B376D0DC@vtiger.fosslabs.com>

Author: saraj
Date: Thu Sep  7 02:12:30 2006
New Revision: 9343

Log:
changes made for weekly recurring events  --Minnie

Modified:
    vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl

Modified: vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl Thu Sep  7 02:12:30 2006
@@ -243,7 +243,7 @@
 										</tr>
 										<tr>
                                                                                         <td width="30%" align=right>&nbsp;</td>
-                                                                                        <td>{$ACTIVITYDATA.repeat_month_str}</td>
+                                                                                        <td>{$ACTIVITYDATA.repeat_str}</td>
                                                                                 </tr>
 										{/if}
 									</table>



From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 01:39:25 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 08:39:25 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9344 - in
	/vtigercrm/trunk/themes/blue lagoon: ./ images/
Message-ID: <20060907083926.2096474815B@vtiger.fosslabs.com>

Author: saraj
Date: Thu Sep  7 02:33:30 2006
New Revision: 9344

Log:
* Added new theme files

Added:
    vtigercrm/trunk/themes/blue lagoon/
    vtigercrm/trunk/themes/blue lagoon/footer.php
    vtigercrm/trunk/themes/blue lagoon/header.php
    vtigercrm/trunk/themes/blue lagoon/images/
    vtigercrm/trunk/themes/blue lagoon/images/3hdrTabBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/Accounts.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/Call.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/Calls.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/Contacts.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/HomeBtm.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/Home_15.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/Leads.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/Meeting.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/Meetings.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/Opportunities.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/Potentials.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/Quotes.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/Reports_arrow.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/RolesDelete.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/RolesEdit.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/RolesMove.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/Rolesadd.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/Settings.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/Tasks.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/Thumbs.db   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/Tickets.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/TopOpenQuotes.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/ViewTemplate.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/aboutUS.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/about_btm.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/aboutus.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/addrss.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/advancedSearchLens.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/announ.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/arrow.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/arrow_down.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/arrow_up.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/assign.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/attachment.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/audit.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/backupserver.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/basicSearchLens.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/bl_bar.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/black.png   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/blank.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/bookMark.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/bottom_left.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/bottom_right.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/btnAlexa.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/btnL3Add-Faded.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/btnL3Add.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/btnL3AllMenu-Faded.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/btnL3AllMenu.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/btnL3Calc-Faded.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/btnL3Calc.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/btnL3Calendar-Faded.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/btnL3Calendar.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/btnL3Clock-Faded.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/btnL3Clock.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/btnL3Search-Faded.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/btnL3Search.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/btnL3Tracker-Faded.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/btnL3Tracker.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/busy.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/cal12x12Shared.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/cal16x16Call.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/cal16x16CallAdd.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/cal16x16Linked.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/cal16x16Meeting.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/cal16x16MeetingAdd.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/cal16x16Shared.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/cal16x16ToDo.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/cal16x16ToDoAdd.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calAddButtonBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calBottomBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calBottomLeft.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calBottomRight.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calNavNext.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calNavPrev.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calSep.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calTopLeft.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calTopRight.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/cal_Hdr.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/cal_Others.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/cal_add.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/cal_add.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/cal_clock.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/cal_event.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/cal_hdr.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/cal_nav.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/cal_next_nav.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/cal_prev_nav.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/cal_sel.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/cal_sharing.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/cal_title.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calc_back_btn.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calc_black_btn.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calc_blue_btn.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calc_bottom_center.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calc_bottom_left.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calc_bottom_right.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calc_canc_btn.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calc_grey_btn.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calc_logo.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calc_mem_btn.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calc_middle_right.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calc_red_btn.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calc_res_bc.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calc_res_bl.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calc_res_br.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calc_res_ml.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calc_res_mr.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calc_res_tc.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calc_res_tl.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calc_res_tr.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calc_top_left.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calc_top_right.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calendar.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/cfcurrency.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/cfpicklist.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/check_mail.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/checkbox.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/clear_field.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/clock_bg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/close.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/collapse.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/company.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/compose.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/composeMail.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/currency.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/currencydelete.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/custom.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/dashBottomBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/dashSelectBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/dashTopBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/dash_btm.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/dash_btm_center.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/dash_btm_left.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/dash_btm_right.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/dash_down_arrow.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/dash_name.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/dash_screw.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/dash_screw.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/dash_scroll_up.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/dash_sel_btm.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/dash_sel_chart.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/dash_sel_left.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/dash_sel_top.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/dash_switch_view.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/dash_top.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/dash_top_shadow.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/dash_unsel_chart.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/date.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/dboardMatrixView.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/dboardNormalView.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/del.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/del_tag.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/delete.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/denied.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/disabled.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/editfield.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/email.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/empty.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/enabled.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/end.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/end_disabled.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/expand.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/free.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/hdrNameBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/hdrTabBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/head_end.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/head_start.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/help.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/help_icon.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/hometop.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/ico-groups.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/ico-profile.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/ico-roles.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/ico-users.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/inventory.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/jump.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/keyMetrics.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/layerPopupBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/left.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/left_arc.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/level2TabBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/loginBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/loginBottomBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/loginBottomURL.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/loginSIBottomLeft.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/loginSIBottomRight.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/loginSITopLeft.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/loginSITopRight.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/loginTopShade.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/logout.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/lvtNavBtnFirst.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/lvtNavBtnLast.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/lvtNavBtnNext.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/lvtNavBtnPrev.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/mailHdr.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/mailSubHeaderBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/mailTitle.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/mailmarge.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/menuDnArrow.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/menu_off_end.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/menu_off_start.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/menu_off_tile.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/menu_on_end.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/menu_on_start.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/menu_on_tile.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/menu_root.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/migrate.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/migration_sucess.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/minus.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/moduleSelectorBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/movecol_del.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/movecol_del_down.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/movecol_del_over.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/movecol_down.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/movecol_down_disabled.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/movecol_down_down.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/movecol_down_over.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/movecol_up.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/movecol_up_disabled.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/movecol_up_down.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/movecol_up_over.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/myGroupAllocation.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/myTickets.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/myTopAccounts.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/myTopInvoices.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/myTopOpenPotentials.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/myTopSalesOrders.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/myUpcoPendAct.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/next.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/nextRecord.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/next_disabled.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/no.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/notification.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/number.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/offstar.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/ogmailserver.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/one.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/onstar.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/orgshar.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/pendingEvents.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/pending_left.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/pending_right.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/percent.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/phone.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/picklist.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/picklistEditor.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/picklist_hint.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/plsWaitAnimated.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/plus.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/pointer.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/popupHdr.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/previous.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/previousRecord.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/previous_disabled.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/pricebook.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/primeTopBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/print.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/private.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/proxy.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/prvPrfBottomLeft.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/prvPrfBottomRight.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/prvPrfHdrArrow.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/prvPrfSelectedTick.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/prvPrfTopLeft.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/prvPrfTopRight.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/public.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/qcBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/qcName.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/reload.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/report_bg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/report_bottom.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/report_btn.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/report_newHdr.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/reportsCreate.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/reportsDelete.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/reportsFolderCreate.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/reportsMove.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/right.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/right_arc.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/rss.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/rssDisplayBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/rssDisplayBottom.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/rssDisplayBottomLeft.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/rssDisplayBottomRight.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/rssDisplayLeft.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/rssDisplayRight.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/rssDisplaySpeaker.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/rssDisplayTop.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/rssDisplayTopLeft.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/rssDisplayTopRight.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/rssHeader.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/rssOnHeader.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/rssdelete.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/rssforward.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/rssframeHdr.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/rssimage.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/rssroot.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/scroll_left.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/scroll_left_down.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/scroll_right.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/scroll_right_down.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/search.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/searchUIBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/searching.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/select.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/set-IcoLoginHistory.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/set-IcoTwoTabConfig.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/settingsActBtnDelete.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/settingsActBtnDuplicate.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/settingsActBtnEdit.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/settingsMTBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/settingsSelUIBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/settings_top.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/shareaccess.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/showDown.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/showPanelTopBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/showPanelTopLeft.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/showPanelTopRight.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/showsubmenu.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/site_hdr.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/site_sel.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/site_unsel.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/small_left.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/small_right.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/spacer.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/start.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/start_disabled.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/status.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/strikeline.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/summarize.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/system.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/tabRht.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/tabSelectedBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/tabSeperatorBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/tabUnSelectedBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/tabular.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/tagCloudBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/tagCloudName.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/tagcloud_03.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/taxConfiguration.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/tbarChat-Faded.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/tbarChat.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/tbarExport-Faded.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/tbarExport.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/tbarImport-Faded.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/tbarImport.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/tbarPrivateChat.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/tbarPublicChat.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/tbarSettings.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/tblPro1BtnHide.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/tblPro1ColBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/terms.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/text.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/titleMailClient.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/titleMySites.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/titleRSSReader.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/todaybg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/topBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/topBnr.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/top_left.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/top_right.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/topbar.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/topcut.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/up.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/uparrow.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/upcomingEvents.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/upcoming_left.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/upcoming_right.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/url.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/vtbusy.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/vtiger-crm.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/vtiger.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/vtigerDevDocs.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/webmail_downarrow.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/webmail_header.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/webmail_root.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/webmail_settings.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/webmail_trash.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/webmail_uparrow.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/yes.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/layout_utils.php
    vtigercrm/trunk/themes/blue lagoon/loginheader.html
    vtigercrm/trunk/themes/blue lagoon/loginheader.php
    vtigercrm/trunk/themes/blue lagoon/style.css



From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 02:30:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 09:30:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9345 -
	/vtigercrm/trunk/include/utils/CommonUtils.php
Message-ID: <20060907093049.8373076D10D@vtiger.fosslabs.com>

Author: richie
Date: Thu Sep  7 03:30:14 2006
New Revision: 9345

Log:
Writing the actionid and actionname array in tabdata.php file

Modified:
    vtigercrm/trunk/include/utils/CommonUtils.php

Modified: vtigercrm/trunk/include/utils/CommonUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/CommonUtils.php (original)
+++ vtigercrm/trunk/include/utils/CommonUtils.php Thu Sep  7 03:30:14 2006
@@ -1593,6 +1593,34 @@
 
         }
 
+	//Constructing the actionname=>actionid array
+	$actionid_array=Array();
+	$sql1="select * from vtiger_actionmapping";
+	$result1=$adb->query($sql1);
+	$num_seq1=$adb->num_rows($result1);
+	for($i=0;$i<$num_seq1;$i++)
+	{
+		$actionname=$adb->query_result($result1,$i,'actionname');
+		$actionid=$adb->query_result($result1,$i,'actionid');
+		$actionid_array[$actionname]=$actionid;
+	}		
+
+	print_r($actionid_array);
+	
+	//Constructing the actionid=>actionname array with securitycheck=0
+	$actionname_array=Array();
+	$sql2="select * from vtiger_actionmapping where securitycheck=0";
+	$result2=$adb->query($sql2);
+	$num_seq2=$adb->num_rows($result2);
+	for($i=0;$i<$num_seq2;$i++)
+	{
+		$actionname=$adb->query_result($result2,$i,'actionname');
+		$actionid=$adb->query_result($result2,$i,'actionid');
+		$actionname_array[$actionid]=$actionname;
+	}
+
+	print_r($actionname_array);	
+	
         $filename = 'tabdata.php';
 	
 	
@@ -1614,6 +1642,10 @@
                 $newbuf .= "\$tab_info_array=".constructArray($result_array).";\n";
                 $newbuf .= "\n";
                 $newbuf .= "\$tab_seq_array=".constructArray($seq_array).";\n";
+		$newbuf .= "\n";
+                $newbuf .= "\$action_id_array=".constructSingleStringKeyAndValueArray($actionid_array).";\n";
+		$newbuf .= "\n";
+                $newbuf .= "\$action_name_array=".constructSingleStringValueArray($actionname_array).";\n";
                 $newbuf .= "?>";
                 fputs($handle, $newbuf);
                 fclose($handle);



From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 02:37:25 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 09:37:25 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9346 -
 /vtigercrm/trunk/Smarty/templates/Settings/BackupServer.tpl
Message-ID: <20060907093725.1E5CB76D10C@vtiger.fosslabs.com>

Author: richie
Date: Thu Sep  7 03:37:11 2006
New Revision: 9346

Log:
Backup config checked from flat file --Jeri

Modified:
    vtigercrm/trunk/Smarty/templates/Settings/BackupServer.tpl

Modified: vtigercrm/trunk/Smarty/templates/Settings/BackupServer.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings/BackupServer.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings/BackupServer.tpl Thu Sep  7 03:37:11 2006
@@ -36,49 +36,84 @@
 				</tr>
 				</table>
 				
-				<br>
-				<table border=0 cellspacing=0 cellpadding=10 width=100% >
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
 				<tr>
-				<td>
+				<td class="big" height="40px;" width="70%"><strong>{$MOD.LBL_BACKUP_SERVER_SETTINGS}</strong></td>
+				<td class="small" align="center" width="30%">&nbsp;
+					<span id="view_info" class="crmButton small cancel" style="display:none;"></span>
+				</td>
+				</tr>
+				</table>
 				
-					<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+				<table border=0 cellspacing=0 cellpadding=0 width=100% class="listRow">
+				<tr>
+				<td class="small" valign=top >
+					<table width="100%"  border="0" cellspacing="0" cellpadding="5">
 					<tr>
-						<td class="big"><strong>{$MOD.LBL_BACKUP_SERVER_SETTINGS} ({$MOD.LBL_FTP})<br>{$ERROR_MSG}</strong></td>
-						{if $BKP_SERVER_MODE neq 'edit'}
-						<td class="small" align=right>
-							<input title="{$APP.LBL_EDIT_BUTTON_TITLE}" accessKey="{$APP.LBL_EDIT_BUTTON_KEY}" class="crmButton small edit" onclick="this.form.action.value='BackupServerConfig';this.form.bkp_server_mode.value='edit'" type="submit" name="Edit" value="{$APP.LBL_EDIT_BUTTON_LABEL}">&nbsp;
-							<input title="{$MOD.LBL_CLEAR_DATA}" accessKey="{$MOD.LBL_CLEAR_DATA}" class="crmButton small cancel" onclick="clearBackupServer();" type="button" name="Clear" value="{$MOD.LBL_CLEAR_DATA}">
-						</td>
-						{else}
-						<td class="small" align=right>
-							<input title="{$APP.LBL_SAVE_BUTTON_LABEL}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="crmButton small save" type="submit" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}" onclick="this.form.action.value='Save'; return validate()">&nbsp;&nbsp;
-						    <input title="{$APP.LBL_CANCEL_BUTTON_LABEL}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="crmButton small cancel" onclick="window.history.back()" type="button" name="button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}">
-						</td>
-						{/if}
+					<td width="20%" nowrap class="small cellLabel"><strong>{$MOD.LBL_ENABLE} {$MOD.LBL_BACKUP_SERVER_SETTINGS}</strong></td>
+					<td width="80%" class="small cellText">
+					{if $BACKUP_STATUS eq 'enabled'}
+						<input type="checkbox" checked name="enable_backup" onclick="backupenabled(this)"></input>
+					{else}
+						<input type="checkbox" name="enable_backup" onclick="backupenabled(this)"></input>
+					{/if}
+					</td>
 					</tr>
 					</table>
+				</td>
+				</tr>
+				<tr>
+				<td class="small" valign=top >
+				<br>
+				{if $BACKUP_STATUS eq 'enabled'}
+					<div id='bckcontents' style="display:block;">
+				{else}
+					<div id='bckcontents' style="display:none;">
+				{/if}
+					<table border=0 cellspacing=0 cellpadding=10 width=100% >
+					<tr>
+					<td>
 				
-					<div id="BackupServerContents">
-						{include file="Settings/BackupServerContents.tpl"}
+						<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+						<tr>
+							<td class="big"><strong>{$MOD.LBL_BACKUP_SERVER_SETTINGS} ({$MOD.LBL_FTP})<br>{$ERROR_MSG}</strong></td>
+							{if $BKP_SERVER_MODE neq 'edit'}
+							<td class="small" align=right>
+								<input title="{$APP.LBL_EDIT_BUTTON_TITLE}" accessKey="{$APP.LBL_EDIT_BUTTON_KEY}" class="crmButton small edit" onclick="this.form.action.value='BackupServerConfig';this.form.bkp_server_mode.value='edit'" type="submit" name="Edit" value="{$APP.LBL_EDIT_BUTTON_LABEL}">&nbsp;
+								<input title="{$MOD.LBL_CLEAR_DATA}" accessKey="{$MOD.LBL_CLEAR_DATA}" class="crmButton small cancel" onclick="clearBackupServer();" type="button" name="Clear" value="{$MOD.LBL_CLEAR_DATA}">
+							</td>
+							{else}
+							<td class="small" align=right>
+								<input title="{$APP.LBL_SAVE_BUTTON_LABEL}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="crmButton small save" type="submit" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}" onclick="this.form.action.value='Save'; return validate()">&nbsp;&nbsp;
+							    <input title="{$APP.LBL_CANCEL_BUTTON_LABEL}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="crmButton small cancel" onclick="window.history.back()" type="button" name="button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}">
+							</td>
+							{/if}
+						</tr>
+						</table>
+					</td>
+					</tr>
+					<tr>
+					<td>
+						<div id="BackupServerContents">
+							{include file="Settings/BackupServerContents.tpl"}
+						</div>
+					</td>
+					</tr>
+					</table>
 					</div>
 				</td>
 				</tr>
 				</table>
-			
-			
-			
-			</td>
-			</tr>
-			</table>
 		</td>
-	</tr>
-	</form>
-	</table>
-		
+		</tr>
+		</form>
+		</table>
+		</td></tr>
+		</table>	
 	</div>
-</td>
+	</td>
         <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
-   </tr>
+</tr>
 </tbody>
 </table>
 {literal}
@@ -103,5 +138,39 @@
                         }
                 );	
 }
+
+function backupenabled(ochkbox)
+{
+	if(ochkbox.checked == true)
+	{
+		$('bckcontents').style.display='block';
+		var status='enabled';
+		$('view_info').innerHTML = 'Backup Enabled';
+		$('view_info').style.display = 'block';		
+		
+			
+	}
+	else
+	{
+		$('bckcontents').style.display='none';
+		var status = 'disabled';	
+	     	$('view_info').innerHTML = 'Backup Disabled';
+	     	$('view_info').style.display = 'block';		
+	}
+             $("status").style.display="block";
+	     new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: 'module=Settings&action=SettingsAjax&file=SaveEnableBackup&ajax=true&enable_backup='+status,
+                        onComplete: function(response) {
+                                $("status").style.display="none";
+                        }
+                }
+        );
+			
+	setTimeout("hide('view_info')",3000);
+}
+
 </script>
 {/literal}



From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 02:40:00 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 09:40:00 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9347 -
	/vtigercrm/trunk/include/utils/utils.php
Message-ID: <20060907094000.8F42A76D05D@vtiger.fosslabs.com>

Author: richie
Date: Thu Sep  7 03:39:52 2006
New Revision: 9347

Log:
retrieve actionid and action name from tabdata file done

Modified:
    vtigercrm/trunk/include/utils/utils.php

Modified: vtigercrm/trunk/include/utils/utils.php
==============================================================================
--- vtigercrm/trunk/include/utils/utils.php (original)
+++ vtigercrm/trunk/include/utils/utils.php Thu Sep  7 03:39:52 2006
@@ -1019,13 +1019,21 @@
 	$log->debug("Entering getActionid(".$action.") method ...");
 	global $adb;
 	$log->info("get Actionid ".$action);
-
 	$actionid = '';
-	$query="select * from vtiger_actionmapping where actionname='".$action."'";
-        $result =$adb->query($query);
-        $actionid=$adb->query_result($result,0,'actionid');
+	if(file_exists('tabdata.php') && (filesize('tabdata.php') != 0)) 
+	{
+		include('tabdata.php');
+		$actionid= $action_id_array[$action];
+	}
+	else
+	{
+		$query="select * from vtiger_actionmapping where actionname='".$action."'";
+        	$result =$adb->query($query);
+        	$actionid=$adb->query_result($result,0,'actionid');
+		
+	}
 	$log->info("action id selected is ".$actionid );
-	$log->debug("Exiting getActionid method ...");
+	$log->debug("Exiting getActionid method ...");	
 	return $actionid;
 }
 
@@ -1042,9 +1050,19 @@
 	global $adb;
 
 	$actionname='';
-	$query="select * from vtiger_actionmapping where actionid=".$actionid ." and securitycheck=0";
-	$result =$adb->query($query);
-	$actionname=$adb->query_result($result,0,"actionname");
+	
+	if (file_exists('tabdata.php') && (filesize('tabdata.php') != 0)) 
+	{
+		include('tabdata.php');
+		$actionname= $action_name_array[$actionid];
+	}
+	else
+	{
+	
+		$query="select * from vtiger_actionmapping where actionid=".$actionid ." and securitycheck=0";
+		$result =$adb->query($query);
+		$actionname=$adb->query_result($result,0,"actionname");
+	}	
 	$log->debug("Exiting getActionname method ...");
 	return $actionname;
 }



From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 02:51:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 09:51:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9348 -
 /vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php
Message-ID: <20060907095110.1925474815B@vtiger.fosslabs.com>

Author: richie
Date: Thu Sep  7 03:50:58 2006
New Revision: 9348

Log:
Added a function to get the array in a single string

Modified:
    vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php

Modified: vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php
==============================================================================
--- vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php (original)
+++ vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php Thu Sep  7 03:50:58 2006
@@ -1317,6 +1317,38 @@
   * @param $var -- input array:: Type array
   * @returns $code -- contains the whole array in a single string:: Type array 
  */
+function constructSingleStringKeyAndValueArray($var)
+{
+
+        $size = sizeof($var);
+        $i=1;
+        if (is_array($var))
+        {
+                $code = 'array(';
+                foreach ($var as $key => $value)
+                {
+                        if($i<$size)
+                        {
+                                $code .= "'".$key."'=>".$value.",";
+                        }
+                        else
+                        {
+                                $code .= "'".$key."'=>".$value;
+                        }
+                        $i++;
+                }
+                $code .= ')';
+                return $code;
+        }
+}
+
+
+
+/** Converts the input array  to a single string to facilitate the writing of the input array in a flat file 
+
+  * @param $var -- input array:: Type array
+  * @returns $code -- contains the whole array in a single string:: Type array 
+ */
 function constructSingleStringKeyValueArray($var)
 {
 



From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 03:47:13 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 10:47:13 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9349 -
 /vtigercrm/trunk/modules/Settings/DeleteCustomField.php
Message-ID: <20060907104713.2520676D0DC@vtiger.fosslabs.com>

Author: saraj
Date: Thu Sep  7 04:47:08 2006
New Revision: 9349

Log:
* Modified to delete the customfield from corresponding module tables and add the missed module tables

Modified:
    vtigercrm/trunk/modules/Settings/DeleteCustomField.php

Modified: vtigercrm/trunk/modules/Settings/DeleteCustomField.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/DeleteCustomField.php (original)
+++ vtigercrm/trunk/modules/Settings/DeleteCustomField.php Thu Sep  7 04:47:08 2006
@@ -11,10 +11,9 @@
 require_once('include/database/PearDatabase.php');
 
 $fld_module = $_REQUEST["fld_module"];
-//echo $fld_module;
+
 $id = $_REQUEST["fld_id"];
-//echo '<BR>';
-//echo $id;
+
 $colName = $_REQUEST["colName"];
 $uitype = $_REQUEST["uitype"];
 
@@ -22,43 +21,37 @@
 $query='delete from vtiger_field where fieldid="'.$id.'"';
 $adb->query($query);
 
-//Deleting from vtiger_profile2field vtiger_table
+//Deleting from vtiger_profile2field table
 $query='delete from vtiger_profile2field where fieldid="'.$id.'"';
 $adb->query($query);
 
-//Deleting from vtiger_def_org_field vtiger_table
+//Deleting from vtiger_def_org_field table
 $query='delete from vtiger_def_org_field where fieldid="'.$id.'"';
 $adb->query($query);
 
-//Dropping the column in the module vtiger_table
-if($fld_module == "Leads")
-{
-	$tableName = "leadscf";
-}
-elseif($fld_module == "Accounts")
-{
-	$tableName = "accountscf";
-}
-elseif($fld_module == "Contacts")
-{
-	$tableName = "contactscf";
-}
-elseif($fld_module == "Potentials")
-{
-	$tableName = "potentialscf";
-}
-elseif($fld_module == "HelpDesk")
-{
-	$tableName = "ticketcf";
-}
-elseif($fld_module == "Products")
-{
-	$tableName = "productcf";
-}
-//echo '<BR>';
-//echo $tableName;
-$dbquery = 'Alter table '.$tableName.' Drop Column '.$colName;
+//Drop the column in the corresponding module table
+$delete_module_tables = Array(
+				"Leads"=>"vtiger_leadscf",
+				"Accounts"=>"vtiger_accountscf",
+				"Contacts"=>"vtiger_contactscf",
+				"Potentials"=>"vtiger_potentialscf",
+				"HelpDesk"=>"vtiger_ticketcf",
+				"Products"=>"vtiger_productcf",
+				"Vendors"=>"vtiger_vendorcf",
+				"PriceBooks"=>"vtiger_pricebookcf",
+				"PurchaseOrder"=>"vtiger_purchaseordercf",
+				"SalesOrder"=>"vtiger_salesordercf",
+				"Quotes"=>"vtiger_quotescf",
+				"Invoice"=>"vtiger_invoicecf",
+				"Campaigns"=>"vtiger_campaignscf",
+			     );
+
+$dbquery = 'alter table '.$delete_module_tables[$fld_module].' drop column '.$colName;
 $adb->query($dbquery);
+
+
+//HANDLE HERE - we have to remove the entries in customview and report related tables which have this field ($colName)
+
 
 //Deleting from convert lead mapping vtiger_table- Jaguar
 if($fld_module=="Leads")
@@ -67,11 +60,12 @@
 	$adb->query($deletequery);
 }
 
-
+//HANDLE HERE - we have to remove the table for other picklist type values which are text area and multiselect combo box 
 if($uitype == 15)
 {
-$deltablequery = 'drop table '.$colName;
-$adb->query($deltablequery);
+	$deltablequery = 'drop table '.$colName;
+	$adb->query($deltablequery);
 }
+
 header("Location:index.php?module=Settings&action=CustomFieldList&fld_module=".$fld_module."&parenttab=Settings");
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 03:52:06 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 10:52:06 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9350 - in /vtigercrm/trunk:
 include/utils/CommonUtils.php modules/Potentials/Charts.php
 modules/Users/User.php
Message-ID: <20060907105206.D598676D0DC@vtiger.fosslabs.com>

Author: saraj
Date: Thu Sep  7 04:51:59 2006
New Revision: 9350

Log:
changes made to show currency in conversion rate and symbol in dashboard

Modified:
    vtigercrm/trunk/include/utils/CommonUtils.php
    vtigercrm/trunk/modules/Potentials/Charts.php
    vtigercrm/trunk/modules/Users/User.php

Modified: vtigercrm/trunk/include/utils/CommonUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/CommonUtils.php (original)
+++ vtigercrm/trunk/include/utils/CommonUtils.php Thu Sep  7 04:51:59 2006
@@ -779,6 +779,17 @@
     * param $crate - conversion rate.
       */
 function convertFromDollar($amount,$crate){
+	global $log;
+	$log->debug("Entering convertFromDollar(".$amount.",".$crate.") method ...");
+	$log->debug("Exiting convertFromDollar method ...");
+        return $amount * $crate;
+}
+
+/** This function returns the amount converted from master currency.
+  * param $amount - amount to be converted.
+    * param $crate - conversion rate.
+      */
+function convertFromMasterCurrency($amount,$crate){
 	global $log;
 	$log->debug("Entering convertFromDollar(".$amount.",".$crate.") method ...");
 	$log->debug("Exiting convertFromDollar method ...");

Modified: vtigercrm/trunk/modules/Potentials/Charts.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/Charts.php (original)
+++ vtigercrm/trunk/modules/Potentials/Charts.php Thu Sep  7 04:51:59 2006
@@ -127,7 +127,7 @@
 					}
 					if (isset($record->column_fields['amount']))	{
 						// Strip all non numbers from this string.
-						$amount = ereg_replace('[^0-9]', '', floor($record->column_fields['amount']));
+						$amount = convertFromMasterCurrency(ereg_replace('[^0-9]', '', floor($record->column_fields['amount'])),$current_user->conv_rate);
 						$sum[$month][$sales_stage] = $sum[$month][$sales_stage] + $amount;
 						if (isset($count[$month][$sales_stage])) {
 							$count[$month][$sales_stage]++;
@@ -261,8 +261,8 @@
 			$gbplot->setBackground(Image_Graph::factory('gradient', array(IMAGE_GRAPH_GRAD_VERTICAL, 'white', '#E5E5E5')));
 
 			// Setup title
-			$titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$curr_symbol.$total.$app_strings['LBL_THOUSANDS_SYMBOL'];
-				//$titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$curr_symbol.$total;
+			$titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$current_user->currency_symbol.$total.$app_strings['LBL_THOUSANDS_SYMBOL'];
+				//$titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$current_user->currency_symbol.$total;
 			
 			$title->setText($titlestr);
 
@@ -298,7 +298,7 @@
 			$yaxis->setAxisIntersection('max');
 
 			// Then fix the tick marks
-			$valueproc =& Image_Graph::factory('Image_Graph_DataPreprocessor_Formatted', $curr_symbol."%d");
+			$valueproc =& Image_Graph::factory('Image_Graph_DataPreprocessor_Formatted', $current_user->currency_symbol."%d");
 			$yaxis->setFontSize(8);
 			$yaxis->setDataPreprocessor($valueproc);
 			// Arrange Y-Axis tick marks inside
@@ -323,7 +323,7 @@
 			$marker->setFontSize(8);
 			$gbplot->setMarker($marker);
 
-			$subtitle .= $current_module_strings['LBL_OPP_SIZE'].$curr_symbol.$current_module_strings['LBL_OPP_SIZE_VALUE'];
+			$subtitle .= $current_module_strings['LBL_OPP_SIZE'].$current_user->currency_symbol.$current_module_strings['LBL_OPP_SIZE_VALUE'];
 			$footer->setText($subtitle);
 			$footer->setAlignment(IMAGE_GRAPH_ALIGN_TOP_RIGHT);
 
@@ -363,7 +363,7 @@
 	 * Contributor(s): ______________________________________..
 	 */
 	function lead_source_by_outcome($datay=array('foo','bar'), $user_id=array('1'), $cache_file_name='a_file', $refresh=false,$width=900,$height=500){
-		global $log;
+		global $log,$current_user;
 		$log->debug("Entering lead_source_by_outcome(".$datay.",".$user_id.",".$cache_file_name.",".$refresh.") method ...");
 		global $app_strings,$lang_crm, $current_module_strings,$charset, $tmp_dir;
 		global $theme;
@@ -471,7 +471,7 @@
 					}
 					if (isset($record->column_fields['amount']))	{
 						// Strip all non numbers from this string.
-						$amount = ereg_replace('[^0-9]', '', floor($record->column_fields['amount']));
+						$amount = convertFromMasterCurrency(ereg_replace('[^0-9]', '', floor($record->column_fields['amount'])),$current_user->conv_rate);
 						$sum[$lead_source][$sales_stage] = $sum[$lead_source][$sales_stage] + $amount;
 						if (isset($count[$lead_source][$sales_stage])) {
 							$count[$lead_source][$sales_stage]++;
@@ -602,8 +602,8 @@
 			$gbplot->setBackground(Image_Graph::factory('gradient', array(IMAGE_GRAPH_GRAD_HORIZONTAL, 'white', '#E5E5E5')));
 
 			// Setup title
-			$titlestr = $current_module_strings['LBL_ALL_OPPORTUNITIES'].$curr_symbol.$total.$app_strings['LBL_THOUSANDS_SYMBOL'];
-			//$titlestr = $current_module_strings['LBL_ALL_OPPORTUNITIES'].$curr_symbol.$total;
+			$titlestr = $current_module_strings['LBL_ALL_OPPORTUNITIES'].$current_user->currency_symbol.$total.$app_strings['LBL_THOUSANDS_SYMBOL'];
+			//$titlestr = $current_module_strings['LBL_ALL_OPPORTUNITIES'].$current_user->currency_symbol.$total;
 			$title->setText($titlestr);
 
 			// Create the xaxis labels
@@ -635,7 +635,7 @@
 			// Then fix the tick marks
 			$yaxis->setFontSize(8);
 			$yaxis->setAxisIntersection('max');
-			$valueproc =& Image_Graph::factory('Image_Graph_DataPreprocessor_Formatted', $curr_symbol."%d");
+			$valueproc =& Image_Graph::factory('Image_Graph_DataPreprocessor_Formatted', $current_user->currency_symbol."%d");
 			$yaxis->setDataPreprocessor($valueproc);
 			$yaxis->setLabelInterval($ticks[0]);
 			$yaxis->setTickOptions(-5,0);
@@ -655,7 +655,7 @@
 			$gbplot->setMarker($marker);
 
 			// Finally setup the title
-			$subtitle = $current_module_strings['LBL_OPP_SIZE'].$curr_symbol.$current_module_strings['LBL_OPP_SIZE_VALUE']; 
+			$subtitle = $current_module_strings['LBL_OPP_SIZE'].$current_user->currency_symbol.$current_module_strings['LBL_OPP_SIZE_VALUE']; 
 			$footer->setText($subtitle);
 			$footer->setAlignment(IMAGE_GRAPH_ALIGN_TOP_RIGHT);
 
@@ -690,7 +690,7 @@
 	 * Contributor(s): ______________________________________..
 	 */
 	function pipeline_by_sales_stage($datax=array('foo','bar'), $date_start='2071-10-15', $date_end='2071-10-15', $user_id=array('1'), $cache_file_name='a_file', $refresh=false,$width=900,$height=500){
-		global $log;
+		global $log,$current_user;
 		$log->debug("Entering pipeline_by_sales_stage(".$datax.",".$date_start.",".$date_end.",".$user_id.",".$cache_file_name.",".$refresh.") method ...");
 		global $app_strings,$lang_crm, $current_module_strings, $charset, $tmp_dir;
 		global $theme;
@@ -793,7 +793,7 @@
 					}
 					if (isset($record->column_fields['amount']))	{
 						// Strip all non numbers from this string.
-						$amount = ereg_replace('[^0-9]', '', floor($record->column_fields['amount']));
+						$amount = convertFromMasterCurrency(ereg_replace('[^0-9]', '', floor($record->column_fields['amount'])),$current_user->conv_rate);
 						$sum[$record->column_fields['sales_stage']][$record->column_fields['assigned_user_id']] = $sum[$record->column_fields['sales_stage']][$record->column_fields['assigned_user_id']] + $amount;
 						if (isset($count[$record->column_fields['sales_stage']][$record->column_fields['assigned_user_id']])) {
 							$count[$record->column_fields['sales_stage']][$record->column_fields['assigned_user_id']]++;
@@ -915,8 +915,8 @@
 			$font->setColor($font_color);
 
 			// Setup title
-			$titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$curr_symbol.$total.$app_strings['LBL_THOUSANDS_SYMBOL'];
-			//$titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$curr_symbol.$total;
+			$titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$current_user->currency_symbol.$total.$app_strings['LBL_THOUSANDS_SYMBOL'];
+			//$titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$current_user->currency_symbol.$total;
 			$title->setText($titlestr);
 
 			// Create the xaxis labels
@@ -951,7 +951,7 @@
 			$gridY->setLineColor('#E5E5E5 at 0.5');
 
 			// First make the labels look right
-			$valueproc =& Image_Graph::factory('Image_Graph_DataPreprocessor_Formatted', $curr_symbol."%d");
+			$valueproc =& Image_Graph::factory('Image_Graph_DataPreprocessor_Formatted', $current_user->currency_symbol."%d");
 			$yaxis->setDataPreprocessor($valueproc);
 			$yaxis->setLabelInterval($ticks[0]);
 			$yaxis->setTickOptions(-5,0);
@@ -972,7 +972,7 @@
 
 			// Finally setup the title
 
-			$subtitle .= $current_module_strings['LBL_OPP_SIZE'].$curr_symbol.$current_module_strings['LBL_OPP_SIZE_VALUE']; 
+			$subtitle .= $current_module_strings['LBL_OPP_SIZE'].$current_user->currency_symbol.$current_module_strings['LBL_OPP_SIZE_VALUE']; 
 			$footer->setText($subtitle);
 			$footer->setAlignment(IMAGE_GRAPH_ALIGN_TOP_RIGHT);
 
@@ -1009,7 +1009,7 @@
 	 * Contributor(s): ______________________________________..
 	 */
 	function pipeline_by_lead_source($legends=array('foo','bar'), $user_id=array('1'), $cache_file_name='a_file', $refresh=true,$width=900,$height=500){
-		global $log;
+		global $log,$current_user;
 		$log->debug("Entering pipeline_by_lead_source(".$legends.") method ...");
 		global $app_strings,$lang_crm, $current_module_strings, $log, $charset, $tmp_dir;
 		global $theme;
@@ -1069,7 +1069,7 @@
 					if (!isset($sum[$record->column_fields['leadsource']])) $sum[$record->column_fields['leadsource']] = 0;
 					if (isset($record->column_fields['amount']) && isset($record->column_fields['leadsource']))	{
 						// Strip all non numbers from this string.
-						$amount = ereg_replace('[^0-9]', '', floor($record->column_fields['amount']));
+						$amount = convertFromMasterCurrency(ereg_replace('[^0-9]', '', floor($record->column_fields['amount'])),$current_user->conv_rate);
 						$sum[$record->column_fields['leadsource']] = $sum[$record->column_fields['leadsource']] + ($amount/1000);
 						if (isset($count[$record->column_fields['leadsource']])) $count[$record->column_fields['leadsource']]++;
 						else $count[$record->column_fields['leadsource']] = 1;
@@ -1174,13 +1174,13 @@
 			$gbplot->setFillStyle($fills);
 
 			// Setup title
-			$titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$curr_symbol.$total.$app_strings['LBL_THOUSANDS_SYMBOL'];
-			//$titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$curr_symbol.$total;
+			$titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$current_user->currency_symbol.$total.$app_strings['LBL_THOUSANDS_SYMBOL'];
+			//$titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$current_user->currency_symbol.$total;
 
 			$title->setText($titlestr);
 
 			// format the data values
-			$valueproc =& Image_Graph::factory('Image_Graph_DataPreprocessor_Formatted', $curr_symbol."%d");
+			$valueproc =& Image_Graph::factory('Image_Graph_DataPreprocessor_Formatted', $current_user->currency_symbol."%d");
 
 			// set markers
 			$marker =& $graph->addNew('value_marker', IMAGE_GRAPH_VALUE_Y);
@@ -1198,7 +1198,7 @@
 			$legend_box->setFillColor('#F5F5F5');
 			$legend_box->showShadow();
 
-			$subtitle = $current_module_strings['LBL_OPP_SIZE'].$curr_symbol.$current_module_strings['LBL_OPP_SIZE_VALUE'];
+			$subtitle = $current_module_strings['LBL_OPP_SIZE'].$current_user->currency_symbol.$current_module_strings['LBL_OPP_SIZE_VALUE'];
 			$footer->setText($subtitle);
 			$footer->setAlignment(IMAGE_GRAPH_ALIGN_TOP_LEFT);
 

Modified: vtigercrm/trunk/modules/Users/User.php
==============================================================================
--- vtigercrm/trunk/modules/Users/User.php (original)
+++ vtigercrm/trunk/modules/Users/User.php Thu Sep  7 04:51:59 2006
@@ -63,6 +63,10 @@
 	'activity_view' =>'',
 	'lead_view' =>'',
 	'currency_id' =>'',
+	'currency_name' =>'',
+	'currency_code' =>'',
+	'currency_symbol' =>'',
+	'conv_rate' =>'',
 	'hour_format' =>'',
 	'end_hour' =>'',
 	'start_hour' =>'',
@@ -839,6 +843,22 @@
 		$this->column_fields["record_id"] = $record;
 		$this->column_fields["record_module"] = $module;
 
+		$currency_query = "select * from vtiger_currency_info where id=".$this->column_fields["currency_id"]." and currency_status='Active'";
+		$currency_result = $adb->query($currency_query);
+		if($adb->num_rows($currency_result) == 0)
+		{
+			$currency_query = "select * from vtiger_currency_info where id =1";
+			$currency_result = $adb->query($currency_query);
+		}
+		$currency_array = array("$"=>"&#36;","&dollar;"=>"&#36;","&euro;"=>"&#8364;","&pound;"=>"&#163;","&yen;"=>"&#165;","Rs"=>"&#8360;");
+			$ui_curr = $currency_array[$adb->query_result($currency_result,0,"currency_symbol")];
+		if($ui_curr == "")
+			$ui_curr = $adb->query_result($currency_result,0,"currency_symbol");
+		$this->column_fields["currency_name"]= $this->currency_name = $adb->query_result($currency_result,0,"currency_name");
+		$this->column_fields["currency_code"]= $this->currency_code = $adb->query_result($currency_result,0,"currency_code");
+		$this->column_fields["currency_symbol"]= $this->currency_symbol = $ui_curr;
+		$this->column_fields["conv_rate"]= $this->conv_rate = $adb->query_result($currency_result,0,"conversion_rate");
+
 		$this->id = $record;
 		$log->debug("Exit from retrieve_entity_info($record, $module) method.");
 



From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 04:02:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 11:02:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9351 -
	/vtigercrm/trunk/include/utils/CommonUtils.php
Message-ID: <20060907110239.77D2576D116@vtiger.fosslabs.com>

Author: richie
Date: Thu Sep  7 05:02:31 2006
New Revision: 9351

Log:
removed junk prints

Modified:
    vtigercrm/trunk/include/utils/CommonUtils.php

Modified: vtigercrm/trunk/include/utils/CommonUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/CommonUtils.php (original)
+++ vtigercrm/trunk/include/utils/CommonUtils.php Thu Sep  7 05:02:31 2006
@@ -1616,8 +1616,6 @@
 		$actionid_array[$actionname]=$actionid;
 	}		
 
-	print_r($actionid_array);
-	
 	//Constructing the actionid=>actionname array with securitycheck=0
 	$actionname_array=Array();
 	$sql2="select * from vtiger_actionmapping where securitycheck=0";
@@ -1630,8 +1628,6 @@
 		$actionname_array[$actionid]=$actionname;
 	}
 
-	print_r($actionname_array);	
-	
         $filename = 'tabdata.php';
 	
 	



From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 04:19:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 11:19:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9353 -
	/vtigercrm/tags/vtigercrm-5.0.0-ga-val1/
Message-ID: <20060907111949.2FFB87618F7@vtiger.fosslabs.com>

Author: richie
Date: Thu Sep  7 05:19:26 2006
New Revision: 9353

Log:
made a copy

Added:
    vtigercrm/tags/vtigercrm-5.0.0-ga-val1/
      - copied from r9352, vtigercrm/trunk/



From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 23:04:47 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 08 Sep 2006 06:04:47 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9354 -
	/vtigercrm/branches/4.2/include/logging.php
Message-ID: <20060908060447.5420366A085@vtiger.fosslabs.com>

Author: allanbush
Date: Fri Sep  8 00:04:44 2006
New Revision: 9354

Log:
Set the umask before initiating log4php so if the log file needs to be created it's created with the permissions specified in the config file.  Closed #1418.

Modified:
    vtigercrm/branches/4.2/include/logging.php

Modified: vtigercrm/branches/4.2/include/logging.php
==============================================================================
--- vtigercrm/branches/4.2/include/logging.php (original)
+++ vtigercrm/branches/4.2/include/logging.php Fri Sep  8 00:04:44 2006
@@ -25,7 +25,13 @@
 require_once(LOG4PHP_DIR.'/LoggerManager.php');
 require_once(LOG4PHP_DIR.'/LoggerPropertyConfigurator.php');
 
+// change the umask so that the log file is created with the proper permissions
+if($log_readable == 1) {
+	$old_umask = umask(0177);
+} else {
+	$old_umask = umask(0577);
+}
 $config = new LoggerPropertyConfigurator();
 $config->configure('log4php.properties');
 
-?>
+?>



From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 23:06:42 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 08 Sep 2006 06:06:42 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9355 -
	/vtigercrm/branches/4.2/include/logging.php
Message-ID: <20060908060642.7C58C66A0B8@vtiger.fosslabs.com>

Author: allanbush
Date: Fri Sep  8 00:06:39 2006
New Revision: 9355

Log:
Revert to the pervious umask after file creation.  Missing from changeset:9354.  Refs #1418.

Modified:
    vtigercrm/branches/4.2/include/logging.php

Modified: vtigercrm/branches/4.2/include/logging.php
==============================================================================
--- vtigercrm/branches/4.2/include/logging.php (original)
+++ vtigercrm/branches/4.2/include/logging.php Fri Sep  8 00:06:39 2006
@@ -33,5 +33,6 @@
 }
 $config = new LoggerPropertyConfigurator();
 $config->configure('log4php.properties');
+umask($old_umask);
 
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Fri Sep  8 19:09:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 02:09:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9356 -
	/vtigercrm/trunk/include/utils/CommonUtils.php
Message-ID: <20060909020903.277D176AF66@vtiger.fosslabs.com>

Author: mmbrich
Date: Fri Sep  8 20:08:57 2006
New Revision: 9356

Log:
fix for table prefix, this should get email personalization working again

Modified:
    vtigercrm/trunk/include/utils/CommonUtils.php

Modified: vtigercrm/trunk/include/utils/CommonUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/CommonUtils.php (original)
+++ vtigercrm/trunk/include/utils/CommonUtils.php Fri Sep  8 20:08:57 2006
@@ -2431,7 +2431,7 @@
 			if(is_array($fields["contacts"]))
 			{
 				$columnfields = implode(',',$fields["contacts"]);
-				$query = 'select '.$columnfields.' from contactdetails where contactid='.$id;
+				$query = 'select '.$columnfields.' from vtiger_contactdetails where contactid='.$id;
 				$result = $adb->query($query);
 				foreach($fields["contacts"] as $columnname)
 				{
@@ -2444,7 +2444,7 @@
 			if(is_array($fields["leads"]))
 			{
 				$columnfields = implode(',',$fields["leads"]);
-				$query = 'select '.$columnfields.' from leaddetails where leadid='.$id;
+				$query = 'select '.$columnfields.' from vtiger_leaddetails where leadid='.$id;
 				$result = $adb->query($query);
 				foreach($fields["leads"] as $columnname)
 				{



From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 00:04:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 07:04:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9357 -
 /thunderbirdextn/trunk/chrome/vtiger/content/vtiger/vtiger.xul
Message-ID: <20060909070449.87C1876B5BA@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 01:04:06 2006
New Revision: 9357

Log:
Issue in thunderbird plugin (add to vtigerCRm window opening twice) has been fixed --Jeri

Modified:
    thunderbirdextn/trunk/chrome/vtiger/content/vtiger/vtiger.xul

Modified: thunderbirdextn/trunk/chrome/vtiger/content/vtiger/vtiger.xul
==============================================================================
Binary files - no diff available.



From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 01:01:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 08:01:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9358 -
	/vtigercrm/trunk/data/CRMEntity.php
Message-ID: <20060909080159.6AEE976BDC3@vtiger.fosslabs.com>

Author: richie
Date: Sat Sep  9 02:00:56 2006
New Revision: 9358

Log:
Postgres fixes by Jens done --By Don

Modified:
    vtigercrm/trunk/data/CRMEntity.php

Modified: vtigercrm/trunk/data/CRMEntity.php
==============================================================================
--- vtigercrm/trunk/data/CRMEntity.php (original)
+++ vtigercrm/trunk/data/CRMEntity.php Sat Sep  9 02:00:56 2006
@@ -935,7 +935,7 @@
         global $adb;
 	global $current_user;
 
-        $current_time = date('Y-m-d H:i:s');
+        $current_time = $adb->formatDate(date('YmdHis'));
 	if($this->column_fields['assigned_user_id'] != '')
 		$ownertype = 'user';
 	else
@@ -949,7 +949,7 @@
 	if($comment != '')
 	{
 		$comment = addslashes($comment);
-		$sql = "insert into vtiger_ticketcomments values('',".$this->id.",'".$comment."','".$current_user->id."','".$ownertype."','".$current_time."')";
+		$sql = "insert into vtiger_ticketcomments values('',".$this->id.",'".$comment."','".$current_user->id."','".$ownertype."',".$current_time.")";	
 	        $adb->query($sql);
 	}
 }
@@ -963,7 +963,7 @@
 	$log->info("in insertIntoFAQCommentTable  ".$table_name."    module is  ".$module);
         global $adb;
 
-        $current_time = date('Y-m-d H:i:s');
+        $current_time = $adb->formatDate(date('YmdHis'));
 
 	if($this->column_fields['comments'] != '')
 		$comment = $this->column_fields['comments'];
@@ -973,7 +973,7 @@
 	if($comment != '')
 	{
 		$comment = addslashes($comment);
-		$sql = "insert into vtiger_faqcomments values('',".$this->id.",'".$comment."','".$current_time."')";
+		$sql = "insert into vtiger_faqcomments values('',".$this->id.",'".$comment."',".$current_time.")";	
 		$adb->query($sql);
 	}
 }



From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 01:10:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 08:10:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9359 -
	/vtigercrm/trunk/data/SugarBean.php
Message-ID: <20060909081049.BE2CA76BE72@vtiger.fosslabs.com>

Author: richie
Date: Sat Sep  9 02:10:11 2006
New Revision: 9359

Log:
Postgres fixes by Jens done --By Don

Modified:
    vtigercrm/trunk/data/SugarBean.php

Modified: vtigercrm/trunk/data/SugarBean.php
==============================================================================
--- vtigercrm/trunk/data/SugarBean.php (original)
+++ vtigercrm/trunk/data/SugarBean.php Sat Sep  9 02:10:11 2006
@@ -1,451 +1,451 @@
-<?php
-/*********************************************************************************
- * The contents of this file are subject to the SugarCRM Public License Version 1.1.2
- * ("License"); You may not use this file except in compliance with the 
- * License. You may obtain a copy of the License at http://www.sugarcrm.com/SPL
- * Software distributed under the License is distributed on an  "AS IS"  basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
- * the specific language governing rights and limitations under the License.
- * The Original Code is:  SugarCRM Open Source
- * The Initial Developer of the Original Code is SugarCRM, Inc.
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.;
- * All Rights Reserved.
- * Contributor(s): ______________________________________.
- ********************************************************************************/
-/*********************************************************************************
- * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/data/SugarBean.php,v 1.70 2005/03/16 10:25:16 shaw Exp $
- * Description:  Defines the base class for all data entities used throughout the 
- * application.  The base class including its methods and variables is designed to 
- * be overloaded with module-specific methods and variables particular to the 
- * module's base entity class. 
- ********************************************************************************/
-
-include_once('config.php');
-require_once('include/logging.php');
-require_once('data/Tracker.php');
-require_once('include/utils/utils.php');
-require_once('include/utils/UserInfoUtil.php');
-require_once('include/database/PearDatabase.php');
-
-class SugarBean
-{
-    /**
-     * This method implements a generic insert and update logic for any SugarBean
-     * This method only works for subclasses that implement the same variable names.
-     * This method uses the presence of an id vtiger_field that is not null to signify and update.
-     * The id vtiger_field should not be set otherwise.
-     * todo - Add support for vtiger_field type validation and encoding of parameters.
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
- * All Rights Reserved.
- * Contributor(s): ______________________________________..
-     */
-	
-
-	function save($module_name= '') 
-	{
-         global $adb; 
-          global $current_user;
-		$isUpdate = true;
-
-		if(!isset($this->id) || $this->id == "")
-		{
-			$isUpdate = false;
-		}
-
-		if ( $this->new_with_id == true )
-		{
-			$isUpdate = false;
-		}
-
-		//$this->date_modified = $this->db->formatDate(date('YmdHis'));
-		$this->date_modified = date('YmdHis');
-		if (isset($current_user)) $this->modified_user_id = $current_user->id;
-		
-		if($isUpdate)
-		{
-    			$query = "Update ".$this->table_name." set ";
-		}
-		else
-		{
-    			//$this->date_entered = $this->db->formatDate(date('YmdHis'));
-			$this->date_entered = date('YmdHis');
-
-			if($this->new_schema && 
-				$this->new_with_id == false)
-			{
-                          $this->id = $adb->getUniqueID("vtiger_users");
-			}
-                        
-			$query = "INSERT into ".$this->table_name;
-		}
-		// todo - add date modified to the list.
-
-		// write out the SQL statement.
-		//$query .= $this->table_name." set ";
-
-		$firstPass = 0;
-		$insKeys = '(';
-		$insValues = '(';
-		$updKeyValues='';
-		foreach($this->column_fields as $field)
-		{
-			// Do not write out the id vtiger_field on the update statement.
-			// We are not allowed to change ids.
-			if($isUpdate && ('id' == $field))
-				continue;
-
-			// Only assign variables that have been set.
-			if(isset($this->$field))
-			{				
-				// Try comparing this element with the head element.
-				if(0 == $firstPass)
-				{
-					$firstPass = 1;
-				}
-				else
-				{
-					if($isUpdate)
-					{
-						$updKeyValues = $updKeyValues.", ";
-					}
-					else
-					{
-						$insKeys = $insKeys.", ";
-						$insValues = $insValues.", ";
-					}
-				}
-				/*else
-					$query = $query.", ";
-	
-				$query = $query.$field."='".$adb->quote(from_html($this->$field,$isUpdate))."'";
-				*/
-				if($isUpdate)
-				{
-					$updKeyValues = $updKeyValues.$field."=".$this->db->formatString($this->table_name,$field,from_html($this->$field,$isUpdate));
-				}
-				else
-				{
-					$insKeys = $insKeys.$field;
-					$insValues = $insValues.$this->db->formatString($this->table_name,$field,from_html($this->$field,$isUpdate));
-				}
-			}
-		}
-
-		if($isUpdate)
-		{
-			$query = $query.$updKeyValues." WHERE ID = '$this->id'";
-			$this->log->info("Update $this->object_name: ".$query);
-		}
-		else
-		{
-			$query = $query.$insKeys.") VALUES ".$insValues.")";
-	        	$this->log->info("Insert: ".$query);
-		}
-
-		$this->db->query($query, true);
-
-		// If this is not an update then store the id for later.
-		if(!$isUpdate && !$this->new_schema && !$this->new_with_id)
-		{
-			$this->db->println("Illegal Access - SugarBean");
-			//this is mysql specific
-	        	$this->id = $this->db->getOne("SELECT LAST_INSERT_ID()" );
-		}
-	        
-		return $this->id;
-	}
-
-    
-    /**
-     * This function retrieves a record of the appropriate type from the DB.
-     * It fills in all of the vtiger_fields from the DB into the object it was called on.
-     * param $id - If ID is specified, it overrides the current value of $this->id.  If not specified the current value of $this->id will be used.
-     * returns this - The object that it was called apon or null if exactly 1 record was not found.
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
- * All Rights Reserved.
- * Contributor(s): ______________________________________..
-	 function retrieve($id = -1, $encodeThis=true) {
-		if ($id == -1) {
-			$id = $this->id;
-		}
-		if($id == '') {
-			return null;
-		}
-// GS porting vtiger_crmentity
-$query = "SELECT * FROM $this->table_name WHERE $this->module_id = '$id'";
-//		$query = "SELECT * FROM $this->table_name WHERE ID = '$id'";
-		$this->log->debug("Retrieve $this->object_name: ".$query);
-
-		$result =& $this->db->requireSingleResult($query, true, "Retrieving record by id $this->table_name:$id found ");
-
-		if(empty($result))
-		{
-			return null;
-		}
-				
-		$row = $this->db->fetchByAssoc($result, -1, $encodeThis);
-
-		foreach($this->column_fields as $field)
-		{
-			if(isset($row[$field]))
-			{
-				$this->$field = $row[$field];
-			}
-		}
-		return $this;
-	}
-     */
-
-	function get_list($order_by = "", $where = "", $row_offset = 0, $limit=-1, $max=-1) {
-		$this->log->debug("get_list:  order_by = '$order_by' and where = '$where' and limit = '$limit'");
-		
-		$query = $this->create_list_query($order_by, $where);
-		
-		return $this->process_list_query($query, $row_offset, $limit, $max);
-	}
-
-	/**
-	 * This function returns a full (ie non-paged) list of the current object type.  
-	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
-	 * All Rights Reserved..
-	 * Contributor(s): ______________________________________..
-	 */
-	function get_full_list($order_by = "", $where = "") {
-		$this->log->debug("get_full_list:  order_by = '$order_by' and where = '$where'");
-		$query = "SELECT * FROM $this->table_name ";
-		
-		if($where != "")
-			$query .= "where ($where) AND deleted=0";
-		else
-			$query .= "where deleted=0";
-
-		if(!empty($order_by))
-			$query .= " ORDER BY $order_by";
-
-		$result =& $this->db->query($query, false);
-
-		if($this->db->getRowCount($result) > 0){
-		
-			// We have some data.
-			while ($row = $this->db->fetchByAssoc($result)) {
-				foreach($this->list_fields as $field)
-				{
-					if (isset($row[$field])) {
-						$this->$field = $row[$field];
-						
-						$this->log->debug("process_full_list: $this->object_name({$row['id']}): ".$field." = ".$this->$field);
-					}
-					else {
- 	                                                $this->$field = '';   
-					}
-				}
-
-
-				$list[] = clone($this);         //added clone tosupport PHP5
-			}
-		}
-
-		if (isset($list)) return $list;
-		else return null;
-
-	}
-
-	function create_list_query($order_by, $where)
-	{
-		$query = "SELECT * FROM $this->table_name ";
-		
-		if($where != "")
-			$query .= "where ($where) AND deleted=0";
-		else
-			$query .= "where deleted=0";
-
-		if(!empty($order_by))
-			$query .= " ORDER BY $order_by";
-
-		return $query;
-	}
-	
-
-	function process_list_query($query, $row_offset, $limit= -1, $max_per_page = -1)
-	{
-		global $list_max_entries_per_page;
-		$this->log->debug("process_list_query: ".$query);
-		if(!empty($limit) && $limit != -1){
-			$result =& $this->db->limitQuery($query, $row_offset + 0, $limit,true,"Error retrieving $this->object_name list: ");
-		}else{
-			$result =& $this->db->query($query,true,"Error retrieving $this->object_name list: ");
-		}
-
-		$list = Array();
-		if($max_per_page == -1){
-			$max_per_page 	= $list_max_entries_per_page;
-		}
-		$rows_found =  $this->db->getRowCount($result);
-
-		$this->log->debug("Found $rows_found ".$this->object_name."s");
-                
-		$previous_offset = $row_offset - $max_per_page;
-		$next_offset = $row_offset + $max_per_page;
-
-		if($rows_found != 0)
-		{
-
-			// We have some data.
-
-			for($index = $row_offset , $row = $this->db->fetchByAssoc($result, $index); $row && ($index < $row_offset + $max_per_page || $max_per_page == -99) ;$index++, $row = $this->db->fetchByAssoc($result, $index)){
-				foreach($this->list_fields as $field)
-				{
-					if (isset($row[$field])) {
-						$this->$field = $row[$field];
-						
-						
-						$this->log->debug("$this->object_name({$row['id']}): ".$field." = ".$this->$field);
-					}
-					else 
-					{
-						$this->$field = "";
-					}
-				}
-
-
-				$list[] = clone($this);   //added clone to support PHP5
-			}
-		}
-
-		$response = Array();
-		$response['list'] = $list;
-		$response['row_count'] = $rows_found;
-		$response['next_offset'] = $next_offset;
-		$response['previous_offset'] = $previous_offset;
-
-		return $response;
-	}
-
-	
-	/**
-	 * Track the viewing of a detail record.  This leverages get_summary_text() which is object specific
-	 * params $user_id - The user that is viewing the record.
-	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
-	 * All Rights Reserved..
-	 * Contributor(s): ______________________________________..
-	 */
-	function track_view($user_id, $current_module,$id='')
-	{
-		$this->log->debug("About to call vtiger_tracker (user_id, module_name, item_id)($user_id, $current_module, $this->id)");
-
-		$tracker = new Tracker();
-		$tracker->track_view($user_id, $current_module, $id, '');
-	}
-
-
-	/** This function should be overridden in each module.  It marks an item as deleted.
-	* If it is not overridden, then marking this type of item is not allowed
-	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
-	 * All Rights Reserved..
-	 * Contributor(s): ______________________________________..
-	*/
-	function mark_deleted($id)
-	{
-		$query = "UPDATE $this->table_name set deleted=1 where id='$id'";
-		$this->db->query($query, true,"Error marking record deleted: ");
-
-		$this->mark_relationships_deleted($id);
-
-		// Take the item off of the recently viewed lists.
-		$tracker = new Tracker();
-		$tracker->delete_item_history($id);
-
-	}
-
-
-	/* This is to allow subclasses to fill in row specific columns of a list view form 
-	function list_view_parse_additional_sections(&$list_form)
-	{
-	}
-	*/
-	/* This function assigns all of the values into the template for the list view 
-	function get_list_view_array(){
-		$return_array = Array();
-		
-		foreach($this->list_fields as $field)
-		{
-			$return_array[strtoupper($field)] = $this->$field;
-		}
-		
-		return $return_array;	
-	}
-	function get_list_view_data()
-	{
-		
-		return $this->get_list_view_array();
-	}
-
-	function get_where(&$fields_array)
-	{ 
-		$where_clause = "WHERE "; 
-		$first = 1; 
-		foreach ($fields_array as $name=>$value) 
-		{ 
-			if ($first) 
-			{ 
-				$first = 0;
-			} 
-			else 
-			{ 
-				$where_clause .= " AND ";
-			} 
-
-			$where_clause .= "$name = ".$adb->quote($value)."";
-		} 
-
-		$where_clause .= " AND deleted=0";
-		return $where_clause;
-	}
-
-
-	function retrieve_by_string_fields($fields_array, $encode=true) 
-	{ 
-		$where_clause = $this->get_where($fields_array);
-		
-		$query = "SELECT * FROM $this->table_name $where_clause";
-		$this->log->debug("Retrieve $this->object_name: ".$query);
-		$result =& $this->db->requireSingleResult($query, true, "Retrieving record $where_clause:");
-		if( empty($result)) 
-		{ 
-		 	return null; 
-		} 
-
-		 $row = $this->db->fetchByAssoc($result,-1, $encode);
-
-		foreach($this->column_fields as $field) 
-		{ 
-			if(isset($row[$field])) 
-			{ 
-				$this->$field = $row[$field];
-			}
-		} 
-		return $this;
-	}
-
-	// this method is called during an import before inserting a bean
-	// define an associative array called $special_fields
-	// the keys are user defined, and don't directly map to the bean's vtiger_fields
-	// the value is the method name within that bean that will do extra
-	// processing for that vtiger_field. example: 'full_name'=>'get_names_from_full_name'
-
-	function process_special_fields() 
-	{ 
-		foreach ($this->special_functions as $func_name) 
-		{ 
-			if ( method_exists($this,$func_name) ) 
-			{ 
-				$this->$func_name(); 
-			} 
-		} 
-	}
-
-	*/
-}
-
-
-?>
+<?php
+/*********************************************************************************
+ * The contents of this file are subject to the SugarCRM Public License Version 1.1.2
+ * ("License"); You may not use this file except in compliance with the 
+ * License. You may obtain a copy of the License at http://www.sugarcrm.com/SPL
+ * Software distributed under the License is distributed on an  "AS IS"  basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
+ * the specific language governing rights and limitations under the License.
+ * The Original Code is:  SugarCRM Open Source
+ * The Initial Developer of the Original Code is SugarCRM, Inc.
+ * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.;
+ * All Rights Reserved.
+ * Contributor(s): ______________________________________.
+ ********************************************************************************/
+/*********************************************************************************
+ * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/data/SugarBean.php,v 1.70 2005/03/16 10:25:16 shaw Exp $
+ * Description:  Defines the base class for all data entities used throughout the 
+ * application.  The base class including its methods and variables is designed to 
+ * be overloaded with module-specific methods and variables particular to the 
+ * module's base entity class. 
+ ********************************************************************************/
+
+include_once('config.php');
+require_once('include/logging.php');
+require_once('data/Tracker.php');
+require_once('include/utils/utils.php');
+require_once('include/utils/UserInfoUtil.php');
+require_once('include/database/PearDatabase.php');
+
+class SugarBean
+{
+    /**
+     * This method implements a generic insert and update logic for any SugarBean
+     * This method only works for subclasses that implement the same variable names.
+     * This method uses the presence of an id vtiger_field that is not null to signify and update.
+     * The id vtiger_field should not be set otherwise.
+     * todo - Add support for vtiger_field type validation and encoding of parameters.
+ * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
+ * All Rights Reserved.
+ * Contributor(s): ______________________________________..
+     */
+	
+
+	function save($module_name= '') 
+	{
+         global $adb; 
+          global $current_user;
+		$isUpdate = true;
+
+		if(!isset($this->id) || $this->id == "")
+		{
+			$isUpdate = false;
+		}
+
+		if ( $this->new_with_id == true )
+		{
+			$isUpdate = false;
+		}
+
+		//$this->date_modified = $this->db->formatDate(date('YmdHis'));
+		$this->date_modified = $this->db->formatDate(date('YmdHis'));	
+		if (isset($current_user)) $this->modified_user_id = $current_user->id;
+		
+		if($isUpdate)
+		{
+    			$query = "Update ".$this->table_name." set ";
+		}
+		else
+		{
+    			//$this->date_entered = $this->db->formatDate(date('YmdHis'));
+			$this->date_entered = $this->db->formatDate(date('YmdHis'));
+
+			if($this->new_schema && 
+				$this->new_with_id == false)
+			{
+                          $this->id = $this->db->getUniqueID("vtiger_users");
+			}
+                        
+			$query = "INSERT into ".$this->table_name;
+		}
+		// todo - add date modified to the list.
+
+		// write out the SQL statement.
+		//$query .= $this->table_name." set ";
+
+		$firstPass = 0;
+		$insKeys = '(';
+		$insValues = '(';
+		$updKeyValues='';
+		foreach($this->column_fields as $field)
+		{
+			// Do not write out the id vtiger_field on the update statement.
+			// We are not allowed to change ids.
+			if($isUpdate && ('id' == $field))
+				continue;
+
+			// Only assign variables that have been set.
+			if(isset($this->$field))
+			{				
+				// Try comparing this element with the head element.
+				if(0 == $firstPass)
+				{
+					$firstPass = 1;
+				}
+				else
+				{
+					if($isUpdate)
+					{
+						$updKeyValues = $updKeyValues.", ";
+					}
+					else
+					{
+						$insKeys = $insKeys.", ";
+						$insValues = $insValues.", ";
+					}
+				}
+				/*else
+					$query = $query.", ";
+	
+				$query = $query.$field."='".$adb->quote(from_html($this->$field,$isUpdate))."'";
+				*/
+				if($isUpdate)
+				{
+					$updKeyValues = $updKeyValues.$field."=".$this->db->formatString($this->table_name,$field,from_html($this->$field,$isUpdate));
+				}
+				else
+				{
+					$insKeys = $insKeys.$field;
+					$insValues = $insValues.$this->db->formatString($this->table_name,$field,from_html($this->$field,$isUpdate));
+				}
+			}
+		}
+
+		if($isUpdate)
+		{
+			$query = $query.$updKeyValues." WHERE ID = '$this->id'";
+			$this->log->info("Update $this->object_name: ".$query);
+		}
+		else
+		{
+			$query = $query.$insKeys.") VALUES ".$insValues.")";
+	        	$this->log->info("Insert: ".$query);
+		}
+
+		$this->db->query($query, true);
+
+		// If this is not an update then store the id for later.
+		if(!$isUpdate && !$this->new_schema && !$this->new_with_id)
+		{
+			$this->db->println("Illegal Access - SugarBean");
+			//this is mysql specific
+	        	$this->id = $this->db->getOne("SELECT LAST_INSERT_ID()" );
+		}
+	        
+		return $this->id;
+	}
+
+    
+    /**
+     * This function retrieves a record of the appropriate type from the DB.
+     * It fills in all of the vtiger_fields from the DB into the object it was called on.
+     * param $id - If ID is specified, it overrides the current value of $this->id.  If not specified the current value of $this->id will be used.
+     * returns this - The object that it was called apon or null if exactly 1 record was not found.
+ * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
+ * All Rights Reserved.
+ * Contributor(s): ______________________________________..
+	 function retrieve($id = -1, $encodeThis=true) {
+		if ($id == -1) {
+			$id = $this->id;
+		}
+		if($id == '') {
+			return null;
+		}
+// GS porting vtiger_crmentity
+$query = "SELECT * FROM $this->table_name WHERE $this->module_id = '$id'";
+//		$query = "SELECT * FROM $this->table_name WHERE ID = '$id'";
+		$this->log->debug("Retrieve $this->object_name: ".$query);
+
+		$result =& $this->db->requireSingleResult($query, true, "Retrieving record by id $this->table_name:$id found ");
+
+		if(empty($result))
+		{
+			return null;
+		}
+				
+		$row = $this->db->fetchByAssoc($result, -1, $encodeThis);
+
+		foreach($this->column_fields as $field)
+		{
+			if(isset($row[$field]))
+			{
+				$this->$field = $row[$field];
+			}
+		}
+		return $this;
+	}
+     */
+
+	function get_list($order_by = "", $where = "", $row_offset = 0, $limit=-1, $max=-1) {
+		$this->log->debug("get_list:  order_by = '$order_by' and where = '$where' and limit = '$limit'");
+		
+		$query = $this->create_list_query($order_by, $where);
+		
+		return $this->process_list_query($query, $row_offset, $limit, $max);
+	}
+
+	/**
+	 * This function returns a full (ie non-paged) list of the current object type.  
+	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
+	 * All Rights Reserved..
+	 * Contributor(s): ______________________________________..
+	 */
+	function get_full_list($order_by = "", $where = "") {
+		$this->log->debug("get_full_list:  order_by = '$order_by' and where = '$where'");
+		$query = "SELECT * FROM $this->table_name ";
+		
+		if($where != "")
+			$query .= "where ($where) AND deleted=0";
+		else
+			$query .= "where deleted=0";
+
+		if(!empty($order_by))
+			$query .= " ORDER BY $order_by";
+
+		$result =& $this->db->query($query, false);
+
+		if($this->db->getRowCount($result) > 0){
+		
+			// We have some data.
+			while ($row = $this->db->fetchByAssoc($result)) {
+				foreach($this->list_fields as $field)
+				{
+					if (isset($row[$field])) {
+						$this->$field = $row[$field];
+						
+						$this->log->debug("process_full_list: $this->object_name({$row['id']}): ".$field." = ".$this->$field);
+					}
+					else {
+ 	                                                $this->$field = '';   
+					}
+				}
+
+
+				$list[] = clone($this);         //added clone tosupport PHP5
+			}
+		}
+
+		if (isset($list)) return $list;
+		else return null;
+
+	}
+
+	function create_list_query($order_by, $where)
+	{
+		$query = "SELECT * FROM $this->table_name ";
+		
+		if($where != "")
+			$query .= "where ($where) AND deleted=0";
+		else
+			$query .= "where deleted=0";
+
+		if(!empty($order_by))
+			$query .= " ORDER BY $order_by";
+
+		return $query;
+	}
+	
+
+	function process_list_query($query, $row_offset, $limit= -1, $max_per_page = -1)
+	{
+		global $list_max_entries_per_page;
+		$this->log->debug("process_list_query: ".$query);
+		if(!empty($limit) && $limit != -1){
+			$result =& $this->db->limitQuery($query, $row_offset + 0, $limit,true,"Error retrieving $this->object_name list: ");
+		}else{
+			$result =& $this->db->query($query,true,"Error retrieving $this->object_name list: ");
+		}
+
+		$list = Array();
+		if($max_per_page == -1){
+			$max_per_page 	= $list_max_entries_per_page;
+		}
+		$rows_found =  $this->db->getRowCount($result);
+
+		$this->log->debug("Found $rows_found ".$this->object_name."s");
+                
+		$previous_offset = $row_offset - $max_per_page;
+		$next_offset = $row_offset + $max_per_page;
+
+		if($rows_found != 0)
+		{
+
+			// We have some data.
+
+			for($index = $row_offset , $row = $this->db->fetchByAssoc($result, $index); $row && ($index < $row_offset + $max_per_page || $max_per_page == -99) ;$index++, $row = $this->db->fetchByAssoc($result, $index)){
+				foreach($this->list_fields as $field)
+				{
+					if (isset($row[$field])) {
+						$this->$field = $row[$field];
+						
+						
+						$this->log->debug("$this->object_name({$row['id']}): ".$field." = ".$this->$field);
+					}
+					else 
+					{
+						$this->$field = "";
+					}
+				}
+
+
+				$list[] = clone($this);   //added clone to support PHP5
+			}
+		}
+
+		$response = Array();
+		$response['list'] = $list;
+		$response['row_count'] = $rows_found;
+		$response['next_offset'] = $next_offset;
+		$response['previous_offset'] = $previous_offset;
+
+		return $response;
+	}
+
+	
+	/**
+	 * Track the viewing of a detail record.  This leverages get_summary_text() which is object specific
+	 * params $user_id - The user that is viewing the record.
+	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
+	 * All Rights Reserved..
+	 * Contributor(s): ______________________________________..
+	 */
+	function track_view($user_id, $current_module,$id='')
+	{
+		$this->log->debug("About to call vtiger_tracker (user_id, module_name, item_id)($user_id, $current_module, $this->id)");
+
+		$tracker = new Tracker();
+		$tracker->track_view($user_id, $current_module, $id, '');
+	}
+
+
+	/** This function should be overridden in each module.  It marks an item as deleted.
+	* If it is not overridden, then marking this type of item is not allowed
+	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
+	 * All Rights Reserved..
+	 * Contributor(s): ______________________________________..
+	*/
+	function mark_deleted($id)
+	{
+		$query = "UPDATE $this->table_name set deleted=1 where id='$id'";
+		$this->db->query($query, true,"Error marking record deleted: ");
+
+		$this->mark_relationships_deleted($id);
+
+		// Take the item off of the recently viewed lists.
+		$tracker = new Tracker();
+		$tracker->delete_item_history($id);
+
+	}
+
+
+	/* This is to allow subclasses to fill in row specific columns of a list view form 
+	function list_view_parse_additional_sections(&$list_form)
+	{
+	}
+	*/
+	/* This function assigns all of the values into the template for the list view 
+	function get_list_view_array(){
+		$return_array = Array();
+		
+		foreach($this->list_fields as $field)
+		{
+			$return_array[strtoupper($field)] = $this->$field;
+		}
+		
+		return $return_array;	
+	}
+	function get_list_view_data()
+	{
+		
+		return $this->get_list_view_array();
+	}
+
+	function get_where(&$fields_array)
+	{ 
+		$where_clause = "WHERE "; 
+		$first = 1; 
+		foreach ($fields_array as $name=>$value) 
+		{ 
+			if ($first) 
+			{ 
+				$first = 0;
+			} 
+			else 
+			{ 
+				$where_clause .= " AND ";
+			} 
+
+			$where_clause .= "$name = ".$adb->quote($value)."";
+		} 
+
+		$where_clause .= " AND deleted=0";
+		return $where_clause;
+	}
+
+
+	function retrieve_by_string_fields($fields_array, $encode=true) 
+	{ 
+		$where_clause = $this->get_where($fields_array);
+		
+		$query = "SELECT * FROM $this->table_name $where_clause";
+		$this->log->debug("Retrieve $this->object_name: ".$query);
+		$result =& $this->db->requireSingleResult($query, true, "Retrieving record $where_clause:");
+		if( empty($result)) 
+		{ 
+		 	return null; 
+		} 
+
+		 $row = $this->db->fetchByAssoc($result,-1, $encode);
+
+		foreach($this->column_fields as $field) 
+		{ 
+			if(isset($row[$field])) 
+			{ 
+				$this->$field = $row[$field];
+			}
+		} 
+		return $this;
+	}
+
+	// this method is called during an import before inserting a bean
+	// define an associative array called $special_fields
+	// the keys are user defined, and don't directly map to the bean's vtiger_fields
+	// the value is the method name within that bean that will do extra
+	// processing for that vtiger_field. example: 'full_name'=>'get_names_from_full_name'
+
+	function process_special_fields() 
+	{ 
+		foreach ($this->special_functions as $func_name) 
+		{ 
+			if ( method_exists($this,$func_name) ) 
+			{ 
+				$this->$func_name(); 
+			} 
+		} 
+	}
+
+	*/
+}
+
+
+?>



From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 01:18:35 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 08:18:35 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9360 -
	/vtigercrm/trunk/include/utils/InventoryUtils.php
Message-ID: <20060909081835.3388D76C287@vtiger.fosslabs.com>

Author: richie
Date: Sat Sep  9 02:18:16 2006
New Revision: 9360

Log:
Postgres fixes by Jens done --By Don

Modified:
    vtigercrm/trunk/include/utils/InventoryUtils.php

Modified: vtigercrm/trunk/include/utils/InventoryUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/InventoryUtils.php (original)
+++ vtigercrm/trunk/include/utils/InventoryUtils.php Sat Sep  9 02:18:16 2006
@@ -334,8 +334,9 @@
 					"Invoice"=>"vtiger_invoicestatushistory"
 				    );
 
-	$modifiedtime = date('YmdHis');
-	$query = "insert into $history_table_array[$module] values('',$id,\"$relatedname\",\"$total\",\"$history_fldval\",\"$modifiedtime\")";
+	$histid = $adb->getUniqueID($history_table_array[$module]);
+ 	$modifiedtime = $adb->formatDate(date('YmdHis'));
+ 	$query = "insert into $history_table_array[$module] values($histid,$id,'$relatedname','$total','$history_fldval',$modifiedtime)";	
 	$adb->query($query);
 
 	$log->debug("Exit from function addInventoryHistory");
@@ -396,12 +397,17 @@
 		}
 		if($available != 'all' && $available == 'available_associated')
 		{
-			$query = "SELECT vtiger_producttaxrel.*, vtiger_inventorytaxinfo.* FROM vtiger_inventorytaxinfo left JOIN vtiger_producttaxrel ON vtiger_inventorytaxinfo.taxid = vtiger_producttaxrel.taxid WHERE vtiger_producttaxrel.productid = $productid or vtiger_inventorytaxinfo.deleted=0 group by vtiger_inventorytaxinfo.taxid";
+			$query = "SELECT vtiger_producttaxrel.*, vtiger_inventorytaxinfo.* FROM vtiger_inventorytaxinfo left JOIN vtiger_producttaxrel ON vtiger_inventorytaxinfo.taxid = vtiger_producttaxrel.taxid WHERE vtiger_producttaxrel.productid = $productid or vtiger_inventorytaxinfo.deleted=0 GROUP BY vtiger_inventorytaxinfo.taxid";
 		}
 		else
 		{
 			$query = "SELECT vtiger_producttaxrel.*, vtiger_inventorytaxinfo.* FROM vtiger_inventorytaxinfo INNER JOIN vtiger_producttaxrel ON vtiger_inventorytaxinfo.taxid = vtiger_producttaxrel.taxid WHERE vtiger_producttaxrel.productid = $productid $where";
 		}
+
+		//Postgres 8 fixes
+ 		if( $adb->dbType == "pgsql")
+ 		    $query = fixPostgresQuery( $query, $log, 0);
+		
 		$res = $adb->query($query);
 		for($i=0;$i<$adb->num_rows($res);$i++)
 		{
@@ -502,7 +508,7 @@
 		// and salepeople can control the order than their quote (etc) items print out
 		// so we create a new field "sequence_no" and stick the value of $i into it
 
-		$query ="insert into vtiger_inventoryproductrel(id, productid, sequence_no, quantity, listprice, comment) values($focus->id, $prod_id , $prod_seq, $qty, $listprice, \"$comment\")";
+		$query ="insert into vtiger_inventoryproductrel(id, productid, sequence_no, quantity, listprice, comment) values($focus->id, $prod_id , $prod_seq, $qty, $listprice, '$comment')";
 		$prod_seq++;
 		$adb->query($query);
 
@@ -551,7 +557,10 @@
 			}
 			$updatequery = trim($updatequery,',')." where id=$focus->id and productid=$prod_id";
 		}
-		$adb->query($updatequery);
+		// jens 2006/08/19 - protect against empy update queries
+ 		if( !preg_match( '/set\s+where/i', $updatequery)) {
+ 		    $adb->query($updatequery);
+ 		}
 	}
 
 	//we should update the netprice (subtotal), taxtype, group discount, S&H charge, S&H taxes, adjustment and total



From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 01:20:05 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 08:20:05 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9361 -
	/vtigercrm/trunk/index.php
Message-ID: <20060909082005.5B08D76C287@vtiger.fosslabs.com>

Author: richie
Date: Sat Sep  9 02:19:43 2006
New Revision: 9361

Log:
Postgres fixes by Jens done --By Don

Modified:
    vtigercrm/trunk/index.php

Modified: vtigercrm/trunk/index.php
==============================================================================
--- vtigercrm/trunk/index.php (original)
+++ vtigercrm/trunk/index.php Sat Sep  9 02:19:43 2006
@@ -382,7 +382,7 @@
 		else
 			$auditrecord = $record;	
 
-		$date_var = date('YmdHis');
+		$date_var = $adb->formatDate(date('YmdHis'));
 		if ($action != 'chat')
 		{	
 			$query = "insert into vtiger_audit_trial values(".$adb->getUniqueID('vtiger_audit_trial').",".$current_user->id.",'".$module."','".$action."','".$auditrecord."',$date_var)";



From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 01:22:21 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 08:22:21 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9362 -
	/vtigercrm/trunk/install/populateSeedData.php
Message-ID: <20060909082221.CECFF76C2E5@vtiger.fosslabs.com>

Author: richie
Date: Sat Sep  9 02:21:55 2006
New Revision: 9362

Log:
Postgres fixes by Jens done --By Don

Modified:
    vtigercrm/trunk/install/populateSeedData.php

Modified: vtigercrm/trunk/install/populateSeedData.php
==============================================================================
--- vtigercrm/trunk/install/populateSeedData.php (original)
+++ vtigercrm/trunk/install/populateSeedData.php Sat Sep  9 02:21:55 2006
@@ -186,7 +186,7 @@
 		$query = "insert into vtiger_freetags values ($freetag, '$cloudtag[1]', '$cloudtag[1]')";
 		$res = $adb->query($query);
 
-		$date = date('YmdHis'); 
+		$date = $adb->formatDate(date('YmdHis')); 
 		$query_tag = "insert into vtiger_freetagged_objects values ($freetag, 1,".$account->id.", $date, 'Accounts')";
 		$result = $adb->query($query_tag);
 	}
@@ -289,7 +289,7 @@
 		$query = "insert into vtiger_freetags values ($freetag, '$cloudtag[2]', '$cloudtag[2]')";
 		$res1 = $adb->query($query);
 
-		$date = date('YmdHis'); 
+		$date = $adb->formatDate(date('YmdHis')); 
 		$query_tag = "insert into vtiger_freetagged_objects values ($freetag, 1,".$contact->id.", $date, 'Contacts')";
 		$result1 = $adb->query($query_tag);
 	}
@@ -839,7 +839,7 @@
 		$query = "insert into vtiger_freetags values ($freetag, '$cloudtag[0]', '$cloudtag[0]')";
 		$res_inv = $adb->query($query);
 
-		$date = date('YmdHis'); 
+		$date = $adb->formatDate(date('YmdHis')); 
 		$query_tag = "insert into vtiger_freetagged_objects values ($freetag, 1,".$invoice->id.", $date, 'Invoice')";
 		$result_inv = $adb->query($query_tag);
 	}
@@ -996,7 +996,7 @@
 		$query = "insert into vtiger_freetags values ($freetag, '$cloudtag[3]', '$cloudtag[3]')";
 		$res_tkt = $adb->query($query);
 
-		$date = date('YmdHis'); 
+		$date = $adb->formatDate(date('YmdHis')); 
 		$query_tag = "insert into vtiger_freetagged_objects values ($freetag, 1,".$helpdesk->id.", $date, 'HelpDesk')";
 		$result_tkt = $adb->query($query_tag);
 	}



From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 01:28:16 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 08:28:16 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9363 -
	/vtigercrm/trunk/modules/Notes/Save.php
Message-ID: <20060909082816.3296476B577@vtiger.fosslabs.com>

Author: richie
Date: Sat Sep  9 02:27:44 2006
New Revision: 9363

Log:
Postgres fixes by Jens done --By Don

Modified:
    vtigercrm/trunk/modules/Notes/Save.php

Modified: vtigercrm/trunk/modules/Notes/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Notes/Save.php (original)
+++ vtigercrm/trunk/modules/Notes/Save.php Sat Sep  9 02:27:44 2006
@@ -56,7 +56,7 @@
 		$filepath = $adb->query_result($result,0,'path');
 
 		$new_attachmentid = $adb->getUniqueID("vtiger_crmentity");
-		$date_var = date('YmdHis');
+		$date_var = $adb->formatDate(date('YmdHis'));	
 
 		$upload_filepath = decideFilePath();
 



From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 01:29:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 08:29:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9364 -
 /vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php
Message-ID: <20060909082957.E2D8876BD02@vtiger.fosslabs.com>

Author: richie
Date: Sat Sep  9 02:29:30 2006
New Revision: 9364

Log:
Postgres fixes by Jens done --By Don

Modified:
    vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php

Modified: vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php (original)
+++ vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php Sat Sep  9 02:29:30 2006
@@ -45,8 +45,8 @@
 //get all the lead related columns 
 $row = $focus->column_fields;
 
-$date_entered = date('YmdHis');
-$date_modified = date('YmdHis');
+$date_entered = $adb->formatDate(date('YmdHis'));
+$date_modified = $adb->formatDate(date('YmdHis'));
 
 /** Function for getting the custom values from leads and saving to vtiger_account/contact/potential custom vtiger_fields.
  *  @param string $type - Field Type (eg: text, list)
@@ -315,8 +315,8 @@
 
 
 
-$date_entered = date('YmdHis');
-$date_modified = date('YmdHis');
+$date_entered = $adb->formatDate(date('YmdHis'));
+$date_modified = $adb->formatDate(date('YmdHis'));
 
 //Saving Contact - starts
 $crmcontactid = $adb->getUniqueID("vtiger_crmentity");
@@ -376,8 +376,9 @@
 if(! isset($createpotential) || ! $createpotential == "on")
 {
 	$log->info("createpotential is not set");
-	$date_entered = date('YmdHis');
-	$date_modified = date('YmdHis');
+
+	$date_entered = $adb->formatDate(date('YmdHis'));
+	$date_modified = $adb->formatDate(date('YmdHis'));
   
 
 	$oppid = $adb->getUniqueID("vtiger_crmentity");



From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 01:32:08 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 08:32:08 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9365 -
	/vtigercrm/trunk/modules/Invoice/Invoice.php
Message-ID: <20060909083209.10BEB76C334@vtiger.fosslabs.com>

Author: richie
Date: Sat Sep  9 02:31:33 2006
New Revision: 9365

Log:
Postgres fixes by Jens done --By Don

Modified:
    vtigercrm/trunk/modules/Invoice/Invoice.php

Modified: vtigercrm/trunk/modules/Invoice/Invoice.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/Invoice.php (original)
+++ vtigercrm/trunk/modules/Invoice/Invoice.php Sat Sep  9 02:31:33 2006
@@ -208,10 +208,10 @@
 		global $log;
 		$log->debug("Entering get_attachments(".$id.") method ...");
 		
-		$query = "select vtiger_notes.title,'Notes      '  ActivityType, vtiger_notes.filename,
-		vtiger_attachments.type  FileType,crm2.modifiedtime lastmodified,
-		vtiger_seattachmentsrel.attachmentsid attachmentsid, vtiger_notes.notesid crmid,
-			crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name
+		$query = "select vtiger_notes.title,'Notes      ' as ActivityType, vtiger_notes.filename,
+ 		vtiger_attachments.type as FileType,crm2.modifiedtime as lastmodified,
+ 		vtiger_seattachmentsrel.attachmentsid as attachmentsid, vtiger_notes.notesid as crmid,
+ 			crm2.createdtime, vtiger_notes.notecontent as description, vtiger_users.user_name	
 		from vtiger_notes
 			inner join vtiger_senotesrel on vtiger_senotesrel.notesid= vtiger_notes.notesid
 			inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_senotesrel.crmid
@@ -223,9 +223,9 @@
 		
 		$query .= ' union all ';
 
-		$query .= "select vtiger_attachments.description  title ,'Attachments'  ActivityType,
-		vtiger_attachments.name filename, vtiger_attachments.type FileType, crm2.modifiedtime lastmodified,
-		vtiger_attachments.attachmentsid attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid,
+		$query .= "select vtiger_attachments.description as title ,'Attachments' as ActivityType,
+ 		vtiger_attachments.name as filename, vtiger_attachments.type as FileType, crm2.modifiedtime as lastmodified,
+ 		vtiger_attachments.attachmentsid as attachmentsid, vtiger_seattachmentsrel.attachmentsid as crmid,	
 			crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name
 		from vtiger_attachments
 			inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid



From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 01:35:10 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 08:35:10 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9366 -
	/vtigercrm/trunk/modules/SalesOrder/SalesOrder.php
Message-ID: <20060909083510.C5CB176C416@vtiger.fosslabs.com>

Author: richie
Date: Sat Sep  9 02:34:39 2006
New Revision: 9366

Log:
Postgres fixes by Jens done --By Don

Modified:
    vtigercrm/trunk/modules/SalesOrder/SalesOrder.php

Modified: vtigercrm/trunk/modules/SalesOrder/SalesOrder.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/SalesOrder.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/SalesOrder.php Sat Sep  9 02:34:39 2006
@@ -198,10 +198,10 @@
 		global $log;
 		$log->debug("Entering get_attachments(".$id.") method ...");
 
-		$query = "select vtiger_notes.title,'Notes      '  ActivityType, vtiger_notes.filename,
-		vtiger_attachments.type  FileType,crm2.modifiedtime lastmodified,
-		vtiger_seattachmentsrel.attachmentsid attachmentsid, vtiger_notes.notesid crmid,
-		vtiger_crmentity.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name
+		$query = "select vtiger_notes.title,'Notes      ' as ActivityType, vtiger_notes.filename,
+ 		vtiger_attachments.type as FileType,crm2.modifiedtime as lastmodified,
+ 		vtiger_seattachmentsrel.attachmentsid as attachmentsid, vtiger_notes.notesid as crmid,
+ 		vtiger_crmentity.createdtime, vtiger_notes.notecontent as description, vtiger_users.user_name
 		from vtiger_notes
 			inner join vtiger_senotesrel on vtiger_senotesrel.notesid= vtiger_notes.notesid
 			inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_senotesrel.crmid
@@ -213,9 +213,9 @@
 
 		$query .= ' union all ';
 
-		$query .= "select vtiger_attachments.description  title ,'Attachments'  ActivityType,
-		vtiger_attachments.name  filename, vtiger_attachments.type  FileType, crm2.modifiedtime lastmodified,
-		vtiger_attachments.attachmentsid  attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid,
+		$query .= "select vtiger_attachments.description as title ,'Attachments' as ActivityType,
+ 		vtiger_attachments.name as filename, vtiger_attachments.type as FileType, crm2.modifiedtime as lastmodified,
+ 		vtiger_attachments.attachmentsid as attachmentsid, vtiger_seattachmentsrel.attachmentsid as crmid,
 		vtiger_crmentity.createdtime, vtiger_attachments.description, vtiger_users.user_name
 		from vtiger_attachments
 			inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid



From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 01:38:16 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 08:38:16 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9367 -
	/vtigercrm/trunk/modules/uploads/add2db.php
Message-ID: <20060909083816.9DD5B76C413@vtiger.fosslabs.com>

Author: richie
Date: Sat Sep  9 02:37:18 2006
New Revision: 9367

Log:
Postgres fixes by Jens done --By Don

Modified:
    vtigercrm/trunk/modules/uploads/add2db.php

Modified: vtigercrm/trunk/modules/uploads/add2db.php
==============================================================================
--- vtigercrm/trunk/modules/uploads/add2db.php (original)
+++ vtigercrm/trunk/modules/uploads/add2db.php Sat Sep  9 02:37:18 2006
@@ -47,10 +47,10 @@
 		{
 			$desc = $_REQUEST['txtDescription'];
 			$description = addslashes($desc);
-			$date_var = date('YmdHis');
+			$date_var = $adb->formatDate(date('YmdHis'));	
 
 			$query = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime) values('";
-			$query .= $current_id."','".$current_user->id."','".$current_user->id."','".$_REQUEST['return_module'].' Attachment'."','".$description."','".$date_var."')";
+			$query .= $current_id."','".$current_user->id."','".$current_user->id."','".$_REQUEST['return_module'].' Attachment'."','".$description."',".$date_var.")";	
 			$result = $adb->query($query);
 
 			$sql = "insert into vtiger_attachments values(";



From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 01:40:51 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 08:40:51 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9368 -
	/vtigercrm/trunk/modules/Users/UsersAjax.php
Message-ID: <20060909084051.44EFB76C413@vtiger.fosslabs.com>

Author: richie
Date: Sat Sep  9 02:40:13 2006
New Revision: 9368

Log:
Postgres fixes by Jens done --By Don

Modified:
    vtigercrm/trunk/modules/Users/UsersAjax.php

Modified: vtigercrm/trunk/modules/Users/UsersAjax.php
==============================================================================
--- vtigercrm/trunk/modules/Users/UsersAjax.php (original)
+++ vtigercrm/trunk/modules/Users/UsersAjax.php Sat Sep  9 02:40:13 2006
@@ -1,37 +1,37 @@
-<?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.
- *
- ********************************************************************************/
-
-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','".$date_var."')";
-	$result=$adb->query($query);
-	echo $announcement;
-}
-?>
+<?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.
+ *
+ ********************************************************************************/
+
+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  Sat Sep  9 01:44:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 08:44:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9369 -
	/vtigercrm/trunk/modules/Users/Authenticate.php
Message-ID: <20060909084409.C04DC76C423@vtiger.fosslabs.com>

Author: richie
Date: Sat Sep  9 02:43:45 2006
New Revision: 9369

Log:
Postgres fixes by Jens done --By Don

Modified:
    vtigercrm/trunk/modules/Users/Authenticate.php

Modified: vtigercrm/trunk/modules/Users/Authenticate.php
==============================================================================
--- vtigercrm/trunk/modules/Users/Authenticate.php (original)
+++ vtigercrm/trunk/modules/Users/Authenticate.php Sat Sep  9 02:43:45 2006
@@ -47,17 +47,9 @@
 		else
 			$auditrecord = $record;	
 
-		if( $adb->dbType = "pgsql")
-	       	{
- 			$date_var = date('Y-m-d H:i:s');
- 			$query = "insert into vtiger_audit_trial values(".$adb->getUniqueID('vtiger_audit_trial').",".$focus->id.",'Users','Authenticate','','$date_var')";
- 	    	}
-		else
-	       	{
+		$date_var = $adb->formatDate(date('YmdHis'));
+ 	    $query = "insert into vtiger_audit_trial values(".$adb->getUniqueID('vtiger_audit_trial').",".$focus->id.",'Users','Authenticate','',$date_var)";	
 			
-			$date_var = date('YmdHis');
-			$query = "insert into vtiger_audit_trial values(".$adb->getUniqueID('vtiger_audit_trial').",".$focus->id.",'Users','Authenticate','',$date_var)";
-		}	
 		$adb->query($query);
 	}
 



From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 01:46:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 08:46:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9370 -
	/vtigercrm/trunk/modules/Webmails/Save.php
Message-ID: <20060909084640.AE6B276C413@vtiger.fosslabs.com>

Author: richie
Date: Sat Sep  9 02:45:45 2006
New Revision: 9370

Log:
Postgres fixes by Jens done --By Don

Modified:
    vtigercrm/trunk/modules/Webmails/Save.php

Modified: vtigercrm/trunk/modules/Webmails/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Webmails/Save.php (original)
+++ vtigercrm/trunk/modules/Webmails/Save.php Sat Sep  9 02:45:45 2006
@@ -1,130 +1,130 @@
-<?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 Initial Developer of the Original Code is FOSS Labs.
-  * Portions created by FOSS Labs are Copyright (C) FOSS Labs.
-  * Portions created by vtiger are Copyright (C) vtiger.
-  * All Rights Reserved.
-  *
-  ********************************************************************************/
-
-require_once('modules/Emails/Email.php');
-require_once('modules/Webmails/Webmail.php');
-require_once('include/logging.php');
-require_once('include/database/PearDatabase.php');
-require_once('include/utils/UserInfoUtil.php');
-require_once('include/utils/CommonUtils.php');
-require_once('modules/Webmails/MailParse.php');
-require_once('modules/Webmails/MailBox.php');
-global $current_user;
-
-$local_log =& LoggerManager::getLogger('index');
-$focus = new Email();
-
-$to_address = explode(";",$_REQUEST['to_list']);
-$cc_address = explode(";",$_REQUEST['cc_list']);
-$bcc_address = explode(";",$_REQUEST['bcc_list']);
-
-$start_message=$_REQUEST["start_message"];
-if($_REQUEST["mailbox"] && $_REQUEST["mailbox"] != "") {$mailbox=$_REQUEST["mailbox"];} else {$mailbox="INBOX";}
-
-$MailBox = new MailBox($mailbox);
-$email = new Webmail($MailBox->mbox, $_REQUEST["mailid"]);
-$subject = $email->subject;
-$date = $email->date;
-
-$email->loadMail();
-$msgData = $email->body;
-
-$focus->column_fields['subject']=$subject;
-$focus->column_fields["activitytype"]="Emails";
-
-$ddate = date("Y-m-d");
-$dtime = date("h:m");
-$focus->column_fields["assigned_user_id"]=$current_user->id;
-$focus->column_fields["date_start"]=$ddate;
-$focus->column_fields["time_start"]=$dtime;
-
-//$tmpBody = preg_replace(array('/<br(.*?)>/i',"/&gt;/i","/&lt;/i","/&nbsp;/i","/&amp/i","/&copy;/i","/<style(.*?)>(.*?)<\/style>/i","/\{(.*?)\}/i","/BODY/i"),array("\r",">","<"," ","&","(c)","","",""),$msgData);
-//$focus->column_fields["description"]=strip_tags($tmpBody);
-$focus->column_fields["description"]=$msgData;
-
-
-//to save the email details in vtiger_emaildetails vtiger_tables
-$fieldid = $adb->query_result($adb->query('select fieldid from vtiger_field where tablename="contactdetails" and fieldname="email" and columnname="email"'),0,'fieldid');
-
-if($email->relationship != 0) {
-	$focus->column_fields['parent_id']=$email->relationship["id"].'@'.$fieldid.'|';
-
-	if($email->relationship["type"] == "Contacts")
-		add_attachment_to_contact($email->relationship["id"],$email);
-}else {
-	//if relationship is not available create a contact and relate the email to the contact
-	require_once('modules/Contacts/Contact.php');
-	$contact_focus = new Contact();	
-	$contact_focus->column_fields['lastname'] =$email->fromname; 
-	$contact_focus->column_fields['email'] = $email->from;
-	$contact_focus->save("Contacts");
-	$focus->column_fields['parent_id']=$contact_focus->id.'@'.$fieldid.'|';
-
-	add_attachment_to_contact($contact_focus->id,$email);
-}
-
-function add_attachment_to_contact($cid,$email) {
-	// add vtiger_attachments to contact
-	global $adb,$current_user;
-	for($j=0;$j<2;$j++) {
-	    if($j==0)
-	    	$attachments=$email->downloadAttachments();
-	    else
-	    	$attachments=$email->downloadInlineAttachments();
-
-	    $upload_filepath = decideFilePath();
-	    for($i=0,$num_files=count($attachments);$i<$num_files;$i++) {
-		$current_id = $adb->getUniqueID("vtiger_crmentity");
-		$date_var = date('YmdHis');
-
-		$filename = ereg_replace("[ ()-]+", "_",$attachments[$i]["filename"]);
-        	$filetype= substr($filename,strstr($filename,"."),strlen($filename));
-		$filesize = $attachments[$i]["filesize"];
-
-                $query = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime) values('";
-                $query .= $current_id."','".$current_user->id."','".$current_user->id."','Contacts Attachment','Uploaded from webmail during qualification','".$date_var."')";
-                $result = $adb->query($query);
-
-                $sql = "insert into vtiger_attachments values(";
-                $sql .= $current_id.",'".$filename."','Uploaded ".$filename." from webmail','".$filetype."','".$upload_filepath."')";
-		echo $query;
-                $result = $adb->query($sql);
-
-                $sql1 = "insert into vtiger_seattachmentsrel values('";
-                $sql1 .= $cid."','".$current_id."')";
-                $result = $adb->query($sql1);
-
-		$fp = fopen($upload_filepath.'/'.$filename, "w") or die("Can't open file");
-		fputs($fp, base64_decode($attachments[$i]["filedata"]));
-		fclose($fp);
-	    }
-	}
-}
-
-$_REQUEST['parent_id'] = $focus->column_fields['parent_id'];
-$focus->save("Emails");
-
-//saving in vtiger_emaildetails vtiger_table
-$id_lists = $focus->column_fields['parent_id'].'@'.$fieldid;
-$all_to_ids = $email->from;
-$query = 'insert into vtiger_emaildetails values ('.$focus->id.',"","'.$all_to_ids.'","","","","'.$id_lists.'","WEBMAIL")';
-$adb->query($query);
-
-$return_id = $_REQUEST["mailid"];
-$return_module='Webmails';
-$return_action='ListView';
-
-
-if($_POST["ajax"] != "true")
-	header("Location: index.php?action=$return_action&module=$return_module&record=$return_id"); 
-
-return;
-?>
+<?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 Initial Developer of the Original Code is FOSS Labs.
+  * Portions created by FOSS Labs are Copyright (C) FOSS Labs.
+  * Portions created by vtiger are Copyright (C) vtiger.
+  * All Rights Reserved.
+  *
+  ********************************************************************************/
+
+require_once('modules/Emails/Email.php');
+require_once('modules/Webmails/Webmail.php');
+require_once('include/logging.php');
+require_once('include/database/PearDatabase.php');
+require_once('include/utils/UserInfoUtil.php');
+require_once('include/utils/CommonUtils.php');
+require_once('modules/Webmails/MailParse.php');
+require_once('modules/Webmails/MailBox.php');
+global $current_user;
+
+$local_log =& LoggerManager::getLogger('index');
+$focus = new Email();
+
+$to_address = explode(";",$_REQUEST['to_list']);
+$cc_address = explode(";",$_REQUEST['cc_list']);
+$bcc_address = explode(";",$_REQUEST['bcc_list']);
+
+$start_message=$_REQUEST["start_message"];
+if($_REQUEST["mailbox"] && $_REQUEST["mailbox"] != "") {$mailbox=$_REQUEST["mailbox"];} else {$mailbox="INBOX";}
+
+$MailBox = new MailBox($mailbox);
+$email = new Webmail($MailBox->mbox, $_REQUEST["mailid"]);
+$subject = $email->subject;
+$date = $email->date;
+
+$email->loadMail();
+$msgData = $email->body;
+
+$focus->column_fields['subject']=$subject;
+$focus->column_fields["activitytype"]="Emails";
+
+$ddate = date("Y-m-d");
+$dtime = date("h:m");
+$focus->column_fields["assigned_user_id"]=$current_user->id;
+$focus->column_fields["date_start"]=$ddate;
+$focus->column_fields["time_start"]=$dtime;
+
+//$tmpBody = preg_replace(array('/<br(.*?)>/i',"/&gt;/i","/&lt;/i","/&nbsp;/i","/&amp/i","/&copy;/i","/<style(.*?)>(.*?)<\/style>/i","/\{(.*?)\}/i","/BODY/i"),array("\r",">","<"," ","&","(c)","","",""),$msgData);
+//$focus->column_fields["description"]=strip_tags($tmpBody);
+$focus->column_fields["description"]=$msgData;
+
+
+//to save the email details in vtiger_emaildetails vtiger_tables
+$fieldid = $adb->query_result($adb->query('select fieldid from vtiger_field where tablename="contactdetails" and fieldname="email" and columnname="email"'),0,'fieldid');
+
+if($email->relationship != 0) {
+	$focus->column_fields['parent_id']=$email->relationship["id"].'@'.$fieldid.'|';
+
+	if($email->relationship["type"] == "Contacts")
+		add_attachment_to_contact($email->relationship["id"],$email);
+}else {
+	//if relationship is not available create a contact and relate the email to the contact
+	require_once('modules/Contacts/Contact.php');
+	$contact_focus = new Contact();	
+	$contact_focus->column_fields['lastname'] =$email->fromname; 
+	$contact_focus->column_fields['email'] = $email->from;
+	$contact_focus->save("Contacts");
+	$focus->column_fields['parent_id']=$contact_focus->id.'@'.$fieldid.'|';
+
+	add_attachment_to_contact($contact_focus->id,$email);
+}
+
+function add_attachment_to_contact($cid,$email) {
+	// add vtiger_attachments to contact
+	global $adb,$current_user;
+	for($j=0;$j<2;$j++) {
+	    if($j==0)
+	    	$attachments=$email->downloadAttachments();
+	    else
+	    	$attachments=$email->downloadInlineAttachments();
+
+	    $upload_filepath = decideFilePath();
+	    for($i=0,$num_files=count($attachments);$i<$num_files;$i++) {
+		$current_id = $adb->getUniqueID("vtiger_crmentity");
+		$date_var = $adb->formatDate(date('YmdHis'));	
+
+		$filename = ereg_replace("[ ()-]+", "_",$attachments[$i]["filename"]);
+        	$filetype= substr($filename,strstr($filename,"."),strlen($filename));
+		$filesize = $attachments[$i]["filesize"];
+
+                $query = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime) values('";
+                $query .= $current_id."','".$current_user->id."','".$current_user->id."','Contacts Attachment','Uploaded from webmail during qualification',".$date_var.")";
+                $result = $adb->query($query);
+
+                $sql = "insert into vtiger_attachments values(";
+                $sql .= $current_id.",'".$filename."','Uploaded ".$filename." from webmail','".$filetype."','".$upload_filepath."')";
+		echo $query;
+                $result = $adb->query($sql);
+
+                $sql1 = "insert into vtiger_seattachmentsrel values('";
+                $sql1 .= $cid."','".$current_id."')";
+                $result = $adb->query($sql1);
+
+		$fp = fopen($upload_filepath.'/'.$filename, "w") or die("Can't open file");
+		fputs($fp, base64_decode($attachments[$i]["filedata"]));
+		fclose($fp);
+	    }
+	}
+}
+
+$_REQUEST['parent_id'] = $focus->column_fields['parent_id'];
+$focus->save("Emails");
+
+//saving in vtiger_emaildetails vtiger_table
+$id_lists = $focus->column_fields['parent_id'].'@'.$fieldid;
+$all_to_ids = $email->from;
+$query = 'insert into vtiger_emaildetails values ('.$focus->id.',"","'.$all_to_ids.'","","","","'.$id_lists.'","WEBMAIL")';
+$adb->query($query);
+
+$return_id = $_REQUEST["mailid"];
+$return_module='Webmails';
+$return_action='ListView';
+
+
+if($_POST["ajax"] != "true")
+	header("Location: index.php?action=$return_action&module=$return_module&record=$return_id"); 
+
+return;
+?>



From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 01:49:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 08:49:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9371 -
	/vtigercrm/trunk/soap/customerportal.php
Message-ID: <20060909084939.E46AC76C481@vtiger.fosslabs.com>

Author: richie
Date: Sat Sep  9 02:49:06 2006
New Revision: 9371

Log:
Postgres fixes by Jens done --By Don

Modified:
    vtigercrm/trunk/soap/customerportal.php

Modified: vtigercrm/trunk/soap/customerportal.php
==============================================================================
--- vtigercrm/trunk/soap/customerportal.php (original)
+++ vtigercrm/trunk/soap/customerportal.php Sat Sep  9 02:49:06 2006
@@ -412,10 +412,10 @@
 function save_faq_comment($faqid,$comment)
 {
 	global $adb;
-	$createdtime = date('Y-m-d H:i:s');
+	$createdtime = $adb->formatDate(date('YmdHis'));	
 	if(trim($comment) != '')
 	{
-		$faq_query = "insert into vtiger_faqcomments values('',".$faqid.",'".$comment."','".$createdtime."')";
+		$faq_query = "insert into vtiger_faqcomments values('',".$faqid.",'".$comment."',".$createdtime.")";
 		$adb->query($faq_query);
 	}
 	$result = get_KBase_details('');
@@ -561,15 +561,15 @@
 function update_ticket_comment($ticketid,$ownerid,$comments)
 {
 	global $adb;
-	$servercreatedtime = date("Y-m-d H:i:s");
-	if(trim($comments) != '')
-	{
-		$sql = "insert into vtiger_ticketcomments values('',".$ticketid.",'".$comments."','".$ownerid."','customer','".$servercreatedtime."')";
-		$adb->query($sql);
-
-		$updatequery = "update vtiger_crmentity set modifiedtime='".$servercreatedtime."' where crmid=".$ticketid;
-		$adb->query($updatequery);
-	}
+	$servercreatedtime = $adb->formatDate(date('YmdHis'));
+  	if(trim($comments) != '')
+  	{
+ 		$sql = "insert into vtiger_ticketcomments values('',".$ticketid.",'".$comments."','".$ownerid."','customer',".$servercreatedtime.")";
+  		$adb->query($sql);
+  
+ 		$updatequery = "update vtiger_crmentity set modifiedtime=".$servercreatedtime." where crmid=".$ticketid;
+  		$adb->query($updatequery);
+  	}	
 }
 
 /**	function used to close the ticket
@@ -633,11 +633,11 @@
 function update_login_details($id,$flag)
 {
         global $adb;
-	$current_time = date("Y-m-d H:i:s");
+	$current_time = $adb->formatDate(date('YmdHis'));	
 
 	if($flag == 'login')
 	{
-	        $sql = "update vtiger_portalinfo set login_time='".$current_time."' where id=".$id;
+	       	$sql = "update vtiger_portalinfo set login_time=".$current_time." where id=".$id; 
 	        $result = $adb->query($sql);
 	}
 	elseif($flag == 'logout')
@@ -647,7 +647,7 @@
                 if($adb->num_rows($result) != 0)
                         $last_login = $adb->query_result($result,0,'login_time');
 
-		$sql = "update vtiger_portalinfo set logout_time = '".$current_time."', last_login_time='".$last_login."' where id=".$id;
+		$sql = "update vtiger_portalinfo set logout_time=".$current_time.", last_login_time='".$last_login."' where id=".$id;	
 		$result = $adb->query($sql);
 	}
 
@@ -821,10 +821,10 @@
 	fclose($handle);	
 
 	//Now store this file information in db and relate with the ticket
-	$date_var = date('YmdHis');
-	$description = 'CustomerPortal Attachment';
-
-	$crmquery = "insert into vtiger_crmentity (crmid,setype,description,createdtime) values('".$attachmentid."','HelpDesk Attachment','".$description."','".$date_var."')";
+	$date_var = $adb->formatDate(date('YmdHis'));
+  	$description = 'CustomerPortal Attachment';
+  
+ 	$crmquery = "insert into vtiger_crmentity (crmid,setype,description,createdtime) values('".$attachmentid."','HelpDesk Attachment','".$description."',".$date_var.")";
 	$crmresult = $adb->query($crmquery);
 
 	$attachmentquery = "insert into vtiger_attachments values(".$attachmentid.",'".$filename."','".$description."','".$filetype."','".$upload_filepath."')";



From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 03:37:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 10:37:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9372 -
	/vtigercrm/trunk/Smarty/templates/HomePage.tpl
Message-ID: <20060909103739.0CB1776C498@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 04:37:32 2006
New Revision: 9372

Log:
UI Issue in Home Page Tables in IE has been fixed --Jeri

Modified:
    vtigercrm/trunk/Smarty/templates/HomePage.tpl

Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/HomePage.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/HomePage.tpl Sat Sep  9 04:37:32 2006
@@ -133,7 +133,7 @@
 															{/if}
 														</td>
 													</tr>
-												</table>										
+											</table>										
 									</td>
 								</tr>
 							</table>
@@ -146,7 +146,22 @@
 											<td align="left" class="homePageMatrixHdr"><b>{$APP.LBL_HOMEPAGE_DASHBOARD}</b></td>
 											<td align="right" class="homePageMatrixHdr"><img src="{$IMAGE_PATH}uparrow.gif" align="absmiddle" /></td>
 										</tr>
-											<tr ><td id="dashborad_cont" colspan="2" style="height:250px;">&nbsp;</td></tr>
+										<tr>	
+											<td colspan="2">
+											<div style="overflow:hidden;height:255px;width:99%"> 
+												<table border=0 cellspacing=0 cellpadding=5 width=100%>
+													<tr><td id="dashborad_cont" style="height:250px;">&nbsp;</td></tr>
+												</table>
+											</div>
+											<table border=0 cellspacing=0 cellpadding=5 width=100%>
+													<tr>
+														<td colspan="2" align="right" valign="bottom">
+															&nbsp;	
+														</td>
+													</tr>
+											</table>
+											</td>
+										</tr>
 									</table>
 								</div>
 						{/if}



From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 03:43:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 10:43:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9373 -
	/vtigercrm/trunk/Smarty/templates/Header.tpl
Message-ID: <20060909104359.4C7FB76C4A0@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 04:43:51 2006
New Revision: 9373

Log:
Changes given by Radiant for The AllMenu's out-of-screen positioning has been integrated --Jeri

Modified:
    vtigercrm/trunk/Smarty/templates/Header.tpl

Modified: vtigercrm/trunk/Smarty/templates/Header.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Header.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Header.tpl Sat Sep  9 04:43:51 2006
@@ -402,7 +402,7 @@
 {/literal}
 
 {* Quick Access Functionality *}
-<div id="allMenu" onmouseout="fninvsh('allMenu');" onMouseOver="fnvshNrm('allMenu');" style="width:650px">
+<div id="allMenu" onmouseout="fninvsh('allMenu');" onMouseOver="fnvshNrm('allMenu');" style="width:550px">
 	<table border=0 cellpadding="5" cellspacing="0" class="allMnuTable" >
 	<tr>
 		<td valign="top">
@@ -411,7 +411,7 @@
 			<span class="allMnuHdr">{$APP[$parenttab]}</span>
 			{foreach name=modulelist item=modules from=$details}
        		{math assign="num" equation="x + y" x=$parentno y=1}
-			{math assign="loopvalue" equation="x % y" x=$num y=14}
+			{math assign="loopvalue" equation="x % y" x=$num y=15}
 			{assign var="parentno" value=$num}
 			{if $loopvalue eq '0'}
 				</td><td valign="top">



From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 04:18:19 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 11:18:19 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9374 - in
	/vtigercrm/trunk/themes/alphagrey: ./ images/
Message-ID: <20060909111820.12E7876B50F@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 05:07:18 2006
New Revision: 9374

Log:
alpha grey theme added --Jeri

Added:
    vtigercrm/trunk/themes/alphagrey/
    vtigercrm/trunk/themes/alphagrey/footer.php
    vtigercrm/trunk/themes/alphagrey/header.php
    vtigercrm/trunk/themes/alphagrey/images/
    vtigercrm/trunk/themes/alphagrey/images/3hdrTabBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/Accounts.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/Call.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/Calls.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/Contacts.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/HomeBtm.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/Home_15.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/Leads.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/Meeting.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/Meetings.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/Opportunities.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/Potentials.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/Quotes.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/Reports_arrow.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/RolesDelete.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/RolesEdit.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/RolesMove.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/Rolesadd.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/Settings.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/Tasks.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/Thumbs.db   (with props)
    vtigercrm/trunk/themes/alphagrey/images/Tickets.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/TopOpenQuotes.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/ViewTemplate.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/aboutUS.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/about_btm.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/aboutus.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/addrss.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/advancedSearchLens.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/announ.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/arrow.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/arrow_down.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/arrow_up.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/assign.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/attachment.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/audit.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/backupserver.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/basicSearchLens.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/bl_bar.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/black.png   (with props)
    vtigercrm/trunk/themes/alphagrey/images/blank.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/bookMark.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/bottom_left.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/bottom_right.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/btnAlexa.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/btnL3Add-Faded.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/btnL3Add.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/btnL3AllMenu-Faded.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/btnL3AllMenu.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/btnL3Calc-Faded.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/btnL3Calc.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/btnL3Calendar-Faded.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/btnL3Calendar.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/btnL3Clock-Faded.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/btnL3Clock.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/btnL3Search-Faded.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/btnL3Search.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/btnL3Tracker-Faded.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/btnL3Tracker.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/busy.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/cal12x12Shared.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/cal16x16Call.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/cal16x16CallAdd.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/cal16x16Linked.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/cal16x16Meeting.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/cal16x16MeetingAdd.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/cal16x16Shared.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/cal16x16ToDo.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/cal16x16ToDoAdd.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calAddButtonBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calBottomBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calBottomLeft.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calBottomRight.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calNavNext.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calNavPrev.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calSep.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calTopLeft.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calTopRight.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/cal_Hdr.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/cal_Others.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/cal_add.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/cal_add.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/cal_clock.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/cal_event.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/cal_hdr.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/cal_nav.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/cal_next_nav.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/cal_prev_nav.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/cal_sel.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/cal_sharing.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/cal_title.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calc_back_btn.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calc_black_btn.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calc_blue_btn.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calc_bottom_center.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calc_bottom_left.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calc_bottom_right.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calc_canc_btn.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calc_grey_btn.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calc_logo.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calc_mem_btn.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calc_middle_right.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calc_red_btn.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calc_res_bc.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calc_res_bl.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calc_res_br.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calc_res_ml.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calc_res_mr.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calc_res_tc.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calc_res_tl.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calc_res_tr.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calc_top_left.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calc_top_right.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calendar.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/cfcurrency.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/cfpicklist.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/check_mail.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/checkbox.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/clear_field.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/clock_bg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/close.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/collapse.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/company.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/compose.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/composeMail.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/currency.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/currencydelete.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/custom.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/dashBottomBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/dashSelectBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/dashTopBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/dash_btm.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/dash_btm_center.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/dash_btm_left.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/dash_btm_right.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/dash_down_arrow.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/dash_name.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/dash_screw.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/dash_screw.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/dash_scroll_up.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/dash_sel_btm.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/dash_sel_chart.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/dash_sel_left.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/dash_sel_top.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/dash_switch_view.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/dash_top.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/dash_top_shadow.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/dash_unsel_chart.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/date.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/dboardMatrixView.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/dboardNormalView.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/del.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/del_tag.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/delete.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/denied.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/disabled.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/editfield.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/email.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/empty.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/enabled.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/end.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/end_disabled.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/expand.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/free.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/hdrNameBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/hdrTabBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/head_end.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/head_start.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/help.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/help_icon.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/hometop.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/ico-groups.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/ico-profile.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/ico-roles.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/ico-users.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/inventory.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/jump.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/keyMetrics.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/layerPopupBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/left.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/left_arc.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/level2TabBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/loginBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/loginBottomBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/loginBottomURL.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/loginSIBottomLeft.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/loginSIBottomRight.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/loginSITopLeft.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/loginSITopRight.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/loginTopShade.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/logout.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/lvtNavBtnFirst.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/lvtNavBtnLast.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/lvtNavBtnNext.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/lvtNavBtnPrev.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/mailHdr.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/mailSubHeaderBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/mailTitle.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/mailmarge.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/menuDnArrow.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/menu_off_end.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/menu_off_start.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/menu_off_tile.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/menu_on_end.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/menu_on_start.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/menu_on_tile.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/menu_root.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/migrate.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/migration_sucess.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/minus.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/moduleSelectorBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/movecol_del.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/movecol_del_down.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/movecol_del_over.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/movecol_down.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/movecol_down_disabled.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/movecol_down_down.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/movecol_down_over.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/movecol_up.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/movecol_up_disabled.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/movecol_up_down.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/movecol_up_over.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/myGroupAllocation.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/myTickets.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/myTopAccounts.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/myTopInvoices.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/myTopOpenPotentials.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/myTopSalesOrders.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/myUpcoPendAct.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/next.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/nextRecord.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/next_disabled.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/no.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/notification.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/number.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/offstar.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/ogmailserver.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/one.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/onstar.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/orgshar.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/pendingEvents.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/pending_left.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/pending_right.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/percent.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/phone.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/picklist.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/picklistEditor.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/picklist_hint.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/plsWaitAnimated.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/plus.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/pointer.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/popupHdr.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/previous.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/previousRecord.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/previous_disabled.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/pricebook.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/primeTopBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/print.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/private.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/proxy.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/prvPrfBottomLeft.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/prvPrfBottomRight.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/prvPrfHdrArrow.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/prvPrfSelectedTick.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/prvPrfTopLeft.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/prvPrfTopRight.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/public.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/qcBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/qcName.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/reload.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/report_bg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/report_bottom.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/report_btn.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/report_newHdr.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/reportsCreate.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/reportsDelete.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/reportsFolderCreate.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/reportsMove.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/right.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/right_arc.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/rss.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/rssDisplayBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/rssDisplayBottom.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/rssDisplayBottomLeft.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/rssDisplayBottomRight.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/rssDisplayLeft.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/rssDisplayRight.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/rssDisplaySpeaker.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/rssDisplayTop.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/rssDisplayTopLeft.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/rssDisplayTopRight.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/rssHeader.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/rssOnHeader.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/rssdelete.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/rssforward.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/rssframeHdr.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/rssimage.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/rssroot.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/scroll_left.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/scroll_left_down.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/scroll_right.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/scroll_right_down.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/search.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/searchUIBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/searching.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/select.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/set-IcoLoginHistory.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/set-IcoTwoTabConfig.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/settingsActBtnDelete.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/settingsActBtnDuplicate.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/settingsActBtnEdit.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/settingsMTBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/settingsSelUIBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/settings_top.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/shareaccess.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/showDown.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/showPanelTopBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/showPanelTopLeft.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/showPanelTopRight.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/showsubmenu.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/site_hdr.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/site_sel.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/site_unsel.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/small_left.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/small_right.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/spacer.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/start.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/start_disabled.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/status.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/strikeline.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/summarize.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/system.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/tabRht.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/tabSelectedBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/tabSeperatorBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/tabUnSelectedBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/tabular.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/tagCloudBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/tagCloudName.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/tagcloud_03.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/taxConfiguration.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/tbarChat-Faded.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/tbarChat.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/tbarExport-Faded.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/tbarExport.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/tbarImport-Faded.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/tbarImport.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/tbarPrivateChat.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/tbarPublicChat.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/tbarSettings.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/tblPro1BtnHide.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/tblPro1ColBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/terms.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/text.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/titleMailClient.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/titleMySites.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/titleRSSReader.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/todaybg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/topBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/topBnr.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/top_left.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/top_right.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/topbar.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/topcut.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/up.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/uparrow.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/upcomingEvents.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/upcoming_left.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/upcoming_right.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/url.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/vtbusy.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/vtiger-crm.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/vtiger.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/vtigerDevDocs.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/webmail_downarrow.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/webmail_header.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/webmail_root.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/webmail_settings.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/webmail_trash.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/webmail_uparrow.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/yes.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/layout_utils.php
    vtigercrm/trunk/themes/alphagrey/loginheader.html
    vtigercrm/trunk/themes/alphagrey/loginheader.php
    vtigercrm/trunk/themes/alphagrey/style.css



From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 05:34:44 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 12:34:44 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9375 - in
 /vtigercrm/trunk/themes/Aqua: footer.php header.html header.php
 layout_utils.php loginheader.html loginheader.php style.css
Message-ID: <20060909123444.C164E76C613@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 06:34:35 2006
New Revision: 9375

Log:
Aqua theme removed --Jeri

Removed:
    vtigercrm/trunk/themes/Aqua/footer.php
    vtigercrm/trunk/themes/Aqua/header.html
    vtigercrm/trunk/themes/Aqua/header.php
    vtigercrm/trunk/themes/Aqua/layout_utils.php
    vtigercrm/trunk/themes/Aqua/loginheader.html
    vtigercrm/trunk/themes/Aqua/loginheader.php
    vtigercrm/trunk/themes/Aqua/style.css



From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 05:35:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 12:35:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9376 - in
 /vtigercrm/trunk/themes/blue: footer.php header.php layout_utils.php
 loginheader.html loginheader.php style.css
Message-ID: <20060909123538.EF7E076CD88@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 06:35:28 2006
New Revision: 9376

Log:
Blue theme removed --Jeri

Removed:
    vtigercrm/trunk/themes/blue/footer.php
    vtigercrm/trunk/themes/blue/header.php
    vtigercrm/trunk/themes/blue/layout_utils.php
    vtigercrm/trunk/themes/blue/loginheader.html
    vtigercrm/trunk/themes/blue/loginheader.php
    vtigercrm/trunk/themes/blue/style.css



From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 05:36:25 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 12:36:25 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9377 -
	/vtigercrm/trunk/themes/Aqua/images/
Message-ID: <20060909123626.18DED76C623@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 06:35:01 2006
New Revision: 9377

Log:
Aqua theme removed --Jeri

Removed:
    vtigercrm/trunk/themes/Aqua/images/Accounts.gif
    vtigercrm/trunk/themes/Aqua/images/Activities.gif
    vtigercrm/trunk/themes/Aqua/images/Calls.gif
    vtigercrm/trunk/themes/Aqua/images/Cases.gif
    vtigercrm/trunk/themes/Aqua/images/Contacts.gif
    vtigercrm/trunk/themes/Aqua/images/Emails.gif
    vtigercrm/trunk/themes/Aqua/images/Faq.gif
    vtigercrm/trunk/themes/Aqua/images/HelpDesk.gif
    vtigercrm/trunk/themes/Aqua/images/Invoice.gif
    vtigercrm/trunk/themes/Aqua/images/Leads.gif
    vtigercrm/trunk/themes/Aqua/images/Meetings.gif
    vtigercrm/trunk/themes/Aqua/images/Notes.gif
    vtigercrm/trunk/themes/Aqua/images/Opportunities.gif
    vtigercrm/trunk/themes/Aqua/images/Potentials.gif
    vtigercrm/trunk/themes/Aqua/images/Products.gif
    vtigercrm/trunk/themes/Aqua/images/PurchaseOrder.gif
    vtigercrm/trunk/themes/Aqua/images/Quotes.gif
    vtigercrm/trunk/themes/Aqua/images/SalesOrder.gif
    vtigercrm/trunk/themes/Aqua/images/Settings.gif
    vtigercrm/trunk/themes/Aqua/images/Tasks.gif
    vtigercrm/trunk/themes/Aqua/images/Thumbs.db
    vtigercrm/trunk/themes/Aqua/images/Tickets.gif
    vtigercrm/trunk/themes/Aqua/images/TopOpenQuotes.gif
    vtigercrm/trunk/themes/Aqua/images/Users.gif
    vtigercrm/trunk/themes/Aqua/images/aboutus.gif
    vtigercrm/trunk/themes/Aqua/images/addrss.gif
    vtigercrm/trunk/themes/Aqua/images/admin.gif
    vtigercrm/trunk/themes/Aqua/images/appointment.gif
    vtigercrm/trunk/themes/Aqua/images/arrow_down.gif
    vtigercrm/trunk/themes/Aqua/images/arrow_up.gif
    vtigercrm/trunk/themes/Aqua/images/attachment.gif
    vtigercrm/trunk/themes/Aqua/images/bl_bar.jpg
    vtigercrm/trunk/themes/Aqua/images/black.png
    vtigercrm/trunk/themes/Aqua/images/blank.gif
    vtigercrm/trunk/themes/Aqua/images/bullet.gif
    vtigercrm/trunk/themes/Aqua/images/busy.gif
    vtigercrm/trunk/themes/Aqua/images/buttonbg.gif
    vtigercrm/trunk/themes/Aqua/images/calc_back_btn.gif
    vtigercrm/trunk/themes/Aqua/images/calc_black_btn.gif
    vtigercrm/trunk/themes/Aqua/images/calc_blue_btn.gif
    vtigercrm/trunk/themes/Aqua/images/calc_bottom_center.gif
    vtigercrm/trunk/themes/Aqua/images/calc_bottom_left.gif
    vtigercrm/trunk/themes/Aqua/images/calc_bottom_right.gif
    vtigercrm/trunk/themes/Aqua/images/calc_canc_btn.gif
    vtigercrm/trunk/themes/Aqua/images/calc_grey_btn.gif
    vtigercrm/trunk/themes/Aqua/images/calc_logo.gif
    vtigercrm/trunk/themes/Aqua/images/calc_mem_btn.gif
    vtigercrm/trunk/themes/Aqua/images/calc_middle_right.gif
    vtigercrm/trunk/themes/Aqua/images/calc_red_btn.gif
    vtigercrm/trunk/themes/Aqua/images/calc_res_bc.gif
    vtigercrm/trunk/themes/Aqua/images/calc_res_bl.gif
    vtigercrm/trunk/themes/Aqua/images/calc_res_br.gif
    vtigercrm/trunk/themes/Aqua/images/calc_res_ml.gif
    vtigercrm/trunk/themes/Aqua/images/calc_res_mr.gif
    vtigercrm/trunk/themes/Aqua/images/calc_res_tc.gif
    vtigercrm/trunk/themes/Aqua/images/calc_res_tl.gif
    vtigercrm/trunk/themes/Aqua/images/calc_res_tr.gif
    vtigercrm/trunk/themes/Aqua/images/calc_top_left.gif
    vtigercrm/trunk/themes/Aqua/images/calc_top_right.gif
    vtigercrm/trunk/themes/Aqua/images/calendar.gif
    vtigercrm/trunk/themes/Aqua/images/checkbox.gif
    vtigercrm/trunk/themes/Aqua/images/clear_field.gif
    vtigercrm/trunk/themes/Aqua/images/clock_bg.gif
    vtigercrm/trunk/themes/Aqua/images/close.gif
    vtigercrm/trunk/themes/Aqua/images/collapse.gif
    vtigercrm/trunk/themes/Aqua/images/comm_temp.gif
    vtigercrm/trunk/themes/Aqua/images/config.gif
    vtigercrm/trunk/themes/Aqua/images/currency.gif
    vtigercrm/trunk/themes/Aqua/images/date.gif
    vtigercrm/trunk/themes/Aqua/images/day.gif
    vtigercrm/trunk/themes/Aqua/images/day_sel.gif
    vtigercrm/trunk/themes/Aqua/images/delete.gif
    vtigercrm/trunk/themes/Aqua/images/email.gif
    vtigercrm/trunk/themes/Aqua/images/end.gif
    vtigercrm/trunk/themes/Aqua/images/end_disabled.gif
    vtigercrm/trunk/themes/Aqua/images/expand.gif
    vtigercrm/trunk/themes/Aqua/images/first.gif
    vtigercrm/trunk/themes/Aqua/images/formborder.gif
    vtigercrm/trunk/themes/Aqua/images/free.gif
    vtigercrm/trunk/themes/Aqua/images/header_end.gif
    vtigercrm/trunk/themes/Aqua/images/header_start.gif
    vtigercrm/trunk/themes/Aqua/images/header_tile.gif
    vtigercrm/trunk/themes/Aqua/images/help.gif
    vtigercrm/trunk/themes/Aqua/images/help_icon.gif
    vtigercrm/trunk/themes/Aqua/images/high_priority.gif
    vtigercrm/trunk/themes/Aqua/images/holidaybg.gif
    vtigercrm/trunk/themes/Aqua/images/keyMetrics.gif
    vtigercrm/trunk/themes/Aqua/images/last.gif
    vtigercrm/trunk/themes/Aqua/images/left.gif
    vtigercrm/trunk/themes/Aqua/images/left_arc.gif
    vtigercrm/trunk/themes/Aqua/images/logout.gif
    vtigercrm/trunk/themes/Aqua/images/menu_off_end.gif
    vtigercrm/trunk/themes/Aqua/images/menu_off_start.gif
    vtigercrm/trunk/themes/Aqua/images/menu_off_tile.gif
    vtigercrm/trunk/themes/Aqua/images/menu_on_end.gif
    vtigercrm/trunk/themes/Aqua/images/menu_on_start.gif
    vtigercrm/trunk/themes/Aqua/images/menu_on_tile.gif
    vtigercrm/trunk/themes/Aqua/images/minus.gif
    vtigercrm/trunk/themes/Aqua/images/modify.gif
    vtigercrm/trunk/themes/Aqua/images/month.gif
    vtigercrm/trunk/themes/Aqua/images/month_sel.gif
    vtigercrm/trunk/themes/Aqua/images/movecol_del.gif
    vtigercrm/trunk/themes/Aqua/images/movecol_del_down.gif
    vtigercrm/trunk/themes/Aqua/images/movecol_del_over.gif
    vtigercrm/trunk/themes/Aqua/images/movecol_down.gif
    vtigercrm/trunk/themes/Aqua/images/movecol_down_disabled.gif
    vtigercrm/trunk/themes/Aqua/images/movecol_down_down.gif
    vtigercrm/trunk/themes/Aqua/images/movecol_down_over.gif
    vtigercrm/trunk/themes/Aqua/images/movecol_up.gif
    vtigercrm/trunk/themes/Aqua/images/movecol_up_disabled.gif
    vtigercrm/trunk/themes/Aqua/images/movecol_up_down.gif
    vtigercrm/trunk/themes/Aqua/images/movecol_up_over.gif
    vtigercrm/trunk/themes/Aqua/images/myGroupAllocation.gif
    vtigercrm/trunk/themes/Aqua/images/myTickets.gif
    vtigercrm/trunk/themes/Aqua/images/myTopAccounts.gif
    vtigercrm/trunk/themes/Aqua/images/myTopInvoices.gif
    vtigercrm/trunk/themes/Aqua/images/myTopOpenPotentials.gif
    vtigercrm/trunk/themes/Aqua/images/myTopSalesOrders.gif
    vtigercrm/trunk/themes/Aqua/images/myUpcoPendAct.gif
    vtigercrm/trunk/themes/Aqua/images/next.gif
    vtigercrm/trunk/themes/Aqua/images/next_disabled.gif
    vtigercrm/trunk/themes/Aqua/images/no.gif
    vtigercrm/trunk/themes/Aqua/images/note.gif
    vtigercrm/trunk/themes/Aqua/images/number.gif
    vtigercrm/trunk/themes/Aqua/images/offstar.gif
    vtigercrm/trunk/themes/Aqua/images/onstar.gif
    vtigercrm/trunk/themes/Aqua/images/percent.gif
    vtigercrm/trunk/themes/Aqua/images/phone.gif
    vtigercrm/trunk/themes/Aqua/images/picklist.gif
    vtigercrm/trunk/themes/Aqua/images/picklist_hint.gif
    vtigercrm/trunk/themes/Aqua/images/plus.gif
    vtigercrm/trunk/themes/Aqua/images/previous.gif
    vtigercrm/trunk/themes/Aqua/images/previous_disabled.gif
    vtigercrm/trunk/themes/Aqua/images/pricebook.gif
    vtigercrm/trunk/themes/Aqua/images/print.gif
    vtigercrm/trunk/themes/Aqua/images/product.gif
    vtigercrm/trunk/themes/Aqua/images/prvPrfBottomLeft.gif
    vtigercrm/trunk/themes/Aqua/images/prvPrfBottomRight.gif
    vtigercrm/trunk/themes/Aqua/images/prvPrfHdrArrow.gif
    vtigercrm/trunk/themes/Aqua/images/prvPrfLine.gif
    vtigercrm/trunk/themes/Aqua/images/prvPrfSelectedTab.gif
    vtigercrm/trunk/themes/Aqua/images/prvPrfSelectedTick.gif
    vtigercrm/trunk/themes/Aqua/images/prvPrfTexture1.gif
    vtigercrm/trunk/themes/Aqua/images/prvPrfTopLeft.gif
    vtigercrm/trunk/themes/Aqua/images/prvPrfTopRight.gif
    vtigercrm/trunk/themes/Aqua/images/prvPrfUnSelectedTab.gif
    vtigercrm/trunk/themes/Aqua/images/purchase_order.gif
    vtigercrm/trunk/themes/Aqua/images/reload.gif
    vtigercrm/trunk/themes/Aqua/images/right.gif
    vtigercrm/trunk/themes/Aqua/images/right_arc.gif
    vtigercrm/trunk/themes/Aqua/images/rss.gif
    vtigercrm/trunk/themes/Aqua/images/rss_folder_cls.gif
    vtigercrm/trunk/themes/Aqua/images/rss_folder_opn.gif
    vtigercrm/trunk/themes/Aqua/images/sales_order.gif
    vtigercrm/trunk/themes/Aqua/images/scroll_left.gif
    vtigercrm/trunk/themes/Aqua/images/scroll_left_down.gif
    vtigercrm/trunk/themes/Aqua/images/scroll_right.gif
    vtigercrm/trunk/themes/Aqua/images/scroll_right_down.gif
    vtigercrm/trunk/themes/Aqua/images/search.gif
    vtigercrm/trunk/themes/Aqua/images/select.gif
    vtigercrm/trunk/themes/Aqua/images/settings_top.gif
    vtigercrm/trunk/themes/Aqua/images/showsubmenu.gif
    vtigercrm/trunk/themes/Aqua/images/start.gif
    vtigercrm/trunk/themes/Aqua/images/start_disabled.gif
    vtigercrm/trunk/themes/Aqua/images/strikeline.gif
    vtigercrm/trunk/themes/Aqua/images/studio.gif
    vtigercrm/trunk/themes/Aqua/images/summarize.gif
    vtigercrm/trunk/themes/Aqua/images/tabular.gif
    vtigercrm/trunk/themes/Aqua/images/text.gif
    vtigercrm/trunk/themes/Aqua/images/todaybg.gif
    vtigercrm/trunk/themes/Aqua/images/topband.gif
    vtigercrm/trunk/themes/Aqua/images/topbar.gif
    vtigercrm/trunk/themes/Aqua/images/url.gif
    vtigercrm/trunk/themes/Aqua/images/user.gif
    vtigercrm/trunk/themes/Aqua/images/user_mgmt.gif
    vtigercrm/trunk/themes/Aqua/images/vendor.gif
    vtigercrm/trunk/themes/Aqua/images/vtiger-crm.gif
    vtigercrm/trunk/themes/Aqua/images/vtiger.jpg
    vtigercrm/trunk/themes/Aqua/images/vtigerDevDocs.gif
    vtigercrm/trunk/themes/Aqua/images/week.gif
    vtigercrm/trunk/themes/Aqua/images/week_sel.gif
    vtigercrm/trunk/themes/Aqua/images/yes.gif



From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 05:38:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 12:38:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9378 -
	/vtigercrm/trunk/themes/blue/images/
Message-ID: <20060909123842.2850276C65B@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 06:36:12 2006
New Revision: 9378

Log:
Blue theme removed --Jeri

Removed:
    vtigercrm/trunk/themes/blue/images/Accounts.gif
    vtigercrm/trunk/themes/blue/images/Call.gif
    vtigercrm/trunk/themes/blue/images/Calls.gif
    vtigercrm/trunk/themes/blue/images/Contacts.gif
    vtigercrm/trunk/themes/blue/images/HomeBtm.gif
    vtigercrm/trunk/themes/blue/images/Home_15.gif
    vtigercrm/trunk/themes/blue/images/Leads.gif
    vtigercrm/trunk/themes/blue/images/Meeting.gif
    vtigercrm/trunk/themes/blue/images/Meetings.gif
    vtigercrm/trunk/themes/blue/images/Opportunities.gif
    vtigercrm/trunk/themes/blue/images/Potentials.gif
    vtigercrm/trunk/themes/blue/images/Quotes.gif
    vtigercrm/trunk/themes/blue/images/Reports_arrow.gif
    vtigercrm/trunk/themes/blue/images/RolesDelete.gif
    vtigercrm/trunk/themes/blue/images/RolesEdit.gif
    vtigercrm/trunk/themes/blue/images/RolesMove.gif
    vtigercrm/trunk/themes/blue/images/Rolesadd.gif
    vtigercrm/trunk/themes/blue/images/Settings.gif
    vtigercrm/trunk/themes/blue/images/Tasks.gif
    vtigercrm/trunk/themes/blue/images/Thumbs.db
    vtigercrm/trunk/themes/blue/images/Tickets.gif
    vtigercrm/trunk/themes/blue/images/TopOpenQuotes.gif
    vtigercrm/trunk/themes/blue/images/ViewTemplate.gif
    vtigercrm/trunk/themes/blue/images/aboutUS.jpg
    vtigercrm/trunk/themes/blue/images/about_btm.jpg
    vtigercrm/trunk/themes/blue/images/aboutus.gif
    vtigercrm/trunk/themes/blue/images/addrss.gif
    vtigercrm/trunk/themes/blue/images/advancedSearchLens.gif
    vtigercrm/trunk/themes/blue/images/announ.gif
    vtigercrm/trunk/themes/blue/images/arrow.jpg
    vtigercrm/trunk/themes/blue/images/arrow_down.gif
    vtigercrm/trunk/themes/blue/images/arrow_up.gif
    vtigercrm/trunk/themes/blue/images/assign.gif
    vtigercrm/trunk/themes/blue/images/attachment.gif
    vtigercrm/trunk/themes/blue/images/audit.gif
    vtigercrm/trunk/themes/blue/images/backupserver.gif
    vtigercrm/trunk/themes/blue/images/basicSearchLens.gif
    vtigercrm/trunk/themes/blue/images/bl_bar.jpg
    vtigercrm/trunk/themes/blue/images/black.png
    vtigercrm/trunk/themes/blue/images/blank.gif
    vtigercrm/trunk/themes/blue/images/bookMark.gif
    vtigercrm/trunk/themes/blue/images/bottom_left.jpg
    vtigercrm/trunk/themes/blue/images/bottom_right.jpg
    vtigercrm/trunk/themes/blue/images/btnL3Add-Faded.gif
    vtigercrm/trunk/themes/blue/images/btnL3Add.gif
    vtigercrm/trunk/themes/blue/images/btnL3AllMenu-Faded.gif
    vtigercrm/trunk/themes/blue/images/btnL3AllMenu.gif
    vtigercrm/trunk/themes/blue/images/btnL3Calc-Faded.gif
    vtigercrm/trunk/themes/blue/images/btnL3Calc.gif
    vtigercrm/trunk/themes/blue/images/btnL3Calendar-Faded.gif
    vtigercrm/trunk/themes/blue/images/btnL3Calendar.gif
    vtigercrm/trunk/themes/blue/images/btnL3Clock-Faded.gif
    vtigercrm/trunk/themes/blue/images/btnL3Clock.gif
    vtigercrm/trunk/themes/blue/images/btnL3Search-Faded.gif
    vtigercrm/trunk/themes/blue/images/btnL3Search.gif
    vtigercrm/trunk/themes/blue/images/btnL3Tracker-Faded.gif
    vtigercrm/trunk/themes/blue/images/btnL3Tracker.gif
    vtigercrm/trunk/themes/blue/images/busy.gif
    vtigercrm/trunk/themes/blue/images/cal16x16Call.jpg
    vtigercrm/trunk/themes/blue/images/cal16x16CallAdd.jpg
    vtigercrm/trunk/themes/blue/images/cal16x16Linked.jpg
    vtigercrm/trunk/themes/blue/images/cal16x16Meeting.jpg
    vtigercrm/trunk/themes/blue/images/cal16x16MeetingAdd.jpg
    vtigercrm/trunk/themes/blue/images/cal16x16ToDo.jpg
    vtigercrm/trunk/themes/blue/images/cal16x16ToDoAdd.jpg
    vtigercrm/trunk/themes/blue/images/calBg.gif
    vtigercrm/trunk/themes/blue/images/calBottomBg.gif
    vtigercrm/trunk/themes/blue/images/calBottomLeft.gif
    vtigercrm/trunk/themes/blue/images/calBottomRight.gif
    vtigercrm/trunk/themes/blue/images/calNavNext.gif
    vtigercrm/trunk/themes/blue/images/calNavPrev.gif
    vtigercrm/trunk/themes/blue/images/calSep.gif
    vtigercrm/trunk/themes/blue/images/calTopLeft.gif
    vtigercrm/trunk/themes/blue/images/calTopRight.gif
    vtigercrm/trunk/themes/blue/images/cal_Hdr.gif
    vtigercrm/trunk/themes/blue/images/cal_Others.gif
    vtigercrm/trunk/themes/blue/images/cal_add.gif
    vtigercrm/trunk/themes/blue/images/cal_add.jpg
    vtigercrm/trunk/themes/blue/images/cal_clock.jpg
    vtigercrm/trunk/themes/blue/images/cal_event.jpg
    vtigercrm/trunk/themes/blue/images/cal_hdr.jpg
    vtigercrm/trunk/themes/blue/images/cal_nav.gif
    vtigercrm/trunk/themes/blue/images/cal_next_nav.gif
    vtigercrm/trunk/themes/blue/images/cal_prev_nav.gif
    vtigercrm/trunk/themes/blue/images/cal_sel.jpg
    vtigercrm/trunk/themes/blue/images/cal_sharing.jpg
    vtigercrm/trunk/themes/blue/images/cal_title.jpg
    vtigercrm/trunk/themes/blue/images/calc_back_btn.gif
    vtigercrm/trunk/themes/blue/images/calc_black_btn.gif
    vtigercrm/trunk/themes/blue/images/calc_blue_btn.gif
    vtigercrm/trunk/themes/blue/images/calc_bottom_center.gif
    vtigercrm/trunk/themes/blue/images/calc_bottom_left.gif
    vtigercrm/trunk/themes/blue/images/calc_bottom_right.gif
    vtigercrm/trunk/themes/blue/images/calc_canc_btn.gif
    vtigercrm/trunk/themes/blue/images/calc_grey_btn.gif
    vtigercrm/trunk/themes/blue/images/calc_logo.gif
    vtigercrm/trunk/themes/blue/images/calc_mem_btn.gif
    vtigercrm/trunk/themes/blue/images/calc_middle_right.gif
    vtigercrm/trunk/themes/blue/images/calc_red_btn.gif
    vtigercrm/trunk/themes/blue/images/calc_res_bc.gif
    vtigercrm/trunk/themes/blue/images/calc_res_bl.gif
    vtigercrm/trunk/themes/blue/images/calc_res_br.gif
    vtigercrm/trunk/themes/blue/images/calc_res_ml.gif
    vtigercrm/trunk/themes/blue/images/calc_res_mr.gif
    vtigercrm/trunk/themes/blue/images/calc_res_tc.gif
    vtigercrm/trunk/themes/blue/images/calc_res_tl.gif
    vtigercrm/trunk/themes/blue/images/calc_res_tr.gif
    vtigercrm/trunk/themes/blue/images/calc_top_left.gif
    vtigercrm/trunk/themes/blue/images/calc_top_right.gif
    vtigercrm/trunk/themes/blue/images/calendar.gif
    vtigercrm/trunk/themes/blue/images/cfcurrency.gif
    vtigercrm/trunk/themes/blue/images/cfpicklist.gif
    vtigercrm/trunk/themes/blue/images/check_mail.gif
    vtigercrm/trunk/themes/blue/images/checkbox.gif
    vtigercrm/trunk/themes/blue/images/clear_field.gif
    vtigercrm/trunk/themes/blue/images/clock_bg.gif
    vtigercrm/trunk/themes/blue/images/close.gif
    vtigercrm/trunk/themes/blue/images/collapse.gif
    vtigercrm/trunk/themes/blue/images/company.gif
    vtigercrm/trunk/themes/blue/images/compose.gif
    vtigercrm/trunk/themes/blue/images/composeMail.jpg
    vtigercrm/trunk/themes/blue/images/currency.gif
    vtigercrm/trunk/themes/blue/images/currencydelete.gif
    vtigercrm/trunk/themes/blue/images/custom.gif
    vtigercrm/trunk/themes/blue/images/dash_btm.jpg
    vtigercrm/trunk/themes/blue/images/dash_btm_center.jpg
    vtigercrm/trunk/themes/blue/images/dash_btm_left.jpg
    vtigercrm/trunk/themes/blue/images/dash_btm_right.jpg
    vtigercrm/trunk/themes/blue/images/dash_down_arrow.jpg
    vtigercrm/trunk/themes/blue/images/dash_name.jpg
    vtigercrm/trunk/themes/blue/images/dash_screw.jpg
    vtigercrm/trunk/themes/blue/images/dash_scroll_up.jpg
    vtigercrm/trunk/themes/blue/images/dash_sel_btm.jpg
    vtigercrm/trunk/themes/blue/images/dash_sel_chart.jpg
    vtigercrm/trunk/themes/blue/images/dash_sel_left.jpg
    vtigercrm/trunk/themes/blue/images/dash_sel_top.jpg
    vtigercrm/trunk/themes/blue/images/dash_switch_view.jpg
    vtigercrm/trunk/themes/blue/images/dash_top.jpg
    vtigercrm/trunk/themes/blue/images/dash_top_shadow.jpg
    vtigercrm/trunk/themes/blue/images/dash_unsel_chart.jpg
    vtigercrm/trunk/themes/blue/images/date.gif
    vtigercrm/trunk/themes/blue/images/dboardMatrixView.gif
    vtigercrm/trunk/themes/blue/images/dboardNormalView.gif
    vtigercrm/trunk/themes/blue/images/del.gif
    vtigercrm/trunk/themes/blue/images/del_tag.gif
    vtigercrm/trunk/themes/blue/images/delete.gif
    vtigercrm/trunk/themes/blue/images/denied.gif
    vtigercrm/trunk/themes/blue/images/disabled.gif
    vtigercrm/trunk/themes/blue/images/editfield.gif
    vtigercrm/trunk/themes/blue/images/email.gif
    vtigercrm/trunk/themes/blue/images/empty.jpg
    vtigercrm/trunk/themes/blue/images/enabled.gif
    vtigercrm/trunk/themes/blue/images/end.gif
    vtigercrm/trunk/themes/blue/images/end_disabled.gif
    vtigercrm/trunk/themes/blue/images/expand.gif
    vtigercrm/trunk/themes/blue/images/free.gif
    vtigercrm/trunk/themes/blue/images/head_end.gif
    vtigercrm/trunk/themes/blue/images/head_start.gif
    vtigercrm/trunk/themes/blue/images/help.gif
    vtigercrm/trunk/themes/blue/images/help_icon.gif
    vtigercrm/trunk/themes/blue/images/hometop.gif
    vtigercrm/trunk/themes/blue/images/ico-groups.gif
    vtigercrm/trunk/themes/blue/images/ico-profile.gif
    vtigercrm/trunk/themes/blue/images/ico-roles.gif
    vtigercrm/trunk/themes/blue/images/ico-users.gif
    vtigercrm/trunk/themes/blue/images/inventory.gif
    vtigercrm/trunk/themes/blue/images/jump.gif
    vtigercrm/trunk/themes/blue/images/keyMetrics.gif
    vtigercrm/trunk/themes/blue/images/left.gif
    vtigercrm/trunk/themes/blue/images/left_arc.gif
    vtigercrm/trunk/themes/blue/images/level2TabBg.gif
    vtigercrm/trunk/themes/blue/images/loginBg.gif
    vtigercrm/trunk/themes/blue/images/loginBottomBg.gif
    vtigercrm/trunk/themes/blue/images/loginBottomURL.gif
    vtigercrm/trunk/themes/blue/images/loginSIBottomLeft.gif
    vtigercrm/trunk/themes/blue/images/loginSIBottomRight.gif
    vtigercrm/trunk/themes/blue/images/loginSITopLeft.gif
    vtigercrm/trunk/themes/blue/images/loginSITopRight.gif
    vtigercrm/trunk/themes/blue/images/loginTopShade.gif
    vtigercrm/trunk/themes/blue/images/logout.gif
    vtigercrm/trunk/themes/blue/images/lvtNavBtnFirst.gif
    vtigercrm/trunk/themes/blue/images/lvtNavBtnLast.gif
    vtigercrm/trunk/themes/blue/images/lvtNavBtnNext.gif
    vtigercrm/trunk/themes/blue/images/lvtNavBtnPrev.gif
    vtigercrm/trunk/themes/blue/images/mailHdr.jpg
    vtigercrm/trunk/themes/blue/images/mailTitle.jpg
    vtigercrm/trunk/themes/blue/images/mailmarge.gif
    vtigercrm/trunk/themes/blue/images/menuDnArrow.gif
    vtigercrm/trunk/themes/blue/images/menu_off_end.gif
    vtigercrm/trunk/themes/blue/images/menu_off_start.gif
    vtigercrm/trunk/themes/blue/images/menu_off_tile.gif
    vtigercrm/trunk/themes/blue/images/menu_on_end.gif
    vtigercrm/trunk/themes/blue/images/menu_on_start.gif
    vtigercrm/trunk/themes/blue/images/menu_on_tile.gif
    vtigercrm/trunk/themes/blue/images/menu_root.gif
    vtigercrm/trunk/themes/blue/images/migrate.gif
    vtigercrm/trunk/themes/blue/images/migration_sucess.jpg
    vtigercrm/trunk/themes/blue/images/minus.gif
    vtigercrm/trunk/themes/blue/images/moduleSelectorBg.gif
    vtigercrm/trunk/themes/blue/images/movecol_del.gif
    vtigercrm/trunk/themes/blue/images/movecol_del_down.gif
    vtigercrm/trunk/themes/blue/images/movecol_del_over.gif
    vtigercrm/trunk/themes/blue/images/movecol_down.gif
    vtigercrm/trunk/themes/blue/images/movecol_down_disabled.gif
    vtigercrm/trunk/themes/blue/images/movecol_down_down.gif
    vtigercrm/trunk/themes/blue/images/movecol_down_over.gif
    vtigercrm/trunk/themes/blue/images/movecol_up.gif
    vtigercrm/trunk/themes/blue/images/movecol_up_disabled.gif
    vtigercrm/trunk/themes/blue/images/movecol_up_down.gif
    vtigercrm/trunk/themes/blue/images/movecol_up_over.gif
    vtigercrm/trunk/themes/blue/images/myGroupAllocation.gif
    vtigercrm/trunk/themes/blue/images/myTickets.gif
    vtigercrm/trunk/themes/blue/images/myTopAccounts.gif
    vtigercrm/trunk/themes/blue/images/myTopInvoices.gif
    vtigercrm/trunk/themes/blue/images/myTopOpenPotentials.gif
    vtigercrm/trunk/themes/blue/images/myTopSalesOrders.gif
    vtigercrm/trunk/themes/blue/images/myUpcoPendAct.gif
    vtigercrm/trunk/themes/blue/images/next.gif
    vtigercrm/trunk/themes/blue/images/next_disabled.gif
    vtigercrm/trunk/themes/blue/images/no.gif
    vtigercrm/trunk/themes/blue/images/notification.gif
    vtigercrm/trunk/themes/blue/images/number.gif
    vtigercrm/trunk/themes/blue/images/offstar.gif
    vtigercrm/trunk/themes/blue/images/ogmailserver.gif
    vtigercrm/trunk/themes/blue/images/one.gif
    vtigercrm/trunk/themes/blue/images/onstar.gif
    vtigercrm/trunk/themes/blue/images/orgshar.gif
    vtigercrm/trunk/themes/blue/images/pendingEvents.gif
    vtigercrm/trunk/themes/blue/images/pending_left.gif
    vtigercrm/trunk/themes/blue/images/pending_right.gif
    vtigercrm/trunk/themes/blue/images/percent.gif
    vtigercrm/trunk/themes/blue/images/phone.gif
    vtigercrm/trunk/themes/blue/images/picklist.gif
    vtigercrm/trunk/themes/blue/images/picklistEditor.gif
    vtigercrm/trunk/themes/blue/images/picklist_hint.gif
    vtigercrm/trunk/themes/blue/images/plus.gif
    vtigercrm/trunk/themes/blue/images/pointer.gif
    vtigercrm/trunk/themes/blue/images/popupHdr.jpg
    vtigercrm/trunk/themes/blue/images/previous.gif
    vtigercrm/trunk/themes/blue/images/previous_disabled.gif
    vtigercrm/trunk/themes/blue/images/pricebook.gif
    vtigercrm/trunk/themes/blue/images/print.gif
    vtigercrm/trunk/themes/blue/images/private.gif
    vtigercrm/trunk/themes/blue/images/proxy.gif
    vtigercrm/trunk/themes/blue/images/prvPrfBottomLeft.gif
    vtigercrm/trunk/themes/blue/images/prvPrfBottomRight.gif
    vtigercrm/trunk/themes/blue/images/prvPrfHdrArrow.gif
    vtigercrm/trunk/themes/blue/images/prvPrfSelectedTick.gif
    vtigercrm/trunk/themes/blue/images/prvPrfTopLeft.gif
    vtigercrm/trunk/themes/blue/images/prvPrfTopRight.gif
    vtigercrm/trunk/themes/blue/images/public.gif
    vtigercrm/trunk/themes/blue/images/qcBg.gif
    vtigercrm/trunk/themes/blue/images/qcName.gif
    vtigercrm/trunk/themes/blue/images/reload.gif
    vtigercrm/trunk/themes/blue/images/report_bg.gif
    vtigercrm/trunk/themes/blue/images/report_bottom.gif
    vtigercrm/trunk/themes/blue/images/report_btn.gif
    vtigercrm/trunk/themes/blue/images/report_newHdr.gif
    vtigercrm/trunk/themes/blue/images/reportsCreate.gif
    vtigercrm/trunk/themes/blue/images/reportsDelete.gif
    vtigercrm/trunk/themes/blue/images/reportsFolderCreate.gif
    vtigercrm/trunk/themes/blue/images/reportsMove.gif
    vtigercrm/trunk/themes/blue/images/right.gif
    vtigercrm/trunk/themes/blue/images/right_arc.gif
    vtigercrm/trunk/themes/blue/images/rss.gif
    vtigercrm/trunk/themes/blue/images/rssHeader.gif
    vtigercrm/trunk/themes/blue/images/rssOnHeader.gif
    vtigercrm/trunk/themes/blue/images/rssdelete.gif
    vtigercrm/trunk/themes/blue/images/rssforward.gif
    vtigercrm/trunk/themes/blue/images/rssframeHdr.gif
    vtigercrm/trunk/themes/blue/images/rssimage.gif
    vtigercrm/trunk/themes/blue/images/rssroot.gif
    vtigercrm/trunk/themes/blue/images/scroll_left.gif
    vtigercrm/trunk/themes/blue/images/scroll_left_down.gif
    vtigercrm/trunk/themes/blue/images/scroll_right.gif
    vtigercrm/trunk/themes/blue/images/scroll_right_down.gif
    vtigercrm/trunk/themes/blue/images/search.gif
    vtigercrm/trunk/themes/blue/images/searching.gif
    vtigercrm/trunk/themes/blue/images/select.gif
    vtigercrm/trunk/themes/blue/images/set-IcoLoginHistory.gif
    vtigercrm/trunk/themes/blue/images/settingsActBtnDelete.gif
    vtigercrm/trunk/themes/blue/images/settingsActBtnDuplicate.gif
    vtigercrm/trunk/themes/blue/images/settingsActBtnEdit.gif
    vtigercrm/trunk/themes/blue/images/settingsMTBg.gif
    vtigercrm/trunk/themes/blue/images/settingsSelUIBg.gif
    vtigercrm/trunk/themes/blue/images/settings_top.gif
    vtigercrm/trunk/themes/blue/images/shareaccess.gif
    vtigercrm/trunk/themes/blue/images/showDown.gif
    vtigercrm/trunk/themes/blue/images/showPanelTopBg.gif
    vtigercrm/trunk/themes/blue/images/showPanelTopLeft.gif
    vtigercrm/trunk/themes/blue/images/showPanelTopRight.gif
    vtigercrm/trunk/themes/blue/images/showsubmenu.gif
    vtigercrm/trunk/themes/blue/images/site_hdr.jpg
    vtigercrm/trunk/themes/blue/images/site_sel.jpg
    vtigercrm/trunk/themes/blue/images/site_unsel.jpg
    vtigercrm/trunk/themes/blue/images/small_left.gif
    vtigercrm/trunk/themes/blue/images/small_right.gif
    vtigercrm/trunk/themes/blue/images/start.gif
    vtigercrm/trunk/themes/blue/images/start_disabled.gif
    vtigercrm/trunk/themes/blue/images/status.gif
    vtigercrm/trunk/themes/blue/images/strikeline.gif
    vtigercrm/trunk/themes/blue/images/summarize.gif
    vtigercrm/trunk/themes/blue/images/system.gif
    vtigercrm/trunk/themes/blue/images/tabRht.gif
    vtigercrm/trunk/themes/blue/images/tabSelectedBg.gif
    vtigercrm/trunk/themes/blue/images/tabSeperatorBg.gif
    vtigercrm/trunk/themes/blue/images/tabUnSelectedBg.gif
    vtigercrm/trunk/themes/blue/images/tabular.gif
    vtigercrm/trunk/themes/blue/images/tagCloudBg.gif
    vtigercrm/trunk/themes/blue/images/tagCloudName.gif
    vtigercrm/trunk/themes/blue/images/tagcloud_03.gif
    vtigercrm/trunk/themes/blue/images/taxConfiguration.gif
    vtigercrm/trunk/themes/blue/images/tbarChat-Faded.gif
    vtigercrm/trunk/themes/blue/images/tbarChat.gif
    vtigercrm/trunk/themes/blue/images/tbarExport-Faded.gif
    vtigercrm/trunk/themes/blue/images/tbarExport.gif
    vtigercrm/trunk/themes/blue/images/tbarImport-Faded.gif
    vtigercrm/trunk/themes/blue/images/tbarImport.gif
    vtigercrm/trunk/themes/blue/images/tbarSettings.gif
    vtigercrm/trunk/themes/blue/images/tblPro1BtnHide.gif
    vtigercrm/trunk/themes/blue/images/tblPro1ColBg.gif
    vtigercrm/trunk/themes/blue/images/terms.gif
    vtigercrm/trunk/themes/blue/images/text.gif
    vtigercrm/trunk/themes/blue/images/todaybg.gif
    vtigercrm/trunk/themes/blue/images/topBg.gif
    vtigercrm/trunk/themes/blue/images/topBnr.gif
    vtigercrm/trunk/themes/blue/images/top_left.jpg
    vtigercrm/trunk/themes/blue/images/top_right.jpg
    vtigercrm/trunk/themes/blue/images/topbar.gif
    vtigercrm/trunk/themes/blue/images/topcut.gif
    vtigercrm/trunk/themes/blue/images/up.gif
    vtigercrm/trunk/themes/blue/images/uparrow.gif
    vtigercrm/trunk/themes/blue/images/upcomingEvents.gif
    vtigercrm/trunk/themes/blue/images/upcoming_left.gif
    vtigercrm/trunk/themes/blue/images/upcoming_right.gif
    vtigercrm/trunk/themes/blue/images/url.gif
    vtigercrm/trunk/themes/blue/images/vtbusy.gif
    vtigercrm/trunk/themes/blue/images/vtiger-crm.gif
    vtigercrm/trunk/themes/blue/images/vtiger.jpg
    vtigercrm/trunk/themes/blue/images/vtigerDevDocs.gif
    vtigercrm/trunk/themes/blue/images/webmail_downarrow.gif
    vtigercrm/trunk/themes/blue/images/webmail_header.gif
    vtigercrm/trunk/themes/blue/images/webmail_root.gif
    vtigercrm/trunk/themes/blue/images/webmail_settings.gif
    vtigercrm/trunk/themes/blue/images/webmail_trash.gif
    vtigercrm/trunk/themes/blue/images/webmail_uparrow.gif
    vtigercrm/trunk/themes/blue/images/yes.gif



From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 05:41:52 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 12:41:52 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9379 -
	/vtigercrm/trunk/log4php/LoggerBasicConfigurator.php
Message-ID: <20060909124152.9611F76C65B@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 06:41:44 2006
New Revision: 9379

Log:
extra bracket removed --Jeri

Modified:
    vtigercrm/trunk/log4php/LoggerBasicConfigurator.php

Modified: vtigercrm/trunk/log4php/LoggerBasicConfigurator.php
==============================================================================
--- vtigercrm/trunk/log4php/LoggerBasicConfigurator.php (original)
+++ vtigercrm/trunk/log4php/LoggerBasicConfigurator.php Sat Sep  9 06:41:44 2006
@@ -59,7 +59,7 @@
         $layout = LoggerLayout::factory('LoggerLayoutTTCC');
         $appender->setLayout($layout);
 
-        $root->addAppender($appender));
+        $root->addAppender($appender);
     }
 
     /**
@@ -77,4 +77,4 @@
         LoggerManager::resetConfiguration();
     }
 }
-?>
+?>



From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 05:43:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 12:43:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9380 -
	/vtigercrm/trunk/themes/Aqua/images/
Message-ID: <20060909124341.86F2E76C65B@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 06:43:34 2006
New Revision: 9380

Log:
Aqua theme removed --Jeri

Removed:
    vtigercrm/trunk/themes/Aqua/images/



From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 05:44:46 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 12:44:46 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9381 -
	/vtigercrm/trunk/themes/blue/images/
Message-ID: <20060909124446.D066276C65B@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 06:44:37 2006
New Revision: 9381

Log:
Blue theme removed --Jeri

Removed:
    vtigercrm/trunk/themes/blue/images/



From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 05:45:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 12:45:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9382 -
	/vtigercrm/trunk/themes/Aqua/
Message-ID: <20060909124555.33D9C76C65B@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 06:45:46 2006
New Revision: 9382

Log:
Aqua theme removed --Jeri

Removed:
    vtigercrm/trunk/themes/Aqua/



From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 05:46:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 12:46:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9383 -
	/vtigercrm/trunk/themes/blue/
Message-ID: <20060909124641.A7A9676C8AD@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 06:46:34 2006
New Revision: 9383

Log:
Blue theme removed --Jeri

Removed:
    vtigercrm/trunk/themes/blue/



From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 05:48:27 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 12:48:27 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9384 -
	/vtigercrm/trunk/themes/blue lagoon/images/
Message-ID: <20060909124827.6237676C8AD@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 06:48:19 2006
New Revision: 9384

Log:
blue lagoon removed --Jeri

Removed:
    vtigercrm/trunk/themes/blue lagoon/images/



From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 05:49:08 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 12:49:08 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9385 - in
 /vtigercrm/trunk/themes/blue lagoon: footer.php header.php layout_utils.php
 loginheader.html loginheader.php style.css
Message-ID: <20060909124908.16F6876C65B@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 06:48:58 2006
New Revision: 9385

Log:
blue lagoon removed --Jeri

Removed:
    vtigercrm/trunk/themes/blue lagoon/footer.php
    vtigercrm/trunk/themes/blue lagoon/header.php
    vtigercrm/trunk/themes/blue lagoon/layout_utils.php
    vtigercrm/trunk/themes/blue lagoon/loginheader.html
    vtigercrm/trunk/themes/blue lagoon/loginheader.php
    vtigercrm/trunk/themes/blue lagoon/style.css



From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 05:50:54 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 12:50:54 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9386 -
	/vtigercrm/trunk/themes/blue lagoon/
Message-ID: <20060909125054.A2D2C76C8AD@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 06:50:45 2006
New Revision: 9386

Log:
blue lagoon removed --Jeri

Removed:
    vtigercrm/trunk/themes/blue lagoon/



From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 05:55:56 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 12:55:56 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9387 -
	/vtigercrm/trunk/modules/Users/User.php
Message-ID: <20060909125556.04D8A76D613@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 06:55:48 2006
New Revision: 9387

Log:
User privilege file written for user save
Currency array modified --Jeri 

Modified:
    vtigercrm/trunk/modules/Users/User.php

Modified: vtigercrm/trunk/modules/Users/User.php
==============================================================================
--- vtigercrm/trunk/modules/Users/User.php (original)
+++ vtigercrm/trunk/modules/Users/User.php Sat Sep  9 06:55:48 2006
@@ -634,7 +634,8 @@
 				$this->insertIntoEntityTable($table_name, $module);			
 			}
 		}
-
+		require_once('modules/Users/CreateUserPrivilegeFile.php');
+		createUserPrivilegesfile($this->id);
 		$this->db->completeTransaction();
 		$this->db->println("TRANS saveentity ends");
 	}
@@ -850,7 +851,7 @@
 			$currency_query = "select * from vtiger_currency_info where id =1";
 			$currency_result = $adb->query($currency_query);
 		}
-		$currency_array = array("$"=>"&#36;","&dollar;"=>"&#36;","&euro;"=>"&#8364;","&pound;"=>"&#163;","&yen;"=>"&#165;","Rs"=>"&#8360;");
+		$currency_array = array("$"=>"&#36;","&euro;"=>"&#8364;","&pound;"=>"&#163;","&yen;"=>"&#165;");
 			$ui_curr = $currency_array[$adb->query_result($currency_result,0,"currency_symbol")];
 		if($ui_curr == "")
 			$ui_curr = $adb->query_result($currency_result,0,"currency_symbol");



From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 06:02:19 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 13:02:19 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9388 -
	/vtigercrm/trunk/install/4createConfigFile.php
Message-ID: <20060909130219.BCC7076D7E4@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 07:02:11 2006
New Revision: 9388

Log:
Default theme set as bluelagoon --Jeri

Modified:
    vtigercrm/trunk/install/4createConfigFile.php

Modified: vtigercrm/trunk/install/4createConfigFile.php
==============================================================================
--- vtigercrm/trunk/install/4createConfigFile.php (original)
+++ vtigercrm/trunk/install/4createConfigFile.php Sat Sep  9 07:02:11 2006
@@ -375,7 +375,7 @@
  	$config .= "\$default_action = 'index';\n\n";
 
  	$config .= "//set default theme\n";
- 	$config .= "\$default_theme = 'blue';\n\n";
+ 	$config .= "\$default_theme = 'bluelagoon';\n\n";
 
  	$config .= "// If true, the time to compose each page is placed in the browser.\n";
  	$config .= "\$calculate_response_time = true;\n";



From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 06:02:56 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 13:02:56 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9389 -
	/vtigercrm/trunk/config.template.php
Message-ID: <20060909130256.2C85376D815@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 07:02:47 2006
New Revision: 9389

Log:
Default theme set as bluelagoon --Jeri

Modified:
    vtigercrm/trunk/config.template.php

Modified: vtigercrm/trunk/config.template.php
==============================================================================
--- vtigercrm/trunk/config.template.php (original)
+++ vtigercrm/trunk/config.template.php Sat Sep  9 07:02:47 2006
@@ -143,7 +143,7 @@
 
 // set default theme
 // default_theme default value = blue
-$default_theme = 'blue';
+$default_theme = 'bluelagoon';
 
 // show or hide time to compose each page
 // calculate_response_time default value = true



From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 06:03:22 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 13:03:22 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9390 - in
	/vtigercrm/trunk/themes/bluelagoon: ./ images/
Message-ID: <20060909130322.6D57076C65B@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 06:52:02 2006
New Revision: 9390

Log:
blue lagoon added --Jeri

Added:
    vtigercrm/trunk/themes/bluelagoon/
    vtigercrm/trunk/themes/bluelagoon/footer.php
    vtigercrm/trunk/themes/bluelagoon/header.php
    vtigercrm/trunk/themes/bluelagoon/images/
    vtigercrm/trunk/themes/bluelagoon/images/3hdrTabBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/Accounts.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/Call.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/Calls.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/Contacts.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/HomeBtm.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/Home_15.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/Leads.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/Meeting.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/Meetings.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/Opportunities.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/Potentials.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/Quotes.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/Reports_arrow.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/RolesDelete.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/RolesEdit.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/RolesMove.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/Rolesadd.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/Settings.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/Tasks.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/Thumbs.db   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/Tickets.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/TopOpenQuotes.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/ViewTemplate.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/aboutUS.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/about_btm.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/aboutus.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/addrss.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/advancedSearchLens.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/announ.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/arrow.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/arrow_down.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/arrow_up.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/assign.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/attachment.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/audit.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/backupserver.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/basicSearchLens.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/bl_bar.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/black.png   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/blank.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/bookMark.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/bottom_left.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/bottom_right.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/btnAlexa.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/btnL3Add-Faded.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/btnL3Add.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/btnL3AllMenu-Faded.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/btnL3AllMenu.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/btnL3Calc-Faded.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/btnL3Calc.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/btnL3Calendar-Faded.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/btnL3Calendar.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/btnL3Clock-Faded.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/btnL3Clock.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/btnL3Search-Faded.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/btnL3Search.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/btnL3Tracker-Faded.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/btnL3Tracker.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/busy.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/cal12x12Shared.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/cal16x16Call.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/cal16x16CallAdd.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/cal16x16Linked.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/cal16x16Meeting.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/cal16x16MeetingAdd.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/cal16x16Shared.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/cal16x16ToDo.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/cal16x16ToDoAdd.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calAddButtonBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calBottomBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calBottomLeft.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calBottomRight.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calNavNext.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calNavPrev.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calSep.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calTopLeft.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calTopRight.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/cal_Hdr.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/cal_Others.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/cal_add.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/cal_add.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/cal_clock.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/cal_event.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/cal_hdr.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/cal_nav.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/cal_next_nav.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/cal_prev_nav.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/cal_sel.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/cal_sharing.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/cal_title.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calc_back_btn.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calc_black_btn.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calc_blue_btn.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calc_bottom_center.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calc_bottom_left.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calc_bottom_right.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calc_canc_btn.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calc_grey_btn.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calc_logo.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calc_mem_btn.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calc_middle_right.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calc_red_btn.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calc_res_bc.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calc_res_bl.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calc_res_br.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calc_res_ml.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calc_res_mr.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calc_res_tc.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calc_res_tl.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calc_res_tr.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calc_top_left.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calc_top_right.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calendar.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/cfcurrency.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/cfpicklist.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/check_mail.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/checkbox.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/clear_field.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/clock_bg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/close.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/collapse.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/company.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/compose.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/composeMail.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/currency.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/currencydelete.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/custom.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/dashBottomBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/dashSelectBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/dashTopBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/dash_btm.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/dash_btm_center.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/dash_btm_left.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/dash_btm_right.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/dash_down_arrow.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/dash_name.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/dash_screw.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/dash_screw.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/dash_scroll_up.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/dash_sel_btm.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/dash_sel_chart.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/dash_sel_left.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/dash_sel_top.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/dash_switch_view.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/dash_top.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/dash_top_shadow.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/dash_unsel_chart.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/date.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/dboardMatrixView.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/dboardNormalView.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/del.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/del_tag.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/delete.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/denied.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/disabled.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/editfield.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/email.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/empty.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/enabled.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/end.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/end_disabled.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/expand.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/free.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/hdrNameBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/hdrTabBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/head_end.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/head_start.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/help.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/help_icon.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/hometop.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/ico-groups.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/ico-profile.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/ico-roles.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/ico-users.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/inventory.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/jump.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/keyMetrics.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/layerPopupBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/left.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/left_arc.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/level2TabBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/loginBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/loginBottomBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/loginBottomURL.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/loginSIBottomLeft.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/loginSIBottomRight.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/loginSITopLeft.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/loginSITopRight.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/loginTopShade.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/logout.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/lvtNavBtnFirst.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/lvtNavBtnLast.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/lvtNavBtnNext.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/lvtNavBtnPrev.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/mailHdr.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/mailSubHeaderBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/mailTitle.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/mailmarge.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/menuDnArrow.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/menu_off_end.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/menu_off_start.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/menu_off_tile.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/menu_on_end.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/menu_on_start.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/menu_on_tile.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/menu_root.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/migrate.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/migration_sucess.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/minus.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/moduleSelectorBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/movecol_del.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/movecol_del_down.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/movecol_del_over.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/movecol_down.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/movecol_down_disabled.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/movecol_down_down.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/movecol_down_over.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/movecol_up.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/movecol_up_disabled.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/movecol_up_down.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/movecol_up_over.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/myGroupAllocation.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/myTickets.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/myTopAccounts.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/myTopInvoices.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/myTopOpenPotentials.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/myTopSalesOrders.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/myUpcoPendAct.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/next.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/nextRecord.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/next_disabled.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/no.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/notification.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/number.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/offstar.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/ogmailserver.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/one.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/onstar.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/orgshar.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/pendingEvents.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/pending_left.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/pending_right.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/percent.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/phone.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/picklist.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/picklistEditor.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/picklist_hint.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/plsWaitAnimated.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/plus.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/pointer.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/popupHdr.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/previous.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/previousRecord.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/previous_disabled.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/pricebook.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/primeTopBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/print.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/private.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/proxy.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/prvPrfBottomLeft.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/prvPrfBottomRight.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/prvPrfHdrArrow.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/prvPrfSelectedTick.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/prvPrfTopLeft.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/prvPrfTopRight.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/public.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/qcBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/qcName.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/reload.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/report_bg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/report_bottom.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/report_btn.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/report_newHdr.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/reportsCreate.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/reportsDelete.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/reportsFolderCreate.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/reportsMove.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/right.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/right_arc.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/rss.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/rssDisplayBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/rssDisplayBottom.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/rssDisplayBottomLeft.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/rssDisplayBottomRight.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/rssDisplayLeft.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/rssDisplayRight.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/rssDisplaySpeaker.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/rssDisplayTop.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/rssDisplayTopLeft.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/rssDisplayTopRight.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/rssHeader.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/rssOnHeader.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/rssdelete.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/rssforward.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/rssframeHdr.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/rssimage.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/rssroot.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/scroll_left.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/scroll_left_down.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/scroll_right.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/scroll_right_down.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/search.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/searchUIBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/searching.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/select.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/set-IcoLoginHistory.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/set-IcoTwoTabConfig.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/settingsActBtnDelete.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/settingsActBtnDuplicate.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/settingsActBtnEdit.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/settingsMTBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/settingsSelUIBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/settings_top.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/shareaccess.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/showDown.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/showPanelTopBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/showPanelTopLeft.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/showPanelTopRight.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/showsubmenu.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/site_hdr.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/site_sel.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/site_unsel.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/small_left.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/small_right.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/spacer.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/start.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/start_disabled.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/status.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/strikeline.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/summarize.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/system.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/tabRht.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/tabSelectedBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/tabSeperatorBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/tabUnSelectedBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/tabular.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/tagCloudBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/tagCloudName.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/tagcloud_03.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/taxConfiguration.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/tbarChat-Faded.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/tbarChat.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/tbarExport-Faded.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/tbarExport.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/tbarImport-Faded.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/tbarImport.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/tbarPrivateChat.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/tbarPublicChat.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/tbarSettings.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/tblPro1BtnHide.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/tblPro1ColBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/terms.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/text.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/titleMailClient.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/titleMySites.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/titleRSSReader.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/todaybg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/topBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/topBnr.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/top_left.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/top_right.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/topbar.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/topcut.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/up.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/uparrow.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/upcomingEvents.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/upcoming_left.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/upcoming_right.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/url.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/vtbusy.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/vtiger-crm.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/vtiger.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/vtigerDevDocs.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/webmail_downarrow.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/webmail_header.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/webmail_root.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/webmail_settings.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/webmail_trash.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/webmail_uparrow.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/yes.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/layout_utils.php
    vtigercrm/trunk/themes/bluelagoon/loginheader.html
    vtigercrm/trunk/themes/bluelagoon/loginheader.php
    vtigercrm/trunk/themes/bluelagoon/style.css



From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 06:05:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 13:05:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9391 -
	/vtigercrm/trunk/themes/alphagrey/style.css
Message-ID: <20060909130546.13BC176C8AD@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 07:05:37 2006
New Revision: 9391

Log:
Changes made by Radiant for alphagrey theme has been integrated--Jeri

Modified:
    vtigercrm/trunk/themes/alphagrey/style.css

Modified: vtigercrm/trunk/themes/alphagrey/style.css
==============================================================================
--- vtigercrm/trunk/themes/alphagrey/style.css (original)
+++ vtigercrm/trunk/themes/alphagrey/style.css Sat Sep  9 07:05:37 2006
@@ -348,7 +348,7 @@
 }
 
 .rightMailMerge {
-	border:2px solid #aae;
+	border:2px solid #aaa;
 }
 
 .rightMailMergeHeader {
@@ -376,10 +376,9 @@
 }
 
 .detailedViewHeader{
-	border-bottom:2px solid #4F94CD;
-	padding:5px; 
-	background-color:#afdbff;
-
+	border-bottom:2px solid #dadada;
+    	padding:5px;
+    	background-color:#aaaaaa;
 }
 
 .detailedViewTextBox {
@@ -2617,7 +2616,7 @@
 	    font-size: 11px;
 }
 .qcTransport{
-	    background-color:#d5d6ff;
+	    background-color:#dadada;
 
 }
 



From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 06:11:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 13:11:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9392 -
	/vtigercrm/trunk/themes/bluelagoon/style.css
Message-ID: <20060909131126.98B1176C519@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 07:11:19 2006
New Revision: 9392

Log:
Changes given by Radiant for blulagoon theme has been integrated --Jeri

Modified:
    vtigercrm/trunk/themes/bluelagoon/style.css

Modified: vtigercrm/trunk/themes/bluelagoon/style.css
==============================================================================
--- vtigercrm/trunk/themes/bluelagoon/style.css (original)
+++ vtigercrm/trunk/themes/bluelagoon/style.css Sat Sep  9 07:11:19 2006
@@ -224,9 +224,11 @@
 	border :0px #cccccc solid;
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 11px;
+	font-weight:bold;
 	width:30px;
 	height:19px;
-	background-color:#999;
+	background-color:#009;
+	color:white;
 }
 
 
@@ -3231,19 +3233,19 @@
 }
 
 .reportGenerateTable{
-	background-image:url(images/searchUIBg.gif);
-	border-left:2px dotted #a3a29a;
-	border-right:2px dotted #a3a29a;
-	border-bottom:2px dotted #a3a29a;
+	background-image:url(images/layerPopupBg.gif);
+	border-left:2px dotted #a5b5ee;
+	border-right:2px dotted #a5b5ee;
+	border-bottom:2px dotted #a5b5ee;
 }
 .reportCreateBottom{
-	background-color:#939271;
+	background-color:#ddf;
 	border-bottom:2px solid #737251;
 
 }
 .importLeadUI{
-	
-	background:#fffff5 url(images/layerPopupBg.gif) ;
+	/*background:#fffff5 url(images/select.gif) ; */
+	background-color:white;
 }
 
 a.customMnu{



From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 06:16:13 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 13:16:13 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9393 -
	/vtigercrm/trunk/themes/alphagrey/style.css
Message-ID: <20060909131613.7A58076C519@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 07:16:05 2006
New Revision: 9393

Log:
css for recalculate layer has been integrated --Jeri

Modified:
    vtigercrm/trunk/themes/alphagrey/style.css

Modified: vtigercrm/trunk/themes/alphagrey/style.css
==============================================================================
--- vtigercrm/trunk/themes/alphagrey/style.css (original)
+++ vtigercrm/trunk/themes/alphagrey/style.css Sat Sep  9 07:16:05 2006
@@ -3339,3 +3339,68 @@
 }
 
 
+
+/* Recalculate Disabling Window */
+
+.veil{
+   background: url(images/layerPopupBg.gif) ;
+    height: 100%;
+    width: 100%;
+    top: 0px;
+    left: 0px;
+    overflow: hidden;
+    z-index: 10000;
+    Filter: Alpha(opacity = 70);
+    -moz-opacity: 0.7;
+    text-align: center;
+    vertical-align: middle;
+    position: absolute;
+}
+
+.veil_new{
+   background: url(images/layerPopupBg.gif) ;
+    height: 100%;
+    width: 100%;
+    top: 0px;
+    left: 0px;
+    overflow: hidden;
+    z-index: 50000;
+    Filter: Alpha(opacity = 70);
+    -moz-opacity: 0.7;
+    text-align: center;
+    vertical-align: middle;
+    position: absolute;
+}
+
+.optioncontainer{
+    vertical-align: middle;   
+    height: 100%;
+    width: 100%;   
+    position: absolute;
+    z-index: 90000;   
+}
+
+
+.options{
+    	vertical-align: middle;   
+	margin-left: 25%;
+	margin-top: 16%;
+	color: #FFFFFF;
+	width:650px;
+	background-color: Black;
+	border: 2px solid #222;	
+    	position: relative;
+	text-align: left;
+    	z-index: 80000;   
+}
+
+.options h2{
+	color: White;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	border-bottom: 1px solid #373D4C;
+	margin: 0;
+	font-weight: normal;
+}
+
+/* Recalculate Disable Ends */
+



From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 09:09:33 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 16:09:33 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9394 -
 /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php
Message-ID: <20060909160933.E35C376D528@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 10:09:15 2006
New Revision: 9394

Log:
Migration script changed --Jeri

Modified:
    vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php

Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php
==============================================================================
--- vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php (original)
+++ vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php Sat Sep  9 10:09:15 2006
@@ -69,7 +69,6 @@
 		"alter table vtiger_def_org_field ADD PRIMARY KEY (fieldid)",
 		"alter table vtiger_leadgrouprelation ADD PRIMARY KEY (leadid)",
 		"alter table vtiger_leadgrouprelation drop key leadgrouprelation_IDX0",
-		"alter table vtiger_organizationdetails ADD PRIMARY KEY (organizationname)",
 		"alter table vtiger_profile2field ADD PRIMARY KEY (profileid,fieldid)",
 		"alter table vtiger_profile2standardpermissions ADD PRIMARY KEY (profileid,tabid,Operation)",
 		"alter table vtiger_profile2standardpermissions drop index idx_prof2stad",
@@ -754,6 +753,7 @@
 Execute($altersql1);
 $altersql2 = "alter table vtiger_vendor change column name vendorname varchar(100) default NULL";
 Execute($altersql2);
+Execute("update vtiger_field set fieldname='vendorname', columnname='vendorname' where tabid=18 and fieldname='name'");
 //TODO (check): Remove this company_name entry from the vtiger_field table if it already exists
 
 //Migration for Default Organisation Share -- Added by Don on 20-11-2005
@@ -989,7 +989,7 @@
 
 $insert_query_array4 = Array(
 				"insert into vtiger_parenttab values(1,'My Home Page',1,0),(2,'Marketing',2,0),(3,'Sales',3,0),(4,'Support',4,0),(5,'Analytics',5,0),(6,'Inventory',6,0), (7,'Tools',7,0),(8,'Settings',8,0)",
-				"insert into vtiger_parenttabrel values(1,9,2),(1,17,3),(1,10,4),(1,3,1),(3,7,1),(3,6,2),(3,4,3),(3,2,4),(3,20,5),(3,22,6),(3,23,7),(3,14,8),(3,19,9),(3,8,10),(4,13,1),(4,15,2),(4,6,3),(4,4,4),(4,14,5),(4,8,6),(5,1,1),(5,25,2),(6,14,1), (6,18,2), (6,19,3), (6,21,4), (6,22,5), (6,20,6), (6,23,7), (7,24,1), (7,27,2), (7,8,3), (2,26,1), (2,6,2), (2,4,3) "
+				"insert into vtiger_parenttabrel values(1,9,2),(1,17,3),(1,10,4),(1,3,1),(3,7,1),(3,6,2),(3,4,3),(3,2,4),(3,20,5),(3,22,6),(3,23,7),(3,14,8),(3,19,9),(3,8,10),(4,13,1),(4,15,2),(4,6,3),(4,4,4),(4,14,5),(4,8,6),(5,1,1),(5,25,2),(6,14,1), (6,18,2), (6,19,3), (6,21,4), (6,22,5), (6,20,6), (6,23,7), (7,24,1), (7,27,2), (7,8,3), (2,6,2), (2,4,3) "
 			    );
 foreach($insert_query_array4 as $query)
 {
@@ -1888,8 +1888,8 @@
 Execute($create_table_query1);
 
 $alter_query_array18 = Array(
-			"alter table vtiger_leaddetails add column campaignid int(19) default NULL after leadid",
-			"alter table vtiger_contactdetails add column  campaignid int(19) default NULL after accountid",
+			"alter table vtiger_potential add column campaignid int(19) default NULL after probability",
+			"alter table vtiger_potential drop column campaignsource",
 			//"alter table vtiger_notes drop PRIMARY KEY contact_id",
 			"alter table vtiger_notes drop PRIMARY KEY , add primary key(notesid)",
 			"update vtiger_field set uitype=99 where fieldname='update_log' and tabid=13"
@@ -1956,7 +1956,7 @@
 "ALTER TABLE `vtiger_durationhrs` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
 "ALTER TABLE `vtiger_durationmins` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
 "ALTER TABLE `vtiger_emailtemplates` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
-"ALTER TABLE `vtiger_emailtemplates_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
+//"ALTER TABLE `vtiger_emailtemplates_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
 "ALTER TABLE `vtiger_faqcategories` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
 "ALTER TABLE `vtiger_faqstatus` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
 "ALTER TABLE `vtiger_field_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
@@ -2368,7 +2368,7 @@
 "ALTER TABLE `vtiger_contactdetails` MODIFY COLUMN `imagename` VARCHAR(150) COLLATE latin1_swedish_ci DEFAULT NULL",
 "ALTER TABLE `vtiger_contactdetails` MODIFY COLUMN `reference` VARCHAR(3) COLLATE latin1_swedish_ci DEFAULT NULL",
 //"ALTER TABLE `vtiger_contactgrouprelation` MODIFY COLUMN `contactid` INTEGER(19) NOT NULL PRIMARY KEY",
-"ALTER TABLE `vtiger_convertleadmapping` MODIFY COLUMN `leadfid` INTEGER(19) NOT NULL",
+//"ALTER TABLE `vtiger_convertleadmapping` MODIFY COLUMN `leadfid` INTEGER(19) NOT NULL",
 //"ALTER TABLE `vtiger_crmentity` MODIFY COLUMN `crmid` INTEGER(19) NOT NULL PRIMARY KEY",
 "ALTER TABLE `vtiger_crmentity` MODIFY COLUMN `description` TEXT COLLATE latin1_swedish_ci",
 "ALTER TABLE `vtiger_crmentity` MODIFY COLUMN `createdtime` DATETIME NOT NULL",
@@ -2393,7 +2393,7 @@
 "ALTER TABLE `vtiger_defaultcv` MODIFY COLUMN `query` TEXT COLLATE latin1_swedish_ci",
 "ALTER TABLE `vtiger_emailtemplates` MODIFY COLUMN `description` TEXT COLLATE latin1_swedish_ci",
 "ALTER TABLE `vtiger_emailtemplates` MODIFY COLUMN `body` TEXT COLLATE latin1_swedish_ci",
-"ALTER TABLE `vtiger_emailtemplates_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL",
+//"ALTER TABLE `vtiger_emailtemplates_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL",
 "ALTER TABLE `vtiger_faq` MODIFY COLUMN `question` TEXT COLLATE latin1_swedish_ci",
 "ALTER TABLE `vtiger_faq` MODIFY COLUMN `answer` TEXT COLLATE latin1_swedish_ci",
 "ALTER TABLE `vtiger_faqcomments` MODIFY COLUMN `comments` TEXT COLLATE latin1_swedish_ci",
@@ -2724,8 +2724,8 @@
 
 
 $query_array2 = Array(
-				"INSERT INTO vtiger_parenttabrel VALUES(2,4,2)",
-				"INSERT INTO vtiger_parenttabrel VALUES(2,6,3)",
+				//"INSERT INTO vtiger_parenttabrel VALUES(2,4,2)",
+				//"INSERT INTO vtiger_parenttabrel VALUES(2,6,3)",
 				"update vtiger_cvcolumnlist set columnname ='vtiger_crmentity:smownerid:assigned_user_id:Emails_Sender:V' where cvid=20 and columnindex=3",
 				"update vtiger_field set sequence = 2 where columnname='filename' and tablename = 'vtiger_attachments'",
 				"delete from vtiger_cvcolumnlist where columnname = 'vtiger_seactivityrel:crmid:parent_id:Emails_Related_To:I'",
@@ -3146,10 +3146,6 @@
 Execute("insert into vtiger_relatedlists values(".$conn->getUniqueID('vtiger_relatedlists').",".getTabid("Leads").",".getTabid("Campaigns").",'get_campaigns',6,'Campaigns',0)");
 Execute("insert into vtiger_relatedlists values(".$conn->getUniqueID('vtiger_relatedlists').",".getTabid("Contacts").",".getTabid("Campaigns").",'get_campaigns',11,'Campaigns',0)");
 
-//campaignid removed from vtiger_leaddetails and vtiger_contactdetails tables
-Execute("alter table vtiger_leaddetails drop column campaignid");
-Execute("alter table vtiger_contactdetails drop column campaignid");
-
 //Contact Name has been removed from Events Information
 Execute("delete from vtiger_field where tabid=16 and fieldname='contact_id'");
 
@@ -3180,7 +3176,7 @@
 
 //type changed to support decimal places
 Execute("alter table vtiger_campaign change expectedrevenue expectedrevenue decimal(11,3)");
-Execute("alter table vtiger_campaign change budgetcost exbudgetcost decimal(11,3)");
+Execute("alter table vtiger_campaign change budgetcost budgetcost decimal(11,3)");
 Execute("alter table vtiger_campaign change actualcost actualcost decimal(11,3)");
 Execute("alter table vtiger_campaign change expectedroi expectedroi decimal(11,3)");
 Execute("alter table vtiger_campaign change actualroi actualroi decimal(11,3)");
@@ -3614,6 +3610,10 @@
 
 Execute("update vtiger_field set uitype = 16 where tabid=2 and uitype=111 and columnname='sales_stage'");
 
+Execute("update vtiger_field set quickcreate=1,quickcreatesequence=null where fieldname='duration_hours' and tabid=16");
+
+Execute("update vtiger_field set quickcreate=0,quickcreatesequence=5 where fieldname='due_date' and tabid=16");
+
 //we have to add id, sortorderid and presence in all existing custom field pick list tables.
 $cf_picklist_res = $conn->query("select fieldname from vtiger_field where uitype=15 and fieldname like 'cf_%'");
 $noofPicklists = $conn->num_rows($cf_picklist_res);
@@ -3628,7 +3628,34 @@
 	Execute($alterquery);
 }
 
+Execute("alter table vtiger_organizationdetails drop primary key");
 Execute("alter table vtiger_organizationdetails change column organizationame  organizationname varchar(60) NOT NULL");
+Execute("alter table vtiger_organizationdetails ADD PRIMARY KEY (organizationname)");
+
+//Activity related changes
+Execute('update vtiger_field set typeofdata="D~M~OTH~GE~date_start~Start Date & Time", uitype=23 where fieldname="due_date" and tabid=16');
+Execute('update vtiger_field set uitype=53 where tabid=16 and fieldname="assigned_user_id"');
+
+Execute('update vtiger_field set typeofdata="D~M~OTH~GE~date_start~Start Date & Time", uitype=23 where fieldname="due_date" and tabid=9');
+Execute('update vtiger_field set uitype=53 where tabid=9 and fieldname="assigned_user_id"');
+
+Execute("alter table vtiger_activity change column subject subject varchar(100) NOT NULL");
+Execute("alter table vtiger_activity change column activitytype activitytype varchar(50) NOT NULL");
+Execute("alter table vtiger_activity change column date_start date_start date NOT NULL");
+Execute("alter table vtiger_activity change column time_start time_start varchar(50) default NULL");
+Execute("alter table vtiger_activity change column visibility visibility varchar(50) NOT NULL default 'all'");
+
+Execute("delete from vtiger_field where tabid=14 and fieldname='currency'");
+Execute("insert into vtiger_field values(14, ".$conn->getUniqueID("vtiger_field").", 'imagename', 'vtiger_products', 1, 69, 'imagename', 'Product Image', 1, 0, 0, 100, 1, 35, 1, 'V~O', 1, NULL, 'ADV')");
+
+//Product related changes
+Execute('update vtiger_field set typeofdata="D~O~OTH~GE~sales_start_date~Sales Start Date" where tabid=14 and fieldname="sales_end_date"');
+Execute('update vtiger_field set typeofdata="D~O~OTH~GE~start_date~Start Date" where tabid=14 and fieldname="expiry_date"');
+
+//changes related to Incoming mail server settings
+Execute("alter table vtiger_mail_accounts drop column showbody");
+
+
 
 
 



From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 09:10:08 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 16:10:08 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9395 -
 /vtigercrm/trunk/modules/Products/language/en_us.lang.php
Message-ID: <20060909161008.B2B7176D528@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 10:09:51 2006
New Revision: 9395

Log:
language strings updated --Jeri

Modified:
    vtigercrm/trunk/modules/Products/language/en_us.lang.php

Modified: vtigercrm/trunk/modules/Products/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Products/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Products/language/en_us.lang.php Sat Sep  9 10:09:51 2006
@@ -117,7 +117,7 @@
 'Reorder Level'=>'Reorder Level',
 'Website'=>'Website',
 'Tax Class'=>'Tax Class',
-'Mfr PartNo'=>'Part No',
+'Mfr PartNo'=>'Mfr Part No',
 'Vendor PartNo'=>'Vendor Part No',
 'Serial No'=>'Serial No',
 'Qty In Stock'=>'Qty. in Stock',



From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 09:10:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 16:10:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9396 -
 /vtigercrm/trunk/modules/Settings/SaveMailAccount.php
Message-ID: <20060909161057.B9C6176D528@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 10:10:40 2006
New Revision: 9396

Log:
in savemail account columnname are give in the insert query --Jeri

Modified:
    vtigercrm/trunk/modules/Settings/SaveMailAccount.php

Modified: vtigercrm/trunk/modules/Settings/SaveMailAccount.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/SaveMailAccount.php (original)
+++ vtigercrm/trunk/modules/Settings/SaveMailAccount.php Sat Sep  9 10:10:40 2006
@@ -38,7 +38,7 @@
 else
 {
 	$account_id = $adb->getUniqueID("vtiger_mail_accounts");
-	$sql="insert into vtiger_mail_accounts values(" .$account_id .",'".$current_user->id."','".$displayname."','".$email."','".$account_name."','".$mailprotocol."','".$server_username."','".$server_password."','".$mail_servername."','".$box_refresh."','".$mails_per_page."', '".$ssltype."', '".$sslmeth."', '".$_REQUEST["int_mailer"]."','1','0')";
+	$sql="insert into vtiger_mail_accounts(account_id, user_id, display_name, mail_id, account_name, mail_protocol, mail_username, mail_password, mail_servername, box_refresh, mails_per_page, ssltype, sslmeth, int_mailer, status, set_default) values(" .$account_id .",'".$current_user->id."','".$displayname."','".$email."','".$account_name."','".$mailprotocol."','".$server_username."','".$server_password."','".$mail_servername."','".$box_refresh."','".$mails_per_page."', '".$ssltype."', '".$sslmeth."', '".$_REQUEST["int_mailer"]."','1','0')";
 }
 
 $adb->query($sql);



From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 11:47:04 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 18:47:04 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9397 -
	/vtigercrm/trunk/cron/intimateTaskStatus.php
Message-ID: <20060909184704.562E676D567@vtiger.fosslabs.com>

Author: mmbrich
Date: Sat Sep  9 12:47:03 2006
New Revision: 9397

Log:
changed this whole file to use ADODB instead of MySQL.  Also added some query change to give better ticket status results, prior to this is was returning false positives.

Modified:
    vtigercrm/trunk/cron/intimateTaskStatus.php

Modified: vtigercrm/trunk/cron/intimateTaskStatus.php
==============================================================================
--- vtigercrm/trunk/cron/intimateTaskStatus.php (original)
+++ vtigercrm/trunk/cron/intimateTaskStatus.php Sat Sep  9 12:47:03 2006
@@ -1,46 +1,39 @@
 <?
+ini_set("include_path", "../:.");
+
 require('send_mail.php');
-require_once('../config.php');
+require_once('config.php');
+require_once('include/utils/utils.php');
 
-$dbhost = $dbconfig['db_hostname'];
-$dbuser =$dbconfig['db_username']; 
-$dbpass = $dbconfig['db_password'];
-$db = mysql_connect($dbhost, $dbuser, $dbpass) or die ('Error connecting to mysql');
-if (!$db) {
-  die('Could not connect: ' . mysql_error());
-}
-else
-{
-  echo 'Successfully connected to database '.$dbconfig['db_name'];
-}
-$selecteddb = $dbconfig['db_name'];
-mysql_select_db($selecteddb,$db);
-
-$emailresult = mysql_query("SELECT email1 from vtiger_users",$db);
-$emailid = mysql_fetch_row($emailresult);
+// Email Setup
+$emailresult = $adb->query("SELECT email1 from vtiger_users");
+$emailid = $adb->fetch_array($emailresult);
 $emailaddress = $emailid[0];
-$mailserveresult = mysql_query("SELECT server,server_username,server_password FROM vtiger_systems",$db);
-$mailrow = mysql_fetch_row($mailserveresult);
+$mailserveresult = $adb->query("SELECT server,server_username,server_password FROM vtiger_systems");
+$mailrow = $adb->fetch_array($mailserveresult);
 $mailserver = $mailrow[0];
 
 $mailuname = $mailrow[1];
 $mailpwd = $mailrow[1];
+// End Email Setup
+
 
 //query the vtiger_notificationscheduler vtiger_table and get data for those notifications which are active
+$sql = "select active from vtiger_notificationscheduler where schedulednotificationid=1";
+$result = $adb->query($sql);
 
+$activevalue = $adb->fetch_array($result);
 
-$sql = "select active from vtiger_notificationscheduler where schedulednotificationid=1";
-$result = mysql_query($sql);
-
-$activevalue = mysql_fetch_row($result);
 if($activevalue[0] == 1)
 {
 //Delayed Tasks Notification
 
 //get all those activities where the status is not completed even after the passing of 24 hours
 $today = date("Ymd"); 
-$result = mysql_query("select (vtiger_activity.date_start +1) from vtiger_activity where vtiger_activity.status !='Completed' and ".$today." > (vtiger_activity.date_start+1)",$db);
-while ($myrow = mysql_fetch_row($result))
+$result = $adb->query("select (vtiger_activity.date_start +1) from vtiger_activity where vtiger_activity.status <> 'Completed' and ".$today." > (vtiger_activity.date_start+1)",$db);
+
+" > (vtiger_activity.date_start+1)";
+while ($myrow = $adb->fetch_array($result))
 {
   $status=$myrow[0];
   if($status != 'Completed')
@@ -52,13 +45,13 @@
 
 //Big Deal Alert
 $sql = "select active from vtiger_notificationscheduler where schedulednotificationid=2";
-$result = mysql_query($sql);
+$result = $adb->query($sql);
 
-$activevalue = mysql_fetch_row($result);
+$activevalue = $adb->fetch_array($result);
 if($activevalue[0] == 1)
 {
-$result = mysql_query("SELECT sales_stage,amount FROM vtiger_potential",$db);
-while ($myrow = mysql_fetch_row($result))
+$result = $adb->query("SELECT sales_stage,amount FROM vtiger_potential",$db);
+while ($myrow = $adb->fetch_array($result))
 {
   $amount=$myrow[1];
   $stage = $myrow[0];
@@ -73,19 +66,19 @@
 
 //Pending tickets
 $sql = "select active from vtiger_notificationscheduler where schedulednotificationid=3";
-$result = mysql_query($sql);
+$result = $adb->query($sql);
 
-$activevalue = mysql_fetch_row($result);
+$activevalue = $adb->fetch_array($result);
 if($activevalue[0] == 1)
 {
-$result = mysql_query("SELECT status,ticketid FROM vtiger_troubletickets",$db);
-while ($myrow = mysql_fetch_row($result))
+$result = $adb->query("SELECT vtiger_troubletickets.status,ticketid FROM vtiger_troubletickets INNER JOIN vtiger_crmentity ON vtiger_crmentity.crmid=vtiger_troubletickets.ticketid WHERE vtiger_crmentity.deleted='0' AND vtiger_troubletickets.status <> 'Completed' AND vtiger_troubletickets.status <> 'Closed' ",$db);
+
+while ($myrow = $adb->fetch_array($result))
 {
   $status=$myrow[0];
   $ticketid = $myrow[1];
-  if($status != 'Completed')
+  if($status != "Completed" || $status != "Closed")
   {
-
     sendmail($emailaddress,$emailaddress,"Pending Ticket notification","Dear Admin,<br> This is to bring to your kind attention that ticket number ".$ticketid ." is yet to be closed<br> Thank You,<br> HelpDesk Team<br>",$mailserver,$mailuname,$mailpwd,"");	
   }
 }
@@ -95,14 +88,14 @@
 
 //Too many tickets related to a particular vtiger_account/company causing concern
 $sql = "select active from vtiger_notificationscheduler where schedulednotificationid=4";
-$result = mysql_query($sql);
+$result = $adb->query($sql);
 
-$activevalue = mysql_fetch_row($result);
+$activevalue = $adb->fetch_array($result);
 if($activevalue[0] == 1)
 {
 
-$result = mysql_query("SELECT status,vtiger_troubletickets.ticketid FROM vtiger_troubletickets where status!='Completed'",$db);
-while ($myrow = mysql_fetch_row($result))
+$result = $adb->query("SELECT status,vtiger_troubletickets.ticketid FROM vtiger_troubletickets where status <> 'Completed' AND status <> 'Closed'",$db);
+while ($myrow = $adb->fetch_array($result))
 {
   $status=$myrow[0];
   $ticketid = $myrow[1];
@@ -113,13 +106,13 @@
 
 //Support Starting
 $sql = "select active from vtiger_notificationscheduler where schedulednotificationid=5";
-$result = mysql_query($sql);
+$result = $adb->query($sql);
 
-$activevalue = mysql_fetch_row($result);
+$activevalue = $adb->fetch_array($result);
 if($activevalue[0] == 1)
 {
-$result = mysql_query("SELECT productname FROM vtiger_products where start_date like '".date('Y-m-d')."%'",$db);
-while ($myrow = mysql_fetch_row($result))
+$result = $adb->query("SELECT productname FROM vtiger_products where start_date like '".date('Y-m-d')."%'",$db);
+while ($myrow = $adb->fetch_array($result))
 {
   $productname=$myrow[0];
   sendmail($emailaddress,$emailaddress,"Support starting","Hello! Support Starts for ".$productname ."\n Congratulations! Your support starts from today",$mailserver,$mailuname,$mailpwd,"");	
@@ -129,20 +122,18 @@
 
 //Support ending
 $sql = "select active from vtiger_notificationscheduler where schedulednotificationid=6";
-$result = mysql_query($sql);
+$result = $adb->query($sql);
 
-$activevalue = mysql_fetch_row($result);
+$activevalue = $adb->fetch_array($result);
 if($activevalue[0] == 1)
 {
 
-$result = mysql_query("SELECT productname from vtiger_products where expiry_date like '".date('Y-m-d')."%'",$db);
-while ($myrow = mysql_fetch_row($result))
+$result = $adb->query("SELECT productname from vtiger_products where expiry_date like '".date('Y-m-d')."%'",$db);
+while ($myrow = $adb->fetch_array($result))
 {
   $productname=$myrow[0];
   sendmail($emailaddress,$emailaddress,"Support Ending","Dear Admin,<br> This is to inform you that the support for ".$productname ."\n ends shortly. Kindly renew your support please<br>Regards,<br>HelpDesk Team<br>",$mailserver,$mailuname,$mailpwd,"");	
 }
 
 }
-
-
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Sun Sep 10 12:36:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sun, 10 Sep 2006 19:36:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9398 - in /vtigercrm/trunk:
 Smarty/templates/Webmails.tpl modules/Webmails/DetailView.php
Message-ID: <20060910193645.B19B176D61C@vtiger.fosslabs.com>

Author: mmbrich
Date: Sun Sep 10 13:36:44 2006
New Revision: 9398

Log:
fixed typo in URL and added a hack to DetailView to work around 2139 Fixes #2139

Modified:
    vtigercrm/trunk/Smarty/templates/Webmails.tpl
    vtigercrm/trunk/modules/Webmails/DetailView.php

Modified: vtigercrm/trunk/Smarty/templates/Webmails.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Webmails.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Webmails.tpl Sun Sep 10 13:36:44 2006
@@ -208,7 +208,7 @@
                         url = 'index.php?module=Webmails&action=dlAttachments&mailid='+id+'&mailbox={$MAILBOX}';
                         break;
                 case 'full_view':
-                        url = 'index.php?module=Webmails&action=DetailView&&record='+id+'&mailid='+id+'&mailbox={$MAILBOX}';
+                        url = 'index.php?module=Webmails&action=DetailView&record='+id+'&mailid='+id+'&mailbox={$MAILBOX}';
                         break;
                 {rdelim}
         openPopUp('xComposeEmail',this,url,'createemailWin',830,662,'menubar=no,toolbar=no,location=no,status=no,resizable=yes,scrollbars=yes');

Modified: vtigercrm/trunk/modules/Webmails/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Webmails/DetailView.php (original)
+++ vtigercrm/trunk/modules/Webmails/DetailView.php Sun Sep 10 13:36:44 2006
@@ -22,7 +22,7 @@
 $MailBox = new MailBox($mailbox);
 
 $webmail = new Webmail($MailBox->mbox,$mailid);
-$elist = $MailBox->mailList["overview"][$mailid];
+$elist = $MailBox->mailList["overview"][($mailid-1)];
 
 echo '<table width="100%" cellpadding="0" cellspacing="0" border="0" class="previewWindow"><tr>';
 



From vtigercrm-commits at vtiger.fosslabs.com  Sun Sep 10 12:42:18 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sun, 10 Sep 2006 19:42:18 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9399 -
	/vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl
Message-ID: <20060910194218.CBB4576D56F@vtiger.fosslabs.com>

Author: mmbrich
Date: Sun Sep 10 13:42:17 2006
New Revision: 9399

Log:
removed POP AGAIN.. if you re-enable it, be prepared to support it on your own

Modified:
    vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl

Modified: vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl Sun Sep 10 13:42:17 2006
@@ -93,8 +93,8 @@
        <tr>
            <td class="dvtCellLabel" align="right">{$MOD.LBL_MAIL_PROTOCOL}</td>
            <td class="dvtCellInfo">
-		<input type="radio" name="mailprotocol" value="pop3" {$POP3}/>&nbsp;{$MOD.LBL_POP} <font color="red">* *</font>&nbsp;
-		<input type="radio" name="mailprotocol" value="imap" {$IMAP}/>&nbsp;{$MOD.LBL_IMAP} <font color="red">* *</font>&nbsp;
+		<!-- <input type="radio" name="mailprotocol" value="pop3" {$POP3}/>&nbsp;{$MOD.LBL_POP} <font color="red">* *</font>&nbsp;
+		<input type="radio" name="mailprotocol" value="imap" {$IMAP}/>&nbsp;{$MOD.LBL_IMAP} <font color="red">* *</font>&nbsp; -->
 		<input type="radio" name="mailprotocol" value="imap2" {$IMAP2}/>&nbsp;{$MOD.LBL_IMAP2}
 		<input type="radio" name="mailprotocol" value="IMAP4" {$IMAP4}/>&nbsp;{$MOD.LBL_IMAP4}
 	   </td>	



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 00:01:14 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 07:01:14 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9400 -
	/vtigercrm/trunk/modules/Calendar/addEventUI.php
Message-ID: <20060911070114.CCB0B76D61A@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Mon Sep 11 01:00:54 2006
New Revision: 9400

Log:
UI Changes given by Saint has been integrated --Jeri

Modified:
    vtigercrm/trunk/modules/Calendar/addEventUI.php

Modified: vtigercrm/trunk/modules/Calendar/addEventUI.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/addEventUI.php (original)
+++ vtigercrm/trunk/modules/Calendar/addEventUI.php Mon Sep 11 01:00:54 2006
@@ -710,9 +710,9 @@
 				<table border=0 cellspacing=0 cellpadding=3 width=100%>
 					<tr>
 						<td class="dvtTabCache" style="width:10px" nowrap>&nbsp;</td>
-						<td id="cellTabInvite" class="dvtSelectedCell" align=center nowrap><a href="#" onClick="switchClass('cellTabInvite','on');switchClass('cellTabRelatedto','off');gshow('addTaskAlarmUI','todo',document.createTodo.task_date_start.value,'',document.createTodo.starthr.value,document.createTodo.startmin.value,document.createTodo.startfmt.value,'','','',document.createTodo.viewOption.value,document.createTodo.subtab.value);ghide('addTaskRelatedtoUI');"><?php echo $mod_strings['LBL_NOTIFICATION']?></a></td>
+						<td id="cellTabNotification" class="dvtSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabNotification','on');switchClass('cellTabtodoRelatedto','off');gshow('addTaskAlarmUI','todo',document.createTodo.task_date_start.value,'',document.createTodo.starthr.value,document.createTodo.startmin.value,document.createTodo.startfmt.value,'','','',document.createTodo.viewOption.value,document.createTodo.subtab.value);ghide('addTaskRelatedtoUI');"><?php echo $mod_strings['LBL_NOTIFICATION']?></a></td>
 						<td class="dvtTabCache" style="width: 10px;" nowrap="nowrap">
-						<td id="cellTabRelatedto" class="dvtUnSelectedCell" align=center nowrap><a href="#" onClick="switchClass('cellTabRelatedto','on'); switchClass('cellTabInvite','off');gshow('addTaskRelatedtoUI','todo',document.createTodo.task_date_start.value,'',document.createTodo.starthr.value,document.createTodo.startmin.value,document.createTodo.startfmt.value,'','','',document.createTodo.viewOption.value,document.createTodo.subtab.value);ghide('addTaskAlarmUI');"><?php echo $mod_strings['LBL_RELATEDTO']?></a></td>					
+						<td id="cellTabtodoRelatedto" class="dvtUnSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabtodoRelatedto','on'); switchClass('cellTabNotification','off');gshow('addTaskRelatedtoUI','todo',document.createTodo.task_date_start.value,'',document.createTodo.starthr.value,document.createTodo.startmin.value,document.createTodo.startfmt.value,'','','',document.createTodo.viewOption.value,document.createTodo.subtab.value);ghide('addTaskAlarmUI');"><?php echo $mod_strings['LBL_RELATEDTO']?></a></td>					
 						<td class="dvtTabCache" style="width: 100%;">&nbsp;</td>
 					</tr>
 				</table>



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 00:01:47 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 07:01:47 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9401 - in
 /vtigercrm/trunk/Smarty/templates: ActivityDetailView.tpl
 ActivityEditView.tpl
Message-ID: <20060911070147.4496876D61A@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Mon Sep 11 01:01:11 2006
New Revision: 9401

Log:
UI Changes given by Saint has been integrated --Minnie

Modified:
    vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl
    vtigercrm/trunk/Smarty/templates/ActivityEditView.tpl

Modified: vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl Mon Sep 11 01:01:11 2006
@@ -1,485 +1,465 @@
-{*<!--
-
-/*********************************************************************************
-** 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.
-*
- ********************************************************************************/
-
--->*}
-<script type="text/javascript" src="modules/{$MODULE}/Activity.js"></script>
-<script type="text/javascript" src="include/js/reflection.js"></script>
-<script src="include/scriptaculous/prototype.js" type="text/javascript"></script>
-<script src="include/scriptaculous/scriptaculous.js" type="text/javascript"></script>
-<script language="JavaScript" type="text/javascript" src="include/js/dtlviewajax.js"></script>
-<span id="crmspanid" style="display:none;position:absolute;"  onmouseover="show('crmspanid');">
-   <a class="link"  align="right" href="javascript:;">{$APP.LBL_EDIT_BUTTON}</a>
-</span>
-
-<script>
-function tagvalidate()
-{ldelim}
-	if(document.getElementById('txtbox_tagfields').value != '')
-		SaveTag('txtbox_tagfields','{$ID}','{$MODULE}');	
-	else
-	{ldelim}
-		alert("Please enter a tag");
-		return false;
-	{rdelim}
-{rdelim}
-function DeleteTag(id)
-{ldelim}
-	$("vtbusy_info").style.display="inline";
-	Effect.Fade('tag_'+id);
-	new Ajax.Request(
-		'index.php',
-                {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
-                        method: 'post',
-                        postBody: "file=TagCloud&module={$MODULE}&action={$MODULE}Ajax&ajxaction=DELETETAG&tagid=" +id,
-                        onComplete: function(response) {ldelim}
-						getTagCloud();
-						$("vtbusy_info").style.display="none";
-                        {rdelim}
-                {rdelim}
-        );
-{rdelim}
-</script>
-<table width="100%" cellpadding="2" cellspacing="0" border="0">
-<form action="index.php" method="post" name="DetailView" id="form">
-<tr><td>&nbsp;</td>
-	<td>
-                <table cellpadding="0" cellspacing="5" border="0">
-			{include file='DetailViewHidden.tpl'}
-		</table>	
-
-<!-- Contents -->
-<table  border="0" cellpadding="5" cellspacing="0" width="100%" style="border:1px solid #cccccc">
-<tr>
-	<td class="lvtHeaderText" style="border-bottom:1px dotted #cccccc">
-	
-		<table align="center" border="0" cellpadding="0" cellspacing="0" width="95%">
-			<tr><td>		
-				 <span class="lvtHeaderText"><font color="purple">[ {$ID} ] </font>{$NAME} -  {$SINGLE_MOD} {$APP.LBL_INFORMATION}</span>&nbsp;&nbsp;<span id="vtbusy_info" style="display:none;" valign="bottom"><img src="{$IMAGE_PATH}vtbusy.gif" border="0"></span><span id="vtbusy_info" style="visibility:hidden;" valign="bottom"><img src="{$IMAGE_PATH}vtbusy.gif" border="0"></span></td><td>&nbsp;
-			</td></tr>
-			 <tr height=20><td>{$UPDATEINFO}</td></tr>
-		 </table>
-	</td>
-</tr>
-<tr><td>
-<table border="0" cellpadding="5" cellspacing="0" width="100%">
-	<tr>
-		<td valign=top align=left >
-                           <table border=0 cellspacing=0 cellpadding=3 width=100%>
-				<tr>
-					<td align=left>
-					<!-- content cache -->
-					
-					<table border=0 cellspacing=0 cellpadding=0 width=100%>
-			                  <tr>
-					     <td style="padding:10px">
-						     <!-- General details -->
-				                     <table border=0 cellspacing=0 cellpadding=0 width=100%>
-						     <tr nowrap>
-							<td  colspan=4 style="padding:5px">
-								{if $EDIT_DUPLICATE eq 'permitted'}
-                                                                <input title="{$APP.LBL_EDIT_BUTTON_TITLE}" accessKey="{$APP.LBL_EDIT_BUTTON_KEY}" class="crmbutton small edit" onclick="this.form.return_module.value='{$MODULE}'; this.form.return_action.value='DetailView'; this.form.return_id.value='{$ID}';this.form.module.value='{$MODULE}';this.form.action.value='EditView'" type="submit" name="Edit" value="&nbsp;{$APP.LBL_EDIT_BUTTON_LABEL}&nbsp;">&nbsp;
-                                                                <input title="{$APP.LBL_DUPLICATE_BUTTON_TITLE}" accessKey="{$APP.LBL_DUPLICATE_BUTTON_KEY}" class="crmbutton small create" onclick="this.form.return_module.value='{$MODULE}'; this.form.return_action.value='DetailView'; this.form.isDuplicate.value='true';this.form.module.value='{$MODULE}'; this.form.action.value='EditView'" type="submit" name="Duplicate" value="{$APP.LBL_DUPLICATE_BUTTON_LABEL}">&nbsp;
-                                                                {/if}
-								{if $DELETE eq 'permitted'}
-                                                                <input title="{$APP.LBL_DELETE_BUTTON_TITLE}" accessKey="{$APP.LBL_DELETE_BUTTON_KEY}" class="crmbutton small delete" onclick="this.form.return_module.value='{$MODULE}'; {if $VIEWTYPE eq 'calendar'} this.form.return_action.value='index'; {else} this.form.return_action.value='ListView'; {/if}  this.form.action.value='Delete'; return confirm('{$APP.NTC_DELETE_CONFIRMATION}')" type="submit" name="Delete" value="{$APP.LBL_DELETE_BUTTON_LABEL}">&nbsp;
-                                                                {/if}
-
-							</td>
-						     </tr>
-						     </table>
-						     {foreach key=header item=detail from=$BLOCKS}
-						     <table border=0 cellspacing=0 cellpadding=0 width=100% class="small">
-						     	<tr>{strip}
-						     		<td colspan=4 style="border-bottom:1px solid #999999;padding:5px;" bgcolor="#e5e5e5">
-									<b>{$header}</b>
-								</td>{/strip}
-					             	</tr>
-						     </table>
-						     {/foreach}
-						     {if $ACTIVITYDATA.activitytype neq 'Task'}	
-						     <table border=0 cellspacing=0 cellpadding=5 width=100% >
-               						 <tr>
-					                        <td width="20%" align="right"><b>{$MOD.LBL_EVENTTYPE}</b></td>
-								<td width="30%"align="left">{$ACTIVITYDATA.activitytype}</td>
-								<td width="20%" align="right">&nbsp;</td>
-								<td width="30%" align="left">&nbsp;</td>
-							 </tr>
-							 <tr>
-                        					<td width="20%" align="right"><b>{$MOD.LBL_EVENTNAME}</b></td>
-					                        <td width="30%" align="left" >{$ACTIVITYDATA.subject}</td>
-								<td width="20%" align="right"><b>{$LABEL.visibility}</b></td>
-                                                                <td width="30%" align="left" >{$ACTIVITYDATA.visibility}</td>
-             						 </tr>
-							 <tr>
-								<td align="right" width="20%" nowrap valign="top"><b>{$LABEL.description}</b></td>
-								<td valign="top" align="left" colspan="3" height="60px">{$ACTIVITYDATA.description}</td>
-							 </tr>
-							 <tr>
-                                                                <td width="20%" align="right"><b>{$LABEL.location}</b></td>
-                                                                <td valign="top" align="left" colspan="3">{$ACTIVITYDATA.location}</td>
-                                                         </tr>
-							 <tr>
-								<td colspan=2 width=80% align="center">
-								<table border=0 cellspacing=0 cellpadding=3 width=80%>
-									<tr>
-										<td ><b>{$LABEL.eventstatus}</b></td>
-										<td ><b>{$LABEL.assigned_user_id}</b></td>
-									</tr>
-									<tr>
-										<td>{$ACTIVITYDATA.eventstatus}</td>
-										<td>{$ACTIVITYDATA.assigned_user_id}</td>
-									</tr>
-									<tr>
-										<td ><b>{$LABEL.taskpriority}</b></td>
-										<td ><b>{$LABEL.sendnotification}</b></td>
-									</tr>
-									<tr>
-										<td >{$ACTIVITYDATA.taskpriority}</td>
-										<td >{$ACTIVITYDATA.sendnotification}</td>
-									</tr>
-								</table>
-								</td>
-							</tr>
-                                                        <tr>
-                                                                <td width="20%" align="right"><b>{$LABEL.createdtime}</b></td>
-                                                                <td width="30%" align="left">{$ACTIVITYDATA.createdtime}</td>
-                                                                <td width="20%" align="right"><b>{$LABEL.modifiedtime}</b></td>
-                                                                <td width="30%" align="left">{$ACTIVITYDATA.modifiedtime}</td>
-                                                        </tr>
-                                                     </table>
-						     <hr noshade size=1>
-						     <table border=0 cellspacing=0 cellpadding=5 width=90% align=center bgcolor="#FFFFFF">
-							<tr>
-								<td >
-									<table border=0 cellspacing=0 cellpadding=2 width=100%>
-									<tr><td width=50% valign=top style="border-right:1p
-x solid #dddddd">
-										 <table border=0 cellspacing=0 cellpadding=2 width=90%>
-											<tr><td><b>{$MOD.LBL_EVENTSTAT}</b></td></tr>
-											<tr><td>{$ACTIVITYDATA.starthr}:{$ACTIVITYDATA.startmin}{$ACTIVITYDATA.startfmt}</td></tr>
-											<tr><td>{$ACTIVITYDATA.date_start}</td></tr>
-										</table></td>
-									<td width=50% valign=top >
-										<table border=0 cellspacing=0 cellpadding=2 width=90%>
-											<tr><td><b>{$MOD.LBL_EVENTEDAT}</b></td></tr>
-											<tr><td>{$ACTIVITYDATA.endhr}:{$ACTIVITYDATA.endmin}{$ACTIVITYDATA.endfmt}</td></tr>
-											<tr><td>{$ACTIVITYDATA.due_date}</td></tr>
-										</table>
-									</td></tr>
-									</table>
-								</td>
-							</tr>
-						     </table>
-						     <br>
-					             <table border=0 cellspacing=0 cellpadding=0 width=100% align=center>
-                					 <tr>
-                        					<td>
-                         				        	<table border=0 cellspacing=0 cellpadding=3 width=100%>
-                             						<tr>
-                                        					<td class="dvtTabCache" style="width:10px" nowrap>&nbsp;</td>
-					                                        <td id="cellTabInvite" class="dvtSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabInvite','on');switchClass('cellTabAlarm','off');switchClass('cellTabRepeat','off');switchClass('cellTabRelatedto','off');ghide('addEventAlarmUI');dispLayer('addEventInviteUI');ghide('addEventRepeatUI');ghide('addEventRelatedtoUI');">{$MOD.LBL_INVITE}</a></td>
-										<td class="dvtTabCache" style="width:10px">&nbsp;</td>
-										<td id="cellTabAlarm" class="dvtUnSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabInvite','off');switchClass('cellTabAlarm','on');switchClass('cellTabRepeat','off');switchClass('cellTabRelatedto','off');dispLayer('addEventAlarmUI');ghide('addEventInviteUI');ghide('addEventRepeatUI');ghide('addEventRelatedtoUI');">{$MOD.LBL_REMINDER}</a></td>
-										<td class="dvtTabCache" style="width:10px">&nbsp;</td>
-										<td id="cellTabRepeat" class="dvtUnSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabInvite','off');switchClass('cellTabAlarm','off');switchClass('cellTabRepeat','on');switchClass('cellTabRelatedto','off');ghide('addEventAlarmUI');ghide('addEventInviteUI');dispLayer('addEventRepeatUI');ghide('addEventRelatedtoUI');">{$MOD.LBL_REPEAT}</a></td>
-										<td class="dvtTabCache" style="width:10px">&nbsp;</td>
-										<td id="cellTabRelatedto" class="dvtUnSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabInvite','off');switchClass('cellTabAlarm','off');switchClass('cellTabRepeat','off');switchClass('cellTabRelatedto','on');ghide('addEventAlarmUI');ghide('addEventInviteUI');dispLayer('addEventRelatedtoUI');ghide('addEventRepeatUI');">{$MOD.LBL_LIST_RELATED_TO}</a></td>
-										<td class="dvtTabCache" style="width:100%">&nbsp;</td>
-									</tr>
-									</table>
-								</td>
-							 </tr>
-							
-							 <tr>
-								<td width=100% valign=top align=left class="dvtContentSpace" style="padding:10px;height:120px">
-									<!-- Invite UI -->
-									<DIV id="addEventInviteUI" style="display:block;width:100%">
-									<table width="100%" cellpadding="5" cellspacing="0" border="0">
-										<tr>
-                                                                                        <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>
-                                                                                                {/foreach}
-											</td>
-                                                                                </tr>
-									</table>
-									</DIV>
-									<!-- Reminder UI -->
-					                                <DIV id="addEventAlarmUI" style="display:none;width:100%">
-									<table width="100%" cellpadding="5" cellspacing="0" border="0">
-                                                                                <tr>
-                                                                                        <td width="30%" align=right><b>{$MOD.LBL_SENDREMINDER}</b></td>
-                                                                                        <td width="70%" align=left>{$ACTIVITYDATA.set_reminder}</td>
-                                                                                </tr>
-										{if $ACTIVITYDATA.set_reminder != 'No'}
-										<tr>
-                                                                                        <td width="30%" align=right><b>{$MOD.LBL_RMD_ON}</b></td>
-											<td width="70%" align=left>{$ACTIVITYDATA.reminder_str}</td>
-										</tr>
-										{/if}
-                                                                        </table>
-									</DIV>
-									<!-- Repeat UI -->
-                                					<div id="addEventRepeatUI" style="display:none;width:100%">
-									<table width="100%" cellpadding="5" cellspacing="0" border="0">
-										<tr>
-                                                                                        <td width="30%" align=right><b>{$MOD.LBL_ENABLE_REPEAT}</b></td>
-                                                                                        <td width="70%" align=left>{$ACTIVITYDATA.recurringcheck}</td>
-                                                                                </tr>
-										{if $ACTIVITYDATA.recurringcheck != 'No'}
-										<tr>
-											<td width="30%" align=right>&nbsp;</td>
-											<td>{$MOD.LBL_REPEATEVENT}&nbsp;{$ACTIVITYDATA.repeat_frequency}&nbsp;{$MOD[$ACTIVITYDATA.recurringtype]}</td>
-										</tr>
-										<tr>
-                                                                                        <td width="30%" align=right>&nbsp;</td>
-                                                                                        <td>{$ACTIVITYDATA.repeat_str}</td>
-                                                                                </tr>
-										{/if}
-									</table>
-									</div>
-									<!-- Relatedto UI -->
-									<div id="addEventRelatedtoUI" style="display:none;width:100%">
-									<table width="100%" cellpadding="5" cellspacing="0" border="0">
-										<tr>
-											<td width="30%" align=right valign="top"><b>{$LABEL.parent_id}</b></td>
-											<td width="70%" align=left valign="top">{$ACTIVITYDATA.parent_name}</td>
-										</tr>
-										<tr>
-											<td width="30%" valign="top" align=right><b>{$MOD.LBL_CONTACT_NAME}</b></td>	
-											<td width="70%" valign="top" align=left>
-											{foreach item=contactname key=cntid from=$CONTACTS}
-	                                                                                {$contactname.0}&nbsp;{$contactname.1}<br>
-                                                                                        {/foreach}
-										</tr>
-									</table>
-									</div>
-								</td>
-                					 </tr>
-						     </table>
-						    {else}
-					 	     <table border="0" cellpadding="5" cellspacing="0" width="95%">
-							<tr>
-								<td width="20%" align="right"><b>{$MOD.LBL_TODO}</b></td>
-								<td width="80%" align="left">{$ACTIVITYDATA.subject}</td>
-							</tr>
-							<tr>
-								<td align="right" valign="top"><b>{$LABEL.description}</b></td>
-                                                                <td align="left" colspan="3" valign="top" height="60px">{$ACTIVITYDATA.description}</td>
-                					</tr>
-							<tr>
-                        					<td colspan="2" align="center" width="80%">
-                                					<table border="0" cellpadding="3" cellspacing="0" width="80%">
-                                        					<tr>
-                                                				<td align="left"><b>{$LABEL.taskstatus}</b></td>
-										<td align="left"><b>{$LABEL.taskpriority}</b></td>
-										<td align="left"><b>{$LABEL.assigned_user_id}</b></td>
-										</tr>
-										<tr>
-                                                				<td align="left" valign="top">{$ACTIVITYDATA.taskstatus}</td>
-										<td align="left" valign="top">{$ACTIVITYDATA.taskpriority}</td>
-										<td align="left" valign="top">{$ACTIVITYDATA.assigned_user_id}</td>
-										</tr>
-									</table>
-								</td>
-							</tr>
-						</table>
-						<br>
-						<table border=0 cellspacing=0 cellpadding=5 width=95% >
-							<tr>
-								<td ><b>{$LABEL.createdtime}</b></td>
-								<td >{$ACTIVITYDATA.createdtime}</td>
-								<td ><b>{$LABEL.modifiedtime}</b></td>
-								<td>{$ACTIVITYDATA.modifiedtime}</td>
-                                                        </tr>
-                                                </table>
-						<hr noshade="noshade" size="1">
-						<table bgcolor="#ffffff" border="0" cellpadding="5" cellspacing="0" width="95%" align=center>
-							<tr><td>
-								<table border="0" cellpadding="2" cellspacing="0" width="100%" align=center>
-									<tr><td width=50% valign=top style="border-right:1px solid #dddddd">
-										<table border=0 cellspacing=0 cellpadding=2 width=95% align=center>
-											<tr><td><b>{$MOD.LBL_TIMEDATE}</b></td></tr>
-											<tr><td>{$ACTIVITYDATA.starthr}:{$ACTIVITYDATA.startmin}{$ACTIVITYDATA.startfmt}</td></tr>
-											<tr><td>{$ACTIVITYDATA.date_start}</td></tr>
-										</table>
-									</td>
-									<td width=50% valign="top">
-										<table border=0 cellspacing=0 cellpadding=2 width=95% align=center>
-											<tr><td><b>{$LABEL.due_date}</b></td></tr>
-											<tr><td>{$ACTIVITYDATA.due_date}</td></tr>
-											<tr><td>&nbsp;</td></tr>
-										</table>
-									</td>
-								</table>	
-							</tr>
-						    </table>
-						    <br>
-						    <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%">
-							<tr>
-								<td>
-									<table border="0" cellpadding="3" cellspacing="0" width="100%">
-									<tr>
-										<td class="dvtTabCache" style="width: 10px;" nowrap="nowrap">&nbsp;</td>
-										<td id="cellTabInvite" class="dvtSelectedCell" align="center" nowrap="nowrap"><a href="javascript:doNothing()" onClick="switchClass('cellTabInvite','on');switchClass('cellTabRelatedto','off');dispLayer('addTaskAlarmUI');ghide('addTaskRelatedtoUI');">{$MOD.LBL_NOTIFICATION}</td></a>
-										<td class="dvtTabCache" style="width: 10px;" nowrap="nowrap">&nbsp;
-										<td id="cellTabRelatedto" class="dvtUnSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabInvite','off');switchClass('cellTabRelatedto','on');dispLayer('addTaskRelatedtoUI');ghide('addTaskAlarmUI');">{$MOD.LBL_RELATEDTO}</a></td>
-
-										<td class="dvtTabCache" style="width: 100%;">&nbsp;</td>
-									</tr>
-									</table>
-								</td>
-							</tr>
-							<tr>                                                                                                                              <td width=100% valign=top align=left class="dvtContentSpace" style="padding:10px;height:120px">
-								<!-- Notification UI -->
-                                                                        <DIV id="addTaskAlarmUI" style="display:block;wid
-th:100%">
-									<table width="100%" cellpadding="5" cellspacing="0" border="0">
-										<tr>
-											<td width="30%" align=right><b>{$MOD.LBL_SENDNOTIFICATION}</b></td>
-											<td width="70%" align=left>{$ACTIVITYDATA.sendnotification}</td>
-										</tr>
-                                                                        </table>
-                                                                        </DIV>
-									<div id="addTaskRelatedtoUI" style="display:none;width:100%">
-                                                                        <table width="100%" cellpadding="5" cellspacing="0" border="0">
-                                                                                <tr>
-                                                                                        <td width="30%" align=right><b>{$LABEL.parent_id}</b></td>
-                                                                                        <td width="70%" align=left>{$ACTIVITYDATA.parent_name}</td>
-                                                                                </tr>
-                                                                                <tr>
-                                                                                        <td align=right><b>{$MOD.LBL_CONTACT_NAME}</b></td>
-                                                                                        <td align=left>{$ACTIVITYDATA.contact_id}</td>
-                                                                                </tr>
-									</table>
-                                                                        </div>
-						  		</td>
-							</tr>
-                                                     </table>	
-						     {/if}
-
-                     	                      </td>
-					   </tr>
-                </tr>
-		<tr>
-			<td style="padding:10px">
-		           <table border=0 cellspacing=0 cellpadding=0 width=100%>
-				     {strip}<tr nowrap>
-							<td  colspan=4 style="padding:5px">
-								{if $EDIT_DUPLICATE eq 'permitted'}
-                                                                <input title="{$APP.LBL_EDIT_BUTTON_TITLE}" accessKey="{$APP.LBL_EDIT_BUTTON_KEY}" class="crmbutton small edit" onclick="this.form.return_module.value='{$MODULE}'; this.form.return_action.value='DetailView'; this.form.return_id.value='{$ID}';this.form.module.value='{$MODULE}';this.form.action.value='EditView'" type="submit" name="Edit" value="&nbsp;{$APP.LBL_EDIT_BUTTON_LABEL}&nbsp;">&nbsp;
-                                                                <input title="{$APP.LBL_DUPLICATE_BUTTON_TITLE}" accessKey="{$APP.LBL_DUPLICATE_BUTTON_KEY}" class="crmbutton small create" onclick="this.form.return_module.value='{$MODULE}'; this.form.return_action.value='DetailView'; this.form.isDuplicate.value='true';this.form.module.value='{$MODULE}'; this.form.action.value='EditView'" type="submit" name="Duplicate" value="{$APP.LBL_DUPLICATE_BUTTON_LABEL}">&nbsp;
-                                                                {/if}
-								{if $DELETE eq 'permitted'}
-                                                                <input title="{$APP.LBL_DELETE_BUTTON_TITLE}" accessKey="{$APP.LBL_DELETE_BUTTON_KEY}" class="crmbutton small delete" onclick="this.form.return_module.value='{$MODULE}'; this.form.return_action.value='index'; this.form.action.value='Delete'; return confirm('{$APP.NTC_DELETE_CONFIRMATION}')" type="submit" name="Delete" value="{$APP.LBL_DELETE_BUTTON_LABEL}">&nbsp;
-                                                                {/if}
-
-							</td>
-					</tr>{/strip}
-			   </table>
-			</td>
-		</tr>
-	</table>
-	</td>
-	<td width=22% valign=top style="border-left:2px dashed #cccccc;padding:13px">
-						<!-- right side relevant info -->
-
-		<!-- Add Tag link added just above the tag cloud image -->
-		<table border=0 cellspacing=0 cellpadding=5 width=100% >
-		<tr>
-			<td align="left" class="genHeaderSmall"  nowrap><div id="addtagdiv"><a href="javascript:;" onClick="show('tagdiv'),fnhide('addtagdiv'),document.getElementById('txtbox_tagfields').focus()"><b>{$APP.LBL_ADD_TAG}</b></a></div><div id="tagdiv" style="display:none;"><input class="textbox"  type="text" id="txtbox_tagfields" name="textbox_First Name" value=""></input>&nbsp;&nbsp;<input name="button_tagfileds" type="button" class="crmbutton small save" value="{$APP.LBL_TAG_IT}" onclick="return tagvalidate()"/><input name="close" type="button" class="crmbutton small cancel" value="{$APP.LBL_CLOSE}" onClick="fnhide('tagdiv'),show('addtagdiv')"></div></td>
-		</tr>
-		</table>
-		<br>
-		<!-- Eng Add Tag Link -->
-		<!-- Tag cloud display -->
-		<table border=0 cellspacing=0 cellpadding=0 width=100% class="tagCloud">
-		<tr>
-			<td class="tagCloudTopBg"><img src="{$IMAGE_PATH}tagCloudName.gif" border=0></td>
-		</tr>
-		<tr>
-			<td class="tagCloudDisplay" valign=top> <span id="tagfields">{$ALL_TAG}</span></td>
-		</tr>
-		</table>
-		<!-- End Tag cloud display -->
-			<!-- Mail Merge-->
-				<br>
-				{if $MERGEBUTTON eq 'permitted'}
-  				<table border=0 cellspacing=0 cellpadding=0 width=100% class="rightMailMerge">
-      				<tr>
-      					   <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>
-      				</tr>
-  				</table>
-				{/if}
-			</td>
-		</tr>
-		</table>
-		
-			
-			
-		
-		</div>
-		<!-- PUBLIC CONTENTS STOPS-->
-	</td>
-</tr>
-</table>
-
-{if $MODULE eq 'Products'}
-<script language="JavaScript" type="text/javascript" src="modules/Products/Productsslide.js"></script>
-<script language="JavaScript" type="text/javascript">Carousel();</script>
-{/if}
-
-<script>
-function getTagCloud()
-{ldelim}
-new Ajax.Request(
-        'index.php',
-        {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
-        method: 'post',
-        postBody: 'module={$MODULE}&action={$MODULE}Ajax&file=TagCloud&ajxaction=GETTAGCLOUD&recordid={$ID}',
-        onComplete: function(response) {ldelim}
-                                $("tagfields").innerHTML=response.responseText;
-                                $("txtbox_tagfields").value ='';
-                        {rdelim}
-        {rdelim}
-);
-{rdelim}
-getTagCloud();
-</script>
-<!-- added for validation -->
-<script language="javascript">
-  var fieldname = new Array({$VALIDATION_DATA_FIELDNAME});
-  var fieldlabel = new Array({$VALIDATION_DATA_FIELDLABEL});
-  var fielddatatype = new Array({$VALIDATION_DATA_FIELDDATATYPE});
-</script>
-</td>
-
-</tr></table></form>
-</td></tr></table>
-</td></tr></table>
-</td></tr></table>
-        </td></tr></table>
-        </td></tr></table>
-        </div>
-        </td>
-        <td valign=top><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
-        </tr>
-        </table>
-
-
+{*<!--
+
+/*********************************************************************************
+** 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.
+*
+ ********************************************************************************/
+
+-->*}
+<script type="text/javascript" src="modules/{$MODULE}/Activity.js"></script>
+<script type="text/javascript" src="include/js/reflection.js"></script>
+<script src="include/scriptaculous/prototype.js" type="text/javascript"></script>
+<script src="include/scriptaculous/scriptaculous.js" type="text/javascript"></script>
+<script language="JavaScript" type="text/javascript" src="include/js/dtlviewajax.js"></script>
+<span id="crmspanid" style="display:none;position:absolute;"  onmouseover="show('crmspanid');">
+   <a class="link"  align="right" href="javascript:;">{$APP.LBL_EDIT_BUTTON}</a>
+</span>
+
+<script>
+function tagvalidate()
+{ldelim}
+	if(document.getElementById('txtbox_tagfields').value != '')
+		SaveTag('txtbox_tagfields','{$ID}','{$MODULE}');	
+	else
+	{ldelim}
+		alert("Please enter a tag");
+		return false;
+	{rdelim}
+{rdelim}
+function DeleteTag(id)
+{ldelim}
+	$("vtbusy_info").style.display="inline";
+	Effect.Fade('tag_'+id);
+	new Ajax.Request(
+		'index.php',
+                {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+                        method: 'post',
+                        postBody: "file=TagCloud&module={$MODULE}&action={$MODULE}Ajax&ajxaction=DELETETAG&tagid=" +id,
+                        onComplete: function(response) {ldelim}
+						getTagCloud();
+						$("vtbusy_info").style.display="none";
+                        {rdelim}
+                {rdelim}
+        );
+{rdelim}
+</script>
+<table width="100%" cellpadding="2" cellspacing="0" border="0">
+<form action="index.php" method="post" name="DetailView" id="form">
+<tr><td>&nbsp;</td>
+	<td>
+                <table cellpadding="0" cellspacing="5" border="0">
+			{include file='DetailViewHidden.tpl'}
+		</table>	
+
+<!-- Contents -->
+<table  border="0" cellpadding="5" cellspacing="0" width="100%" >
+<tr>
+	<td class="lvtHeaderText" style="border-bottom:1px dotted #cccccc">
+	
+		<table align="center" border="0" cellpadding="0" cellspacing="0" width="95%">
+			<tr><td>		
+				 <span class="lvtHeaderText"><font color="purple">[ {$ID} ] </font>{$NAME} -  {$SINGLE_MOD} {$APP.LBL_INFORMATION}</span>&nbsp;&nbsp;<span id="vtbusy_info" style="display:none;" valign="bottom"><img src="{$IMAGE_PATH}vtbusy.gif" border="0"></span><span id="vtbusy_info" style="visibility:hidden;" valign="bottom"><img src="{$IMAGE_PATH}vtbusy.gif" border="0"></span></td><td>&nbsp;
+			</td></tr>
+			 <tr height=20><td class=small>{$UPDATEINFO}</td></tr>
+		 </table>
+	</td>
+</tr>
+<tr><td>
+<table border="0" cellpadding="0" cellspacing="0" width="100%">
+	<tr>
+		<td valign=top align=left >
+                           <table border=0 cellspacing=0 cellpadding=3 width=100%>
+				<tr>
+					<td align=left>
+					<!-- content cache -->
+					
+					<table border=0 cellspacing=0 cellpadding=0 width=100%>
+			                  <tr>
+					     <td style="padding:3px">
+						     <!-- General details -->
+				                     <table border=0 cellspacing=0 cellpadding=0 width=100%>
+						     <tr nowrap>
+							<td  colspan=4 style="padding:5px">
+								{if $EDIT_DUPLICATE eq 'permitted'}
+                                                                <input title="{$APP.LBL_EDIT_BUTTON_TITLE}" accessKey="{$APP.LBL_EDIT_BUTTON_KEY}" class="crmbutton small edit" onclick="this.form.return_module.value='{$MODULE}'; this.form.return_action.value='DetailView'; this.form.return_id.value='{$ID}';this.form.module.value='{$MODULE}';this.form.action.value='EditView'" type="submit" name="Edit" value="&nbsp;{$APP.LBL_EDIT_BUTTON_LABEL}&nbsp;">&nbsp;
+								{/if}
+							</td>
+							<td width=50% align=right>
+							{if $EDIT_DUPLICATE eq 'permitted'}
+                                                                <input title="{$APP.LBL_DUPLICATE_BUTTON_TITLE}" accessKey="{$APP.LBL_DUPLICATE_BUTTON_KEY}" class="crmbutton small create" onclick="this.form.return_module.value='{$MODULE}'; this.form.return_action.value='DetailView'; this.form.isDuplicate.value='true';this.form.module.value='{$MODULE}'; this.form.action.value='EditView'" type="submit" name="Duplicate" value="{$APP.LBL_DUPLICATE_BUTTON_LABEL}">&nbsp;
+                                                        {/if}
+							{if $DELETE eq 'permitted'}
+                                                                <input title="{$APP.LBL_DELETE_BUTTON_TITLE}" accessKey="{$APP.LBL_DELETE_BUTTON_KEY}" class="crmbutton small delete" onclick="this.form.return_module.value='{$MODULE}'; {if $VIEWTYPE eq 'calendar'} this.form.return_action.value='index'; {else} this.form.return_action.value='ListView'; {/if}  this.form.action.value='Delete'; return confirm('{$APP.NTC_DELETE_CONFIRMATION}')" type="submit" name="Delete" value="{$APP.LBL_DELETE_BUTTON_LABEL}">&nbsp;
+                                                         {/if}
+
+							</td>
+						     </tr>
+						     </table>
+						     {foreach key=header item=detail from=$BLOCKS}
+						     <table border=0 cellspacing=0 cellpadding=5 width=100% class="small">
+						     	<tr>{strip}
+						     		<td colspan=4 class="tableHeading">
+									<b>{$header}</b>
+								</td>{/strip}
+					             	</tr>
+						     </table>
+						     {/foreach}
+						     {if $ACTIVITYDATA.activitytype neq 'Task'}	
+							 <!-- display of fields starts -->
+						     <table border=0 cellspacing=0 cellpadding=5 width=100% >
+               						 <tr>
+								<td class="cellLabel" width="20%" align="right"><b>{$MOD.LBL_EVENTTYPE}</b></td>
+								<td class="cellInfo" width="30%"align="left">{$ACTIVITYDATA.activitytype}</td>
+								<td class="cellLabel" width="20%" align="right"><b>{$LABEL.visibility}</b></td>
+                                                                <td class="cellInfo" width="30%" align="left" >{$ACTIVITYDATA.visibility}</td>
+							 </tr>
+							 <tr>
+                        					<td class="cellLabel" align="right"><b>{$MOD.LBL_EVENTNAME}</b></td>
+					                        <td class="cellInfo" colspan=3 align="left" >{$ACTIVITYDATA.subject}</td>
+             						 </tr>
+							 <tr>
+								<td class="cellLabel" align="right" nowrap valign="top"><b>{$LABEL.description}</b></td>
+								<td class="cellInfo" valign="top" align="left" colspan="3" height="60px">{$ACTIVITYDATA.description}</td>
+							 </tr>
+							 <tr>
+								<td class="cellLabel" align="right" nowrap valign="top"><b>{$LABEL.eventstatus}</b></td>
+								<td class="cellInfo" align="left" nowrap valign="top">{$ACTIVITYDATA.eventstatus}</td>
+								<td class="cellLabel" align="right" nowrap valign="top"><b>{$LABEL.assigned_user_id}</b></td>
+								<td class="cellInfo" align="left" nowrap valign="top">{$ACTIVITYDATA.assigned_user_id}</td>
+                                                         </tr>
+							 <tr>
+                                                                <td class="cellLabel" align="right" nowrap valign="top"><b>{$LABEL.taskpriority}</b></td>
+                                                                <td class="cellInfo" align="left" nowrap valign="top">{$ACTIVITYDATA.taskpriority}</td>
+                                                                <td class="cellLabel" align="right" nowrap valign="top"><b>{$LABEL.sendnotification}</b></td>
+                                                                <td class="cellInfo" align="left" nowrap valign="top">{$ACTIVITYDATA.sendnotification}</td>
+                                                         </tr>
+                                                         <tr>
+                                                                <td class="cellLabel" align="right" nowrap valign="top"align="right"><b>{$LABEL.createdtime}</b></td>
+                                                                <td class="cellInfo" align="left" nowrap valign="top">{$ACTIVITYDATA.createdtime}</td>
+                                                                <td class="cellLabel" align="right" nowrap valign="top"align="right"><b>{$LABEL.modifiedtime}</b></td>
+                                                                <td class="cellInfo" align="left" nowrap valign="top">{$ACTIVITYDATA.modifiedtime}</td>
+                                                         </tr>
+						     </table>
+						     <table border=0 cellspacing=1 cellpadding=0 width=100%>
+							<tr><td width=50% valign=top >
+								<table border=0 cellspacing=0 cellpadding=2 width=100%>
+                                                                        <tr><td class="mailSubHeader"><b>{$MOD.LBL_EVENTSTAT}</b></td></tr>
+                                                                        <tr><td class=small>{$ACTIVITYDATA.starthr}:{$ACTIVITYDATA.startmin}{$ACTIVITYDATA.startfmt}</td></tr>
+                                                                        <tr><td class=small>{$ACTIVITYDATA.date_start}</td></tr>
+                                                                </table></td>
+							<td width=50% valign=top >
+                                                                <table border=0 cellspacing=0 cellpadding=2 width=100%>
+                                                                        <tr><td  class="mailSubHeader"><b>{$MOD.LBL_EVENTEDAT}</b></td></tr>
+                                                                        <tr><td class=small>{$ACTIVITYDATA.endhr}:{$ACTIVITYDATA.endmin}{$ACTIVITYDATA.endfmt}</td></tr>
+                                                                        <tr><td class=small>{$ACTIVITYDATA.due_date}</td></tr>
+                                                                </table>
+                                                        </td></tr>
+                                                     </table>
+						     <br>
+					             <table border=0 cellspacing=0 cellpadding=0 width=100% align=center>
+                					 <tr>
+                        					<td>
+                         				        	<table border=0 cellspacing=0 cellpadding=3 width=100%>
+                             						<tr>
+                                        					<td class="dvtTabCache" style="width:10px" nowrap>&nbsp;</td>
+					                                        <td id="cellTabInvite" class="dvtSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabInvite','on');switchClass('cellTabAlarm','off');switchClass('cellTabRepeat','off');switchClass('cellTabRelatedto','off');ghide('addEventAlarmUI');dispLayer('addEventInviteUI');ghide('addEventRepeatUI');ghide('addEventRelatedtoUI');">{$MOD.LBL_INVITE}</a></td>
+										<td class="dvtTabCache" style="width:10px">&nbsp;</td>
+										<td id="cellTabAlarm" class="dvtUnSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabInvite','off');switchClass('cellTabAlarm','on');switchClass('cellTabRepeat','off');switchClass('cellTabRelatedto','off');dispLayer('addEventAlarmUI');ghide('addEventInviteUI');ghide('addEventRepeatUI');ghide('addEventRelatedtoUI');">{$MOD.LBL_REMINDER}</a></td>
+										<td class="dvtTabCache" style="width:10px">&nbsp;</td>
+										<td id="cellTabRepeat" class="dvtUnSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabInvite','off');switchClass('cellTabAlarm','off');switchClass('cellTabRepeat','on');switchClass('cellTabRelatedto','off');ghide('addEventAlarmUI');ghide('addEventInviteUI');dispLayer('addEventRepeatUI');ghide('addEventRelatedtoUI');">{$MOD.LBL_REPEAT}</a></td>
+										<td class="dvtTabCache" style="width:10px">&nbsp;</td>
+										<td id="cellTabRelatedto" class="dvtUnSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabInvite','off');switchClass('cellTabAlarm','off');switchClass('cellTabRepeat','off');switchClass('cellTabRelatedto','on');ghide('addEventAlarmUI');ghide('addEventInviteUI');dispLayer('addEventRelatedtoUI');ghide('addEventRepeatUI');">{$MOD.LBL_LIST_RELATED_TO}</a></td>
+										<td class="dvtTabCache" style="width:100%">&nbsp;</td>
+									</tr>
+									</table>
+								</td>
+							 </tr>
+							
+							 <tr>
+								<td width=100% valign=top align=left class="dvtContentSpace" style="padding:10px;height:120px">
+									<!-- Invite UI -->
+									<DIV id="addEventInviteUI" style="display:block;width:100%">
+									<table width="100%" cellpadding="5" cellspacing="0" border="0">
+										<tr>
+                                                                                        <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>
+                                                                                                {/foreach}
+											</td>
+                                                                                </tr>
+									</table>
+									</DIV>
+									<!-- Reminder UI -->
+					                                <DIV id="addEventAlarmUI" style="display:none;width:100%">
+									<table width="100%" cellpadding="5" cellspacing="0" border="0">
+                                                                                <tr>
+                                                                                        <td width="30%" align=right><b>{$MOD.LBL_SENDREMINDER}</b></td>
+                                                                                        <td width="70%" align=left>{$ACTIVITYDATA.set_reminder}</td>
+                                                                                </tr>
+										{if $ACTIVITYDATA.set_reminder != 'No'}
+										<tr>
+                                                                                        <td width="30%" align=right><b>{$MOD.LBL_RMD_ON}</b></td>
+											<td width="70%" align=left>{$ACTIVITYDATA.reminder_str}</td>
+										</tr>
+										{/if}
+                                                                        </table>
+									</DIV>
+									<!-- Repeat UI -->
+                                					<div id="addEventRepeatUI" style="display:none;width:100%">
+									<table width="100%" cellpadding="5" cellspacing="0" border="0">
+										<tr>
+                                                                                        <td width="30%" align=right><b>{$MOD.LBL_ENABLE_REPEAT}</b></td>
+                                                                                        <td width="70%" align=left>{$ACTIVITYDATA.recurringcheck}</td>
+                                                                                </tr>
+										{if $ACTIVITYDATA.recurringcheck != 'No'}
+										<tr>
+											<td width="30%" align=right>&nbsp;</td>
+											<td>{$MOD.LBL_REPEATEVENT}&nbsp;{$ACTIVITYDATA.repeat_frequency}&nbsp;{$MOD[$ACTIVITYDATA.recurringtype]}</td>
+										</tr>
+										<tr>
+                                                                                        <td width="30%" align=right>&nbsp;</td>
+                                                                                        <td>{$ACTIVITYDATA.repeat_str}</td>
+                                                                                </tr>
+										{/if}
+									</table>
+									</div>
+									<!-- Relatedto UI -->
+									<div id="addEventRelatedtoUI" style="display:none;width:100%">
+									<table width="100%" cellpadding="5" cellspacing="0" border="0">
+										<tr>
+											<td width="30%" align=right valign="top"><b>{$LABEL.parent_id}</b></td>
+											<td width="70%" align=left valign="top">{$ACTIVITYDATA.parent_name}</td>
+										</tr>
+										<tr>
+											<td width="30%" valign="top" align=right><b>{$MOD.LBL_CONTACT_NAME}</b></td>	
+											<td width="70%" valign="top" align=left>
+											{foreach item=contactname key=cntid from=$CONTACTS}
+	                                                                                {$contactname.0}&nbsp;{$contactname.1}<br>
+                                                                                        {/foreach}
+										</tr>
+									</table>
+									</div>
+								</td>
+                					 </tr>
+						     </table>
+						    {else}
+							<!-- detailed view of a ToDo -->
+					 	     <table border="0" cellpadding="5" cellspacing="0" width="100%">
+							<tr>
+								<td class="cellLabel" width="20%" align="right"><b>{$MOD.LBL_TODO}</b></td>
+								<td class="cellInfo" width="80%" align="left">{$ACTIVITYDATA.subject}</td>
+							</tr>
+							<tr>
+								<td class="cellLabel" align="right" valign="top"><b>{$LABEL.description}</b></td>
+                                                                <td class="cellInfo" align="left" colspan="3" valign="top" height="60px">{$ACTIVITYDATA.description}</td>
+                					</tr>
+							<tr>
+                        					<td colspan="2" align="center" style="padding:0px">
+                                				<table border="0" cellpadding="5" cellspacing="1" width="100%" >
+                                       					<tr>
+                                                				<td class="cellLabel" width=33% align="left"><b>{$LABEL.taskstatus}</b></td>
+										<td class="cellLabel" width=33% align="left"><b>{$LABEL.taskpriority}</b></td>
+										<td class="cellLabel" width=34% align="left"><b>{$LABEL.assigned_user_id}</b></td>
+									</tr>
+									<tr>
+                                                				<td class="cellInfo" align="left" valign="top">{$ACTIVITYDATA.taskstatus}</td>
+										<td class="cellInfo" align="left" valign="top">{$ACTIVITYDATA.taskpriority}</td>
+										<td class="cellInfo" align="left" valign="top">{$ACTIVITYDATA.assigned_user_id}</td>
+									</tr>
+								</table>
+								</td>
+							</tr>
+						     </table>
+						     <table border="0" cellpadding="0" cellspacing="0" width="100%" align=center>
+	                                                <tr><td width=50% valign=top >
+								<table border=0 cellspacing=0 cellpadding=2 width=100% align=center>
+									<tr><td class="mailSubHeader" align=left ><b>{$MOD.LBL_TIMEDATE}</b></td></tr>
+									<tr><td class="small" >{$ACTIVITYDATA.starthr}:{$ACTIVITYDATA.startmin}{$ACTIVITYDATA.startfmt}</td></tr>
+									<tr><td class="cellInfo" style="padding-left:0px">{$ACTIVITYDATA.date_start}</td></tr>
+								</table>
+							</td>
+							<td width=50% valign="top">
+								<table border=0 cellspacing=0 cellpadding=2 width=100% align=center>
+									<tr><td class="mailSubHeader"><b>{$LABEL.due_date}</b></td></tr>
+									<tr><td class="small">{$ACTIVITYDATA.due_date}</td></tr>
+									<tr><td class="cellInfo">&nbsp;</td></tr>
+								</table>
+							</td>
+						     </table>
+						     <table border=0 cellspacing=0 cellpadding=5 width=100% >
+							<tr>
+								<td class="cellLabel" align=right nowrap width=20%><b>{$LABEL.createdtime}</b></td>
+                                                                <td class="cellInfo" align=left nowrap width=30%>{$ACTIVITYDATA.createdtime}</td>
+                                                                <td class="cellLabel" align=right nowrap width=20%><b>{$LABEL.modifiedtime}</b></td>
+                                                                <td class="cellInfo" align=left  nowrap width=30%>{$ACTIVITYDATA.modifiedtime}</td>
+                                                        </tr>
+                                                     </table>
+						     <br>
+						     <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%">
+							<tr>
+								<td>
+									<table border="0" cellpadding="3" cellspacing="0" width="100%">
+									<tr>
+										<td class="dvtTabCache" style="width: 10px;" nowrap="nowrap">&nbsp;</td>
+                                                                                <td id="cellTabInvite" class="dvtSelectedCell" align="center" nowrap="nowrap"><a href="javascript:doNothing()" onClick="switchClass('cellTabInvite','on');switchClass('cellTabRelatedto','off');dispLayer('addTaskAlarmUI');ghide('addTaskRelatedtoUI');">{$MOD.LBL_NOTIFICATION}</td></a>
+										<td class="dvtTabCache" style="width: 10px;" nowrap="nowrap">&nbsp;
+                                                                                <td id="cellTabRelatedto" class="dvtUnSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabInvite','off');switchClass('cellTabRelatedto','on');dispLayer('addTaskRelatedtoUI');ghide('addTaskAlarmUI');">{$MOD.LBL_RELATEDTO}</a></td>
+
+                                                                                <td class="dvtTabCache" style="width: 100%;">&nbsp;</td>
+									</tr>
+									</table>
+								</td>
+							</tr>
+							<tr>
+								<td width=100% valign=top align=left class="dvtContentSpace" style="padding:10px;height:120px">
+                                                                <!-- Notification UI -->
+                                                                        <DIV id="addTaskAlarmUI" style="display:block;width:100%">
+                                                                        <table width="100%" cellpadding="5" cellspacing="0" border="0">
+                                                                                <tr>
+                                                                                        <td width="30%" align=right><b>{$MOD.LBL_SENDNOTIFICATION}</b></td>
+                                                                                        <td width="70%" align=left>{$ACTIVITYDATA.sendnotification}</td>
+                                                                                </tr>
+                                                                        </table>
+                                                                        </DIV>
+									<div id="addTaskRelatedtoUI" style="display:none;width:100%">
+                                                                        <table width="100%" cellpadding="5" cellspacing="0" border="0">
+                                                                                <tr>
+                                                                                        <td width="30%" align=right><b>{$LABEL.parent_id}</b></td>
+                                                                                        <td width="70%" align=left>{$ACTIVITYDATA.parent_name}</td>
+                                                                                </tr>
+                                                                                <tr>
+                                                                                        <td align=right><b>{$MOD.LBL_CONTACT_NAME}</b></td>
+                                                                                        <td align=left>{$ACTIVITYDATA.contact_id}</td>
+                                                                                </tr>
+                                                                        </table>
+                                                                        </div>
+								</td>
+							</tr>
+						     </table>
+						     {/if}
+
+                     	                      </td>
+					   </tr>
+                </tr>
+		<tr>
+			<td style="padding:10px">
+		           <table border=0 cellspacing=0 cellpadding=0 width=100%>
+				     {strip}<tr nowrap>
+							<td  colspan=4 style="padding:5px">
+								{if $EDIT_DUPLICATE eq 'permitted'}
+                                                                <input title="{$APP.LBL_EDIT_BUTTON_TITLE}" accessKey="{$APP.LBL_EDIT_BUTTON_KEY}" class="crmbutton small edit" onclick="this.form.return_module.value='{$MODULE}'; this.form.return_action.value='DetailView'; this.form.return_id.value='{$ID}';this.form.module.value='{$MODULE}';this.form.action.value='EditView'" type="submit" name="Edit" value="&nbsp;{$APP.LBL_EDIT_BUTTON_LABEL}&nbsp;">&nbsp;
+								{/if}
+							</td>
+							<td align=right>
+								{if $EDIT_DUPLICATE eq 'permitted'}
+                                                                <input title="{$APP.LBL_DUPLICATE_BUTTON_TITLE}" accessKey="{$APP.LBL_DUPLICATE_BUTTON_KEY}" class="crmbutton small create" onclick="this.form.return_module.value='{$MODULE}'; this.form.return_action.value='DetailView'; this.form.isDuplicate.value='true';this.form.module.value='{$MODULE}'; this.form.action.value='EditView'" type="submit" name="Duplicate" value="{$APP.LBL_DUPLICATE_BUTTON_LABEL}">&nbsp;
+                                                                {/if}
+								{if $DELETE eq 'permitted'}
+                                                                <input title="{$APP.LBL_DELETE_BUTTON_TITLE}" accessKey="{$APP.LBL_DELETE_BUTTON_KEY}" class="crmbutton small delete" onclick="this.form.return_module.value='{$MODULE}'; this.form.return_action.value='index'; this.form.action.value='Delete'; return confirm('{$APP.NTC_DELETE_CONFIRMATION}')" type="submit" name="Delete" value="{$APP.LBL_DELETE_BUTTON_LABEL}">&nbsp;
+                                                                {/if}
+
+							</td>
+					</tr>{/strip}
+			   </table>
+			</td>
+		</tr>
+	</table>
+	</td>
+	<td width=22% valign=top style="border-left:2px dashed #cccccc;padding:13px">
+						<!-- right side relevant info -->
+
+		<!-- Add Tag link added just above the tag cloud image -->
+		<table border=0 cellspacing=0 cellpadding=5 width=100% >
+		<tr>
+			<td align="left" class="genHeaderSmall"  nowrap><div id="addtagdiv"><a href="javascript:;" onClick="show('tagdiv'),fnhide('addtagdiv'),document.getElementById('txtbox_tagfields').focus()"><b>{$APP.LBL_ADD_TAG}</b></a></div><div id="tagdiv" style="display:none;"><input class="textbox"  type="text" id="txtbox_tagfields" name="textbox_First Name" value=""></input>&nbsp;&nbsp;<input name="button_tagfileds" type="button" class="crmbutton small save" value="{$APP.LBL_TAG_IT}" onclick="return tagvalidate()"/><input name="close" type="button" class="crmbutton small cancel" value="{$APP.LBL_CLOSE}" onClick="fnhide('tagdiv'),show('addtagdiv')"></div></td>
+		</tr>
+		</table>
+		<br>
+		<!-- Eng Add Tag Link -->
+		<!-- Tag cloud display -->
+		<table border=0 cellspacing=0 cellpadding=0 width=100% class="tagCloud">
+		<tr>
+			<td class="tagCloudTopBg"><img src="{$IMAGE_PATH}tagCloudName.gif" border=0></td>
+		</tr>
+		<tr>
+			<td class="tagCloudDisplay" valign=top> <span id="tagfields">{$ALL_TAG}</span></td>
+		</tr>
+		</table>
+		<!-- End Tag cloud display -->
+			<!-- Mail Merge-->
+				<br>
+				{if $MERGEBUTTON eq 'permitted'}
+  				<table border=0 cellspacing=0 cellpadding=0 width=100% class="rightMailMerge">
+      				<tr>
+      					   <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>
+      				</tr>
+  				</table>
+				{/if}
+			</td>
+		</tr>
+		</table>
+		
+			
+			
+		
+		</div>
+		<!-- PUBLIC CONTENTS STOPS-->
+	</td>
+</tr>
+</table>
+
+{if $MODULE eq 'Products'}
+<script language="JavaScript" type="text/javascript" src="modules/Products/Productsslide.js"></script>
+<script language="JavaScript" type="text/javascript">Carousel();</script>
+{/if}
+
+<script>
+function getTagCloud()
+{ldelim}
+new Ajax.Request(
+        'index.php',
+        {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+        method: 'post',
+        postBody: 'module={$MODULE}&action={$MODULE}Ajax&file=TagCloud&ajxaction=GETTAGCLOUD&recordid={$ID}',
+        onComplete: function(response) {ldelim}
+                                $("tagfields").innerHTML=response.responseText;
+                                $("txtbox_tagfields").value ='';
+                        {rdelim}
+        {rdelim}
+);
+{rdelim}
+getTagCloud();
+</script>
+<!-- added for validation -->
+<script language="javascript">
+  var fieldname = new Array({$VALIDATION_DATA_FIELDNAME});
+  var fieldlabel = new Array({$VALIDATION_DATA_FIELDLABEL});
+  var fielddatatype = new Array({$VALIDATION_DATA_FIELDDATATYPE});
+</script>
+</td>
+
+</tr></table></form>
+</td></tr></table>
+</td></tr></table>
+</td></tr></table>
+        </td></tr></table>
+        </td></tr></table>
+        </div>
+        </td>
+        <td valign=top><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+        </tr>
+        </table>
+
+

Modified: vtigercrm/trunk/Smarty/templates/ActivityEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ActivityEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ActivityEditView.tpl Mon Sep 11 01:01:11 2006
@@ -1,831 +1,823 @@
-{*<!--
-
-/*********************************************************************************
-** 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}/Activity.js"></script>
-<script type="text/javascript">
-</script>
-
-{*<!-- Contents -->*}
-<table width="100%" cellpadding="2" cellspacing="0" border="0">
-<form name="EditView" method="POST" action="index.php">
-<input type="hidden" name="time_start" id="time_start">
-<tr><td>&nbsp;</td>
-        <td>
-                <table cellpadding="0" cellspacing="5" border="0">
-			{include file='EditViewHidden.tpl'}
-                </table>
-<table  border="0" cellpadding="5" cellspacing="0" width="100%" style="border:1px solid #cccccc">
-<tr>
-        <td class="lvtHeaderText" style="border-bottom:1px dotted #cccccc">
-
-                <table align="center" border="0" cellpadding="0" cellspacing="0" width="95%">
-                        <tr><td>
-		
-				{if $OP_MODE eq 'edit_view'}   
-					<span class="lvtHeaderText"><font color="purple">[ {$ID} ] </font>{$NAME} - {$APP.LBL_EDITING} {$SINGLE_MOD} {$APP.LBL_INFORMATION}</span> <br>
-					{$UPDATEINFO}	 
-				{/if}
-				{if $OP_MODE eq 'create_view'}
-					<span class="lvtHeaderText">{$APP.LBL_CREATING} {$SINGLE_MOD}</span> <br>
-				{/if}
-			</td></tr>
-		</table>
-        </td>
-</tr>
-<tr><td>
-<table border="0" cellpadding="5" cellspacing="0" width="100%">
-        <tr>
-                <td valign=top align=left >
-                           <table border=0 cellspacing=0 cellpadding=0 width=100%>
-                                <tr>
-					<td align=left>
-					<!-- content cache -->
-
-					<table border=0 cellspacing=0 cellpadding=0 width=100%>
-					  <tr>
-					     <td style="padding:10px">
-						     <!-- General details -->
-						     <table border=0 cellspacing=0 cellpadding=0 width=100% >
-						     <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" {if $ACTIVITY_MODE neq 'Task'} onclick="this.form.action.value='Save';  displaydeleted();return maincheck_form();"{else} onclick="this.form.action.value='Save';  displaydeleted(); maintask_check_form();return formValidate();" {/if} 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>
-						     <!-- included to handle the edit fields based on ui types -->
-						     {foreach key=header item=data from=$BLOCKS}
-						     <table border=0 cellspacing=0 cellpadding=0 width=100% class="small">
-						     <tr>
-							<td colspan=4 style="border-bottom:1px solid #999999;padding:5px;" bgcolor="#e5e5e5">
-								<b>{$header}</b>
-							</td>
-						     </tr>
-						     </table>
-						     {/foreach}
-						     {if $ACTIVITY_MODE neq 'Task'}
-							<input type="hidden" name="time_end" id="time_end">
-							<input type=hidden name="inviteesid" id="inviteesid" value="">
-							<input type="hidden" name="duration_hours" value="0">
-							<input type="hidden" name="duration_minutes" value="0">
-						     <table border=0 cellspacing=0 cellpadding=5 width=100% >
-							<tr>
-								<td nowrap  width=20% align="right"><b>{$MOD.LBL_EVENTTYPE}</b></td>
-								<td width=80% align="left">
-									<table>
-										<tr>
-										{foreach key=tyeparrkey item=typearr from=$ACTIVITYDATA.activitytype}
-                                                                                {foreach key=sel_value item=value from=$typearr}
-                                                                                {if $value eq 'selected' && $sel_value eq 'Meeting'}
-                                                                                        {assign var='meetcheck' value='checked'}
-                                                                                        {assign var='callcheck' value=''}
-                                                                                {else}
-                                                                                        {assign var='meetcheck' value=''}
-                                                                                        {assign var='callcheck' value='checked'}
-                                                                                {/if}
-                                                                                {/foreach}
-                                                                                {/foreach}
-											<td><input type="radio" name='activitytype' value='Call' style='vertical-align: middle;' {$callcheck}></td><td>{$APP.Call}</td><td style="width:10px">
-											<td><input type="radio" name='activitytype' value='Meeting' style='vertical-align: middle;' {$meetcheck}></td><td>{$APP.Meeting}</td><td style="width:20px">
-										</tr>
-									</table>
-								</td>
-							</tr>
-							<tr>
-								<td nowrap align="right"><b>{$MOD.LBL_EVENTNAME}</b></td>
-								<td align="left"><input name="subject" type="text" class="textbox" value="{$ACTIVITYDATA.subject}" style="width:50%">&nbsp;&nbsp;&nbsp;
-								{foreach key=key_one item=arr from=$ACTIVITYDATA.visibility}
-                                                                        {foreach key=sel_value item=value from=$arr}
-                                                                        {if $value eq 'selected' && $sel_value eq 'Public'}
-                                                                                {assign var="visiblecheck" value="checked"}
-                                                                        {else}
-                                                                                {assign var="visiblecheck" value=""}
-                                                                        {/if}
-                                                                        {/foreach}
-                                                                        {/foreach}
-                                                                        <input name="visibility" value="Public" type="checkbox" {$visiblecheck}>{$MOD.LBL_PUBLIC}
-								</td>
-							</tr>
-							<tr>
-                        					<td valign="top" nowrap align="right"><b>{$LABEL.description}</b></td>
-								<td align="left"><textarea style="width:100%; height : 60px;" name="description">{$ACTIVITYDATA.description}</textarea></td>
-                					</tr>
-							<tr>
-								<td valign="top" nowrap align="right"><b>{$LABEL.location}</b></td>
-								 <td align="left"><input type="text" class="textbox" name="location" id ="location" value="{$ACTIVITYDATA.location}" style="width:50%"></td>
-							</tr>
-							<tr>
-								<td colspan=2 width=80% align="center">
-                                				<table border=0 cellspacing=0 cellpadding=3 width=80%>
-                                        				<tr>
-										<td ><b>{$LABEL.eventstatus}</b></td>
-										<td ><b>{$LABEL.assigned_user_id}</b></td>
-									</tr>
-									<tr>
-										<td valign=top>
-                                                                                <select name="eventstatus" id="eventstatus" class=small>
-                                                                                        {foreach item=arr from=$ACTIVITYDATA.eventstatus}
-                                                                                        {foreach key=sel_value item=value from=$arr}
-                                                                                        <option value="{$sel_value}" {$value}>
-                                                                                                {if $APP[$sel_value] neq ''}
-                                                                                                {$APP[$sel_value]}
-                                                                                                {else}
-                                                                                                        {$sel_value}
-                                                                                                {/if}
-                                                                                        </option>
-                                                                                        {/foreach}
-                                                                                        {/foreach}
-                                                                                </select>
-                                                                        	</td>
-										<td valign=top rowspan=2>
-											{assign var=check value=1}
-                                        						{foreach key=key_one item=arr from=$ACTIVITYDATA.assigned_user_id}
-                                                					{foreach key=sel_value item=value from=$arr}
-                                                        					{if $value ne ''}
-                                                                					{assign var=check value=$check*0}
-                                                        					{else}
-                                                                					{assign var=check value=$check*1}
-                                                        					{/if}
-                                                					{/foreach}
-                                        						{/foreach}
-
-                                        						{if $check eq 0}
-                                                						{assign var=select_user value='checked'}
-                                                						{assign var=style_user value='display:block'}
-                                                						{assign var=style_group value='display:none'}
-                                        						{else}
-                                                						{assign var=select_group value='checked'}
-                                                						{assign var=style_user value='display:none'}
-                                                						{assign var=style_group value='display:block'}
-                                        						{/if}
-                                        						<input type="radio" name="assigntype" {$select_user} value="U" onclick="toggleAssignType(this.value)">&nbsp;{$APP.LBL_USER}
-                                        						{if $secondvalue.assigned_user_id neq ''}
-                                                					<input type="radio" name="assigntype" {$select_group} value="T" onclick="toggleAssignType(this.value)">&nbsp;{$APP.LBL_GROUP}
-                                        						{/if}
-											<span id="assign_user" style="{$style_user}">
-                                     				           			<select name="assigned_user_id">
-                                                        					{foreach key=key_one item=arr from=$ACTIVITYDATA.assigned_user_id}
-                                                                				{foreach key=sel_value item=value from=$arr}
-                                                                        				<option value="{$key_one}" {$value}>{$sel_value}</option>
-                                                                				{/foreach}
-                                                        					{/foreach}
-                                                			   			</select>
-                                        			       			</span>
-
-                                        						{if $secondvalue.assigned_user_id neq ''}
-                                                					<span id="assign_team" style="{$style_group}">
-                                                        					<select name="assigned_group_name" >';
-                                                                				{foreach key=key_one item=arr from=$secondvalue.assigned_user_id}
-                                                                        			{foreach key=sel_value item=value from=$arr}
-                                                                                			<option value="{$sel_value}" {$value}>{$sel_value}</option>
-                                                                        			{/foreach}
-                                                                				{/foreach}
-                                                        					</select>
-                                                					</span>
-                                        						{/if}
-											<br><input type="checkbox" name="sendnotification" >&nbsp;{$LABEL.sendnotification}
-										</td>
-									</tr>
-									<tr>
-										<td valign=top><b>{$LABEL.taskpriority}</b>
-										<br>
-										<select name="taskpriority" id="taskpriority">
-                                                                                        {foreach item=arr from=$ACTIVITYDATA.taskpriority}
-                                                                                        {foreach key=sel_value item=value from=$arr}
-                                                                                        <option value="{$sel_value}" {$value}>
-                                                                                                {if $APP[$sel_value] neq ''}
-                                                                                                {$APP[$sel_value]}
-                                                                                                {else}
-                                                                                                        {$sel_value}
-                                                                                                {/if}
-                                                                                        </option>
-                                                                                        {/foreach}
-                                                                                        {/foreach}
-                                                                                </select>
-										</td> 
-										
-									</tr>
-								</table>
-							</td></tr>
-						     </table>
-						     <hr noshade size=1>
-						     <table border=0 cellspacing=0 cellpadding=5 width=90% align=center bgcolor="#FFFFFF">
-							<tr>
-								<td >
-									<table border=0 cellspacing=0 cellpadding=2 width=100% align=center>
-									<tr><td width=50% valign=top style="border-right:1px solid #dddddd">
-										<table border=0 cellspacing=0 cellpadding=2 width=90% align=center>
-											<tr><td colspan=3 ><b>{$MOD.LBL_EVENTSTAT}</b></td></tr>
-											<tr><td colspan=3>{$STARTHOUR}</td></tr>
-											<tr><td>
-												{foreach key=date_value item=time_value from=$ACTIVITYDATA.date_start}
-                                                                                                        {assign var=date_val value="$date_value"}
-                                                                                                        {assign var=time_val value="$time_value"}
-	                                                                                        {/foreach}
-                                                                                                <input type="text" name="date_start" id="jscal_field_date_start" class="textbox" style="width:90px" value="{$date_val}"></td><td width=100%><img border=0 src="{$IMAGE_PATH}btnL3Calendar.gif" alt="Set date.." title="Set date.." id="jscal_trigger_date_start">
-													{foreach key=date_fmt item=date_str from=$secondvalue.date_start}
-													{assign var=date_vl value="$date_fmt"}
-													{/foreach}
-													<script type="text/javascript">
-														Calendar.setup ({ldelim}
-														inputField : "jscal_field_date_start", ifFormat : "{$date_vl}", showsTime : false, button : "jscal_trigger_date_start", singleClick : true, step : 1
-														{rdelim})
-													</script>
-											</td></tr>
-										</table></td>
-										<td width=50% valign=top >
-											<table border=0 cellspacing=0 cellpadding=2 width=90% align=center>
-												<tr><td colspan=3><b>{$MOD.LBL_EVENTEDAT}</b></td></tr>
-												<tr><td colspan=3>{$ENDHOUR}
-												</td></tr>
-												<tr><td>
-													{foreach key=date_value item=time_value from=$ACTIVITYDATA.due_date}
-													{assign var=date_val value="$date_value"}
-													{assign var=time_val value="$time_value"}
-													{/foreach}
-													<input type="text" name="due_date" id="jscal_field_due_date" class="textbox" style="width:90px" value="{$date_val}"></td><td width=100%><img border=0 src="{$IMAGE_PATH}btnL3Calendar.gif" alt="Set date.." title="Set date.." id="jscal_trigger_due_date">
-													{foreach key=date_fmt item=date_str from=$secondvalue.due_date}
-													{assign var=date_vl value="$date_fmt"}
-                                                                                                        {/foreach}
-													<script type="text/javascript">
-														Calendar.setup ({ldelim}
-														inputField : "jscal_field_due_date", ifFormat : "{$date_vl}", showsTime : false, button : "jscal_trigger_due_date", singleClick : true, step : 1
-														{rdelim})
-													</script>
-												</td></tr>
-											</table>
-										</td>
-									</tr>
-								</table></td>
-							</tr>
-						     </table>
-						     <br>
-						     <table border=0 cellspacing=0 cellpadding=0 width=100% align=center>
-							<tr><td>
-								<table border=0 cellspacing=0 cellpadding=3 width=100%>
-									<tr>
-										<td class="dvtTabCache" style="width:10px" nowrap>&nbsp;</td>
-										<td id="cellTabInvite" class="dvtSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabInvite','on');switchClass('cellTabAlarm','off');switchClass('cellTabRepeat','off');switchClass('cellTabRelatedto','off');ghide('addEventAlarmUI');gshow('addEventInviteUI','',document.EditView.date_start.value,document.EditView.due_date.value,document.EditView.starthr.value,document.EditView.startmin.value,document.EditView.startfmt.value,document.EditView.endhr.value,document.EditView.endmin.value,document.EditView.endfmt.value);ghide('addEventRepeatUI');ghide('addEventRelatedtoUI');">{$MOD.LBL_INVITE}</a></td>
-										<td class="dvtTabCache" style="width:10px">&nbsp;</td>
-										<td id="cellTabAlarm" class="dvtUnSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabInvite','off');switchClass('cellTabAlarm','on');switchClass('cellTabRepeat','off');switchClass('cellTabRelatedto','off');gshow('addEventAlarmUI','',document.EditView.date_start.value,document.EditView.due_date.value,document.EditView.starthr.value,document.EditView.startmin.value,document.EditView.startfmt.value,document.EditView.endhr.value,document.EditView.endmin.value,document.EditView.endfmt.value);ghide('addEventInviteUI');ghide('addEventRepeatUI');ghide('addEventRelatedtoUI');">{$MOD.LBL_REMINDER}</a></td>
-										<td class="dvtTabCache" style="width:10px">&nbsp;</td>
-										<td id="cellTabRepeat" class="dvtUnSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabInvite','off');switchClass('cellTabAlarm','off');switchClass('cellTabRepeat','on');switchClass('cellTabRelatedto','off');ghide('addEventAlarmUI');ghide('addEventInviteUI');gshow('addEventRepeatUI','',document.EditView.date_start.value,document.EditView.due_date.value,document.EditView.starthr.value,document.EditView.startmin.value,document.EditView.startfmt.value,document.EditView.endhr.value,document.EditView.endmin.value,document.EditView.endfmt.value);ghide('addEventRelatedtoUI');">{$MOD.LBL_REPEAT}</a></td>
-										<td class="dvtTabCache" style="width:10px">&nbsp;</td>
-										<td id="cellTabRelatedto" class="dvtUnSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabInvite','off');switchClass('cellTabAlarm','off');switchClass('cellTabRepeat','off');switchClass('cellTabRelatedto','on');ghide('addEventAlarmUI');ghide('addEventInviteUI');gshow('addEventRelatedtoUI','',document.EditView.date_start.value,document.EditView.due_date.value,document.EditView.starthr.value,document.EditView.startmin.value,document.EditView.startfmt.value,document.EditView.endhr.value,document.EditView.endmin.value,document.EditView.endfmt.value);ghide('addEventRepeatUI');">{$MOD.LBL_RELATEDTO}</a></td>
-										<td class="dvtTabCache" style="width:100%">&nbsp;</td>
-									</tr>
-								</table>
-							</td></tr>
-							<tr>
-								<td width=100% valign=top align=left class="dvtContentSpace" style="padding:10px;height:120px">
-								<!-- Invite UI -->
-									<DIV id="addEventInviteUI" style="display:block;width:100%">
-									<table border=0 cellspacing=0 cellpadding=2 width=100%>
-										<tr>
-											<td valign=top> 
-												<table border=0 cellspacing=0 cellpadding=2 width=100%>
-													<tr><td colspan=3>
-														<ul style="padding-left:20px">
-														<li>{$MOD.LBL_INVITE_INST1}
-														<li>{$MOD.LBL_INVITE_INST2}
-														</ul>
-													</td></tr>
-													<tr>
-														<td><b>{$MOD.LBL_AVL_USERS}</b></td>
-														<td>&nbsp;</td>
-														<td><b>{$MOD.LBL_SEL_USERS}</b></td>
-													</tr>
-													<tr>
-														<td width=40% align=center valign=top>
-														<select name="availableusers" id="availableusers" class=small size=5 multiple style="height:70px;width:100%">
-														{foreach item=username key=userid from=$USERSLIST}
-														{if $userid != ''}
-														<option value="{$userid}">{$username}</option>
-														{/if}
-														{/foreach}
-														</select>
-														</td>
-														<td width=20% align=center valign=top>
-														<input type=button value="{$MOD.LBL_ADD_BUTTON} >>" class="crm button small save" style="width:100%" onClick="addColumn()"><br>
-														<input type=button value="<< {$MOD.LBL_RMV_BUTTON} " class="crm button small cancel" style="width:100%" onClick="delColumn()">
-														</td>
-														<td width=40% align=center valign=top>
-														<select name="selectedusers" id="selectedusers" class=small size=5 multiple style="height:70px;width:100%">
-														{foreach item=username key=userid from=$INVITEDUSERS}
-														{if $userid != ''}
-														<option value="{$userid}">{$username}</option>
-                                                                                                                {/if}
-                                                                                                                {/foreach}
-														</select>
-														<div align=left> {$MOD.LBL_SELUSR_INFO}
-														</div>
-														</td>
-													</tr>
-												</table>
-											</td>
-										</tr>
-									</table>
-									</DIV>
-									<!-- Reminder UI -->	
-									<DIV id="addEventAlarmUI" style="display:none;width:100%">
-										<table>
-											{assign var=secondval value=$secondvalue.reminder_time}
-											{assign var=check value=$secondval[0]}
-											{assign var=yes_val value=$secondval[1]}
-											{assign var=no_val value=$secondval[2]}
-											
-											<tr><td>{$LABEL.reminder_time}</td><td>
-											<input type="radio" name="set_reminder" value="Yes" {$check} onClick="showBlock('reminderOptions')">&nbsp;{$yes_val}&nbsp;
-											<input type="radio" name="set_reminder" value="No" onClick="fnhide('reminderOptions')">&nbsp;{$no_val}&nbsp;
-											</td></tr>
-										</table>
-									{if $check eq 'CHECKED'}
-										{assign var=reminstyle value='style="display:block;width:100%"'}
-									{else}
-										{assign var=reminstyle value='style="display:none;width:100%"'}
-									{/if}
-									<DIV id="reminderOptions" {$reminstyle}>
-										<table border=0 cellspacing=0 cellpadding=2  width=100%>
-											<tr>
-												<td nowrap align=right width=20% valign=top><b>{$MOD.LBL_RMD_ON} : </b></td>
-												<td width=80%>
-													<table border=0>
-													<tr>
-														<td colspan=2>
-														{foreach item=val_arr from=$ACTIVITYDATA.reminder_time}
-														{assign var=start value="$val_arr[0]"}
-														{assign var=end value="$val_arr[1]"}
-														{assign var=sendname value="$val_arr[2]"}
-														{assign var=disp_text value="$val_arr[3]"}
-														{assign var=sel_val value="$val_arr[4]"}
-														<select name="{$sendname}">
-														{section name=reminder start=$start max=$end loop=$end step=1 }
-														{if $smarty.section.reminder.index eq $sel_val}
-														{assign var=sel_value value="SELECTED"}
-														{else}
-														{assign var=sel_value value=""}
-														{/if}
-														<OPTION VALUE="{$smarty.section.reminder.index}" "{$sel_value}">{$smarty.section.reminder.index}</OPTION>
-														{/section}
-														</select>
-														&nbsp;{$disp_text}
-														{/foreach}
-														</td>
-													</tr>
-													</table>
-												</td>
-											</tr>
-											<tr>
-												<td nowrap align=right>
-													{$MOD.LBL_SDRMD}
-												</td>
-												<td >
-													<input type=text name="toemail" class=textbox style="width:90%" value="{$USEREMAILID}">
-												</td>
-											</tr>
-										</table>
-									</DIV>
-									</DIV>
-									<!-- Repeat UI -->
-									<div id="addEventRepeatUI" style="display:none;width:100%">
-
-									<table border=0 cellspacing=0 cellpadding=2  width=100%>
-										<tr>
-											<td nowrap align=right width=20% valign=top>
-												<strong>{$MOD.LBL_REPEAT}</strong>
-											</td>
-											<td nowrap width=80% valign=top>
-												<table border=0 cellspacing=0 cellpadding=0>
-												<tr>
-							
-													<td width=20>
-													{if $ACTIVITYDATA.recurringcheck eq 'Yes'}
-														{assign var=rptstyle value='style="display:block"'}
-														{if $ACTIVITYDATA.eventrecurringtype eq 'Daily'}
-															{assign var=rptmonthstyle value='style="display:none"'}
-															{assign var=rptweekstyle value='style="display:none"'}
-														{elseif $ACTIVITYDATA.eventrecurringtype eq 'Weekly'}
-															{assign var=rptmonthstyle value='style="display:none"'}
-															{assign var=rptweekstyle value='style="display:block"'}
-														{elseif $ACTIVITYDATA.eventrecurringtype eq 'Monthly'}
-															{assign var=rptmonthstyle value='style="display:block"'}
-															{assign var=rptweekstyle value='style="display:none"'}
-														{elseif $ACTIVITYDATA.eventrecurringtype eq 'Yearly'}
-															{assign var=rptmonthstyle value='style="display:none"'}
-															{assign var=rptweekstyle value='style="display:none"'}
-														{/if}
-													<input type="checkbox" name="recurringcheck" onClick="showhide('repeatOptions')" checked>
-													{else}
-														{assign var=rptstyle value='style="display:none"'}
-														{assign var=rptmonthstyle value='style="display:none"'}
-														{assign var=rptweekstyle value='style="display:none"'}
-													<input type="checkbox" name="recurringcheck" onClick="showhide('repeatOptions')">
-													{/if}
-													</td>
-													<td colspan=2>Enable Repeat</td>
-												</tr>
-												<tr>
-													<td colspan=2>
-													<div id="repeatOptions" {$rptstyle}>
-													<table border=0 cellspacing=0 cellpadding=2>
-													<tr>
-													<td>Repeat once in every</td>
-													<td><input type="text" name="repeat_frequency" class="textbox" style="width:20px" value="{$ACTIVITYDATA.repeat_frequency}" ></td>
-													<td><select name="recurringtype">
-													<option value="Daily" onClick="ghide('repeatWeekUI'); ghide('repeatMonthUI');" {if $ACTIVITYDATA.eventrecurringtype eq 'Daily'} selected {/if}>{$MOD.LBL_DAYS}</option>
-													<option value="Weekly" onClick="gshow('repeatWeekUI'); ghide('repeatMonthUI');" {if $ACTIVITYDATA.eventrecurringtype eq 'Weekly'} selected {/if}>{$MOD.LBL_WEEKS}</option>
-												<option value="Monthly" onClick="ghide('repeatWeekUI'); gshow('repeatMonthUI');" {if $ACTIVITYDATA.eventrecurringtype eq 'Monthly'} selected {/if}>{$MOD.LBL_MONTHS}</option>
-													<option value="Yearly" onClick="ghide('repeatWeekUI'); ghide('repeatMonthUI');"; {if $ACTIVITYDATA.eventrecurringtype eq 'Yearly'} selected {/if}>{$MOD.LBL_YEAR}</option>
-													</select>
-													</td>
-												</tr>
-												</table>
-												<div id="repeatWeekUI" {$rptweekstyle}>
-												<table border=0 cellspacing=0 cellpadding=2>
-												<tr>
-													<td><input name="sun_flag" value="sunday" {$ACTIVITYDATA.week0} type="checkbox"></td><td>Sun</td>
-													<td><input name="mon_flag" value="monday" {$ACTIVITYDATA.week1} type="checkbox"></td><td>Mon</td>
-													<td><input name="tue_flag" value="tuesday" {$ACTIVITYDATA.week2} type="checkbox"></td><td>Tue</td>
-													<td><input name="wed_flag" value="wednesday" {$ACTIVITYDATA.week3} type="checkbox"></td><td>Wed</td>
-													<td><input name="thu_flag" value="thursday" {$ACTIVITYDATA.week4} type="checkbox"></td><td>Thu</td>
-													<td><input name="fri_flag" value="friday" {$ACTIVITYDATA.week5} type="checkbox"></td><td>Fri</td>
-													<td><input name="sat_flag" value="saturday" {$ACTIVITYDATA.week6} type="checkbox"></td><td>Sat</td>
-												</tr>
-												</table>
-												</div>
-	
-												<div id="repeatMonthUI" {$rptmonthstyle}>
-												<table border=0 cellspacing=0 cellpadding=2>
-												<tr>
-													<td>
-														<table border=0 cellspacing=0 cellpadding=2>
-														<tr>
-														<td><input type="radio" checked name="repeatMonth" {if $ACTIVITYDATA.repeatMonth eq 'date'} checked {/if} value="date"></td><td>on</td><td><input type="text" class=textbox style="width:20px" value="{$ACTIVITYDATA.repeatMonth_date}" name="repeatMonth_date" ></td><td>day of the month</td>
-														</tr>
-														</table>
-													</td>
-												</tr>
-												<tr>
-													<td>
-														<table border=0 cellspacing=0 cellpadding=2>
-														<tr><td>
-														<input type="radio" name="repeatMonth" {if $ACTIVITYDATA.repeatMonth eq 'day'} checked {/if} value="day"></td>
-														<td>on</td>
-														<td>
-														<select name="repeatMonth_daytype">
-															<option value="first" {if $ACTIVITYDATA.repeatMonth_daytype eq 'first'} selected {/if}>First</option>
-															<option value="last" {if $ACTIVITYDATA.repeatMonth_daytype eq 'last'} selected {/if}>Last</option>
-														</select>
-														</td>
-														<td>
-														<select name="repeatMonth_day">
-															<option value=1 {if $ACTIVITYDATA.repeatMonth_day eq 1} selected {/if}>{$MOD.LBL_DAY1}</option>
-															<option value=2 {if $ACTIVITYDATA.repeatMonth_day eq 2} selected {/if}>{$MOD.LBL_DAY2}</option>
-															<option value=3 {if $ACTIVITYDATA.repeatMonth_day eq 3} selected {/if}>{$MOD.LBL_DAY3}</option>
-															<option value=4 {if $ACTIVITYDATA.repeatMonth_day eq 4} selected {/if}>{$MOD.LBL_DAY4}</option>
-															<option value=5 {if $ACTIVITYDATA.repeatMonth_day eq 5} selected {/if}>{$MOD.LBL_DAY5}</option>
-															<option value=6 {if $ACTIVITYDATA.repeatMonth_day eq 6} selected {/if}>{$MOD.LBL_DAY6}</option>
-														</select>
-														</td>
-														</tr>
-														</table>
-													</td>
-												</tr>
-												</table>
-												</div>
-								
-											</div>
-										</td>
-										</tr>
-									</table>
-								</td>
-							</tr>
-						</table>
-						</div>
-						<div id="addEventRelatedtoUI" style="display:none;width:100%">
-						<table width="100%" cellpadding="5" cellspacing="0" border="0">
-							<tr>
-								<td><b>{$MOD.LBL_RELATEDTO}</b></td>
-								<td>
-									<input name="parent_id" type="hidden" value="{$secondvalue.parent_id}">
-									<select name="parent_type" class="small" id="parent_type" onChange="document.EditView.parent_name.value='';document.EditView.parent_id.value=''">
-									{section name=combo loop=$LABEL.parent_id}
-										<option value="{$fldlabel_combo.parent_id[combo]}" {$fldlabel_sel.parent_id[combo]}>{$LABEL.parent_id[combo]}</option>
-									{/section}
-                                             				</select>
-								</td>
-								<td>
-									<div id="eventrelatedto" align="left">
-										<input name="parent_name" readonly type="text" class="calTxt small" value="{$ACTIVITYDATA.parent_id}">
-										<input type="button" name="selectparent" class="crmButton small edit" value="Select" onclick="return window.open('index.php?module='+document.EditView.parent_type.value+'&action=Popup','test','width=640,height=602,resizable=0,scrollbars=0,top=150,left=200');">
-									</div>
-								</td>
-							</tr>
-							<tr>
-								<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;
-									<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>
-						</table>
-					</div>
-			</td>
-		</tr>
-		</table>
-		<!-- Alarm, Repeat, Invite stops-->
-		{else}
-		<table border="0" cellpadding="5" cellspacing="0" width="100%">
-			<tr>
-                        	<td width="20%" align="right"><b>{$MOD.LBL_TODO}</b></td>
-                        	<td width="80%" align="left"><input name="subject" value="{$ACTIVITYDATA.subject}" class="textbox" style="width: 70%;" type="text"></td>
-           		</tr>
-			<tr>
-				<td align="right"><b>{$LABEL.description}</b></td>
-				<td align="left"><textarea style="width: 90%; height: 60px;" name="description">{$ACTIVITYDATA.description}</textarea>
-			</tr>
-			<tr>
-		    		<td colspan="2" align="center" width="80%">
-					<table border="0" cellpadding="3" cellspacing="0" width="80%">
-            					<tr>
-							<td align="left"><b>{$LABEL.taskstatus}</td>
-              						<td align="left"><b>{$LABEL.taskpriority}</b></td>
-              						<td align="left"><b>{$LABEL.assigned_user_id}</b></td>
-						</tr>
-						<tr>
-							<td align="left" valign="top">
-								<select name="taskstatus" id="taskstatus" class=small>
-                                        			{foreach item=arr from=$ACTIVITYDATA.taskstatus}
-                                        			{foreach key=sel_value item=value from=$arr}
-                                                			<option value="{$sel_value}" {$value}>
-                                                        		{if $APP[$sel_value] neq ''}
-                                                                		{$APP[$sel_value]}
-                                                        		{else}
-                                                                		{$sel_value}
-                                                        		{/if}
-                                                			</option>
-                                        			{/foreach}
-                                        			{/foreach}
-                                				</select>
-							</td>
-							<td align="left" valign="top">
-								<select name="taskpriority" id="taskpriority" class=small>
-        			                                {foreach item=arr from=$ACTIVITYDATA.taskpriority}
-                                			        {foreach key=sel_value item=value from=$arr}
-			                                                <option value="{$sel_value}" {$value}>
-                        		                                {if $APP[$sel_value] neq ''}
-                                        		                        {$APP[$sel_value]}
-                                                       			{else}
-                                                                		{$sel_value}
-                                                        		{/if}
-                                                			</option>
-                                        			{/foreach}
-                                        			{/foreach}
-                                				</select>
-							</td>
-							<td align="left" valign="top">
-								{assign var=check value=1}
-                                        			{foreach key=key_one item=arr from=$ACTIVITYDATA.assigned_user_id}
-			                                        {foreach key=sel_value item=value from=$arr}
-                        		                              	{if $value ne ''}
-                                        		                      	{assign var=check value=$check*0}
-                                                        		{else}
-                                                                		{assign var=check value=$check*1}
-                                                        		{/if}
-                                                		{/foreach}
-                                        			{/foreach}
-								{if $check eq 0}
-                                             				{assign var=select_user value='checked'}
-                                                			{assign var=style_user value='display:block'}
-                                                			{assign var=style_group value='display:none'}
-                                        			{else}
-                                                			{assign var=select_group value='checked'}
-                                                			{assign var=style_user value='display:none'}
-                                                			{assign var=style_group value='display:block'}
-                                        			{/if}
-				                                <input type="radio" name="assigntype" {$select_user} value="U" onclick="toggleAssignType(this.value)">&nbsp;User
-				                                {if $secondvalue.assigned_user_id neq ''}
-                                			        <input type="radio" name="assigntype" {$select_group} value="T" onclick="toggleAssignType(this.value)">&nbsp;Group
-                                        			{/if}
-                                        			<span id="assign_user" style="{$style_user}">
-                                                		<select name="assigned_user_id" class=small>
-                                                        	{foreach key=key_one item=arr from=$ACTIVITYDATA.assigned_user_id}
-				                                {foreach key=sel_value item=value from=$arr}
-                                		                	<option value="{$key_one}" {$value}>{$sel_value}</option>
-								{/foreach}
-                                                        	{/foreach}
-                                                		</select>
-								</span>
-								{if $secondvalue.assigned_user_id neq ''}
-                                                		<span id="assign_team" style="{$style_group}">
-                                                        		<select name="assigned_group_name" class=small>';
-                                                                		{foreach key=key_one item=arr from=$secondvalue.assigned_user_id}
-                                                                       		{foreach key=sel_value item=value from=$arr}
-                                                                               		<option value="{$sel_value}" {$value}>{$sel_value}</option>
-                                                                       		{/foreach}
-                                                                		{/foreach}
-                                                        		</select>
-				                                </span>
-                                				{/if}	
-							</td>
-						</tr>
-					</table>
-				</td>
-			</tr>
-			<tr><td colspan="2">    <hr noshade="noshade" size="1"></td></tr>
-			</table>
-			<table bgcolor="#ffffff" border="0" cellpadding="5" cellspacing="0" width="90%" align=center>
-			<tr><td>
-				<table border="0" cellpadding="0" cellspacing="0" width="100%" align=center>
-				<tr><td width=50% valign=top style="border-right:1px solid #dddddd">
-					<table border=0 cellspacing=0 cellpadding=2 width=90% align=center>
-						<tr><td colspan=3 ><b>{$MOD.LBL_TODODATETIME}</b></td></tr>
-						<tr><td colspan=3>{$STARTHOUR}</td></tr>
-						<tr><td>
-							{foreach key=date_value item=time_value from=$ACTIVITYDATA.date_start}
-	                                        		{assign var=date_val value="$date_value"}
-								{assign var=time_val value="$time_value"}
-                                        		{/foreach}
-							<input name="date_start" id="date_start" class="textbox" style="width: 90px;" value="{$date_val}" type="text"></td><td width=100%><img src="{$IMAGE_PATH}btnL3Calendar.gif" alt="Set date.." title="Set date.." id="jscal_trigger_date_start" align="middle" border="0">
-							{foreach key=date_fmt item=date_str from=$secondvalue.date_start}
-								{assign var=date_vl value="$date_fmt"}
-							{/foreach}				
-							<script type="text/javascript">
-								Calendar.setup ({ldelim}
-	        	                                	inputField : "date_start", ifFormat : "{$date_vl}", showsTime : false, button : "jscal_trigger_date_start", singleClick : true, step : 1
-							{rdelim})
-							</script>
-						</td></tr>
-					</table></td>
-					<td width=50% valign="top">
-                                                <table border="0" cellpadding="2" cellspacing="0" width="90%" align=center>
-							<tr><td colspan=3><b>{$LABEL.due_date}</b></td></tr>
-							<tr><td>
-								{foreach key=date_value item=time_value from=$ACTIVITYDATA.due_date}
-									{assign var=date_val value="$date_value"}
-									{assign var=time_val value="$time_value"}
-								{/foreach}
-								<input name="due_date" id="due_date" class="textbox" style="width: 90px;" value="{$date_val}" type="text"></td><td width=100%><img src="{$IMAGE_PATH}btnL3Calendar.gif" alt="Set date.." title="Set date.." id="jscal_trigger_due_date" border="0">
-								{foreach key=date_fmt item=date_str from=$secondvalue.due_date}
-                                                			{assign var=date_vl value="$date_fmt"}
-                                        			{/foreach}
-				      				<script type="text/javascript">
-								Calendar.setup ({ldelim}
-	                                        			inputField : "date_start", ifFormat : "{$date_vl}", showsTime : false, button : "jscal_trigger_due_date", singleClick : true, step : 1
-					   			{rdelim})
-								</script>
-        						</td></tr>
-						</table></td>
-					</tr>
-				</table>
-				</td></tr>
-                	<tr><td>&nbsp;</td></tr>
-        	</table>
-		<table align="center" border="0" cellpadding="0" cellspacing="0" width="95%" bgcolor="#FFFFFF">
-			<tr>
-				<td>
-					<table border="0" cellpadding="3" cellspacing="0" width="100%">
-						<tr>
-							<td class="dvtTabCache" style="width: 10px;" nowrap="nowrap">&nbsp;</td>
-							<td id="cellTabInvite" class="dvtSelectedCell" align="center" nowrap="nowrap"><a href="javascript:doNothing()" onClick="switchClass('cellTabInvite','on');switchClass('cellTabRelatedto','off');Taskshow('addTaskAlarmUI','todo',document.EditView.date_start.value,document.EditView.starthr.value,document.EditView.startmin.value,document.EditView.startfmt.value);ghide('addTaskRelatedtoUI');">{$MOD.LBL_NOTIFICATION}</a></td>
-							<td class="dvtTabCache" style="width: 10px;" nowrap="nowrap">&nbsp;
-                                                        <td id="cellTabRelatedto" class="dvtUnSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabInvite','off');switchClass('cellTabRelatedto','on');Taskshow('addTaskRelatedtoUI','todo',document.EditView.date_start.value,document.EditView.starthr.value,document.EditView.startmin.value,document.EditView.startfmt.value);ghide('addTaskAlarmUI');">{$MOD.LBL_RELATEDTO}</a></td>
-                                                        <td class="dvtTabCache" style="width:100%">
-						</tr>
-
-					</table>
-				</td>
-			</tr>
-			<tr>
-				<td class="dvtContentSpace" style="padding: 10px; height: 120px;" align="left" valign="top" width="100%">
-			<!-- Reminder UI -->
-			<div id="addTaskAlarmUI" style="display: block; width: 100%;">
-                	<table>
-				<tr><td>{$LABEL.sendnotification}</td>
-					{if $ACTIVITYDATA.sendnotification eq 1}
-                                        <td>
-                                                <input name="sendnotification" type="checkbox" checked>
-                                        </td>
-                                	{else}
-                                        <td>
-                                                <input name="sendnotification" type="checkbox">
-                                        </td>
-                                	{/if}
-				</tr>
-			</table>
-			</div>
-			<div id="addTaskRelatedtoUI" style="display:none;width:100%">
-           		     <table width="100%" cellpadding="5" cellspacing="0" border="0">
-                	     <tr>
-                        	     <td><b>{$MOD.LBL_RELATEDTO}</b></td>
-                                     <td>
-					<input name="parent_id" type="hidden" value="{$secondvalue.parent_id}">
-                                             <select name="parent_type" class="small" id="parent_type" onChange="document.EditView.parent_name.value='';document.EditView.parent_id.value=''">
-							{section name=combo loop=$LABEL.parent_id}
-								<option value="{$fldlabel_combo.parent_id[combo]}" {$fldlabel_sel.parent_id[combo]}>{$LABEL.parent_id[combo]}</option>
-							{/section}
-					     </select>
-                                     </td>
-                                     <td>
-                              	        <div id="taskrelatedto" align="left">
-						<input name="parent_name" readonly type="text" class="calTxt small" value="{$ACTIVITYDATA.parent_id}">
-						<input type="button" name="selectparent" class="crmButton small edit" value="Select" onclick="return window.open('index.php?module='+document.EditView.parent_type.value+'&action=Popup','test','width=640,height=602,resizable=0,scrollbars=0,top=150,left=200');">
-					 </div>
-                                     </td>
-			     </tr>
-			     <tr>
-                                     <td><b>{$LABEL.contact_id}</b></td>
-				     <td colspan="2">
-						<input name="contact_name" readonly type="text" class="calTxt" value="{$ACTIVITYDATA.contact_id}"><input name="contact_id" type="hidden" value="{$secondvalue.contact_id}">&nbsp;
-						<input type="button" onclick="return window.open('index.php?module=Contacts&action=Popup&html=Popup_picker&popuptype=specific&form=EditView','test','width=640,height=602,resizable=0,scrollbars=0');" class="crmButton small edit" name="selectcnt" value="Select Contact">
-				     </td>
-                             </tr>
-		</table>
-              	</div>
-                </td></tr></table>
-
-		{/if}
-			</td></tr>
-			<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" {if $ACTIVITY_MODE neq 'Task'} onclick="this.form.action.value='Save';  displaydeleted();return maincheck_form();"{else} onclick="this.form.action.value='Save';  displaydeleted(); maintask_check_form();return formValidate();" {/if} 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>
-		</td></tr></table>
-		</td></tr></table>
-		</td></tr></table>
-</td></tr>
-</form></table>
-</td></tr></table>
-</td></tr></table>
-</td></tr></table>
-        </td></tr></table>
-        </td></tr></table>
-        </div>
-        </td>
-        <td valign=top><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
-        </tr>
-        </table>
-<script>
-{if $ACTIVITY_MODE eq 'Task'}
-	var fieldname = new Array('subject','date_start','time_start','taskstatus');
-	var fieldlabel = new Array('Subject','Date','Time','Status');
-	var fielddatatype = new Array('V~M','D~M~time_start','T~O','V~O');
-{else}
-	var fieldname = new Array('subject','date_start','due_date','taskpriority','sendnotification','parent_id','contact_id','reminder_time','recurringtype');
-	var fieldlabel = new Array('Subject','Start Date','Due Date','Priority','Send Notification','Related To','Contact Name','Send Reminder','Recurrence');
-	var fielddatatype = new Array('V~M','D~M','D~M~OTH~GE~date_start~Start Date','V~O','C~O','I~O','I~O','I~O','O~O');
-{/if}
-</script>
-<script>	
-	var ProductImages=new Array();
-	var count=0;
-
-	function delRowEmt(imagename)
-	{ldelim}
-		ProductImages[count++]=imagename;
-	{rdelim}
-
-	function displaydeleted()
-	{ldelim}
-		var imagelists='';
-		for(var x = 0; x < ProductImages.length; x++)
-		{ldelim}
-			imagelists+=ProductImages[x]+'###';
-		{rdelim}
-
-		if(imagelists != '')
-			document.EditView.imagelist.value=imagelists
-	{rdelim}
-
-</script>
-<script language="JavaScript" type="text/JavaScript">
-	setObjects();
-</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}/Activity.js"></script>
+<script type="text/javascript">
+</script>
+
+{*<!-- Contents -->*}
+<table width="100%" cellpadding="2" cellspacing="0" border="0">
+<form name="EditView" method="POST" action="index.php">
+<input type="hidden" name="time_start" id="time_start">
+<tr>
+        <td>
+                <table cellpadding="0" cellspacing="5" border="0">
+			{include file='EditViewHidden.tpl'}
+                </table>
+<table  border="0" cellpadding="5" cellspacing="0" width="100%" >
+<tr>
+        <td class="lvtHeaderText" style="border-bottom:1px dotted #cccccc">
+
+                <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%">
+                        <tr><td>
+		
+				{if $OP_MODE eq 'edit_view'}   
+					<span class="lvtHeaderText"><font color="purple">[ {$ID} ] </font>{$NAME} - {$APP.LBL_EDITING} {$SINGLE_MOD} {$APP.LBL_INFORMATION}</span> <br>
+					<span class="small">{$UPDATEINFO}	 </span> 
+				{/if}
+				{if $OP_MODE eq 'create_view'}
+					<span class="lvtHeaderText">{$APP.LBL_CREATING} {$SINGLE_MOD}</span> <br>
+				{/if}
+			</td></tr>
+		</table>
+        </td>
+</tr>
+
+<tr><td>
+<table border="0" cellpadding="5" cellspacing="0" width="100%">
+        <tr>
+                <td valign=top align=left >
+                           <table border=0 cellspacing=0 cellpadding=0 width=100%>
+                                <tr>
+					<td align=left>
+					<!-- content cache -->
+
+					<table border=0 cellspacing=0 cellpadding=0 width=100%>
+					  <tr>
+					     <td style="padding:10px">
+						     <!-- General details -->
+						     <table border=0 cellspacing=0 cellpadding=0 width=100% >
+						     <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" {if $ACTIVITY_MODE neq 'Task'} onclick="this.form.action.value='Save';  displaydeleted();return maincheck_form();"{else} onclick="this.form.action.value='Save';  displaydeleted(); maintask_check_form();return formValidate();" {/if} 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>
+						     <!-- included to handle the edit fields based on ui types -->
+						     {foreach key=header item=data from=$BLOCKS}
+						     <table border=0 cellspacing=0 cellpadding=0 width=100% class="small">
+						     <tr>
+							<td colspan=4 class="tableHeading">
+								<b>{$header}</b>
+							</td>
+						     </tr>
+						     </table>
+						     {/foreach}
+						     {if $ACTIVITY_MODE neq 'Task'}
+							<input type="hidden" name="time_end" id="time_end">
+							<input type=hidden name="inviteesid" id="inviteesid" value="">
+							<input type="hidden" name="duration_hours" value="0">
+							<input type="hidden" name="duration_minutes" value="0">
+						     <table border=0 cellspacing=0 cellpadding=5 width=100% >
+							<tr>
+								<td class="cellLabel" nowrap  width=20% align="right"><b>{$MOD.LBL_EVENTTYPE}</b></td>
+								<td class="cellInfo" width=80% align="left">
+									<table>
+										<tr>
+										{foreach key=tyeparrkey item=typearr from=$ACTIVITYDATA.activitytype}
+                                                                                {foreach key=sel_value item=value from=$typearr}
+                                                                                {if $value eq 'selected' && $sel_value eq 'Meeting'}
+                                                                                        {assign var='meetcheck' value='checked'}
+                                                                                        {assign var='callcheck' value=''}
+                                                                                {else}
+                                                                                        {assign var='meetcheck' value=''}
+                                                                                        {assign var='callcheck' value='checked'}
+                                                                                {/if}
+                                                                                {/foreach}
+                                                                                {/foreach}
+											<td><input type="radio" name='activitytype' value='Call' style='vertical-align: middle;' {$callcheck}></td><td>{$APP.Call}</td><td style="width:10px">
+											<td><input type="radio" name='activitytype' value='Meeting' style='vertical-align: middle;' {$meetcheck}></td><td>{$APP.Meeting}</td><td style="width:20px">
+										</tr>
+									</table>
+								</td>
+							</tr>
+							<tr>
+								<td class="cellLabel" nowrap align="right"><b>{$MOD.LBL_EVENTNAME}</b></td>
+								<td class="cellInfo" align="left"><input name="subject" type="text" class="textbox" value="{$ACTIVITYDATA.subject}" style="width:50%">&nbsp;&nbsp;&nbsp;
+								{foreach key=key_one item=arr from=$ACTIVITYDATA.visibility}
+                                                                        {foreach key=sel_value item=value from=$arr}
+                                                                        {if $value eq 'selected' && $sel_value eq 'Public'}
+                                                                                {assign var="visiblecheck" value="checked"}
+                                                                        {else}
+                                                                                {assign var="visiblecheck" value=""}
+                                                                        {/if}
+                                                                        {/foreach}
+                                                                        {/foreach}
+                                                                        <input name="visibility" value="Public" type="checkbox" {$visiblecheck}>{$MOD.LBL_PUBLIC}
+								</td>
+							</tr>
+							<tr>
+                        					<td class="cellLabel" valign="top" nowrap align="right"><b>{$LABEL.description}</b></td>
+								<td class="cellInfo" align="left"><textarea style="width:100%; height : 60px;" name="description">{$ACTIVITYDATA.description}</textarea></td>
+                					</tr>
+							<tr>
+								<td colspan=2 width=80% align="center">
+								<table border=0 cellspacing=0 cellpadding=3 width=80%>
+									<tr>
+										<td ><b>{$LABEL.eventstatus}</b></td>
+                                                                                <td ><b>{$LABEL.assigned_user_id}</b></td>
+									</tr>
+									<tr>
+										<td valign=top>
+                                                                                <select name="eventstatus" id="eventstatus" class=small>
+                                                                                        {foreach item=arr from=$ACTIVITYDATA.eventstatus}
+                                                                                        {foreach key=sel_value item=value from=$arr}
+                                                                                        <option value="{$sel_value}" {$value}>
+                                                                                                {if $APP[$sel_value] neq ''}
+                                                                                                {$APP[$sel_value]}
+                                                                                                {else}
+                                                                                                        {$sel_value}
+                                                                                                {/if}
+                                                                                        </option>
+                                                                                        {/foreach}
+                                                                                        {/foreach}
+                                                                                </select>
+                                                                        	</td>
+										<td valign=top rowspan=2>
+											{assign var=check value=1}
+                                        						{foreach key=key_one item=arr from=$ACTIVITYDATA.assigned_user_id}
+                                                					{foreach key=sel_value item=value from=$arr}
+                                                        					{if $value ne ''}
+                                                                					{assign var=check value=$check*0}
+                                                        					{else}
+                                                                					{assign var=check value=$check*1}
+                                                        					{/if}
+                                                					{/foreach}
+                                        						{/foreach}
+
+                                        						{if $check eq 0}
+                                                						{assign var=select_user value='checked'}
+                                                						{assign var=style_user value='display:block'}
+                                                						{assign var=style_group value='display:none'}
+                                        						{else}
+                                                						{assign var=select_group value='checked'}
+                                                						{assign var=style_user value='display:none'}
+                                                						{assign var=style_group value='display:block'}
+                                        						{/if}
+                                        						<input type="radio" name="assigntype" {$select_user} value="U" onclick="toggleAssignType(this.value)">&nbsp;{$APP.LBL_USER}
+                                        						{if $secondvalue.assigned_user_id neq ''}
+                                                					<input type="radio" name="assigntype" {$select_group} value="T" onclick="toggleAssignType(this.value)">&nbsp;{$APP.LBL_GROUP}
+                                        						{/if}
+											<span id="assign_user" style="{$style_user}">
+                                     				           			<select name="assigned_user_id">
+                                                        					{foreach key=key_one item=arr from=$ACTIVITYDATA.assigned_user_id}
+                                                                				{foreach key=sel_value item=value from=$arr}
+                                                                        				<option value="{$key_one}" {$value}>{$sel_value}</option>
+                                                                				{/foreach}
+                                                        					{/foreach}
+                                                			   			</select>
+                                        			       			</span>
+
+                                        						{if $secondvalue.assigned_user_id neq ''}
+                                                					<span id="assign_team" style="{$style_group}">
+                                                        					<select name="assigned_group_name" >';
+                                                                				{foreach key=key_one item=arr from=$secondvalue.assigned_user_id}
+                                                                        			{foreach key=sel_value item=value from=$arr}
+                                                                                			<option value="{$sel_value}" {$value}>{$sel_value}</option>
+                                                                        			{/foreach}
+                                                                				{/foreach}
+                                                        					</select>
+                                                					</span>
+                                        						{/if}
+											<br><input type="checkbox" name="sendnotification" >&nbsp;{$LABEL.sendnotification}
+										</td>
+									</tr>
+									<tr>
+										<td valign=top><b>{$LABEL.taskpriority}</b>
+										<br>
+										<select name="taskpriority" id="taskpriority">
+                                                                                        {foreach item=arr from=$ACTIVITYDATA.taskpriority}
+                                                                                        {foreach key=sel_value item=value from=$arr}
+                                                                                        <option value="{$sel_value}" {$value}>
+                                                                                                {if $APP[$sel_value] neq ''}
+                                                                                                {$APP[$sel_value]}
+                                                                                                {else}
+                                                                                                        {$sel_value}
+                                                                                                {/if}
+                                                                                        </option>
+                                                                                        {/foreach}
+                                                                                        {/foreach}
+                                                                                </select>
+										</td> 
+										
+									</tr>
+								</table>
+							</td></tr>
+						     </table>
+						     <hr noshade size=1>
+						     <table border=0 cellspacing=0 cellpadding=5 width=90% align=center bgcolor="#FFFFFF">
+							<tr>
+								<td >
+									<table border=0 cellspacing=0 cellpadding=2 width=100% align=center>
+									<tr><td width=50% valign=top style="border-right:1px solid #dddddd">
+										<table border=0 cellspacing=0 cellpadding=2 width=90% align=center>
+											<tr><td colspan=3 ><b>{$MOD.LBL_EVENTSTAT}</b></td></tr>
+											<tr><td colspan=3>{$STARTHOUR}</td></tr>
+											<tr><td>
+												{foreach key=date_value item=time_value from=$ACTIVITYDATA.date_start}
+                                                                                                        {assign var=date_val value="$date_value"}
+                                                                                                        {assign var=time_val value="$time_value"}
+	                                                                                        {/foreach}
+                                                                                                <input type="text" name="date_start" id="jscal_field_date_start" class="textbox" style="width:90px" value="{$date_val}"></td><td width=100%><img border=0 src="{$IMAGE_PATH}btnL3Calendar.gif" alt="Set date.." title="Set date.." id="jscal_trigger_date_start">
+													{foreach key=date_fmt item=date_str from=$secondvalue.date_start}
+													{assign var=date_vl value="$date_fmt"}
+													{/foreach}
+													<script type="text/javascript">
+														Calendar.setup ({ldelim}
+														inputField : "jscal_field_date_start", ifFormat : "{$date_vl}", showsTime : false, button : "jscal_trigger_date_start", singleClick : true, step : 1
+														{rdelim})
+													</script>
+											</td></tr>
+										</table></td>
+										<td width=50% valign=top >
+											<table border=0 cellspacing=0 cellpadding=2 width=90% align=center>
+												<tr><td colspan=3><b>{$MOD.LBL_EVENTEDAT}</b></td></tr>
+												<tr><td colspan=3>{$ENDHOUR}
+												</td></tr>
+												<tr><td>
+													{foreach key=date_value item=time_value from=$ACTIVITYDATA.due_date}
+													{assign var=date_val value="$date_value"}
+													{assign var=time_val value="$time_value"}
+													{/foreach}
+													<input type="text" name="due_date" id="jscal_field_due_date" class="textbox" style="width:90px" value="{$date_val}"></td><td width=100%><img border=0 src="{$IMAGE_PATH}btnL3Calendar.gif" alt="Set date.." title="Set date.." id="jscal_trigger_due_date">
+													{foreach key=date_fmt item=date_str from=$secondvalue.due_date}
+													{assign var=date_vl value="$date_fmt"}
+                                                                                                        {/foreach}
+													<script type="text/javascript">
+														Calendar.setup ({ldelim}
+														inputField : "jscal_field_due_date", ifFormat : "{$date_vl}", showsTime : false, button : "jscal_trigger_due_date", singleClick : true, step : 1
+														{rdelim})
+													</script>
+												</td></tr>
+											</table>
+										</td>
+									</tr>
+								</table></td>
+							</tr>
+						     </table>
+						     <br>
+						     <table border=0 cellspacing=0 cellpadding=0 width=100% align=center>
+							<tr><td>
+								<table border=0 cellspacing=0 cellpadding=3 width=100%>
+									<tr>
+										<td class="dvtTabCache" style="width:10px" nowrap>&nbsp;</td>
+										<td id="cellTabInvite" class="dvtSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabInvite','on');switchClass('cellTabAlarm','off');switchClass('cellTabRepeat','off');switchClass('cellTabRelatedto','off');ghide('addEventAlarmUI');gshow('addEventInviteUI','',document.EditView.date_start.value,document.EditView.due_date.value,document.EditView.starthr.value,document.EditView.startmin.value,document.EditView.startfmt.value,document.EditView.endhr.value,document.EditView.endmin.value,document.EditView.endfmt.value);ghide('addEventRepeatUI');ghide('addEventRelatedtoUI');">{$MOD.LBL_INVITE}</a></td>
+										<td class="dvtTabCache" style="width:10px">&nbsp;</td>
+										<td id="cellTabAlarm" class="dvtUnSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabInvite','off');switchClass('cellTabAlarm','on');switchClass('cellTabRepeat','off');switchClass('cellTabRelatedto','off');gshow('addEventAlarmUI','',document.EditView.date_start.value,document.EditView.due_date.value,document.EditView.starthr.value,document.EditView.startmin.value,document.EditView.startfmt.value,document.EditView.endhr.value,document.EditView.endmin.value,document.EditView.endfmt.value);ghide('addEventInviteUI');ghide('addEventRepeatUI');ghide('addEventRelatedtoUI');">{$MOD.LBL_REMINDER}</a></td>
+										<td class="dvtTabCache" style="width:10px">&nbsp;</td>
+										<td id="cellTabRepeat" class="dvtUnSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabInvite','off');switchClass('cellTabAlarm','off');switchClass('cellTabRepeat','on');switchClass('cellTabRelatedto','off');ghide('addEventAlarmUI');ghide('addEventInviteUI');gshow('addEventRepeatUI','',document.EditView.date_start.value,document.EditView.due_date.value,document.EditView.starthr.value,document.EditView.startmin.value,document.EditView.startfmt.value,document.EditView.endhr.value,document.EditView.endmin.value,document.EditView.endfmt.value);ghide('addEventRelatedtoUI');">{$MOD.LBL_REPEAT}</a></td>
+										<td class="dvtTabCache" style="width:10px">&nbsp;</td>
+										<td id="cellTabRelatedto" class="dvtUnSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabInvite','off');switchClass('cellTabAlarm','off');switchClass('cellTabRepeat','off');switchClass('cellTabRelatedto','on');ghide('addEventAlarmUI');ghide('addEventInviteUI');gshow('addEventRelatedtoUI','',document.EditView.date_start.value,document.EditView.due_date.value,document.EditView.starthr.value,document.EditView.startmin.value,document.EditView.startfmt.value,document.EditView.endhr.value,document.EditView.endmin.value,document.EditView.endfmt.value);ghide('addEventRepeatUI');">{$MOD.LBL_RELATEDTO}</a></td>
+										<td class="dvtTabCache" style="width:100%">&nbsp;</td>
+									</tr>
+								</table>
+							</td></tr>
+							<tr>
+								<td width=100% valign=top align=left class="dvtContentSpace" style="padding:10px;height:120px">
+								<!-- Invite UI -->
+									<DIV id="addEventInviteUI" style="display:block;width:100%">
+									<table border=0 cellspacing=0 cellpadding=2 width=100%>
+										<tr>
+											<td valign=top> 
+												<table border=0 cellspacing=0 cellpadding=2 width=100%>
+													<tr><td colspan=3>
+														<ul style="padding-left:20px">
+														<li>{$MOD.LBL_INVITE_INST1}
+														<li>{$MOD.LBL_INVITE_INST2}
+														</ul>
+													</td></tr>
+													<tr>
+														<td><b>{$MOD.LBL_AVL_USERS}</b></td>
+														<td>&nbsp;</td>
+														<td><b>{$MOD.LBL_SEL_USERS}</b></td>
+													</tr>
+													<tr>
+														<td width=40% align=center valign=top>
+														<select name="availableusers" id="availableusers" class=small size=5 multiple style="height:70px;width:100%">
+														{foreach item=username key=userid from=$USERSLIST}
+														{if $userid != ''}
+														<option value="{$userid}">{$username}</option>
+														{/if}
+														{/foreach}
+														</select>
+														</td>
+														<td width=20% align=center valign=top>
+														<input type=button value="{$MOD.LBL_ADD_BUTTON} >>" class="crm button small save" style="width:100%" onClick="addColumn()"><br>
+														<input type=button value="<< {$MOD.LBL_RMV_BUTTON} " class="crm button small cancel" style="width:100%" onClick="delColumn()">
+														</td>
+														<td width=40% align=center valign=top>
+														<select name="selectedusers" id="selectedusers" class=small size=5 multiple style="height:70px;width:100%">
+														{foreach item=username key=userid from=$INVITEDUSERS}
+														{if $userid != ''}
+														<option value="{$userid}">{$username}</option>
+                                                                                                                {/if}
+                                                                                                                {/foreach}
+														</select>
+														<div align=left> {$MOD.LBL_SELUSR_INFO}
+														</div>
+														</td>
+													</tr>
+												</table>
+											</td>
+										</tr>
+									</table>
+									</DIV>
+									<!-- Reminder UI -->	
+									<DIV id="addEventAlarmUI" style="display:none;width:100%">
+										<table>
+											{assign var=secondval value=$secondvalue.reminder_time}
+											{assign var=check value=$secondval[0]}
+											{assign var=yes_val value=$secondval[1]}
+											{assign var=no_val value=$secondval[2]}
+											
+											<tr><td>{$LABEL.reminder_time}</td><td>
+											<input type="radio" name="set_reminder" value="Yes" {$check} onClick="showBlock('reminderOptions')">&nbsp;{$yes_val}&nbsp;
+											<input type="radio" name="set_reminder" value="No" onClick="fnhide('reminderOptions')">&nbsp;{$no_val}&nbsp;
+											</td></tr>
+										</table>
+									{if $check eq 'CHECKED'}
+										{assign var=reminstyle value='style="display:block;width:100%"'}
+									{else}
+										{assign var=reminstyle value='style="display:none;width:100%"'}
+									{/if}
+									<DIV id="reminderOptions" {$reminstyle}>
+										<table border=0 cellspacing=0 cellpadding=2  width=100%>
+											<tr>
+												<td nowrap align=right width=20% valign=top><b>{$MOD.LBL_RMD_ON} : </b></td>
+												<td width=80%>
+													<table border=0>
+													<tr>
+														<td colspan=2>
+														{foreach item=val_arr from=$ACTIVITYDATA.reminder_time}
+														{assign var=start value="$val_arr[0]"}
+														{assign var=end value="$val_arr[1]"}
+														{assign var=sendname value="$val_arr[2]"}
+														{assign var=disp_text value="$val_arr[3]"}
+														{assign var=sel_val value="$val_arr[4]"}
+														<select name="{$sendname}">
+														{section name=reminder start=$start max=$end loop=$end step=1 }
+														{if $smarty.section.reminder.index eq $sel_val}
+														{assign var=sel_value value="SELECTED"}
+														{else}
+														{assign var=sel_value value=""}
+														{/if}
+														<OPTION VALUE="{$smarty.section.reminder.index}" "{$sel_value}">{$smarty.section.reminder.index}</OPTION>
+														{/section}
+														</select>
+														&nbsp;{$disp_text}
+														{/foreach}
+														</td>
+													</tr>
+													</table>
+												</td>
+											</tr>
+											<tr>
+												<td nowrap align=right>
+													{$MOD.LBL_SDRMD}
+												</td>
+												<td >
+													<input type=text name="toemail" class=textbox style="width:90%" value="{$USEREMAILID}">
+												</td>
+											</tr>
+										</table>
+									</DIV>
+									</DIV>
+									<!-- Repeat UI -->
+									<div id="addEventRepeatUI" style="display:none;width:100%">
+
+									<table border=0 cellspacing=0 cellpadding=2  width=100%>
+										<tr>
+											<td nowrap align=right width=20% valign=top>
+												<strong>{$MOD.LBL_REPEAT}</strong>
+											</td>
+											<td nowrap width=80% valign=top>
+												<table border=0 cellspacing=0 cellpadding=0>
+												<tr>
+							
+													<td width=20>
+													{if $ACTIVITYDATA.recurringcheck eq 'Yes'}
+														{assign var=rptstyle value='style="display:block"'}
+														{if $ACTIVITYDATA.eventrecurringtype eq 'Daily'}
+															{assign var=rptmonthstyle value='style="display:none"'}
+															{assign var=rptweekstyle value='style="display:none"'}
+														{elseif $ACTIVITYDATA.eventrecurringtype eq 'Weekly'}
+															{assign var=rptmonthstyle value='style="display:none"'}
+															{assign var=rptweekstyle value='style="display:block"'}
+														{elseif $ACTIVITYDATA.eventrecurringtype eq 'Monthly'}
+															{assign var=rptmonthstyle value='style="display:block"'}
+															{assign var=rptweekstyle value='style="display:none"'}
+														{elseif $ACTIVITYDATA.eventrecurringtype eq 'Yearly'}
+															{assign var=rptmonthstyle value='style="display:none"'}
+															{assign var=rptweekstyle value='style="display:none"'}
+														{/if}
+													<input type="checkbox" name="recurringcheck" onClick="showhide('repeatOptions')" checked>
+													{else}
+														{assign var=rptstyle value='style="display:none"'}
+														{assign var=rptmonthstyle value='style="display:none"'}
+														{assign var=rptweekstyle value='style="display:none"'}
+													<input type="checkbox" name="recurringcheck" onClick="showhide('repeatOptions')">
+													{/if}
+													</td>
+													<td colspan=2>Enable Repeat</td>
+												</tr>
+												<tr>
+													<td colspan=2>
+													<div id="repeatOptions" {$rptstyle}>
+													<table border=0 cellspacing=0 cellpadding=2>
+													<tr>
+													<td>Repeat once in every</td>
+													<td><input type="text" name="repeat_frequency" class="textbox" style="width:20px" value="{$ACTIVITYDATA.repeat_frequency}" ></td>
+													<td><select name="recurringtype">
+													<option value="Daily" onClick="ghide('repeatWeekUI'); ghide('repeatMonthUI');" {if $ACTIVITYDATA.eventrecurringtype eq 'Daily'} selected {/if}>{$MOD.LBL_DAYS}</option>
+													<option value="Weekly" onClick="gshow('repeatWeekUI'); ghide('repeatMonthUI');" {if $ACTIVITYDATA.eventrecurringtype eq 'Weekly'} selected {/if}>{$MOD.LBL_WEEKS}</option>
+												<option value="Monthly" onClick="ghide('repeatWeekUI'); gshow('repeatMonthUI');" {if $ACTIVITYDATA.eventrecurringtype eq 'Monthly'} selected {/if}>{$MOD.LBL_MONTHS}</option>
+													<option value="Yearly" onClick="ghide('repeatWeekUI'); ghide('repeatMonthUI');"; {if $ACTIVITYDATA.eventrecurringtype eq 'Yearly'} selected {/if}>{$MOD.LBL_YEAR}</option>
+													</select>
+													</td>
+												</tr>
+												</table>
+												<div id="repeatWeekUI" {$rptweekstyle}>
+												<table border=0 cellspacing=0 cellpadding=2>
+												<tr>
+													<td><input name="sun_flag" value="sunday" {$ACTIVITYDATA.week0} type="checkbox"></td><td>Sun</td>
+													<td><input name="mon_flag" value="monday" {$ACTIVITYDATA.week1} type="checkbox"></td><td>Mon</td>
+													<td><input name="tue_flag" value="tuesday" {$ACTIVITYDATA.week2} type="checkbox"></td><td>Tue</td>
+													<td><input name="wed_flag" value="wednesday" {$ACTIVITYDATA.week3} type="checkbox"></td><td>Wed</td>
+													<td><input name="thu_flag" value="thursday" {$ACTIVITYDATA.week4} type="checkbox"></td><td>Thu</td>
+													<td><input name="fri_flag" value="friday" {$ACTIVITYDATA.week5} type="checkbox"></td><td>Fri</td>
+													<td><input name="sat_flag" value="saturday" {$ACTIVITYDATA.week6} type="checkbox"></td><td>Sat</td>
+												</tr>
+												</table>
+												</div>
+	
+												<div id="repeatMonthUI" {$rptmonthstyle}>
+												<table border=0 cellspacing=0 cellpadding=2>
+												<tr>
+													<td>
+														<table border=0 cellspacing=0 cellpadding=2>
+														<tr>
+														<td><input type="radio" checked name="repeatMonth" {if $ACTIVITYDATA.repeatMonth eq 'date'} checked {/if} value="date"></td><td>on</td><td><input type="text" class=textbox style="width:20px" value="{$ACTIVITYDATA.repeatMonth_date}" name="repeatMonth_date" ></td><td>day of the month</td>
+														</tr>
+														</table>
+													</td>
+												</tr>
+												<tr>
+													<td>
+														<table border=0 cellspacing=0 cellpadding=2>
+														<tr><td>
+														<input type="radio" name="repeatMonth" {if $ACTIVITYDATA.repeatMonth eq 'day'} checked {/if} value="day"></td>
+														<td>on</td>
+														<td>
+														<select name="repeatMonth_daytype">
+															<option value="first" {if $ACTIVITYDATA.repeatMonth_daytype eq 'first'} selected {/if}>First</option>
+															<option value="last" {if $ACTIVITYDATA.repeatMonth_daytype eq 'last'} selected {/if}>Last</option>
+														</select>
+														</td>
+														<td>
+														<select name="repeatMonth_day">
+															<option value=1 {if $ACTIVITYDATA.repeatMonth_day eq 1} selected {/if}>{$MOD.LBL_DAY1}</option>
+															<option value=2 {if $ACTIVITYDATA.repeatMonth_day eq 2} selected {/if}>{$MOD.LBL_DAY2}</option>
+															<option value=3 {if $ACTIVITYDATA.repeatMonth_day eq 3} selected {/if}>{$MOD.LBL_DAY3}</option>
+															<option value=4 {if $ACTIVITYDATA.repeatMonth_day eq 4} selected {/if}>{$MOD.LBL_DAY4}</option>
+															<option value=5 {if $ACTIVITYDATA.repeatMonth_day eq 5} selected {/if}>{$MOD.LBL_DAY5}</option>
+															<option value=6 {if $ACTIVITYDATA.repeatMonth_day eq 6} selected {/if}>{$MOD.LBL_DAY6}</option>
+														</select>
+														</td>
+														</tr>
+														</table>
+													</td>
+												</tr>
+												</table>
+												</div>
+								
+											</div>
+										</td>
+										</tr>
+									</table>
+								</td>
+							</tr>
+						</table>
+						</div>
+						<div id="addEventRelatedtoUI" style="display:none;width:100%">
+						<table width="100%" cellpadding="5" cellspacing="0" border="0">
+							<tr>
+								<td><b>{$MOD.LBL_RELATEDTO}</b></td>
+								<td>
+									<input name="parent_id" type="hidden" value="{$secondvalue.parent_id}">
+									<select name="parent_type" class="small" id="parent_type" onChange="document.EditView.parent_name.value='';document.EditView.parent_id.value=''">
+									{section name=combo loop=$LABEL.parent_id}
+										<option value="{$fldlabel_combo.parent_id[combo]}" {$fldlabel_sel.parent_id[combo]}>{$LABEL.parent_id[combo]}</option>
+									{/section}
+                                             				</select>
+								</td>
+								<td>
+									<div id="eventrelatedto" align="left">
+										<input name="parent_name" readonly type="text" class="calTxt small" value="{$ACTIVITYDATA.parent_id}">
+										<input type="button" name="selectparent" class="crmButton small edit" value="Select" onclick="return window.open('index.php?module='+document.EditView.parent_type.value+'&action=Popup','test','width=640,height=602,resizable=0,scrollbars=0,top=150,left=200');">
+									</div>
+								</td>
+							</tr>
+							<tr>
+								<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;
+									<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>
+						</table>
+					</div>
+			</td>
+		</tr>
+		</table>
+		<!-- Alarm, Repeat, Invite stops-->
+		{else}
+		<table border="0" cellpadding="5" cellspacing="0" width="100%">
+			<tr>
+                        	<td class="cellLabel" width="20%" align="right"><b>{$MOD.LBL_TODO}</b></td>
+                        	<td class="cellInfo" width="80%" align="left"><input name="subject" value="{$ACTIVITYDATA.subject}" class="textbox" style="width: 70%;" type="text"></td>
+           		</tr>
+			<tr>
+				<td class="cellLabel" align="right"><b>{$LABEL.description}</b></td>
+				<td class="cellInfo" align="left"><textarea style="width: 90%; height: 60px;" name="description">{$ACTIVITYDATA.description}</textarea>
+			</tr>
+			<tr>
+		    		<td colspan="2" align="center" width="100%" style="padding:0px">
+					<table border="0" cellpadding="5" cellspacing="1" width="100%">
+            					<tr>
+							<td class="cellLabel" width=33% align="left"><b>{$LABEL.taskstatus}</td>
+              						<td class="cellLabel" width=33% align="left"><b>{$LABEL.taskpriority}</b></td>
+              						<td class="cellLabel" width=34% align="left"><b>{$LABEL.assigned_user_id}</b></td>
+						</tr>
+						<tr>
+							<td align="left" valign="top">
+								<select name="taskstatus" id="taskstatus" class=small>
+                                        			{foreach item=arr from=$ACTIVITYDATA.taskstatus}
+                                        			{foreach key=sel_value item=value from=$arr}
+                                                			<option value="{$sel_value}" {$value}>
+                                                        		{if $APP[$sel_value] neq ''}
+                                                                		{$APP[$sel_value]}
+                                                        		{else}
+                                                                		{$sel_value}
+                                                        		{/if}
+                                                			</option>
+                                        			{/foreach}
+                                        			{/foreach}
+                                				</select>
+							</td>
+							<td align="left" valign="top">
+								<select name="taskpriority" id="taskpriority" class=small>
+        			                                {foreach item=arr from=$ACTIVITYDATA.taskpriority}
+                                			        {foreach key=sel_value item=value from=$arr}
+			                                                <option value="{$sel_value}" {$value}>
+                        		                                {if $APP[$sel_value] neq ''}
+                                        		                        {$APP[$sel_value]}
+                                                       			{else}
+                                                                		{$sel_value}
+                                                        		{/if}
+                                                			</option>
+                                        			{/foreach}
+                                        			{/foreach}
+                                				</select>
+							</td>
+							<td align="left" valign="top">
+								{assign var=check value=1}
+                                        			{foreach key=key_one item=arr from=$ACTIVITYDATA.assigned_user_id}
+			                                        {foreach key=sel_value item=value from=$arr}
+                        		                              	{if $value ne ''}
+                                        		                      	{assign var=check value=$check*0}
+                                                        		{else}
+                                                                		{assign var=check value=$check*1}
+                                                        		{/if}
+                                                		{/foreach}
+                                        			{/foreach}
+								{if $check eq 0}
+                                             				{assign var=select_user value='checked'}
+                                                			{assign var=style_user value='display:block'}
+                                                			{assign var=style_group value='display:none'}
+                                        			{else}
+                                                			{assign var=select_group value='checked'}
+                                                			{assign var=style_user value='display:none'}
+                                                			{assign var=style_group value='display:block'}
+                                        			{/if}
+				                                <input type="radio" name="assigntype" {$select_user} value="U" onclick="toggleAssignType(this.value)">&nbsp;User
+				                                {if $secondvalue.assigned_user_id neq ''}
+                                			        <input type="radio" name="assigntype" {$select_group} value="T" onclick="toggleAssignType(this.value)">&nbsp;Group
+                                        			{/if}
+                                        			<span id="assign_user" style="{$style_user}">
+                                                		<select name="assigned_user_id" class=small>
+                                                        	{foreach key=key_one item=arr from=$ACTIVITYDATA.assigned_user_id}
+				                                {foreach key=sel_value item=value from=$arr}
+                                		                	<option value="{$key_one}" {$value}>{$sel_value}</option>
+								{/foreach}
+                                                        	{/foreach}
+                                                		</select>
+								</span>
+								{if $secondvalue.assigned_user_id neq ''}
+                                                		<span id="assign_team" style="{$style_group}">
+                                                        		<select name="assigned_group_name" class=small>';
+                                                                		{foreach key=key_one item=arr from=$secondvalue.assigned_user_id}
+                                                                       		{foreach key=sel_value item=value from=$arr}
+                                                                               		<option value="{$sel_value}" {$value}>{$sel_value}</option>
+                                                                       		{/foreach}
+                                                                		{/foreach}
+                                                        		</select>
+				                                </span>
+                                				{/if}	
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			</table>
+			<table border="0" cellpadding="0" cellspacing="1" width="100%" align=center>
+			<tr><td width=50% valign=top>
+				<table border=0 cellspacing=0 cellpadding=2 width=100% align=center >
+					<tr><td colspan=3  class="mailSubHeader"><b>{$MOD.LBL_TODODATETIME}</b></td></tr>
+					<tr><td colspan=3>{$STARTHOUR}</td></tr>
+					<tr><td>
+							{foreach key=date_value item=time_value from=$ACTIVITYDATA.date_start}
+	                                        		{assign var=date_val value="$date_value"}
+								{assign var=time_val value="$time_value"}
+                                        		{/foreach}
+							<input name="date_start" id="date_start" class="textbox" style="width: 90px;" value="{$date_val}" type="text"></td><td width=100%><img src="{$IMAGE_PATH}btnL3Calendar.gif" alt="Set date.." title="Set date.." id="jscal_trigger_date_start" align="middle" border="0">
+							{foreach key=date_fmt item=date_str from=$secondvalue.date_start}
+								{assign var=date_vl value="$date_fmt"}
+							{/foreach}				
+							<script type="text/javascript">
+								Calendar.setup ({ldelim}
+	        	                                	inputField : "date_start", ifFormat : "{$date_vl}", showsTime : false, button : "jscal_trigger_date_start", singleClick : true, step : 1
+							{rdelim})
+							</script>
+						</td></tr>
+					</table></td>
+					<td width=50% valign="top">
+                                                <table border="0" cellpadding="2" cellspacing="0" width="100%" align=center>
+							<tr><td class="mailSubHeader" colspan=3><b>{$LABEL.due_date}</b></td></tr>
+							<tr><td>
+								{foreach key=date_value item=time_value from=$ACTIVITYDATA.due_date}
+									{assign var=date_val value="$date_value"}
+									{assign var=time_val value="$time_value"}
+								{/foreach}
+								<input name="due_date" id="due_date" class="textbox" style="width: 90px;" value="{$date_val}" type="text"></td><td width=100%><img src="{$IMAGE_PATH}btnL3Calendar.gif" alt="Set date.." title="Set date.." id="jscal_trigger_due_date" border="0">
+								{foreach key=date_fmt item=date_str from=$secondvalue.due_date}
+                                                			{assign var=date_vl value="$date_fmt"}
+                                        			{/foreach}
+				      				<script type="text/javascript">
+								Calendar.setup ({ldelim}
+	                                        			inputField : "date_start", ifFormat : "{$date_vl}", showsTime : false, button : "jscal_trigger_due_date", singleClick : true, step : 1
+					   			{rdelim})
+								</script>
+        						</td></tr>
+						</table></td>
+					</tr>
+				</table>
+				<br><br>
+		<table align="center" border="0" cellpadding="0" cellspacing="0" width="95%" bgcolor="#FFFFFF">
+			<tr>
+				<td>
+					<table border="0" cellpadding="3" cellspacing="0" width="100%">
+						<tr>
+							<td class="dvtTabCache" style="width: 10px;" nowrap="nowrap">&nbsp;</td>
+							<td id="cellTabInvite" class="dvtSelectedCell" align="center" nowrap="nowrap"><a href="javascript:doNothing()" onClick="switchClass('cellTabInvite','on');switchClass('cellTabRelatedto','off');Taskshow('addTaskAlarmUI','todo',document.EditView.date_start.value,document.EditView.starthr.value,document.EditView.startmin.value,document.EditView.startfmt.value);ghide('addTaskRelatedtoUI');">{$MOD.LBL_NOTIFICATION}</a></td>
+							<td class="dvtTabCache" style="width: 10px;" nowrap="nowrap">&nbsp;
+                                                        <td id="cellTabRelatedto" class="dvtUnSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabInvite','off');switchClass('cellTabRelatedto','on');Taskshow('addTaskRelatedtoUI','todo',document.EditView.date_start.value,document.EditView.starthr.value,document.EditView.startmin.value,document.EditView.startfmt.value);ghide('addTaskAlarmUI');">{$MOD.LBL_RELATEDTO}</a></td>
+                                                        <td class="dvtTabCache" style="width:100%">
+						</tr>
+
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td class="dvtContentSpace" style="padding: 10px; height: 120px;" align="left" valign="top" width="100%">
+			<!-- Reminder UI -->
+			<div id="addTaskAlarmUI" style="display: block; width: 100%;">
+                	<table>
+				<tr><td>{$LABEL.sendnotification}</td>
+					{if $ACTIVITYDATA.sendnotification eq 1}
+                                        <td>
+                                                <input name="sendnotification" type="checkbox" checked>
+                                        </td>
+                                	{else}
+                                        <td>
+                                                <input name="sendnotification" type="checkbox">
+                                        </td>
+                                	{/if}
+				</tr>
+			</table>
+			</div>
+			<div id="addTaskRelatedtoUI" style="display:none;width:100%">
+           		     <table width="100%" cellpadding="5" cellspacing="0" border="0">
+                	     <tr>
+                        	     <td><b>{$MOD.LBL_RELATEDTO}</b></td>
+                                     <td>
+					<input name="parent_id" type="hidden" value="{$secondvalue.parent_id}">
+                                             <select name="parent_type" class="small" id="parent_type" onChange="document.EditView.parent_name.value='';document.EditView.parent_id.value=''">
+							{section name=combo loop=$LABEL.parent_id}
+								<option value="{$fldlabel_combo.parent_id[combo]}" {$fldlabel_sel.parent_id[combo]}>{$LABEL.parent_id[combo]}</option>
+							{/section}
+					     </select>
+                                     </td>
+                                     <td>
+                              	        <div id="taskrelatedto" align="left">
+						<input name="parent_name" readonly type="text" class="calTxt small" value="{$ACTIVITYDATA.parent_id}">
+						<input type="button" name="selectparent" class="crmButton small edit" value="Select" onclick="return window.open('index.php?module='+document.EditView.parent_type.value+'&action=Popup','test','width=640,height=602,resizable=0,scrollbars=0,top=150,left=200');">
+					 </div>
+                                     </td>
+			     </tr>
+			     <tr>
+                                     <td><b>{$LABEL.contact_id}</b></td>
+				     <td colspan="2">
+						<input name="contact_name" readonly type="text" class="calTxt" value="{$ACTIVITYDATA.contact_id}"><input name="contact_id" type="hidden" value="{$secondvalue.contact_id}">&nbsp;
+						<input type="button" onclick="return window.open('index.php?module=Contacts&action=Popup&html=Popup_picker&popuptype=specific&form=EditView','test','width=640,height=602,resizable=0,scrollbars=0');" class="crmButton small edit" name="selectcnt" value="Select Contact">
+				     </td>
+                             </tr>
+		</table>
+              	</div>
+                </td></tr></table>
+
+		{/if}
+			</td></tr>
+			<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" {if $ACTIVITY_MODE neq 'Task'} onclick="this.form.action.value='Save';  displaydeleted();return maincheck_form();"{else} onclick="this.form.action.value='Save';  displaydeleted(); maintask_check_form();return formValidate();" {/if} 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>
+		</td></tr></table>
+		</td></tr></table>
+		</td></tr></table>
+</td></tr>
+</form></table>
+</td></tr></table>
+</td></tr></table>
+</td></tr></table>
+        </td></tr></table>
+        </td></tr></table>
+        </div>
+        </td>
+        <td valign=top><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+        </tr>
+        </table>
+<script>
+{if $ACTIVITY_MODE eq 'Task'}
+	var fieldname = new Array('subject','date_start','time_start','taskstatus');
+	var fieldlabel = new Array('Subject','Date','Time','Status');
+	var fielddatatype = new Array('V~M','D~M~time_start','T~O','V~O');
+{else}
+	var fieldname = new Array('subject','date_start','due_date','taskpriority','sendnotification','parent_id','contact_id','reminder_time','recurringtype');
+	var fieldlabel = new Array('Subject','Start Date','Due Date','Priority','Send Notification','Related To','Contact Name','Send Reminder','Recurrence');
+	var fielddatatype = new Array('V~M','D~M','D~M~OTH~GE~date_start~Start Date','V~O','C~O','I~O','I~O','I~O','O~O');
+{/if}
+</script>
+<script>	
+	var ProductImages=new Array();
+	var count=0;
+
+	function delRowEmt(imagename)
+	{ldelim}
+		ProductImages[count++]=imagename;
+	{rdelim}
+
+	function displaydeleted()
+	{ldelim}
+		var imagelists='';
+		for(var x = 0; x < ProductImages.length; x++)
+		{ldelim}
+			imagelists+=ProductImages[x]+'###';
+		{rdelim}
+
+		if(imagelists != '')
+			document.EditView.imagelist.value=imagelists
+	{rdelim}
+
+</script>
+<script language="JavaScript" type="text/JavaScript">
+	setObjects();
+</script>



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 00:06:10 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 07:06:10 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9402 -
	/vtigercrm/trunk/install/0welcome.php
Message-ID: <20060911070610.69E9676D61A@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Mon Sep 11 01:05:17 2006
New Revision: 9402

Log:
Version changed from RC to 5.0.0 --Jeri

Modified:
    vtigercrm/trunk/install/0welcome.php

Modified: vtigercrm/trunk/install/0welcome.php
==============================================================================
--- vtigercrm/trunk/install/0welcome.php (original)
+++ vtigercrm/trunk/install/0welcome.php Mon Sep 11 01:05:17 2006
@@ -97,10 +97,10 @@
 
 					<tr>
 						<td align=left class="small" style="padding-left:20px">
-		<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;This Configuration Wizard will create vtiger CRM 5.0 RC databases and tables and configuration files you need to start. The entire process should take about four minutes. Click the Start button when you are ready. 
+		<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;This Configuration Wizard will create vtiger CRM 5.0.0 databases and tables and configuration files you need to start. The entire process should take about four minutes. Click the Start button when you are ready. 
 <br><br>
-<p><span style="color:#555555">- vtiger CRM 5.0 RC is tested on mySQL 4.1.X, mySQL 5.0.19, PHP 5.0.19 and Apache 2.0.40.</p> 
-<p align="center"><font color='red'><b>vtiger CRM 5 RC will not work on mysql 4.0.x versions</b></font></center><center><font color='blue'><b>vtiger crm can run on a system which has xampp/lampp/wampp already installed in it provided it meets the above mentioned requirements</b></font></center>
+<p><span style="color:#555555">- vtiger CRM 5.0.0 is tested on mySQL 4.1.X, mySQL 5.0.19, PHP 5.0.19 and Apache 2.0.40.</p> 
+<p align="center"><font color='red'><b>vtiger CRM 5.0.0 will not work on mysql 4.0.x versions</b></font></center><center><font color='blue'><b>vtiger crm can run on a system which has xampp/lampp/wampp already installed in it provided it meets the above mentioned requirements</b></font></center>
 <p>The installation wizard will guide you with the installation regardless of the setup you may have.</span>
 						
 					  </td>



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 04:18:22 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 11:18:22 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9403 -
	/vtigercrm/trunk/modules/Users/add2db.php
Message-ID: <20060911111822.6D51576D630@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Mon Sep 11 05:18:08 2006
New Revision: 9403

Log:
Issue while uploading templated because of vtiger_ prefix has been fixed --Jeri

Modified:
    vtigercrm/trunk/modules/Users/add2db.php

Modified: vtigercrm/trunk/modules/Users/add2db.php
==============================================================================
--- vtigercrm/trunk/modules/Users/add2db.php (original)
+++ vtigercrm/trunk/modules/Users/add2db.php Mon Sep 11 05:18:08 2006
@@ -89,7 +89,7 @@
 			$module = $_REQUEST['target_module'];
 			$sql = "INSERT INTO vtiger_wordtemplates ";
 			$sql .= "(templateid,module,date_entered,parent_type,data,description,filename,filesize,filetype) ";
-			$sql .= "VALUES (".$genQueryId.",'".$module."',".$adb->formatString('wordtemplates','date_entered',$date_entered).",'$parent_type',".$adb->getEmptyBlob().",'$strDescription',";
+			$sql .= "VALUES (".$genQueryId.",'".$module."',".$adb->formatString('vtiger_wordtemplates','date_entered',$date_entered).",'$parent_type',".$adb->getEmptyBlob().",'$strDescription',";
 			$sql .= "'$filename', '$filesize', '$filetype')";
 
 			$result = $adb->query($sql);



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 06:05:35 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 13:05:35 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9404 -
	/vtigercrm/trunk/include/js/dtlviewajax.js
Message-ID: <20060911130535.041B176D633@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Mon Sep 11 07:05:22 2006
New Revision: 9404

Log:
Issue in assigned user ajax edit has been fixed --Jeri

Modified:
    vtigercrm/trunk/include/js/dtlviewajax.js

Modified: vtigercrm/trunk/include/js/dtlviewajax.js
==============================================================================
--- vtigercrm/trunk/include/js/dtlviewajax.js (original)
+++ vtigercrm/trunk/include/js/dtlviewajax.js Mon Sep 11 07:05:22 2006
@@ -135,7 +135,7 @@
 			var groupurl = "&assigned_group_name="+group_name+"&assigntype=T"
 		}
 
-	}if(globaluitype == 33)
+	}else if(globaluitype == 33)
 	{
 	  var txtBox= "txtbox_"+ fieldLabel;
 	  var oMulSelect = $(txtBox);
@@ -145,8 +145,7 @@
       if (oMulSelect.options[iter].selected)
         r[r.length] = oMulSelect.options[iter].value;
       }
-	}
-  else
+	}else
 	{
 		var txtBox= "txtbox_"+ fieldLabel;
 	}
@@ -163,7 +162,6 @@
 	$("vtbusy_info").style.display="inline";
 	var isAdmin = document.getElementById("hdtxt_IsAdmin").value; 
 
-	var tagValue = trim(document.getElementById(txtBox).value);
 
 	//overriden the tagValue based on UI Type for checkbox 
 	if(uitype == '56')
@@ -186,8 +184,11 @@
 		}
 	}else if(uitype == '33')
 	{
-			tagValue = r.join(" |##| ");
-  	}
+		tagValue = r.join(" |##| ");
+  	}else
+	{
+		tagValue = trim(document.getElementById(txtBox).value);
+	}
 
 
 	var data = "file=DetailViewAjax&module=" + module + "&action=" + module + "Ajax&record=" + crmId+"&recordid=" + crmId ;
@@ -212,12 +213,10 @@
 	if(uitype == '13' || uitype == '104')
 	{
 		getObj(dtlView).innerHTML = "<a href=\"mailto:"+ tagValue+"\" target=\"_blank\">"+tagValue+"&nbsp;</a>";
-	}
-	else if(uitype == '17')
+	}else if(uitype == '17')
 	{
 		getObj(dtlView).innerHTML = "<a href=\"http://"+ tagValue+"\" target=\"_blank\">"+tagValue+"&nbsp;</a>";
-	}
-	else if(uitype == '53')
+	}else if(uitype == '53')
 	{
 		var hdObj = getObj(hdTxt);
 		if(typeof(document.DetailView.assigntype[0]) != 'undefined')
@@ -238,8 +237,7 @@
 		{
 			getObj(dtlView).innerHTML = "<a href=\"index.php?module=Users&action=GroupDetailView&groupId="+tagValue+"\">"+hdObj.value+"&nbsp;</a>";
 		}
-	}
-	else if(uitype == '56')
+	}else if(uitype == '56')
 	{
 		if(tagValue == '1')
 		{



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 06:31:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 13:31:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9405 -
	/vtigercrm/trunk/include/js/conveyor.js
Message-ID: <20060911133149.6024D76D62B@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Mon Sep 11 07:31:42 2006
New Revision: 9405

Log:
unwanted file deleted --Jeri

Removed:
    vtigercrm/trunk/include/js/conveyor.js



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 06:47:19 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 13:47:19 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9406 -
	/vtigercrm/trunk/modules/Users/about_us.php
Message-ID: <20060911134719.A7A5576D5EF@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep 11 07:46:57 2006
New Revision: 9406

Log:
Updated for the latest 5 GA release

Modified:
    vtigercrm/trunk/modules/Users/about_us.php

Modified: vtigercrm/trunk/modules/Users/about_us.php
==============================================================================
--- vtigercrm/trunk/modules/Users/about_us.php (original)
+++ vtigercrm/trunk/modules/Users/about_us.php Mon Sep 11 07:46:57 2006
@@ -82,7 +82,7 @@
 				<td width="70%" style="border:3px solid #CCCCCC;" height="100" >
 						<marquee behavior="scroll" direction="up" width="100%" scrollamount="1" scrolldelay="50"  height="100" onMouseOut="javascript:start();" onMouseOver="javascript:stop();">
 								<table width="100%" border="0" cellpadding="0" cellspacing="0" class="rollOver">
-										<tr><th>Team</th></tr>
+								<tr><th><?php echo $mod_strings['LBL_TEAM'];?></th></tr>
 										<tr><td>Ahmed</td></tr>
 										<tr><td>Don</td></tr>
 										<tr><td>Ela</td></tr>
@@ -92,31 +92,74 @@
 										<tr><td>Mickie</td></tr>
 										<tr><td>Minnie</td></tr>
 										<tr><td>Philip</td></tr>
+										<tr><td>Radiant</td></tr>
 										<tr><td>Richie</td></tr>
-										<tr><td>Saint</td></tr>
 										<tr><td>SRaj</td></tr>
 										<tr><td>&nbsp;</td></tr>
-										<tr><th>Credits</th></tr>
-										<tr><td>Matthew Brichacek</td></tr>
-										<tr><td>Michel JACQUEMES </td></tr>
-										<tr><td>Mike Crowe </td></tr>
+										<tr><th><?php echo $mod_strings['LBL_CREDITS'];?></th></tr>
+										<tr><td>Aissa Belaid</td></tr>
 										<tr><td>Allan Bush</td></tr>
-										<tr><td>Frank Piepiorra</td></tr>
-										<tr><td>Dino Eberle </td></tr>
-										<tr><td>Jamie Jackson</td></tr>
-										<tr><td>Aissa Belaid</td></tr>
-										<tr><td>Sergio A. Kessler</td></tr>
-										<tr><td>Jeff Kowalczyk</td></tr>
 										<tr><td>Brian Devendorf</td></tr>
 										<tr><td>Brian Laughlin</td></tr>
+										<tr><td>Davide Giarolo</td></tr>	
 										<tr><td>Dennis Grant</td></tr>
+										<tr><td>Dhr. R.R. Gerbrands</td></tr>
+										<tr><td>Dino Eberle</td></tr> 
+										<tr><td>Dirk Gorny</td></tr>
 										<tr><td>Fathi Boudra</td></tr>
+										<tr><td>Frank Piepiorra</td></tr>
 										<tr><td>Jamie Jackson</td></tr>
+										<tr><td>Jeff Kowalczyk</td></tr>
+										<tr><td>Jens Gammelgaard</td></tr>
+										<tr><td>Jens Hamisch</td></tr>
+										<tr><td>Joao Oliveira</td></tr>
 										<tr><td>Joel Rydbeck</td></tr>
 										<tr><td>Josh Lee</td></tr>
+										<tr><td>Ken Lyle</td></tr>
+										<tr><td>Kim Haverblad</td></tr>
+										<tr><td>Manilal K M</td></tr>
+										<tr><td>Matjaz Slak</td></tr>
+										<tr><td>Matthew Brichacek</td></tr>
+										<tr><td>Michel Jacquemes</td></tr> 
+										<tr><td>Mike Crowe</td></tr> 
 										<tr><td>Mike Fedyk</td></tr>
+										<tr><td>Neil</td></tr>
+										<tr><td>Tim Smith</td></tr>
+										<tr><td>Sergio A. Kessler</td></tr>
+										<tr><td>Valmir Carlos Trindade</td></tr>
 										<tr><td>&nbsp;</td></tr>
-										<tr><td><b>And vtiger Community</b></td></tr>
+										<tr><th><?php echo $mod_strings['LBL_CREDITS'];?> - <?php echo $mod_strings['LBL_THIRD_PARTY'];?></th></tr>
+										<tr><td><a href="http://adodb.sourceforge.net" target="_blank">ADOdb</a></td></tr>
+										<tr><td><a href="http://www.os-solution.com/demo/ajaxcsspopupchat/index.php" target="_blank">Ajax Popup Chat</a></td></tr>
+										<tr><td><a href="http://httpd.apache.org/" target="_blank">Apache HTTP Server</a></td></tr>
+										<tr><td><a href="http://www.linuxscope.net/articles/mailAttachmentsPHP.html" target="_blank">Attachments in E-mail Client</a></td></tr>
+										<tr><td><a href="http://www.hmhd.com/steve" target="_blank">Calculator</a></td></tr>
+										<tr><td><a href="http://www.dynamicdrive.com/dynamicindex14/carousel2.htm" target="_blank">Carousel Slideshow</a></td></tr>
+										<tr><td><a href="http://www.troywolf.com/articles/php/class_http/" target="_blank">class_http</a></td></tr>
+										<tr><td><a href="http://freshmeat.net/projects/phpexcelreader/" target="_blank">ExcelReader</a></td></tr>
+										<tr><td><a href="http://www.fckeditor.net/download/default.html" target="_blank">FCKeditor</a></td></tr>
+										<tr><td><a href="http://www.fpdf.org" target="_blank">FPDF</a></td></tr>
+										<tr><td><a href="http://www.getluky.net" target="_blank">freetag</a></td></tr>
+										<tr><td><a href="http://www.boutell.com/gd/" target="_blank">gdwin32</a></td></tr>
+										<tr><td><a href="http://pear.php.net/package/Image_Graph" target="_blank">Graph</a></td></tr>
+										<tr><td><a href="http://slayeroffice.com/code/imageCrossFade/xfade2.html" target="_blank">Image Crossfade Redux</a></td></tr>
+										<tr><td><a href="http://pear.php.net/pepr/pepr-proposal-show.php?id=212" target="_blank">Image_Canvas</a></td></tr>
+										<tr><td><a href="http://pear.php.net/package/Image_Color" target="_blank">Image_Color</a></td></tr>
+										<tr><td><a href="http://www.dynarch.com/projects/calendar/" target="_blank">jscalendar</a></td></tr>
+										<tr><td><a href="http://www.vxr.it/log4php/" target="_blank">log4php</a></td></tr>
+										<tr><td><a href="http://magpierss.sourceforge.net/" target="_blank">MagpieRSS</a></td></tr>
+										<tr><td><a href="http://wiki.wonko.com/software/mailfeed/" target="_blank">Mailfeed</a></td></tr>
+										<tr><td><a href="http://www.mysql.com" target="_blank">MySQL</a></td></tr>
+										<tr><td><a href="http://sourceforge.net/projects/nusoap" target="_blank">nusoap</a></td></tr>
+										<tr><td><a href="http://www.php.net" target="_blank">PHP</a></td></tr>
+										<tr><td><a href="http://phpmailer.sourceforge.net/" target="_blank">PHPMailer</a></td></tr>
+										<tr><td><a href="http://phpsysinfo.sourceforge.net/" target="_blank">phpSysinfo</a></td></tr>
+										<tr><td><a href="http://prototype.conio.net" target="_blank">Prototype</a></td></tr>
+										<tr><td><a href="http://script.aculo.us" target="_blank">script.oculo.us</a></td></tr>
+										<tr><td><a href="http://smarty.php.net/" target="_blank">Smarty Template Engine</a></td></tr>
+										<tr><td><a href="http://www.sugarcrm.com" target="_blank">SugarCRM</a> (SPL 1.1.2)</td></tr>
+										<tr><td>&nbsp;</td></tr>
+										<tr><td><b><?php echo $mod_strings['LBL_COMMUNITY'];?></b></td></tr>
 										<tr><td>&nbsp;</td></tr>
 										<tr><td>&nbsp;</td></tr>
 								</table>
@@ -129,13 +172,13 @@
 		  <td colspan="3" background="<? echo $image_path;?>about_btm.jpg" height="75">
 		  		<table width="100%" border="0" cellpadding="5" cellspacing="0">
 						<tr>
-							<td width="70%" align="left">
-									<span class="small" style="color:#999999;">Version : 5.0.0 rc</span>&nbsp;|&nbsp;
-									<a href="http://www.vtiger.com/copyrights/LICENSE_AGREEMENT.txt" class="webMnu" target="_blank">Read License</a>&nbsp;|&nbsp;
-									<a href="http://www.vtiger.com/index.php?option=com_content&task=view&id=26&Itemid=54" class="webMnu" target="_blank">Contact Us</a>
+							<td width="70%" align="left" class="small">
+							<span class="small" style="color:#999999;"><?php echo $mod_strings['LBL_VERSION'];?> : 5.0.0 </span>&nbsp;|&nbsp;
+									<a href="http://www.vtiger.com/copyrights/LICENSE_AGREEMENT.txt" target="_blank"><?php echo $mod_strings['LBL_READ_LICENSE'];?></a>&nbsp;|&nbsp;
+									<a href="http://www.vtiger.com/index.php?option=com_content&task=view&id=26&Itemid=54" target="_blank"><?php echo $mod_strings['LBL_CONTACT_US'];?></a>
 							</td>
 							<td align="right">
-									<input type="button" name="close" value=" &nbsp;Close&nbsp; " onClick="window.close();" class="crmbutton small cancel">
+									<input type="button" name="close" value=" &nbsp;<?php echo $mod_strings['LBL_CLOSE'];?>&nbsp; " onClick="window.close();" class="crmbutton small cancel">
 							</td>
 						</tr>
 				</table>



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 06:49:11 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 13:49:11 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9407 -
 /vtigercrm/trunk/modules/Users/language/en_us.lang.php
Message-ID: <20060911134911.B8B3076D63B@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep 11 07:49:01 2006
New Revision: 9407

Log:
i18n for about us -- By Ahmed

Modified:
    vtigercrm/trunk/modules/Users/language/en_us.lang.php

Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Users/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Users/language/en_us.lang.php Mon Sep 11 07:49:01 2006
@@ -599,6 +599,18 @@
 'LBL_MANDATORY_MSG'=>'Mandatory Fields',
 'LBL_DISABLE_FIELD_MSG'=>'Fields Disabled from Global Field Access Settings',
 
+//Added for About Us
+
+'LBL_CONTACT_US'=>'Contact Us',
+'LBL_READ_LICENSE'=>'Read License',
+'LBL_VERSION'=>'Version',
+'LBL_TEAM'=>'Team',
+'LBL_CREDITS'=>'Credits',
+'LBL_THIRD_PARTY'=>'Third Party Packages',
+'LBL_COMMUNITY'=>'And vtiger Community',
+
+'LBL_ASSIGN_ROLE'=>'Assign Role',
+
 );
 
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 06:52:28 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 13:52:28 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9408 -
	/vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl
Message-ID: <20060911135228.58E8F76D63B@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep 11 07:52:20 2006
New Revision: 9408

Log:
Fixed the Settings link URL --By Ahmed

Modified:
    vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl

Modified: vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl Mon Sep 11 07:52:20 2006
@@ -31,7 +31,8 @@
 <tr><td style="height:2px"></td></tr>
 <tr>
 	{if $CATEGORY eq 'Settings'}
-		<td style="padding-left:10px;padding-right:50px" class="moduleName" nowrap><a class="hdrLink" href="index.php?action=ListView&module={$MODULE}&parenttab={$CATEGORY}">{$APP.$MODULE}</a></td>
+<!-- No List View in Settings - Action is index -->
+		<td style="padding-left:10px;padding-right:50px" class="moduleName" nowrap><a class="hdrLink" href="index.php?action=index&module={$MODULE}&parenttab={$CATEGORY}">{$APP.$MODULE}</a></td>
 	{else}
 		<td style="padding-left:10px;padding-right:50px" class="moduleName" nowrap>{$APP.$CATEGORY} > <a class="hdrLink" href="index.php?action=ListView&module={$MODULE}&parenttab={$CATEGORY}">{$APP.$MODULE}</a></td>
 	{/if}



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 06:54:33 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 13:54:33 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9409 -
	/vtigercrm/trunk/Smarty/templates/RolePopup.tpl
Message-ID: <20060911135433.C053976D5EF@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep 11 07:54:26 2006
New Revision: 9409

Log:
Changed header from delete User to Assign Role --By Ahmed

Modified:
    vtigercrm/trunk/Smarty/templates/RolePopup.tpl

Modified: vtigercrm/trunk/Smarty/templates/RolePopup.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/RolePopup.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/RolePopup.tpl Mon Sep 11 07:54:26 2006
@@ -50,7 +50,7 @@
 			<td>
 				<table width="100%" border="0" cellpadding="0" cellspacing="0">
 				<tr>
-					<td class="moduleName" width="80%" style="padding-left:10px;">Delete User</td>
+					<td class="moduleName" width="80%" style="padding-left:10px;">{$CMOD.LBL_ASSIGN_ROLE}</td>
 					<td  width=30% nowrap class="componentName" align=right>{$APP.VTIGER}</td>
 				</tr>
 			</table>



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 06:56:27 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 13:56:27 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9410 -
	/vtigercrm/trunk/user_privileges/enable_backup.php
Message-ID: <20060911135627.ABF9D76D63B@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep 11 07:56:20 2006
New Revision: 9410

Log:
Fixed the logout issue due to a blank line -- By Ahmed

Modified:
    vtigercrm/trunk/user_privileges/enable_backup.php

Modified: vtigercrm/trunk/user_privileges/enable_backup.php
==============================================================================
--- vtigercrm/trunk/user_privileges/enable_backup.php (original)
+++ vtigercrm/trunk/user_privileges/enable_backup.php Mon Sep 11 07:56:20 2006
@@ -12,4 +12,3 @@
 $enable_backup = 'false';
 
 ?>
-



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 07:12:53 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 14:12:53 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9411 -
	/vtigercrm/trunk/install/populateSeedData.php
Message-ID: <20060911141253.4BFDA76D627@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep 11 08:12:45 2006
New Revision: 9411

Log:
RC Changed to 5

Modified:
    vtigercrm/trunk/install/populateSeedData.php

Modified: vtigercrm/trunk/install/populateSeedData.php
==============================================================================
--- vtigercrm/trunk/install/populateSeedData.php (original)
+++ vtigercrm/trunk/install/populateSeedData.php Mon Sep 11 08:12:45 2006
@@ -884,7 +884,7 @@
 
 //Populate Email Data
 
-$esubj_array =  array ("Vtiger RC Released", "Try vtigercrm!", "Hi There!!!", "Welcome to Open Source", "Help needed in customization of Vtiger");
+$esubj_array =  array ("Vtiger 5 Released", "Try vtigercrm!", "Hi There!!!", "Welcome to Open Source", "Help needed in customization of Vtiger");
 $startdate_array =  array ("2006-1-2","2003-3-4","2003-4-5","2001-2-1","2005-8-8");
 $filename_array = array ("vtiger5alpha.tar.gz", "zohowriter.zip", "hi.doc", "welcome.pps", "sos.doc");
 



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 07:13:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 14:13:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9412 -
	/vtigercrm/trunk/modules/Products/Product.js
Message-ID: <20060911141359.E4CFD76D645@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Mon Sep 11 08:13:50 2006
New Revision: 9412

Log:
Issue in Ajax edit while changing Product Name from HelpDesk DetailView has been fixed --Jeri.Fixes #2093,2163

Modified:
    vtigercrm/trunk/modules/Products/Product.js

Modified: vtigercrm/trunk/modules/Products/Product.js
==============================================================================
--- vtigercrm/trunk/modules/Products/Product.js (original)
+++ vtigercrm/trunk/modules/Products/Product.js Mon Sep 11 08:13:50 2006
@@ -45,14 +45,19 @@
 }
 function set_return_specific(product_id, product_name) {
         //getOpenerObj used for DetailView 
+
 	if(document.getElementById('from_link').value != '')
 	{
 		var fldName = window.opener.document.QcEditView.product_name;
 		var fldId = window.opener.document.QcEditView.product_id;
+	}else if(typeof(window.opener.document.DetailView) != 'undefined')
+	{
+	   var fldName = window.opener.document.DetailView.product_name;
+	   var fldId = window.opener.document.DetailView.product_id;
 	}else
-	{	
-		var fldName = window.opener.document.EditView.product_name;
-		var fldId = window.opener.document.EditView.product_id;
+	{
+	   var fldName = window.opener.document.EditView.product_name;
+	   var fldId = window.opener.document.EditView.product_id;
 	}
         fldName.value = product_name;
         fldId.value = product_id;



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 07:16:19 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 14:16:19 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9413 -
	/vtigercrm/trunk/install/4createConfigFile.php
Message-ID: <20060911141619.A7B1E76D645@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep 11 08:16:12 2006
New Revision: 9413

Log:
RC changed to 5.0.0 GA

Modified:
    vtigercrm/trunk/install/4createConfigFile.php

Modified: vtigercrm/trunk/install/4createConfigFile.php
==============================================================================
--- vtigercrm/trunk/install/4createConfigFile.php (original)
+++ vtigercrm/trunk/install/4createConfigFile.php Mon Sep 11 08:16:12 2006
@@ -45,8 +45,8 @@
 
 // vtiger CRM version number; do not edit!
 
-$vtiger_version = "5.0 Beta";
-$release_date = "31 March 2006";
+$vtiger_version = "5.0.0";
+$release_date = "14 September 2006";
 
 
 if (isset($_REQUEST['db_hostname']))



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 07:22:05 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 14:22:05 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9414 -
	/vtigercrm/trunk/themes/alphagrey/images/aboutUs.jpg
Message-ID: <20060911142205.BF4E376D64C@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep 11 08:21:56 2006
New Revision: 9414

Log:
updated to latest 5.0.0 GA

Added:
    vtigercrm/trunk/themes/alphagrey/images/aboutUs.jpg



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 07:23:13 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 14:23:13 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9415 -
 /vtigercrm/trunk/themes/bluelagoon/images/aboutUS.jpg
Message-ID: <20060911142313.9D0FA76D64C@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep 11 08:23:04 2006
New Revision: 9415

Log:
updated to latest 5.0.0 GA

Modified:
    vtigercrm/trunk/themes/bluelagoon/images/aboutUS.jpg

Modified: vtigercrm/trunk/themes/bluelagoon/images/aboutUS.jpg
==============================================================================
Binary files - no diff available.



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 07:24:00 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 14:24:00 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9416 -
	/vtigercrm/trunk/themes/woodspice/images/aboutUS.jpg
Message-ID: <20060911142400.4208276D64C@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep 11 08:23:48 2006
New Revision: 9416

Log:
updated to latest 5.0.0 GA

Modified:
    vtigercrm/trunk/themes/woodspice/images/aboutUS.jpg

Modified: vtigercrm/trunk/themes/woodspice/images/aboutUS.jpg
==============================================================================
Binary files - no diff available.



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 07:48:22 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 14:48:22 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9417 -
	/vtigercrm/trunk/Smarty/templates/ListView.tpl
Message-ID: <20060911144822.C0AE976D5D8@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Mon Sep 11 08:48:15 2006
New Revision: 9417

Log:
inconsistency in mass delete has been fixed --Jeri.Fixes #2162.

Modified:
    vtigercrm/trunk/Smarty/templates/ListView.tpl

Modified: vtigercrm/trunk/Smarty/templates/ListView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ListView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ListView.tpl Mon Sep 11 08:48:15 2006
@@ -329,7 +329,7 @@
 function ajaxChangeStatus(statusname)
 {
 	$("status").style.display="inline";
-	var viewid = document.massdelete.viewname.value;
+	var viewid = document.getElementById('viewname').options[document.getElementById('viewname').options.selectedIndex].value;
 	var idstring = document.getElementById('idlist').value;
 	if(statusname == 'status')
 	{



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 07:54:17 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 14:54:17 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9418 -
 /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php
Message-ID: <20060911145418.2BD6976D5D8@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep 11 08:54:10 2006
New Revision: 9418

Log:
Migration Fixes done

Modified:
    vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php

Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php
==============================================================================
--- vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php (original)
+++ vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php Mon Sep 11 08:54:10 2006
@@ -267,7 +267,7 @@
 */
 //commented the above array as that queries are wrong queries -- changed on 23-12-2005
 $insert_array1 = array(
-			"update vtiger_field set uitype='357' where tabid=10 and fieldname='parent_id' and tablename='seactivityrel'",
+			"update vtiger_field set uitype='357' where tabid=10 and fieldname='parent_id' and tablename='vtiger_seactivityrel'",
 			"update vtiger_field set sequence=1 where tabid=10 and fieldname in ('parent_id','subject','filename','description')",
 			"update vtiger_field set block=2 where tabid=10 and fieldname='parent_id'",
 			"update vtiger_field set block=3 where tabid=10 and fieldname='subject'",
@@ -1257,7 +1257,7 @@
 		"insert into vtiger_cvcolumnlist values ($cvid,2,'vtiger_contactdetails:title:title:Contacts_Title:V')",
 		"insert into vtiger_cvcolumnlist values ($cvid,3,'vtiger_account:accountname:accountname:Contacts_Account_Name:V')",
 		"insert into vtiger_cvcolumnlist values ($cvid,4,'vtiger_contactdetails:email:email:Contacts_Email:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,5,'vtiger_contactdetails:phone:phone:Contacts_Phone_Name:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,5,'vtiger_contactdetails:phone:phone:Contacts_Office_Phone:V')",
 		"insert into vtiger_cvcolumnlist values ($cvid,6,'vtiger_crmentity:smownerid:assigned_user_id:Contacts_Assigned_To:V')"
 			    );
 foreach($insert_query_array9 as $query)
@@ -1764,7 +1764,7 @@
 	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'actualroi','campaign',1,'1','actualroi','Actual ROI',1,0,0,100,20,76,1,'N~O',1,null,'BAS')",
 	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,15,76,2,'T~O',1,null,'BAS')",
 	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,16,76,2,'T~O',1,null,'BAS')",
-	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,78,1,'V~O',1,null,'BAS')"
+	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,82,1,'V~O',1,null,'BAS')"
 			     );
 foreach($insert_query_array24 as $query)
 {
@@ -3293,7 +3293,6 @@
 Execute("update vtiger_field set sequence=9, block=78 where tabid=26 and columnname='expectedroi' and fieldname='expectedroi'");
 Execute("update vtiger_field set sequence=10, block=78 where tabid=26 and columnname='actualroi' and fieldname='actualroi'");
 
-Execute("insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,82,1,'V~O',1,null,'BAS')");
 
 
 //Update query to set the fieldname in user detail/edit/create view
@@ -3655,6 +3654,34 @@
 //changes related to Incoming mail server settings
 Execute("alter table vtiger_mail_accounts drop column showbody");
 
+//change the Account relatedlist Activity label from Acivities to Activities
+Execute("update vtiger_relatedlists set label='Activities' where tabid=6 and relation_id=3");
+
+//change the fieldname from title to notes_title for notes and update in columnlist also
+Execute("update vtiger_field set fieldname='notes_title' where tabid=8 and fieldname='title'");
+Execute('update vtiger_cvcolumnlist set columnname="vtiger_notes:title:notes_title:Notes_Title:V" where columnname="vtiger_notes:title:title:Notes_Title:V"');
+
+//change the sequence of Billing and Shipping address details for Inventory modules
+Execute("update vtiger_field set sequence=5 where tabid in (20,21,22,23) and fieldname='bill_city'");
+Execute("update vtiger_field set sequence=6 where tabid in (20,21,22,23) and fieldname='ship_city'");
+Execute("update vtiger_field set sequence=7 where tabid in (20,21,22,23) and fieldname='bill_state'");
+Execute("update vtiger_field set sequence=8 where tabid in (20,21,22,23) and fieldname='ship_state'");
+Execute("update vtiger_field set sequence=9 where tabid in (20,21,22,23) and fieldname='bill_code'");
+Execute("update vtiger_field set sequence=10 where tabid in (20,21,22,23) and fieldname='ship_code'");
+Execute("update vtiger_field set sequence=11 where tabid in (20,21,22,23) and fieldname='bill_country'");
+Execute("update vtiger_field set sequence=12 where tabid in (20,21,22,23) and fieldname='ship_country'");
+
+//for vtiger_campaignleadrel  table
+Execute("alter table vtiger_campaignleadrel DROP PRIMARY KEY");
+Execute("alter table vtiger_campaignleadrel ADD PRIMARY KEY (campaignid,leadid)");
+
+//for  vtiger_campaigncontrel  table
+Execute("alter table vtiger_campaigncontrel DROP PRIMARY KEY");
+Execute("alter table vtiger_campaigncontrel ADD PRIMARY KEY (campaignid,contactid)");
+
+//for  vtiger_seactivityrel  table
+Execute("alter table vtiger_seactivityrel DROP PRIMARY KEY");
+Execute("alter table vtiger_seactivityrel ADD PRIMARY KEY (crmid,activityid)");
 
 
 



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 07:57:12 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 14:57:12 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9419 -
	/vtigercrm/trunk/Smarty/templates/GlobalListView.tpl
Message-ID: <20060911145712.DC6B276D5D8@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep 11 08:57:05 2006
New Revision: 9419

Log:
Removed reference to Conveyor.js -- by Mickie

Modified:
    vtigercrm/trunk/Smarty/templates/GlobalListView.tpl

Modified: vtigercrm/trunk/Smarty/templates/GlobalListView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/GlobalListView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/GlobalListView.tpl Mon Sep 11 08:57:05 2006
@@ -18,7 +18,6 @@
 {if $MODULE eq 'Contacts'}
 {$IMAGELISTS}
 <script language="JavaScript" type="text/javascript" src="include/js/thumbnail.js"></script>
-<script language="JavaScript" type="text/javascript" src="include/js/conveyor.js"></script>
 <div id="dynloadarea" style=float:left;position:absolute;left:350px;top:150px;></div>
 {/if}
 <script language="JavaScript" type="text/javascript" src="modules/{$MODULE}/{$SINGLE_MOD}.js"></script>



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 08:25:04 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 15:25:04 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9420 - in
 /vtigercrm/trunk/Smarty/templates: RelatedListNew.tpl RelatedLists.tpl
Message-ID: <20060911152504.F391376D5EC@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep 11 09:24:55 2006
New Revision: 9420

Log:
Fixed the Select One Issue in Campaign Related List

Modified:
    vtigercrm/trunk/Smarty/templates/RelatedListNew.tpl
    vtigercrm/trunk/Smarty/templates/RelatedLists.tpl

Modified: vtigercrm/trunk/Smarty/templates/RelatedListNew.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/RelatedListNew.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/RelatedListNew.tpl Mon Sep 11 09:24:55 2006
@@ -52,10 +52,20 @@
 
 function loadCvList(type,id) {ldelim}
 	if(type === 'Leads')
-		$("lead_list_button").innerHTML = '<input title="{$MOD.LBL_LOAD_LIST}" accessKey="" class="crmbutton small edit" value="{$MOD.LBL_LOAD_LIST}" type="button"  name="button" onclick="window.location.href=\'index.php?action=LoadList&module=Campaigns&return_action=DetailView&return_id='+id+'&list_type='+type+'&cvid='+$("lead_cv_list").value+'\'">';
+	{ldelim}
+		if($("lead_cv_list").value != 'None')
+		{ldelim}
+			$("lead_list_button").innerHTML = '<input title="{$MOD.LBL_LOAD_LIST}" accessKey="" class="crmbutton small edit" value="{$MOD.LBL_LOAD_LIST}" type="button"  name="button" onclick="window.location.href=\'index.php?action=LoadList&module=Campaigns&return_action=DetailView&return_id='+id+'&list_type='+type+'&cvid='+$("lead_cv_list").value+'\'">';
+		{rdelim}
+	{rdelim}
 
 	if(type === 'Contacts')
+	{ldelim}
+		if($("cont_cv_list").value != 'None')
+		{ldelim}
 		$("contact_list_button").innerHTML = '<input title="{$MOD.LBL_LOAD_LIST}" accessKey="" class="crmbutton small edit" value="{$MOD.LBL_LOAD_LIST}" type="button"  name="button" onclick="window.location.href=\'index.php?action=LoadList&module=Campaigns&return_action=DetailView&return_id='+id+'&list_type='+type+'&cvid='+$("cont_cv_list").value+'\'">';
+		{rdelim}
+	{rdelim}
 {rdelim}
 </script>
 

Modified: vtigercrm/trunk/Smarty/templates/RelatedLists.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/RelatedLists.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/RelatedLists.tpl Mon Sep 11 09:24:55 2006
@@ -52,10 +52,20 @@
 
 function loadCvList(type,id) {ldelim}
 	if(type === 'Leads')
-		$("lead_list_button").innerHTML = '<input title="{$MOD.LBL_LOAD_LIST}" accessKey="" class="crmbutton small edit" value="{$MOD.LBL_LOAD_LIST}" type="button"  name="button" onclick="window.location.href=\'index.php?action=LoadList&module=Campaigns&return_id='+id+'&list_type='+type+'&cvid='+$("lead_cv_list").value+'\'">';
+	{ldelim}
+		if($("lead_cv_list").value != 'None')
+		{ldelim}
+			$("lead_list_button").innerHTML = '<input title="{$MOD.LBL_LOAD_LIST}" accessKey="" class="crmbutton small edit" value="{$MOD.LBL_LOAD_LIST}" type="button"  name="button" onclick="window.location.href=\'index.php?action=LoadList&module=Campaigns&return_id='+id+'&list_type='+type+'&cvid='+$("lead_cv_list").value+'\'">';
+		{rdelim}
+	{rdelim}
 
 	if(type === 'Contacts')
-		$("contact_list_button").innerHTML = '<input title="{$MOD.LBL_LOAD_LIST}" accessKey="" class="crmbutton small edit" value="{$MOD.LBL_LOAD_LIST}" type="button"  name="button" onclick="window.location.href=\'index.php?action=LoadList&module=Campaigns&return_id='+id+'&list_type='+type+'&cvid='+$("cont_cv_list").value+'\'">';
+	{ldelim}
+		if($("cont_cv_list").value !='None')
+		{ldelim}
+			$("contact_list_button").innerHTML = '<input title="{$MOD.LBL_LOAD_LIST}" accessKey="" class="crmbutton small edit" value="{$MOD.LBL_LOAD_LIST}" type="button"  name="button" onclick="window.location.href=\'index.php?action=LoadList&module=Campaigns&return_id='+id+'&list_type='+type+'&cvid='+$("cont_cv_list").value+'\'">';
+		{rdelim}
+	{rdelim}
 {rdelim}
 </script>
 	{include file='Buttons_List1.tpl'}



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 08:27:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 15:27:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9421 - in
 /vtigercrm/trunk/modules/Campaigns: CallRelatedList.php DetailView.php
Message-ID: <20060911152730.C1DF576D5EC@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep 11 09:27:23 2006
New Revision: 9421

Log:
Fixed the Select One Issue in Campaign Related List

Modified:
    vtigercrm/trunk/modules/Campaigns/CallRelatedList.php
    vtigercrm/trunk/modules/Campaigns/DetailView.php

Modified: vtigercrm/trunk/modules/Campaigns/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Campaigns/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Campaigns/CallRelatedList.php Mon Sep 11 09:27:23 2006
@@ -51,11 +51,11 @@
 
 $cvObj = new CustomView("Contacts");
 $cvcombo = $cvObj->getCustomViewCombo();
-$smarty->assign("CONTCVCOMBO","<select id='cont_cv_list' onchange='loadCvList(\"Contacts\",".$_REQUEST["record"].");'><option>-- ".$mod_strings['Select One']." --</option>".$cvcombo."</select>");
+$smarty->assign("CONTCVCOMBO","<select id='cont_cv_list' onchange='loadCvList(\"Contacts\",".$_REQUEST["record"].");'><option value='None'>-- ".$mod_strings['Select One']." --</option>".$cvcombo."</select>");
 
 $cvObj = new CustomView("Leads");
 $cvcombo = $cvObj->getCustomViewCombo();
-$smarty->assign("LEADCVCOMBO","<select id='lead_cv_list' onchange='loadCvList(\"Leads\",".$_REQUEST["record"].");'> <option>-- ".$mod_strings['Select One']." --</option>".$cvcombo."</select>");
+$smarty->assign("LEADCVCOMBO","<select id='lead_cv_list' onchange='loadCvList(\"Leads\",".$_REQUEST["record"].");'> <option value='None'>-- ".$mod_strings['Select One']." --</option>".$cvcombo."</select>");
 
 $category = getParentTab();
 $smarty->assign("CATEGORY",$category);

Modified: vtigercrm/trunk/modules/Campaigns/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Campaigns/DetailView.php (original)
+++ vtigercrm/trunk/modules/Campaigns/DetailView.php Mon Sep 11 09:27:23 2006
@@ -77,11 +77,11 @@
 	$smarty->assign("RELATEDLISTS", $related_array);
 	$cvObj = new CustomView("Contacts");
 	$cvcombo = $cvObj->getCustomViewCombo();
-	$smarty->assign("CONTCVCOMBO","<select id='cont_cv_list' onchange='loadCvList(\"Contacts\",".$_REQUEST["record"].");'><option>-- ".$mod_strings['Select One']." --</option>".$cvcombo."</select>");
+	$smarty->assign("CONTCVCOMBO","<select id='cont_cv_list' onchange='loadCvList(\"Contacts\",".$_REQUEST["record"].");'><option value='None'>-- ".$mod_strings['Select One']." --</option>".$cvcombo."</select>");
 
 	$cvObj = new CustomView("Leads");
 	$cvcombo = $cvObj->getCustomViewCombo();
-	$smarty->assign("LEADCVCOMBO","<select id='lead_cv_list' onchange='loadCvList(\"Leads\",".$_REQUEST["record"].");'> <option>-- ".$mod_strings['Select One']." --</option>".$cvcombo."</select>");
+	$smarty->assign("LEADCVCOMBO","<select id='lead_cv_list' onchange='loadCvList(\"Leads\",".$_REQUEST["record"].");'> <option value='None'>-- ".$mod_strings['Select One']." --</option>".$cvcombo."</select>");
 }
 
 $smarty->assign("SinglePane_View", $singlepane_view);



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 08:31:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 15:31:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9422 -
	/vtigercrm/trunk/include/utils/DetailViewUtils.php
Message-ID: <20060911153126.CD3E976D608@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep 11 09:31:14 2006
New Revision: 9422

Log:
Fixed the Sales Profile Issue when viewing events

Modified:
    vtigercrm/trunk/include/utils/DetailViewUtils.php

Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/DetailViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/DetailViewUtils.php Mon Sep 11 09:31:14 2006
@@ -225,9 +225,9 @@
 			$label_fld["link"][] = "index.php?module=Users&action=GroupDetailView&groupId=".$groupid;
 		}
 		//Security Checks
-		if($fieldlabel == 'Assigned To' && $is_admin==false && $profileGlobalPermission[2] == 1 && ($defaultOrgSharingPermission[getTabid($module_name)] == 3 or $defaultOrgSharingPermission[getTabid($module_name)] == 0))
-		{
-			$result=get_current_user_access_groups($module_name);
+		if($fieldlabel == 'Assigned To' && $is_admin==false && $profileGlobalPermission[2] == 1 && ($defaultOrgSharingPermission[getTabid($module)] == 3 or $defaultOrgSharingPermission[getTabid($module)] == 0))
+		{
+			$result=get_current_user_access_groups($module);
 		}
 		else
 		{ 		
@@ -269,7 +269,7 @@
 			}	
 		}
 
-		if($fieldlabel == 'Assigned To' && $is_admin==false && $profileGlobalPermission[2] == 1 && ($defaultOrgSharingPermission[getTabid($module_name)] == 3 or $defaultOrgSharingPermission[getTabid($module_name)] == 0))
+		if($fieldlabel == 'Assigned To' && $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", $assigned_user_id,'private'), $assigned_user_id);
 		}



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 08:34:47 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 15:34:47 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9423 -
	/vtigercrm/trunk/modules/Calendar/Activity.php
Message-ID: <20060911153447.E3A9376D633@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep 11 09:34:41 2006
New Revision: 9423

Log:
Fixed the Sales Profile Issue when viewing events

Modified:
    vtigercrm/trunk/modules/Calendar/Activity.php

Modified: vtigercrm/trunk/modules/Calendar/Activity.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/Activity.php (original)
+++ vtigercrm/trunk/modules/Calendar/Activity.php Mon Sep 11 09:34:41 2006
@@ -160,7 +160,7 @@
 
 			$returnset = '&return_module=Calendar&return_action=CallRelatedList&activity_mode=Events&return_id='.$id;
 
-			$query = 'select vtiger_users.user_name,vtiger_contactdetails.accountid,vtiger_contactdetails.contactid, vtiger_contactdetails.firstname,vtiger_contactdetails.lastname, vtiger_contactdetails.department, vtiger_contactdetails.title, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_contactdetails inner join vtiger_cntactivityrel on vtiger_cntactivityrel.contactid=vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid where vtiger_cntactivityrel.activityid='.$id.' and vtiger_crmentity.deleted=0';
+			$query = 'select vtiger_users.user_name,vtiger_contactdetails.accountid,vtiger_contactdetails.contactid, vtiger_contactdetails.firstname,vtiger_contactdetails.lastname, vtiger_contactdetails.department, vtiger_contactdetails.title, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_contactdetails inner join vtiger_cntactivityrel on vtiger_cntactivityrel.contactid=vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_cntactivityrel.activityid = vtiger_activitygrouprelation.activityid left join vtiger_groups on vtiger_groups.groupname = vtiger_activitygrouprelation.groupname where vtiger_cntactivityrel.activityid='.$id.' and vtiger_crmentity.deleted=0';
 			$log->debug("Exiting get_contacts method ...");
 			return GetRelatedList('Calendar','Contacts',$focus,$query,$button,$returnset);
         }



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 08:41:17 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 15:41:17 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9424 -
	/vtigercrm/trunk/modules/Calendar/Calendar.php
Message-ID: <20060911154117.B466C76D633@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep 11 09:41:08 2006
New Revision: 9424

Log:
Fixed the 12pm issue in Calendar Hour view

Modified:
    vtigercrm/trunk/modules/Calendar/Calendar.php

Modified: vtigercrm/trunk/modules/Calendar/Calendar.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/Calendar.php (original)
+++ vtigercrm/trunk/modules/Calendar/Calendar.php Mon Sep 11 09:41:08 2006
@@ -198,7 +198,7 @@
 		}
 		else
 		{
-			$this->day_end_hour=24;
+			$this->day_end_hour=23;
 		}
 		if ( $this->view == 'week')
 		{



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 09:31:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 16:31:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9425 - in
 /wordintegration/trunk/resources/images: config.gif pluginOLGeneric.gif
 pluginOfficeAbout.gif
Message-ID: <20060911163155.AC3B576D648@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Mon Sep 11 10:31:30 2006
New Revision: 9425

Log:
Images added for WordPlugin --Jeri

Added:
    wordintegration/trunk/resources/images/pluginOLGeneric.gif   (with props)
    wordintegration/trunk/resources/images/pluginOfficeAbout.gif   (with props)
Modified:
    wordintegration/trunk/resources/images/config.gif

Modified: wordintegration/trunk/resources/images/config.gif
==============================================================================
Binary files - no diff available.



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 09:33:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 16:33:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9426 - in
 /wordintegration/trunk/client/source: Connect.DCA frmAbout.frm frmAbout.frx
 frmConf.frx frmvtigerTempate.frm frmvtigerTempate.frx
 vtigerCRMWordPlugin.vbw
Message-ID: <20060911163302.E52BC74817F@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Mon Sep 11 10:32:33 2006
New Revision: 9426

Log:
New Images added for word plugin --Jeri

Modified:
    wordintegration/trunk/client/source/Connect.DCA
    wordintegration/trunk/client/source/frmAbout.frm
    wordintegration/trunk/client/source/frmAbout.frx
    wordintegration/trunk/client/source/frmConf.frx
    wordintegration/trunk/client/source/frmvtigerTempate.frm
    wordintegration/trunk/client/source/frmvtigerTempate.frx
    wordintegration/trunk/client/source/vtigerCRMWordPlugin.vbw

Modified: wordintegration/trunk/client/source/Connect.DCA
==============================================================================
Binary files - no diff available.

Modified: wordintegration/trunk/client/source/frmAbout.frm
==============================================================================
Binary files - no diff available.

Modified: wordintegration/trunk/client/source/frmAbout.frx
==============================================================================
Binary files - no diff available.

Modified: wordintegration/trunk/client/source/frmConf.frx
==============================================================================
Binary files - no diff available.

Modified: wordintegration/trunk/client/source/frmvtigerTempate.frm
==============================================================================
Binary files - no diff available.

Modified: wordintegration/trunk/client/source/frmvtigerTempate.frx
==============================================================================
Binary files - no diff available.

Modified: wordintegration/trunk/client/source/vtigerCRMWordPlugin.vbw
==============================================================================
Binary files - no diff available.



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 00:00:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 07:00:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9427 - in
 /vtigercrm/trunk/Smarty/templates: SetMenu.tpl Settings.tpl
Message-ID: <20060912070041.A5F476FDF42@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep 12 01:00:23 2006
New Revision: 9427

Log:
Moved the Default Module View from Users & Access Management to Other Settings --by Ahmed

Modified:
    vtigercrm/trunk/Smarty/templates/SetMenu.tpl
    vtigercrm/trunk/Smarty/templates/Settings.tpl

Modified: vtigercrm/trunk/Smarty/templates/SetMenu.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/SetMenu.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/SetMenu.tpl Tue Sep 12 01:00:23 2006
@@ -11,7 +11,6 @@
  ********************************************************************************/
 
 -->*}
-
 <table border=0 cellspacing=0 cellpadding=20 width=90% class="settingsUI">
 <tr>
 <td valign=top>
@@ -72,12 +71,7 @@
 		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=ListLoginHistory&parenttab=Settings">{$MOD.LBL_LOGIN_HISTORY_DETAILS}</a></td></tr>
 		{/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>
-		{else}
-		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=DefModuleView&parenttab=Settings">{$MOD.LBL_DEFAULT_MODULE_VIEW}</a></td></tr>
-		{/if}
-
+		
 		<tr><td class="settingsTabHeader" nowrap>{$MOD.LBL_STUDIO}</td></tr>
 		{if  $smarty.request.action eq 'CustomFieldList' || $smarty.request.action eq 'LeadCustomFieldMapping'}
 		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Settings&action=CustomFieldList&parenttab=Settings">{$MOD.LBL_CUSTOM_FIELDS}</a></td></tr>
@@ -177,6 +171,12 @@
 		{else}
 		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=Announcements&parenttab=Settings">{$MOD.LBL_ANNOUNCEMENT}</a></td></tr>
 		{/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>
+		{else}
+		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&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>
 		</table>

Modified: vtigercrm/trunk/Smarty/templates/Settings.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings.tpl Tue Sep 12 01:00:23 2006
@@ -10,7 +10,6 @@
  ********************************************************************************/
 -->*}
 
-
 	{include file="Buttons_List1.tpl"}
 <table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
 <tbody><tr>
@@ -158,7 +157,364 @@
 					</td>
 					<!-- Row 3 -->
 					<tr>
-					<td width=25% valign=top>
+					
+				</tr>
+				</table>
+
+
+				</td>
+			</tr>
+
+
+			<tr>
+				<td class="settingsTabHeader">
+
+				<!-- Studio  -->
+					{$MOD.LBL_STUDIO}	
+				</td>
+			</tr>
+			<tr>
+				<td class="settingsIconDisplay small">
+				<!-- Icons for Users & Access Management -->
+				
+				<table border=0 cellspacing=0 cellpadding=10 width=100%>
+				<tr>
+
+					<td width=25% valign=top>
+					<!-- icon 9-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=CustomFieldList&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}custom.gif" alt="{$MOD.LBL_CUSTOM_FIELDS}" title="{$MOD.LBL_CUSTOM_FIELDS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=CustomFieldList&parenttab=Settings">{$MOD.LBL_CUSTOM_FIELDS}</a></td>
+						</tr>
+						<tr>
+
+							<td class="small" valign=top>{$MOD.LBL_CUSTOM_FIELDS_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 10-->
+						<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>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_PICKLIST_DESCRIPTION}</td>	
+						</tr>
+						</table>
+					</td>
+
+					<td width=25% valign=top>
+					<!-- empty-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top>&nbsp;</td>
+							<td class=big valign=top>&nbsp;</td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>&nbsp;</td>
+
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- empty-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top>&nbsp;</td>
+							<td class=big valign=top>&nbsp;</td>
+
+						</tr>
+						<tr>
+							<td class="small" valign=top>&nbsp;</td>
+						</tr>
+						</table>
+					</td>
+				</tr>
+				</table>
+				
+				
+				</td>
+
+			</tr>
+			
+			
+			
+			<tr>
+				<td class="settingsTabHeader">
+				<!-- Communication Templates -->
+					{$MOD.LBL_COMMUNICATION_TEMPLATES}
+				</td>
+			</tr>
+			<tr>
+				<td class="settingsIconDisplay small">
+
+				<!-- Icons for Communication Templates -->
+				
+				<table border=0 cellspacing=0 cellpadding=10 width=100%>
+				<tr>
+					<td width=25% valign=top>
+					<!-- 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>
+
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_EMAIL_TEMPLATE_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 12-->
+
+						<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>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_MAIL_MERGE_DESCRIPTION}</td>
+						</tr>
+
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- 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>
+
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_NOTIF_SCHED_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 14-->
+
+						<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>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_INV_NOTIF_DESCRIPTION}</td>
+						</tr>
+
+						</table>
+					</td>
+				</tr>
+				<!-- Row 2 -->
+				<tr>
+					<td width=25% valign=top>
+					<!-- icon 15-->
+						<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>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_INV_TANDC_DESCRIPTION}</td>
+						</tr>
+						</table>
+
+					</td>
+					<td width=25% valign=top>
+					<!-- empty -->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top>&nbsp;</td>
+							<td class=big valign=top>&nbsp;</td>
+						</tr>
+						<tr>
+
+							<td class="small" valign=top>&nbsp;</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- empty-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top>&nbsp;</td>
+
+							<td class=big valign=top>&nbsp;</td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>&nbsp;</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- empty-->
+
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top>&nbsp;</td>
+							<td class=big valign=top>&nbsp;</td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>&nbsp;</td>
+						</tr>
+						</table>
+
+					</td>
+				</tr>
+				</table>
+				
+				
+				</td>
+			</tr>
+			<tr>
+				<td class="settingsTabHeader">
+				<!-- Other settings -->
+					{$MOD.LBL_OTHER_SETTINGS}
+				</td>
+
+			</tr>
+			<tr>
+				<td class="settingsIconDisplay small">
+				<!-- Icons for Other Settings-->
+				
+				<table border=0 cellspacing=0 cellpadding=10 width=100%>
+				<tr>
+					<td width=25% valign=top>
+					<!-- icon 16-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=OrganizationConfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}company.gif" alt="{$MOD.LBL_COMPANY_DETAILS}" title="{$MOD.LBL_COMPANY_DETAILS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=OrganizationConfig&parenttab=Settings">{$MOD.LBL_COMPANY_DETAILS}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_COMPANY_DESCRIPTION}</td>
+						</tr>
+						</table>
+
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 17-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=EmailConfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}ogmailserver.gif" alt="{$MOD.LBL_MAIL_SERVER_SETTINGS}" title="{$MOD.LBL_MAIL_SERVER_SETTINGS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=EmailConfig&parenttab=Settings">{$MOD.LBL_MAIL_SERVER_SETTINGS}</a></td>
+						</tr>
+
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_MAIL_SERVER_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 18-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=BackupServerConfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}backupserver.gif" alt="{$MOD.LBL_BACKUP_SERVER_SETTINGS}" title="{$MOD.LBL_BACKUP_SERVER_SETTINGS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=BackupServerConfig&parenttab=Settings">{$MOD.LBL_BACKUP_SERVER_SETTINGS}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_BACKUP_SERVER_DESCRIPTION}</td>
+						</tr>
+						</table>
+
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 7-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=ListModuleOwners&parenttab=Settings"><img src="{$IMAGE_PATH}assign.gif" alt="{$MOD.LBL_ASSIGN_MODULE_OWNERS}" width="48" height="48" border=0 title="{$MOD.LBL_ASSIGN_MODULE_OWNERS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=ListModuleOwners&parenttab=Settings">{$MOD.LBL_MODULE_OWNERS}</a></td>
+
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_MODULE_OWNERS_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+				</tr>
+				<!-- Row 2 -->
+				<tr>
+
+					<td width=25% valign=top>
+					<!-- icon 19-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=CurrencyListView&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}currency.gif" alt="{$MOD.LBL_CURRENCY_SETTINGS}" title="{$MOD.LBL_CURRENCY_SETTINGS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=CurrencyListView&parenttab=Settings">{$MOD.LBL_CURRENCY_SETTINGS}</a></td>
+						</tr>
+
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_CURRENCY_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+
+					<td width=25% valign=top>
+					<!-- icon 20-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=TaxConfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}taxConfiguration.gif" alt="{$MOD.LBL_TAX_SETTINGS}" title="{$MOD.LBL_TAX_SETTINGS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=TaxConfig&parenttab=Settings">{$MOD.LBL_TAX_SETTINGS}</a></td>
+						</tr>
+						<tr>
+
+							<td class="small" valign=top>{$MOD.LBL_TAX_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- empty -->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=System&action=listsysconfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}system.gif" alt="{$MOD.LBL_SYSTEM_INFO}" title="{$MOD.LBL_SYSTEM_INFO}"></a></td>
+							<td class=big valign=top><a href="index.php?module=System&action=listsysconfig&parenttab=Settings">{$MOD.LBL_SYSTEM_INFO}</a></td>
+
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_SYSTEM_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+
+					<!-- empty-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=ProxyServerConfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}proxy.gif" alt="{$MOD.LBL_PROXY_SETTINGS}" title="{$MOD.LBL_PROXY_SETTINGS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=ProxyServerConfig&parenttab=Settings">{$MOD.LBL_PROXY_SETTINGS}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_PROXY_DESCRIPTION}</td>
+						</tr>
+
+						</table>
+					</td>
+				</tr>
+				<tr>
+
+					<td width=25% valign=top>
+					<!-- empty-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Users&action=Announcements&parenttab=Settings"><img src="{$IMAGE_PATH}announ.gif" alt="{$MOD.LBL_ANNOUNCEMENT}" width="48" height="48" border=0 title="{$MOD.LBL_ANNOUNCEMENT}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Users&action=Announcements&parenttab=Settings">{$MOD.LBL_ANNOUNCEMENT}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_ANNOUNCEMENT_DESCRIPTION}</td>
+						</tr>
+
+						</table>
+					</td>
+<td width=25% valign=top>
 					<!-- icon 9-->	
 					<table border=0 cellspacing=0 cellpadding=5 width=100%>
 					<tr>
@@ -170,362 +526,6 @@
 					</tr>
 
 					</table>
-					</td>
-				</tr>
-				</table>
-
-
-				</td>
-			</tr>
-
-
-			<tr>
-				<td class="settingsTabHeader">
-
-				<!-- Studio  -->
-					{$MOD.LBL_STUDIO}	
-				</td>
-			</tr>
-			<tr>
-				<td class="settingsIconDisplay small">
-				<!-- Icons for Users & Access Management -->
-				
-				<table border=0 cellspacing=0 cellpadding=10 width=100%>
-				<tr>
-
-					<td width=25% valign=top>
-					<!-- icon 9-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=CustomFieldList&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}custom.gif" alt="{$MOD.LBL_CUSTOM_FIELDS}" title="{$MOD.LBL_CUSTOM_FIELDS}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Settings&action=CustomFieldList&parenttab=Settings">{$MOD.LBL_CUSTOM_FIELDS}</a></td>
-						</tr>
-						<tr>
-
-							<td class="small" valign=top>{$MOD.LBL_CUSTOM_FIELDS_DESCRIPTION}</td>
-						</tr>
-						</table>
-					</td>
-					<td width=25% valign=top>
-					<!-- icon 10-->
-						<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>
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_PICKLIST_DESCRIPTION}</td>	
-						</tr>
-						</table>
-					</td>
-
-					<td width=25% valign=top>
-					<!-- empty-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top>&nbsp;</td>
-							<td class=big valign=top>&nbsp;</td>
-						</tr>
-						<tr>
-							<td class="small" valign=top>&nbsp;</td>
-
-						</tr>
-						</table>
-					</td>
-					<td width=25% valign=top>
-					<!-- empty-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top>&nbsp;</td>
-							<td class=big valign=top>&nbsp;</td>
-
-						</tr>
-						<tr>
-							<td class="small" valign=top>&nbsp;</td>
-						</tr>
-						</table>
-					</td>
-				</tr>
-				</table>
-				
-				
-				</td>
-
-			</tr>
-			
-			
-			
-			<tr>
-				<td class="settingsTabHeader">
-				<!-- Communication Templates -->
-					{$MOD.LBL_COMMUNICATION_TEMPLATES}
-				</td>
-			</tr>
-			<tr>
-				<td class="settingsIconDisplay small">
-
-				<!-- Icons for Communication Templates -->
-				
-				<table border=0 cellspacing=0 cellpadding=10 width=100%>
-				<tr>
-					<td width=25% valign=top>
-					<!-- 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>
-
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_EMAIL_TEMPLATE_DESCRIPTION}</td>
-						</tr>
-						</table>
-					</td>
-					<td width=25% valign=top>
-					<!-- icon 12-->
-
-						<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>
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_MAIL_MERGE_DESCRIPTION}</td>
-						</tr>
-
-						</table>
-					</td>
-					<td width=25% valign=top>
-					<!-- 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>
-
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_NOTIF_SCHED_DESCRIPTION}</td>
-						</tr>
-						</table>
-					</td>
-					<td width=25% valign=top>
-					<!-- icon 14-->
-
-						<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>
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_INV_NOTIF_DESCRIPTION}</td>
-						</tr>
-
-						</table>
-					</td>
-				</tr>
-				<!-- Row 2 -->
-				<tr>
-					<td width=25% valign=top>
-					<!-- icon 15-->
-						<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>
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_INV_TANDC_DESCRIPTION}</td>
-						</tr>
-						</table>
-
-					</td>
-					<td width=25% valign=top>
-					<!-- empty -->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top>&nbsp;</td>
-							<td class=big valign=top>&nbsp;</td>
-						</tr>
-						<tr>
-
-							<td class="small" valign=top>&nbsp;</td>
-						</tr>
-						</table>
-					</td>
-					<td width=25% valign=top>
-					<!-- empty-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top>&nbsp;</td>
-
-							<td class=big valign=top>&nbsp;</td>
-						</tr>
-						<tr>
-							<td class="small" valign=top>&nbsp;</td>
-						</tr>
-						</table>
-					</td>
-					<td width=25% valign=top>
-					<!-- empty-->
-
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top>&nbsp;</td>
-							<td class=big valign=top>&nbsp;</td>
-						</tr>
-						<tr>
-							<td class="small" valign=top>&nbsp;</td>
-						</tr>
-						</table>
-
-					</td>
-				</tr>
-				</table>
-				
-				
-				</td>
-			</tr>
-			<tr>
-				<td class="settingsTabHeader">
-				<!-- Other settings -->
-					{$MOD.LBL_OTHER_SETTINGS}
-				</td>
-
-			</tr>
-			<tr>
-				<td class="settingsIconDisplay small">
-				<!-- Icons for Other Settings-->
-				
-				<table border=0 cellspacing=0 cellpadding=10 width=100%>
-				<tr>
-					<td width=25% valign=top>
-					<!-- icon 16-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=OrganizationConfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}company.gif" alt="{$MOD.LBL_COMPANY_DETAILS}" title="{$MOD.LBL_COMPANY_DETAILS}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Settings&action=OrganizationConfig&parenttab=Settings">{$MOD.LBL_COMPANY_DETAILS}</a></td>
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_COMPANY_DESCRIPTION}</td>
-						</tr>
-						</table>
-
-					</td>
-					<td width=25% valign=top>
-					<!-- icon 17-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=EmailConfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}ogmailserver.gif" alt="{$MOD.LBL_MAIL_SERVER_SETTINGS}" title="{$MOD.LBL_MAIL_SERVER_SETTINGS}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Settings&action=EmailConfig&parenttab=Settings">{$MOD.LBL_MAIL_SERVER_SETTINGS}</a></td>
-						</tr>
-
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_MAIL_SERVER_DESCRIPTION}</td>
-						</tr>
-						</table>
-					</td>
-					<td width=25% valign=top>
-					<!-- icon 18-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=BackupServerConfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}backupserver.gif" alt="{$MOD.LBL_BACKUP_SERVER_SETTINGS}" title="{$MOD.LBL_BACKUP_SERVER_SETTINGS}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Settings&action=BackupServerConfig&parenttab=Settings">{$MOD.LBL_BACKUP_SERVER_SETTINGS}</a></td>
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_BACKUP_SERVER_DESCRIPTION}</td>
-						</tr>
-						</table>
-
-					</td>
-					<td width=25% valign=top>
-					<!-- icon 7-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=ListModuleOwners&parenttab=Settings"><img src="{$IMAGE_PATH}assign.gif" alt="{$MOD.LBL_ASSIGN_MODULE_OWNERS}" width="48" height="48" border=0 title="{$MOD.LBL_ASSIGN_MODULE_OWNERS}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Settings&action=ListModuleOwners&parenttab=Settings">{$MOD.LBL_MODULE_OWNERS}</a></td>
-
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_MODULE_OWNERS_DESCRIPTION}</td>
-						</tr>
-						</table>
-					</td>
-				</tr>
-				<!-- Row 2 -->
-				<tr>
-
-					<td width=25% valign=top>
-					<!-- icon 19-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=CurrencyListView&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}currency.gif" alt="{$MOD.LBL_CURRENCY_SETTINGS}" title="{$MOD.LBL_CURRENCY_SETTINGS}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Settings&action=CurrencyListView&parenttab=Settings">{$MOD.LBL_CURRENCY_SETTINGS}</a></td>
-						</tr>
-
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_CURRENCY_DESCRIPTION}</td>
-						</tr>
-						</table>
-					</td>
-
-					<td width=25% valign=top>
-					<!-- icon 20-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=TaxConfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}taxConfiguration.gif" alt="{$MOD.LBL_TAX_SETTINGS}" title="{$MOD.LBL_TAX_SETTINGS}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Settings&action=TaxConfig&parenttab=Settings">{$MOD.LBL_TAX_SETTINGS}</a></td>
-						</tr>
-						<tr>
-
-							<td class="small" valign=top>{$MOD.LBL_TAX_DESCRIPTION}</td>
-						</tr>
-						</table>
-					</td>
-					<td width=25% valign=top>
-					<!-- empty -->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=System&action=listsysconfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}system.gif" alt="{$MOD.LBL_SYSTEM_INFO}" title="{$MOD.LBL_SYSTEM_INFO}"></a></td>
-							<td class=big valign=top><a href="index.php?module=System&action=listsysconfig&parenttab=Settings">{$MOD.LBL_SYSTEM_INFO}</a></td>
-
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_SYSTEM_DESCRIPTION}</td>
-						</tr>
-						</table>
-					</td>
-					<td width=25% valign=top>
-
-					<!-- empty-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=ProxyServerConfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}proxy.gif" alt="{$MOD.LBL_PROXY_SETTINGS}" title="{$MOD.LBL_PROXY_SETTINGS}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Settings&action=ProxyServerConfig&parenttab=Settings">{$MOD.LBL_PROXY_SETTINGS}</a></td>
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_PROXY_DESCRIPTION}</td>
-						</tr>
-
-						</table>
-					</td>
-				</tr>
-				<tr>
-
-					<td width=25% valign=top>
-					<!-- empty-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Users&action=Announcements&parenttab=Settings"><img src="{$IMAGE_PATH}announ.gif" alt="{$MOD.LBL_ANNOUNCEMENT}" width="48" height="48" border=0 title="{$MOD.LBL_ANNOUNCEMENT}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Users&action=Announcements&parenttab=Settings">{$MOD.LBL_ANNOUNCEMENT}</a></td>
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_ANNOUNCEMENT_DESCRIPTION}</td>
-						</tr>
-
-						</table>
 					</td>
 				  <td valign=top><table border=0 cellspacing=0 cellpadding=5 width=100%>
                     <tr>



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 01:14:10 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 08:14:10 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9428 -
 /vtigercrm/trunk/modules/CustomView/language/en_us.lang.php
Message-ID: <20060912081410.774716FDF54@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep 12 02:14:02 2006
New Revision: 9428

Log:
Modified Label for End Date --by Ahmed

Modified:
    vtigercrm/trunk/modules/CustomView/language/en_us.lang.php

Modified: vtigercrm/trunk/modules/CustomView/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/CustomView/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/CustomView/language/en_us.lang.php Tue Sep 12 02:14:02 2006
@@ -266,7 +266,7 @@
 'Select_Duration'=>'Select Duration', 
 'Simple_Time_Filter'=>'Simple Time Filter', 
 'Start_Date'=>'Start Date', 
-'End_Date'=>'End_Date', 
+'End_Date'=>'End Date', 
 'LBL_RULE'=>'RULE' 
 ); 
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 06:53:58 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 13:53:58 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9429 -
	/vtigercrm/trunk/themes/woodspice/images/aboutus.gif
Message-ID: <20060912135358.B5BFC76BF8A@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 07:53:45 2006
New Revision: 9429

Log:
unused image deleted --Jeri

Removed:
    vtigercrm/trunk/themes/woodspice/images/aboutus.gif



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 06:55:25 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 13:55:25 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9430 -
	/vtigercrm/trunk/themes/alphagrey/images/aboutus.gif
Message-ID: <20060912135525.51E3D76D5E9@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 07:55:18 2006
New Revision: 9430

Log:
unused image deleted --Jeri

Removed:
    vtigercrm/trunk/themes/alphagrey/images/aboutus.gif



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 06:55:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 13:55:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9431 -
 /vtigercrm/trunk/themes/bluelagoon/images/aboutus.gif
Message-ID: <20060912135537.8D9DD76D5FE@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 07:55:30 2006
New Revision: 9431

Log:
unused image deleted --Jeri

Removed:
    vtigercrm/trunk/themes/bluelagoon/images/aboutus.gif



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 06:56:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 13:56:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9432 - in
 /thunderbirdextn/trunk/chrome/vtiger/content/vtiger: addtovtiger.js
 addtovtiger.xul exportab.xul vtiger.js vtiger.xul vtigerab.js vtigerab.xul
Message-ID: <20060912135638.29BC076D5E9@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 07:56:17 2006
New Revision: 9432

Log:
Security implemented in thunderbird Plugin --Jeri

Modified:
    thunderbirdextn/trunk/chrome/vtiger/content/vtiger/addtovtiger.js
    thunderbirdextn/trunk/chrome/vtiger/content/vtiger/addtovtiger.xul
    thunderbirdextn/trunk/chrome/vtiger/content/vtiger/exportab.xul
    thunderbirdextn/trunk/chrome/vtiger/content/vtiger/vtiger.js
    thunderbirdextn/trunk/chrome/vtiger/content/vtiger/vtiger.xul
    thunderbirdextn/trunk/chrome/vtiger/content/vtiger/vtigerab.js
    thunderbirdextn/trunk/chrome/vtiger/content/vtiger/vtigerab.xul

Modified: thunderbirdextn/trunk/chrome/vtiger/content/vtiger/addtovtiger.js
==============================================================================
Binary files - no diff available.

Modified: thunderbirdextn/trunk/chrome/vtiger/content/vtiger/addtovtiger.xul
==============================================================================
Binary files - no diff available.

Modified: thunderbirdextn/trunk/chrome/vtiger/content/vtiger/exportab.xul
==============================================================================
Binary files - no diff available.

Modified: thunderbirdextn/trunk/chrome/vtiger/content/vtiger/vtiger.js
==============================================================================
Binary files - no diff available.

Modified: thunderbirdextn/trunk/chrome/vtiger/content/vtiger/vtiger.xul
==============================================================================
Binary files - no diff available.

Modified: thunderbirdextn/trunk/chrome/vtiger/content/vtiger/vtigerab.js
==============================================================================
Binary files - no diff available.

Modified: thunderbirdextn/trunk/chrome/vtiger/content/vtiger/vtigerab.xul
==============================================================================
Binary files - no diff available.



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 07:00:34 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 14:00:34 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9433 -
	/vtigercrm/trunk/soap/thunderbirdplugin.php
Message-ID: <20060912140034.CD36576D667@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 08:00:27 2006
New Revision: 9433

Log:
Security implemented in thunderbird Plugin --Jeri

Modified:
    vtigercrm/trunk/soap/thunderbirdplugin.php

Modified: vtigercrm/trunk/soap/thunderbirdplugin.php
==============================================================================
--- vtigercrm/trunk/soap/thunderbirdplugin.php (original)
+++ vtigercrm/trunk/soap/thunderbirdplugin.php Tue Sep 12 08:00:27 2006
@@ -46,6 +46,12 @@
     array('username'=>'xsd:string'),
     array('return'=>'tns:contactdetails'),
     $NAMESPACE);
+    
+$server->register(
+    'CheckContactPerm',array('user_name'=>'xsd:string'),array('return'=>'xsd:string'),$NAMESPACE);
+
+$server->register(
+    'CheckContactViewPerm',array('user_name'=>'xsd:string'),array('return'=>'xsd:string'),$NAMESPACE);
 
 $server->register(
 	  'AddContact',
@@ -382,7 +388,31 @@
 
 function create_session($user_name, $password)
 {
-        return "TempSessionID";
+  global $adb,$log;
+  $return_access = 'failure';
+  require_once('modules/Users/User.php');
+	$objuser = new User();
+  if($password != "" && $user_name != '')
+	{
+		$objuser->column_fields['user_name'] = $user_name;
+		$encrypted_password = $objuser->encrypt_password($password);
+		$query = "select id from vtiger_users where user_name='$user_name' and user_password='$encrypted_password'";
+		$result = $adb->query($query);
+		if($adb->num_rows($result) > 0)
+		{
+			$return_access = 'success';
+			$log->debug("Logged in sucessfully from thunderbirdplugin");
+		}else
+		{
+			$return_access = 'failure';
+			$log->debug("Logged in failure from thunderbirdplugin");
+		}
+	}else
+	{
+		$return_access = 'failure';
+		$log->debug("Logged in failure from thunderbirdplugin");
+  }
+	return $return_access;
 }
 
 function end_session($user_name)
@@ -390,6 +420,39 @@
         return "Success";       
 }
 
+function CheckContactPerm($user_name)
+{
+  global $current_user;
+	require_once('modules/Users/User.php');
+	$seed_user = new User();
+	$user_id = $seed_user->retrieve_user_id($user_name);
+	$current_user = $seed_user;
+	$current_user->retrieve_entity_info($user_id,"Users");
+	if(isPermitted("Contacts","EditView") == "yes")
+	{
+		return "allowed";
+	}else
+	{
+		return "denied";
+	}
+}
+
+function CheckContactViewPerm($user_name)
+{
+  global $current_user,$log;
+	require_once('modules/Users/User.php');
+	$seed_user = new User();
+	$user_id = $seed_user->retrieve_user_id($user_name);
+	$current_user = $seed_user;
+	$current_user->retrieve_entity_info($user_id,"Users");
+	if(isPermitted("Contacts","index") == "yes")
+	{
+		return "allowed";
+	}else
+	{
+		return "denied";
+	}
+}
 
 $server->service($HTTP_RAW_POST_DATA); 
 exit(); 



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 07:11:29 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 14:11:29 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9434 -
 /thunderbirdextn/trunk/chrome/vtiger/content/vtiger/vtiger.js
Message-ID: <20060912141129.E769C76CE1F@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 08:11:18 2006
New Revision: 9434

Log:
Security implemented in thunderbird Plugin --Jeri

Modified:
    thunderbirdextn/trunk/chrome/vtiger/content/vtiger/vtiger.js

Modified: thunderbirdextn/trunk/chrome/vtiger/content/vtiger/vtiger.js
==============================================================================
Binary files - no diff available.



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 07:18:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 14:18:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9435 -
 /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php
Message-ID: <20060912141809.B098176D667@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep 12 08:17:56 2006
New Revision: 9435

Log:
fixed the Migration Issues -- By Mickie

Modified:
    vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php

Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php
==============================================================================
--- vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php (original)
+++ vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php Tue Sep 12 08:17:56 2006
@@ -115,8 +115,8 @@
 {
 	$profile_id = $conn->query_result($res,$i,'profileid');
 
-	$sql1 = "insert into vtiger_profile2globalpermissions values ($profile_id,1,0)";
-	$sql2 = "insert into vtiger_profile2globalpermissions values ($profile_id,2,0)";
+	$sql1 = "insert into vtiger_profile2globalpermissions values ($profile_id,1,1)";
+	$sql2 = "insert into vtiger_profile2globalpermissions values ($profile_id,2,1)";
 
 	Execute($sql1);
 	Execute($sql2);
@@ -295,25 +295,25 @@
 
 //changes made to fix the bug in Address Information block of Accounts and Contacs module
 $update_array2 = Array(
-		"UPDATE vtiger_field SET fieldlabel='Billing City' WHERE tabid=6 and tablename='accountbillads' and fieldname='bill_city'",
-		"UPDATE vtiger_field SET fieldlabel='Billing State' WHERE tabid=6 and tablename='accountbillads' and fieldname='bill_state'",
-		"UPDATE vtiger_field SET fieldlabel='Billing Code' WHERE tabid=6 and tablename='accountbillads' and fieldname='bill_code'",
-		"UPDATE vtiger_field SET fieldlabel='Billing Country' WHERE tabid=6 and tablename='accountbillads' and fieldname='bill_country'",
-
-		"UPDATE vtiger_field SET fieldlabel='Shipping City' WHERE tabid=6 and tablename='accountshipads' and fieldname='ship_city'",
-		"UPDATE vtiger_field SET fieldlabel='Shipping Country' WHERE tabid=6 and tablename='accountshipads' and fieldname='ship_country'",
-		"UPDATE vtiger_field SET fieldlabel='Shipping State' WHERE tabid=6 and tablename='accountshipads' and fieldname='ship_state'",
-		"UPDATE vtiger_field SET fieldlabel='Shipping Code' WHERE tabid=6 and tablename='accountshipads' and fieldname='ship_code'",
-
-		"UPDATE vtiger_field SET fieldlabel='Mailing City' WHERE tabid=4 and tablename='contactaddress' and fieldname='mailingcity'",
-		"UPDATE vtiger_field SET fieldlabel='Mailing State' WHERE tabid=4 and tablename='contactaddress' and fieldname='mailingstate'",
-		"UPDATE vtiger_field SET fieldlabel='Mailing Zip' WHERE tabid=4 and tablename='contactaddress' and fieldname='mailingzip'",
-		"UPDATE vtiger_field SET fieldlabel='Mailing Country' WHERE tabid=4 and tablename='contactaddress' and fieldname='mailingcountry'",
-
-		"UPDATE vtiger_field SET fieldlabel='Other City' WHERE tabid=4 and tablename='contactaddress' and fieldname='othercity'",
-		"UPDATE vtiger_field SET fieldlabel='Other State' WHERE tabid=4 and tablename='contactaddress' and fieldname='otherstate'",
-		"UPDATE vtiger_field SET fieldlabel='Other Zip' WHERE tabid=4 and tablename='contactaddress' and fieldname='otherzip'",
-		"UPDATE vtiger_field SET fieldlabel='Other Country' WHERE tabid=4 and tablename='contactaddress' and fieldname='othercountry'",
+		"UPDATE vtiger_field SET fieldlabel='Billing City', sequence=5 WHERE tabid=6 and fieldname='bill_city'",
+		"UPDATE vtiger_field SET fieldlabel='Billing State', sequence=7 WHERE tabid=6 and fieldname='bill_state'",
+		"UPDATE vtiger_field SET fieldlabel='Billing Code', sequence=9 WHERE tabid=6 and fieldname='bill_code'",
+		"UPDATE vtiger_field SET fieldlabel='Billing Country', sequence=11 WHERE tabid=6 and fieldname='bill_country'",
+
+		"UPDATE vtiger_field SET fieldlabel='Shipping City', sequence=6 WHERE tabid=6 and fieldname='ship_city'",
+		"UPDATE vtiger_field SET fieldlabel='Shipping State', sequence=8 WHERE tabid=6 and fieldname='ship_state'",
+		"UPDATE vtiger_field SET fieldlabel='Shipping Code', sequence=10 WHERE tabid=6 and fieldname='ship_code'",
+		"UPDATE vtiger_field SET fieldlabel='Shipping Country', sequence=12 WHERE tabid=6 and fieldname='ship_country'",
+
+		"UPDATE vtiger_field SET fieldlabel='Mailing City', sequence=5 WHERE tabid=4 and fieldname='mailingcity'",
+		"UPDATE vtiger_field SET fieldlabel='Mailing State', sequence=7 WHERE tabid=4 and fieldname='mailingstate'",
+		"UPDATE vtiger_field SET fieldlabel='Mailing Zip', sequence=9 WHERE tabid=4 and fieldname='mailingzip'",
+		"UPDATE vtiger_field SET fieldlabel='Mailing Country', sequence=11 WHERE tabid=4 and fieldname='mailingcountry'",
+
+		"UPDATE vtiger_field SET fieldlabel='Other City', sequence=6 WHERE tabid=4 and fieldname='othercity'",
+		"UPDATE vtiger_field SET fieldlabel='Other State', sequence=8 WHERE tabid=4 and fieldname='otherstate'",
+		"UPDATE vtiger_field SET fieldlabel='Other Zip', sequence=10 WHERE tabid=4 and fieldname='otherzip'",
+		"UPDATE vtiger_field SET fieldlabel='Other Country', sequence=12 WHERE tabid=4 and fieldname='othercountry'",
 		);
 foreach($update_array2 as $query)
 {
@@ -3683,6 +3683,60 @@
 Execute("alter table vtiger_seactivityrel DROP PRIMARY KEY");
 Execute("alter table vtiger_seactivityrel ADD PRIMARY KEY (crmid,activityid)");
 
+//change the block for vendor address details
+Execute("update vtiger_field set fieldname='street' where tabid=18 and columnname='street'");
+Execute("update vtiger_field set block=46 where tabid=18 and fieldname in ('city','country','pobox','postalcode','state','street')");
+
+//change the calendar sharing access to private
+Execute("update vtiger_def_org_share set permission=3 where tabid=9");
+//Now sharing access is not available for Emails
+Execute("delete from vtiger_def_org_share where tabid=10");
+
+//we have to delete the entry from datashare_relatedmodules (Settings -> Sharing Access -> Add Privileges)
+Execute("delete from vtiger_datashare_relatedmodules where tabid=10");
+Execute("delete from vtiger_datashare_relatedmodules where relatedto_tabid=10");
+
+
+//change the share_action_name in vtiger_org_share_action_mapping table for entry Public:Read,Create/Edit 
+Execute('update vtiger_org_share_action_mapping set share_action_name="Public: Read, Create/Edit" where share_action_name="Public:Read,Create/Edit"');
+
+//add entries for Campaign and My Sites in profile2tab and profile2standardpermissions tables
+$res = $conn->query("select * from vtiger_profile");
+$noofprofiles = $conn->num_rows($res);
+
+for($i=0;$i<$noofprofiles;$i++)
+{
+	        $profile_id = $conn->query_result($res,$i,'profileid');
+		
+		Execute("insert into vtiger_profile2tab values($profile_id,26,0)");
+		Execute("insert into vtiger_profile2tab values($profile_id,27,0)");
+
+		Execute("insert into vtiger_profile2standardpermissions values ($profile_id,26,0,0)");
+		Execute("insert into vtiger_profile2standardpermissions values ($profile_id,26,1,0)");
+		Execute("insert into vtiger_profile2standardpermissions values ($profile_id,26,2,0)");
+		Execute("insert into vtiger_profile2standardpermissions values ($profile_id,26,3,0)");
+		Execute("insert into vtiger_profile2standardpermissions values ($profile_id,26,4,0)");
+}
+
+//add all field entries to def_org_field table for Campaigns
+$field_res = $conn->query("select fieldid from vtiger_field where tabid=26");
+for($i=0;$i<$conn->num_rows($field_res);$i++)
+{
+	$fieldid = $conn->query_result($field_res,$i,'fieldid');
+	
+	Execute("insert into vtiger_def_org_field values(26,$fieldid,0,1)");
+
+	//Also we have to add in profile2tab for all profiles
+	$profile_res = $conn->query("select * from vtiger_profile");
+	for($j=0;$j<$conn->num_rows($profile_res);$j++)
+	{
+		$profile_id = $conn->query_result($profile_res,$j,'profileid');
+
+		Execute("insert into vtiger_profile2field values($profile_id,26,$fieldid,0,1)");
+	}
+	
+}
+
 
 
 



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 07:22:47 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 14:22:47 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9436 -
	/vtigercrm/trunk/modules/Portal/Popup.php
Message-ID: <20060912142247.032D676D67E@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 08:22:39 2006
New Revision: 9436

Log:
Class applied for My Sites Popup --Jeri

Modified:
    vtigercrm/trunk/modules/Portal/Popup.php

Modified: vtigercrm/trunk/modules/Portal/Popup.php
==============================================================================
--- vtigercrm/trunk/modules/Portal/Popup.php (original)
+++ vtigercrm/trunk/modules/Portal/Popup.php Tue Sep 12 08:22:39 2006
@@ -1,57 +1,64 @@
-<?
-/*********************************************************************************
-** 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.
-*
-********************************************************************************/
-
-require_once('modules/Portal/Portal.php');
-global $app_strings;
-global $app_list_strings;
-global $mod_strings;
-global $adb;
-if(isset($_REQUEST['record']) && $_REQUEST['record'] !='')
-{
-	$portalid = $_REQUEST['record'];
-	$query="select * from vtiger_portal where portalid =$portalid";
-	$result=$adb->query($query);
-	$portalname = $adb->query_result($result,0,'portalname');
-        $portalurl = $adb->query_result($result,0,'portalurl');		
-}
-$portal_inputs='';
-$portal_inputs.='<div style="display:block;position:relative;" id="orgLay">
-		<table border="0" cellpadding="5" cellspacing="0" width="100%">
-		<tbody><tr>
-			<td class="genHeaderSmall" align="left" width="30%">' .$mod_strings['LBL_ADD'] .' '.$mod_strings['LBL_BOOKMARK'].'</td>
-			<td align="right" width="80%"><a href="javascript:fninvsh(\'orgLay\');"><img src="../themes/blue/images/close.gif" align="absmiddle" border="0"></a></td>
-		</tr>
-		<tr><td colspan="2"><hr></td></tr>
-		<tr>
-
-			<td align="right"><b>'.$mod_strings['LBL_BOOKMARK'].' ' .$mod_strings['LBL_URL'] .' </b></td>
-			<td align="left"><input name="portalurl" id="portalurl" class="txtBox" value="'.$portalurl.'" type="text"></td>
-		</tr>
-		<tr>
-			<td align="right"><b>'.$mod_strings['LBL_BOOKMARK'].' ' .$mod_strings['LBL_NAME'] .' </b></td>
-			<td align="left"><input name="portalname" id="portalname" value="'.$portalname.'" class="txtBox" type="text"></td>
-		</tr>
-		<tr><td style="border-bottom: 1px dashed rgb(204, 204, 204);" colspan="2">&nbsp;</td></tr>
-
-		<tr>
-			<td colspan="2" align="center">
-					<input name="save" value=" &nbsp;'.$app_strings['LBL_SAVE_BUTTON_LABEL'].'&nbsp; " class="crmbutton small save" onClick="SaveSite(\''.$portalid.'\')" type="button">&nbsp;&nbsp;
-					<input name="cancel" value=" '.$app_strings['LBL_CANCEL_BUTTON_LABEL'].' " class="crmbutton small cancel" onclick="fninvsh(\'orgLay\');" type="button">
-			</td>
-		</tr>
-		<tr><td colspan="2" style="border-top: 1px dashed rgb(204, 204, 204);">&nbsp;</td></tr>
-	</tbody></table>
-</div>';
-	
-echo $portal_inputs;
-
-
-?>
+<?
+/*********************************************************************************
+** 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.
+*
+********************************************************************************/
+
+require_once('modules/Portal/Portal.php');
+global $app_strings;
+global $app_list_strings;
+global $mod_strings;
+global $adb;
+if(isset($_REQUEST['record']) && $_REQUEST['record'] !='')
+{
+	$portalid = $_REQUEST['record'];
+	$query="select * from vtiger_portal where portalid =$portalid";
+	$result=$adb->query($query);
+	$portalname = $adb->query_result($result,0,'portalname');
+        $portalurl = $adb->query_result($result,0,'portalurl');		
+}
+$portal_inputs='';
+$portal_inputs.='<div style="display:block;position:relative;" id="orgLay" class="layerPopup">
+		<table border="0" cellpadding="3" cellspacing="0" width="100%" class="layerHeadingULine">
+		<tr>
+			<td class="layerPopupHeading" align="left" width="60%">' .$mod_strings['LBL_ADD'] .' '.$mod_strings['LBL_BOOKMARK'].'</td>
+			<td align="right" width="40%"><a href="javascript:fninvsh(\'orgLay\');"><img src="../themes/blue/images/close.gif" align="absmiddle" border="0"></a></td>
+		</tr>
+		</table>
+<table border="0" cellspacing="0" cellpadding="5" width="95%" align="center"> 
+	<tr>
+	<td class="small" >
+		<table border="0" celspacing="0" cellpadding="5" width="100%" align="center" bgcolor="white">
+		
+		<tr>
+
+			<td align="right" width="40%" ><b>'.$mod_strings['LBL_BOOKMARK'].' ' .$mod_strings['LBL_URL'] .' </b></td>
+			<td align="left" width="60%"><input name="portalurl" id="portalurl" class="txtBox" value="'.$portalurl.'" type="text"></td>
+		</tr>
+		<tr>
+			<td align="right" width="40%"> <b>'.$mod_strings['LBL_BOOKMARK'].' ' .$mod_strings['LBL_NAME'] .' </b></td>
+			<td align="left" width="60%"><input name="portalname" id="portalname" value="'.$portalname.'" class="txtBox" type="text"></td>
+		</tr>
+		</table>
+	</td>
+	</tr>
+</table>
+<table border="0" cellspacing="0" cellpadding="5" width="100%" class="layerPopupTransport">
+	<tr>
+	<td align="center">
+			<input name="save" value=" &nbsp;'.$app_strings['LBL_SAVE_BUTTON_LABEL'].'&nbsp; " class="crmbutton small save" onClick="SaveSite(\''.$portalid.'\')" type="button">&nbsp;&nbsp;
+			<input name="cancel" value=" '.$app_strings['LBL_CANCEL_BUTTON_LABEL'].' " class="crmbutton small cancel" onclick="fninvsh(\'orgLay\');" type="button">
+	</td>
+	</tr>
+</table>
+</div>';
+	
+echo $portal_inputs;
+
+
+?>



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 08:00:29 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 15:00:29 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9437 -
	/vtigercrm/trunk/themes/alphagrey/images/aboutUS.jpg
Message-ID: <20060912150029.865E266A7FD@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 09:00:22 2006
New Revision: 9437

Log:
aboutus images removed --Jeri

Removed:
    vtigercrm/trunk/themes/alphagrey/images/aboutUS.jpg



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 08:01:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 15:01:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9438 -
	/vtigercrm/trunk/themes/alphagrey/images/aboutUs.jpg
Message-ID: <20060912150150.9F09466A7FD@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 09:01:43 2006
New Revision: 9438

Log:
Class applied for My Sites Popup --Jeri

Removed:
    vtigercrm/trunk/themes/alphagrey/images/aboutUs.jpg



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 08:49:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 15:49:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9440 -
 /vtigercrm/trunk/themes/bluelagoon/images/aboutUS.jpg
Message-ID: <20060912154957.B1D9876CE1F@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep 12 09:49:50 2006
New Revision: 9440

Log:
un used files deleted --Jeri

Removed:
    vtigercrm/trunk/themes/bluelagoon/images/aboutUS.jpg



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 08:50:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 15:50:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9441 -
	/vtigercrm/trunk/themes/woodspice/images/aboutUS.jpg
Message-ID: <20060912155045.30A4C76CE1F@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep 12 09:50:37 2006
New Revision: 9441

Log:
un used files deleted --Jeri

Removed:
    vtigercrm/trunk/themes/woodspice/images/aboutUS.jpg



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 09:07:31 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 16:07:31 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9442 -
	/vtigercrm/trunk/themes/alphagrey/images/aboutUS.jpg
Message-ID: <20060912160731.6347C748304@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 10:07:20 2006
New Revision: 9442

Log:
Image for about us added --jeri

Added:
    vtigercrm/trunk/themes/alphagrey/images/aboutUS.jpg   (with props)



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 09:08:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 16:08:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9444 -
	/vtigercrm/trunk/themes/woodspice/images/aboutUS.jpg
Message-ID: <20060912160850.D08B576D689@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 10:08:40 2006
New Revision: 9444

Log:
Image for about us added --jeri

Added:
    vtigercrm/trunk/themes/woodspice/images/aboutUS.jpg   (with props)



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 09:13:54 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 16:13:54 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9445 -
	/vtigercrm/trunk/soap/thunderbirdplugin.php
Message-ID: <20060912161354.87F1476D687@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 10:13:46 2006
New Revision: 9445

Log:
First name missing while export has been fixed --Jeri

Modified:
    vtigercrm/trunk/soap/thunderbirdplugin.php

Modified: vtigercrm/trunk/soap/thunderbirdplugin.php
==============================================================================
--- vtigercrm/trunk/soap/thunderbirdplugin.php (original)
+++ vtigercrm/trunk/soap/thunderbirdplugin.php Tue Sep 12 10:13:46 2006
@@ -357,7 +357,7 @@
   }
 	
 	$contact = new Contact();
-	$contact->column_fields[firstname]=in_array('salutation',$permitted_lists) ? $first_name : "";
+	$contact->column_fields[firstname]=in_array('firstname',$permitted_lists) ? $first_name : "";
 	$contact->column_fields[lastname]=in_array('lastname',$permitted_lists) ? $last_name : "";
 	$contact->column_fields[birthday]=in_array('birthday',$permitted_lists) ? getDisplayDate("0000-00-00") : "";
 	$contact->column_fields[email]=in_array('email',$permitted_lists) ? $email_address : "";



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 09:27:44 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 16:27:44 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9446 -
	/vtigercrm/trunk/Smarty/templates/UserGroups.tpl
Message-ID: <20060912162744.5CE24709BB2@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 10:27:37 2006
New Revision: 9446

Log:
Issue in Group List from user detail view has been fixed --Jeri

Modified:
    vtigercrm/trunk/Smarty/templates/UserGroups.tpl

Modified: vtigercrm/trunk/Smarty/templates/UserGroups.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/UserGroups.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/UserGroups.tpl Tue Sep 12 10:27:37 2006
@@ -1,29 +1,29 @@
-{*<!--
-/*********************************************************************************
-  ** 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.
-  *
- ********************************************************************************/
--->*}
-<table class="listTable" border="0" cellpadding="5" cellspacing="0" width="100%">
-<tr>
-<td class="colHeader small" valign="top">#</td>
-<td class="colHeader small" valign="top">{$UMOD.LBL_GROUP_NAME}</td>
-<td class="colHeader small" valign="top">{$UMOD.LBL_DESCRIPTION}</td>
-</tr>
-{foreach name=groupiter key=id item=groupname from=$GROUPLIST}
-<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&record={$id}">{$groupname.1}</a></td>
-{else}
-<td class="listTableRow small" valign="top">{$groupname.1}</td>
-{/if}
-<td class="listTableRow small" valign="top" width="65%">{$groupname.2}</td>
-</tr>
-{/foreach}
-</table>
+{*<!--
+/*********************************************************************************
+  ** 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.
+  *
+ ********************************************************************************/
+-->*}
+<table class="listTable" border="0" cellpadding="5" cellspacing="0" width="100%">
+<tr>
+<td class="colHeader small" valign="top">#</td>
+<td class="colHeader small" valign="top">{$UMOD.LBL_GROUP_NAME}</td>
+<td class="colHeader small" valign="top">{$UMOD.LBL_DESCRIPTION}</td>
+</tr>
+{foreach name=groupiter key=id item=groupname from=$GROUPLIST}
+<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>
+{else}
+<td class="listTableRow small" valign="top">{$groupname.1}</td>
+{/if}
+<td class="listTableRow small" valign="top" width="65%">{$groupname.2}</td>
+</tr>
+{/foreach}
+</table>



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 09:08:21 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 16:08:21 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9443 -
 /vtigercrm/trunk/themes/bluelagoon/images/aboutUS.jpg
Message-ID: <20060912160821.7F1CF748304@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 10:08:11 2006
New Revision: 9443

Log:
Image for about us added --jeri

Added:
    vtigercrm/trunk/themes/bluelagoon/images/aboutUS.jpg   (with props)



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 10:12:33 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 17:12:33 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9447 - in
 /vtigercrm/trunk/modules: Accounts/ Campaigns/ Contacts/ HelpDesk/ Invoice/
 Leads/ Potentials/ PriceBooks/ Products/ PurchaseOrder/ Quotes/ SalesOrder/
 Vendors/
Message-ID: <20060912171233.A54C676D68B@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 11:11:57 2006
New Revision: 9447

Log:
header redirected to detailview at any case for singlepane view

Modified:
    vtigercrm/trunk/modules/Accounts/CallRelatedList.php
    vtigercrm/trunk/modules/Campaigns/CallRelatedList.php
    vtigercrm/trunk/modules/Contacts/CallRelatedList.php
    vtigercrm/trunk/modules/HelpDesk/CallRelatedList.php
    vtigercrm/trunk/modules/Invoice/CallRelatedList.php
    vtigercrm/trunk/modules/Leads/CallRelatedList.php
    vtigercrm/trunk/modules/Potentials/CallRelatedList.php
    vtigercrm/trunk/modules/PriceBooks/CallRelatedList.php
    vtigercrm/trunk/modules/Products/CallRelatedList.php
    vtigercrm/trunk/modules/PurchaseOrder/CallRelatedList.php
    vtigercrm/trunk/modules/Quotes/CallRelatedList.php
    vtigercrm/trunk/modules/SalesOrder/CallRelatedList.php
    vtigercrm/trunk/modules/Vendors/CallRelatedList.php

Modified: vtigercrm/trunk/modules/Accounts/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Accounts/CallRelatedList.php Tue Sep 12 11:11:57 2006
@@ -13,7 +13,15 @@
 require_once('Smarty_setup.php');
 require_once('modules/Accounts/Account.php');
 require_once('include/utils/utils.php');
-
+//Redirecting Header for single page layout
+require_once('user_privileges/default_module_view.php');
+global $singlepane_view;
+if($singlepane_view == 'true' && $_REQUEST['action'] == 'CallRelatedList' )
+{
+	header("Location:index.php?action=DetailView&module=".$_REQUEST['module']."&record=".$_REQUEST['record']."&parenttab=".$_REQUEST['parenttab']);
+}
+else
+{
 $focus = new Account();
 $currentmodule = $_REQUEST['module'];
 $RECORD = $_REQUEST['record'];
@@ -65,5 +73,5 @@
 $smarty->assign("CHECK", $check_button);
 
 $smarty->display("RelatedLists.tpl");
-
+}
 ?>

Modified: vtigercrm/trunk/modules/Campaigns/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Campaigns/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Campaigns/CallRelatedList.php Tue Sep 12 11:11:57 2006
@@ -14,7 +14,15 @@
 require_once('modules/Campaigns/Campaign.php');
 require_once('modules/CustomView/CustomView.php');
 require_once('include/utils/utils.php');
-
+//Redirecting Header for single page layout 
+require_once('user_privileges/default_module_view.php');
+global $singlepane_view;
+if($singlepane_view == 'true' && $_REQUEST['action'] == 'CallRelatedList' )
+{
+	header("Location:index.php?action=DetailView&module=".$_REQUEST['module']."&record=".$_REQUEST['record']."&parenttab=".$_REQUEST['parenttab']);
+}
+else
+{
 $focus = new Campaign();
 $currentmodule = $_REQUEST['module'];
 $RECORD = $_REQUEST['record'];
@@ -72,4 +80,5 @@
 $smarty->assign("CHECK", $check_button);
 
 $smarty->display("RelatedLists.tpl");
+}
 ?>

Modified: vtigercrm/trunk/modules/Contacts/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Contacts/CallRelatedList.php Tue Sep 12 11:11:57 2006
@@ -13,6 +13,15 @@
 require_once('modules/Contacts/Contact.php');
 require_once('include/utils/utils.php');
 
+//Redirecting Header for single page layout
+require_once('user_privileges/default_module_view.php');
+global $singlepane_view;
+if($singlepane_view == 'true' && $_REQUEST['action'] == 'CallRelatedList' )
+{
+	header("Location:index.php?action=DetailView&module=".$_REQUEST['module']."&record=".$_REQUEST['record']."&parenttab=".$_REQUEST['parenttab']);
+}
+else
+{
 $focus = new Contact();
 $currentmodule = $_REQUEST['module'];
 $RECORD = $_REQUEST['record'];
@@ -71,4 +80,5 @@
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
 $smarty->display("RelatedLists.tpl");
+}
 ?>

Modified: vtigercrm/trunk/modules/HelpDesk/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/CallRelatedList.php Tue Sep 12 11:11:57 2006
@@ -14,6 +14,15 @@
 require_once('modules/HelpDesk/HelpDesk.php');
 require_once('include/utils/utils.php');
 
+//Redirecting Header for single page layout
+require_once('user_privileges/default_module_view.php');
+global $singlepane_view;
+if($singlepane_view == 'true' && $_REQUEST['action'] == 'CallRelatedList' )
+{
+	header("Location:index.php?action=DetailView&module=".$_REQUEST['module']."&record=".$_REQUEST['record']."&parenttab=".$_REQUEST['parenttab']);
+}
+else
+{
 $focus = new HelpDesk();
 $currentmodule = $_REQUEST['module'];
 $RECORD = $_REQUEST['record'];
@@ -63,4 +72,5 @@
 $smarty->assign("CHECK", $check_button);
 
 $smarty->display("RelatedLists.tpl");
+}
 ?>

Modified: vtigercrm/trunk/modules/Invoice/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Invoice/CallRelatedList.php Tue Sep 12 11:11:57 2006
@@ -14,6 +14,15 @@
 require_once('modules/Invoice/Invoice.php');
 require_once('include/utils/utils.php');
 
+//Redirecting Header for single page layout
+require_once('user_privileges/default_module_view.php');
+global $singlepane_view;
+if($singlepane_view == 'true' && $_REQUEST['action'] == 'CallRelatedList' )
+{
+	header("Location:index.php?action=DetailView&module=".$_REQUEST['module']."&record=".$_REQUEST['record']."&parenttab=".$_REQUEST['parenttab']);
+}
+else
+{
 $focus = new Invoice();
 $currentmodule = $_REQUEST['module'];
 $RECORD = $_REQUEST['record'];
@@ -56,4 +65,5 @@
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
 $smarty->display("RelatedLists.tpl");
+}
 ?>

Modified: vtigercrm/trunk/modules/Leads/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Leads/CallRelatedList.php Tue Sep 12 11:11:57 2006
@@ -13,6 +13,15 @@
 require_once('Smarty_setup.php');
 require_once('modules/Leads/Lead.php');
 require_once('include/utils/utils.php');
+//Redirecting Header for single page layout 
+require_once('user_privileges/default_module_view.php');
+global $singlepane_view;
+if($singlepane_view == 'true' && $_REQUEST['action'] == 'CallRelatedList' )
+{
+	header("Location:index.php?action=DetailView&module=".$_REQUEST['module']."&record=".$_REQUEST['record']."&parenttab=".$_REQUEST['parenttab']);
+}
+else
+{
 $focus = new Lead();
 $MODULE = $_REQUEST['module'];
 $RECORD = $_REQUEST['record'];
@@ -71,5 +80,5 @@
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
 $smarty->display("RelatedLists.tpl");
-
+}
 ?>

Modified: vtigercrm/trunk/modules/Potentials/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Potentials/CallRelatedList.php Tue Sep 12 11:11:57 2006
@@ -12,6 +12,15 @@
 
 require_once('Smarty_setup.php');
 require_once('modules/Potentials/Opportunity.php');
+//Redirecting Header for single page layout
+require_once('user_privileges/default_module_view.php');
+global $singlepane_view;
+if($singlepane_view == 'true' && $_REQUEST['action'] == 'CallRelatedList' )
+{
+	header("Location:index.php?action=DetailView&module=".$_REQUEST['module']."&record=".$_REQUEST['record']."&parenttab=".$_REQUEST['parenttab']);
+}
+else
+{
 $focus = new Potential();
 $currentmodule = $_REQUEST['module'];
 $RECORD = $_REQUEST['record'];
@@ -57,5 +66,5 @@
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
 $smarty->display("RelatedLists.tpl");
-
+}
 ?>

Modified: vtigercrm/trunk/modules/PriceBooks/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/PriceBooks/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/PriceBooks/CallRelatedList.php Tue Sep 12 11:11:57 2006
@@ -11,7 +11,15 @@
 
 require_once('Smarty_setup.php');
 require_once('modules/PriceBooks/PriceBook.php');
-
+//Redirecting Header for single page layout
+require_once('user_privileges/default_module_view.php');
+global $singlepane_view;
+if($singlepane_view == 'true' && $_REQUEST['action'] == 'CallRelatedList' )
+{
+	header("Location:index.php?action=DetailView&module=".$_REQUEST['module']."&record=".$_REQUEST['record']."&parenttab=".$_REQUEST['parenttab']);
+}
+else
+{
 global $currentModule;
 
 $focus = new PriceBook();
@@ -66,5 +74,5 @@
 	$smarty->display("RelatedListContents.tpl");
 else
 	$smarty->display("RelatedLists.tpl");
-
+}
 ?>

Modified: vtigercrm/trunk/modules/Products/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Products/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Products/CallRelatedList.php Tue Sep 12 11:11:57 2006
@@ -12,6 +12,15 @@
 require_once('Smarty_setup.php');
 require_once('modules/Products/Product.php');
 
+//Redirecting Header for single page layout
+require_once('user_privileges/default_module_view.php');
+global $singlepane_view;
+if($singlepane_view == 'true' && $_REQUEST['action'] == 'CallRelatedList' )
+{
+	header("Location:index.php?action=DetailView&module=".$_REQUEST['module']."&record=".$_REQUEST['record']."&parenttab=".$_REQUEST['parenttab']);
+}
+else
+{
 $focus = new Product();
 $currentmodule = $_REQUEST['module'];
 $RECORD = $_REQUEST['record'];
@@ -58,5 +67,5 @@
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
 $smarty->display("RelatedLists.tpl");
-
+}
 ?>

Modified: vtigercrm/trunk/modules/PurchaseOrder/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/CallRelatedList.php Tue Sep 12 11:11:57 2006
@@ -12,6 +12,15 @@
 
 require_once('Smarty_setup.php');
 require_once('modules/PurchaseOrder/PurchaseOrder.php');
+//Redirecting Header for single page layout
+require_once('user_privileges/default_module_view.php');
+global $singlepane_view;
+if($singlepane_view == 'true' && $_REQUEST['action'] == 'CallRelatedList' )
+{
+	header("Location:index.php?action=DetailView&module=".$_REQUEST['module']."&record=".$_REQUEST['record']."&parenttab=".$_REQUEST['parenttab']);
+}
+else
+{
 $focus = new Order();
 $currentmodule = $_REQUEST['module'];
 $RECORD = $_REQUEST['record'];
@@ -52,4 +61,5 @@
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
 $smarty->display("RelatedLists.tpl");
+}
 ?>

Modified: vtigercrm/trunk/modules/Quotes/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Quotes/CallRelatedList.php Tue Sep 12 11:11:57 2006
@@ -12,6 +12,15 @@
 
 require_once('Smarty_setup.php');
 require_once('modules/Quotes/Quote.php');
+//Redirecting Header for single page layout
+require_once('user_privileges/default_module_view.php');
+global $singlepane_view;
+if($singlepane_view == 'true' && $_REQUEST['action'] == 'CallRelatedList' )
+{
+	header("Location:index.php?action=DetailView&module=".$_REQUEST['module']."&record=".$_REQUEST['record']."&parenttab=".$_REQUEST['parenttab']);
+}
+else
+{
 $focus = new Quote();
 $currentmodule = $_REQUEST['module'];
 $RECORD = $_REQUEST['record'];
@@ -52,4 +61,5 @@
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
 $smarty->display("RelatedLists.tpl");
+}
 ?>

Modified: vtigercrm/trunk/modules/SalesOrder/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/CallRelatedList.php Tue Sep 12 11:11:57 2006
@@ -11,6 +11,15 @@
 
 require_once('Smarty_setup.php');
 require_once('modules/SalesOrder/SalesOrder.php');
+//Redirecting Header for single page layout
+require_once('user_privileges/default_module_view.php');
+global $singlepane_view;
+if($singlepane_view == 'true' && $_REQUEST['action'] == 'CallRelatedList' )
+{
+	header("Location:index.php?action=DetailView&module=".$_REQUEST['module']."&record=".$_REQUEST['record']."&parenttab=".$_REQUEST['parenttab']);
+}
+else
+{
 $focus = new SalesOrder();
 $currentmodule = $_REQUEST['module'];
 $RECORD = $_REQUEST['record'];
@@ -51,4 +60,5 @@
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
 $smarty->display("RelatedLists.tpl");
+}
 ?>

Modified: vtigercrm/trunk/modules/Vendors/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Vendors/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Vendors/CallRelatedList.php Tue Sep 12 11:11:57 2006
@@ -11,7 +11,15 @@
 
 require_once('Smarty_setup.php');
 require_once('modules/Vendors/Vendor.php');
-
+//Redirecting Header for single page layout
+require_once('user_privileges/default_module_view.php');
+global $singlepane_view;
+if($singlepane_view == 'true' && $_REQUEST['action'] == 'CallRelatedList' )
+{
+	header("Location:index.php?action=DetailView&module=".$_REQUEST['module']."&record=".$_REQUEST['record']."&parenttab=".$_REQUEST['parenttab']);
+}
+else
+{
 global $currentModule;
 $focus = new Vendor();
 
@@ -63,5 +71,5 @@
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
 $smarty->display("RelatedLists.tpl");
-
+}
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 10:13:15 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 17:13:15 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9448 -
 /vtigercrm/trunk/modules/Settings/language/en_us.lang.php
Message-ID: <20060912171315.B6F3976D68B@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 11:13:08 2006
New Revision: 9448

Log:
language strings updated --Jeri

Modified:
    vtigercrm/trunk/modules/Settings/language/en_us.lang.php

Modified: vtigercrm/trunk/modules/Settings/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Settings/language/en_us.lang.php Tue Sep 12 11:13:08 2006
@@ -591,7 +591,7 @@
 'INVENTORYTERMSANDCONDITIONS'=>'Inventory : Terms & Conditions',//newly added for Inventory terms and conditions
 'LBL_INVENTORY_TERMSANDCONDITIONS'=>' - Edit Terms & Conditions',//newly added
 'LBL_TANDC_TEXT'=>'Terms & Conditions Text',
-'LBL_INVENTORY_TANDC'=>'Terms & Conditions',
+'LBL_INVENTORY_TANDC'=>'Inventory Terms & Conditions',
 
 'LBL_OTHER_SETTINGS'=>'Other Settings',
 'LBL_SCROLL'=>'[Scroll to Top]',



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 10:16:14 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 17:16:14 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9449 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060912171614.8101876D693@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 11:16:06 2006
New Revision: 9449

Log:
Inventort terms and conditions added in demo data and create/Edit Delete permissions removed from Emails module in Profiles--Jeri

Modified:
    vtigercrm/trunk/modules/Users/DefaultDataPopulator.php

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Tue Sep 12 11:16:06 2006
@@ -1090,13 +1090,6 @@
 		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",9,3,0)");
 		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",9,4,0)");
 
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",10,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",10,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",10,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",10,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",10,4,0)");
-
-		
 		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",13,0,0)");
 		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",13,1,0)");
 		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",13,2,0)");
@@ -1204,13 +1197,6 @@
 		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",9,2,0)");
 		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",9,3,0)");
 		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",9,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",10,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",10,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",10,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",10,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",10,4,0)");
-
 		
 		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",13,0,1)");
 		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",13,1,1)");
@@ -1318,13 +1304,6 @@
 		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",9,3,0)");
 		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",9,4,0)");
 
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",10,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",10,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",10,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",10,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",10,4,0)");
-
-		
 		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",13,0,0)");
 		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",13,1,0)");
 		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",13,2,0)");
@@ -1431,12 +1410,6 @@
 		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",9,3,0)");
 		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",9,4,0)");
 
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",10,0,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",10,1,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",10,2,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",10,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",10,4,0)");
-		
 		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",13,0,1)");
 		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",13,1,1)");
 		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",13,2,1)");
@@ -1913,6 +1886,15 @@
 		
                $this->db->query("insert into vtiger_inventorynotification(notificationid,notificationname,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("vtiger_inventorynotification").",'SalesOrderNotification','Sales Order generated for {PRODUCTNAME}','".$so_body." ','SalesOrderNotificationDescription')");
 
+//insert into inventory terms and conditions table
+
+	$inv_tandc_text='
+ - Unless otherwise agreed in writing by the supplier all invoices are payable within thirty (30) days of the date of invoice, in the currency of the invoice, drawn on a bank based in India or by such other method as is agreed in advance by the Supplier.
+
+ - All prices are not inclusive of VAT which shall be payable in addition by the Customer at the applicable rate.';
+
+	$this->db->query("insert into vtiger_inventory_tandc(id,type,tandc) values (".$this->db->getUniqueID("vtiger_inventory_tandc").", 'Inventory', '".$inv_tandc_text."')");	
+
 //insert into email template vtiger_table
 
 	$body='
@@ -2089,8 +2071,6 @@
 	       //Insert into vtiger_organizationdetails vtiger_table 
 	       $this->db->query("insert into vtiger_organizationdetails(organizationname,address,city,state,country,code,phone,fax,website,logoname) values ('vtiger',' 40-41-42, Sivasundar Apartments, Flat D-II, Shastri Street, Velachery','Chennai','Tamil Nadu','India','600 042','+91-44-5202-1990','+91-44-5202-1990','www.vtiger.com','vtiger-crm-logo.jpg')");
 
-  //Insert into vtiger_inventory_tandc vtiger_table
-               $this->db->query("insert into vtiger_inventory_tandc values('".$this->db->getUniqueID('vtiger_inventory_tandc')."','Inventory','')");
 
 	$this->db->query("insert into vtiger_actionmapping values(0,'Save',0)");
 	$this->db->query("insert into vtiger_actionmapping values(1,'EditView',0)");



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 11:57:08 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 18:57:08 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9450 -
 /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php
Message-ID: <20060912185708.AFE0176D667@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep 12 12:56:58 2006
New Revision: 9450

Log:
Migration Fixes Done -- By Mickie

Modified:
    vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php

Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php
==============================================================================
--- vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php (original)
+++ vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php Tue Sep 12 12:56:58 2006
@@ -2921,7 +2921,7 @@
 $sql_sec="select profileid from  vtiger_profile";
 $result_sec=$conn->query($sql_sec);
 $num_rows=$conn->num_rows($result_sec);
-for($i=0;$i<$num_row;$i++)
+for($i=0;$i<$num_rows;$i++)
 {
 	$prof_id=$conn->query_result($result_sec,$i,'profileid');
 	$sql1_sec="insert into vtiger_profile2utility values(".$prof_id.",13,8,0)";
@@ -3205,7 +3205,7 @@
 
 //Added for Tax and Inventory - Product details handling
 
-Execute("CREATE TABLE vtiger_inventoryproductrel (id int(19) NOT NULL, productid int(19) NOT NULL, sequence_no int(4) default NULL, quantity int(19) default NULL, listprice decimal(11,3) default NULL, discount_percent decimal(7,3) default NULL, discount_amount decimal(11,3) default NULL, comment varchar(100) default NULL, KEY inventoryproductrel_id_idx (id), KEY inventoryproductrel_productid_idx (productid) ) ENGINE=InnoDB");
+Execute("CREATE TABLE vtiger_inventoryproductrel (id int(19) NOT NULL, productid int(19) NOT NULL, sequence_no int(4) NOT NULL default 1, quantity int(19) default NULL, listprice decimal(11,3) default NULL, discount_percent decimal(7,3) default NULL, discount_amount decimal(11,3) default NULL, comment varchar(100) default NULL, KEY inventoryproductrel_id_idx (id), KEY inventoryproductrel_productid_idx (productid) ) ENGINE=InnoDB");
 
 //Execute("alter table vtiger_inventorytaxinfo add column deleted int(1) default 0");
 
@@ -3550,7 +3550,6 @@
 //Added after 5 rc release
 Execute("alter table vtiger_account modify siccode varchar(50)");
 Execute("update vtiger_field set typeofdata='V~O' where fieldname='siccode' and columnname='siccode' and tabid=6");
-Execute("alter table vtiger_inventoryproductrel add column sequence_no int(4) not null default 1 after productid");
 
 //changes made for CustomView and Reports - Activities changed to Calendar -- Starts
 //Added to change the entitytype from Activities to Calendar for customview
@@ -3627,7 +3626,7 @@
 	Execute($alterquery);
 }
 
-Execute("alter table vtiger_organizationdetails drop primary key");
+$conn->query("alter table vtiger_organizationdetails drop primary key");
 Execute("alter table vtiger_organizationdetails change column organizationame  organizationname varchar(60) NOT NULL");
 Execute("alter table vtiger_organizationdetails ADD PRIMARY KEY (organizationname)");
 
@@ -3645,7 +3644,6 @@
 Execute("alter table vtiger_activity change column visibility visibility varchar(50) NOT NULL default 'all'");
 
 Execute("delete from vtiger_field where tabid=14 and fieldname='currency'");
-Execute("insert into vtiger_field values(14, ".$conn->getUniqueID("vtiger_field").", 'imagename', 'vtiger_products', 1, 69, 'imagename', 'Product Image', 1, 0, 0, 100, 1, 35, 1, 'V~O', 1, NULL, 'ADV')");
 
 //Product related changes
 Execute('update vtiger_field set typeofdata="D~O~OTH~GE~sales_start_date~Sales Start Date" where tabid=14 and fieldname="sales_end_date"');
@@ -3700,6 +3698,8 @@
 //change the share_action_name in vtiger_org_share_action_mapping table for entry Public:Read,Create/Edit 
 Execute('update vtiger_org_share_action_mapping set share_action_name="Public: Read, Create/Edit" where share_action_name="Public:Read,Create/Edit"');
 
+//This has been already added (line 2939) where as that loop failed because given num_row instead of num_rows
+/*
 //add entries for Campaign and My Sites in profile2tab and profile2standardpermissions tables
 $res = $conn->query("select * from vtiger_profile");
 $noofprofiles = $conn->num_rows($res);
@@ -3717,25 +3717,22 @@
 		Execute("insert into vtiger_profile2standardpermissions values ($profile_id,26,3,0)");
 		Execute("insert into vtiger_profile2standardpermissions values ($profile_id,26,4,0)");
 }
-
-//add all field entries to def_org_field table for Campaigns
+*/
+
+//add all field entries to def_org_field and profile2field tables for Campaigns
 $field_res = $conn->query("select fieldid from vtiger_field where tabid=26");
 for($i=0;$i<$conn->num_rows($field_res);$i++)
 {
 	$fieldid = $conn->query_result($field_res,$i,'fieldid');
-	
-	Execute("insert into vtiger_def_org_field values(26,$fieldid,0,1)");
-
-	//Also we have to add in profile2tab for all profiles
-	$profile_res = $conn->query("select * from vtiger_profile");
-	for($j=0;$j<$conn->num_rows($profile_res);$j++)
-	{
-		$profile_id = $conn->query_result($profile_res,$j,'profileid');
-
-		Execute("insert into vtiger_profile2field values($profile_id,26,$fieldid,0,1)");
-	}
-	
-}
+
+	populateFieldForSecurity('26',$fieldid);
+}
+
+//delete the entries from vtiger_profile2standardpermissions table for Emails
+Execute("delete from vtiger_profile2standardpermissions where tabid=10");
+
+
+
 
 
 



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 12:17:20 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 19:17:20 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9451 -
	/vtigercrm/trunk/install/4createConfigFile.php
Message-ID: <20060912191720.C6C7176D69E@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep 12 13:17:13 2006
New Revision: 9451

Log:
made changes in default currency handling -- BY Philip

Modified:
    vtigercrm/trunk/install/4createConfigFile.php

Modified: vtigercrm/trunk/install/4createConfigFile.php
==============================================================================
--- vtigercrm/trunk/install/4createConfigFile.php (original)
+++ vtigercrm/trunk/install/4createConfigFile.php Tue Sep 12 13:17:13 2006
@@ -216,6 +216,9 @@
 						      	$buffer = str_replace( "_MAIL_PASSWORD_", $mail_server_password, $buffer);
 						      	$buffer = str_replace( "_DB_STAT_", "true", $buffer);
 				
+						      	/* replace the application unique key variable */
+				      			$buffer = str_replace( "_MASTER_CURRENCY_", $currency_name, $buffer);
+
 						      	/* replace the application unique key variable */
 					      		$buffer = str_replace( "_VT_APP_UNIQKEY_", md5($root_directory), $buffer);
 	
@@ -408,6 +411,8 @@
  	    $language_value .= ')';
  	}
  	$config .= "\$languages = $language_value;\n";
+	$config .= "// Master currency name\n";
+ 	$config .= "\$currency_name = '$currency_name';\n";
  	$config .= "// Default charset if the language specific character set is not found.\n";
  	$config .= "\$default_charset = 'ISO-8859-1';\n";
  	$config .= "// Default language in case all or part of the user's language pack is not available.\n";



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 12:22:28 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 19:22:28 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9452 -
	/vtigercrm/trunk/config.template.php
Message-ID: <20060912192228.AA07F76D69D@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep 12 13:22:21 2006
New Revision: 9452

Log:
made changes in default currency handling -- BY Philip

Modified:
    vtigercrm/trunk/config.template.php

Modified: vtigercrm/trunk/config.template.php
==============================================================================
--- vtigercrm/trunk/config.template.php (original)
+++ vtigercrm/trunk/config.template.php Tue Sep 12 13:22:21 2006
@@ -171,6 +171,9 @@
 // languages default value = en_us=>US English
 $languages = Array('en_us'=>'US English',);
 
+//Master currency name
+$currency_name = '_MASTER_CURRENCY_';
+
 // default charset
 // default charset default value = ISO-8859-1
 $default_charset = 'ISO-8859-1';



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 12:24:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 19:24:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9453 -
 /vtigercrm/trunk/modules/Settings/CurrencyEditView.php
Message-ID: <20060912192430.2895676D69D@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep 12 13:24:22 2006
New Revision: 9453

Log:
made changes in default currency handling -- BY Philip

Modified:
    vtigercrm/trunk/modules/Settings/CurrencyEditView.php

Modified: vtigercrm/trunk/modules/Settings/CurrencyEditView.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/CurrencyEditView.php (original)
+++ vtigercrm/trunk/modules/Settings/CurrencyEditView.php Tue Sep 12 13:24:22 2006
@@ -47,6 +47,7 @@
 $smarty->assign("MOD", $mod_strings);
 $smarty->assign("APP", $app_strings);
 $smarty->assign("PARENTTAB",$_REQUEST['parenttab']);
+$smarty->assign("MASTER_CURRENCY",$currency_name);
 $smarty->assign("IMAGE_PATH",$image_path);
 
 if(isset($_REQUEST['detailview']) && $_REQUEST['detailview'] != '')



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 12:30:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 19:30:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9454 -
 /vtigercrm/trunk/Smarty/templates/CurrencyEditView.tpl
Message-ID: <20060912193030.2356E76D693@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep 12 13:30:22 2006
New Revision: 9454

Log:
Modified Currency Label --By Philip

Modified:
    vtigercrm/trunk/Smarty/templates/CurrencyEditView.tpl

Modified: vtigercrm/trunk/Smarty/templates/CurrencyEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/CurrencyEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/CurrencyEditView.tpl Tue Sep 12 13:30:22 2006
@@ -77,7 +77,7 @@
                             <td class="small cellText"><input type="text" class="detailedViewTextBox small" value="{$CURRENCY_SYMBOL}" name="currency_symbol"></td>
                           </tr>
                           <tr valign="top">
-                            <td nowrap class="small cellLabel"><font color="red">*</font><strong>{$MOD.LBL_CURRENCY_CRATE}</strong><br>({$MOD.LBL_BASE_CURRENCY})</td>
+                            <td nowrap class="small cellLabel"><font color="red">*</font><strong>{$MOD.LBL_CURRENCY_CRATE}</strong><br>({$MOD.LBL_BASE_CURRENCY}{$MASTER_CURRENCY})</td>
 
                             <td class="small cellText"><input type="text" class="detailedViewTextBox small" value="{$CONVERSION_RATE}" name="conversion_rate"></td>
                           </tr>



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 12:33:27 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 19:33:27 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9455 -
 /vtigercrm/trunk/modules/Settings/language/en_us.lang.php
Message-ID: <20060912193327.76DC566AE0F@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep 12 13:33:20 2006
New Revision: 9455

Log:
Modified Currency Label --By Philip

Modified:
    vtigercrm/trunk/modules/Settings/language/en_us.lang.php

Modified: vtigercrm/trunk/modules/Settings/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Settings/language/en_us.lang.php Tue Sep 12 13:33:20 2006
@@ -703,7 +703,7 @@
 'LBL_PROXY_SERVER_DESC'=>'Configure proxies to access RSS feeds through Internet',
 
 'LBL_NEW_CURRENCTY'=>'New Currency',
-'LBL_BASE_CURRENCY'=>'Base Currency - US Dollar',
+'LBL_BASE_CURRENCY'=>'Base Currency - ',
 'LBL_DELETE_CURRENCY'=>'Delete Currency',
 
 //Added for singlepane view in modules 



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 13:43:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 20:43:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9456 - in /vtigercrm/trunk:
 Smarty/templates/HomePage.tpl install/5createTables.inc.php
 modules/Home/index.php modules/Users/DefaultDataPopulator.php
 modules/Users/User.php schema/DatabaseSchema.xml
Message-ID: <20060912204310.9945776D6B0@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 14:42:48 2006
New Revision: 9456

Log:
tagcloud from tagcloud.com website integration has been removed

Modified:
    vtigercrm/trunk/Smarty/templates/HomePage.tpl
    vtigercrm/trunk/install/5createTables.inc.php
    vtigercrm/trunk/modules/Home/index.php
    vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
    vtigercrm/trunk/modules/Users/User.php
    vtigercrm/trunk/schema/DatabaseSchema.xml

Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/HomePage.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/HomePage.tpl Tue Sep 12 14:42:48 2006
@@ -237,18 +237,6 @@
 
 <br>
 {/if}
-{if $TAGCLOUD_JS ne ''}
-<table width="100%" border=0>
-<tr>
-	<td>
-		<link href="{$TAGCLOUD_CSS}" rel="stylesheet" type="text/css">
-		<script language="JavaScript" type="text/javascript" src="{$TAGCLOUD_JS}"></script>
-	</td>
-</tr>
-</table>
-<br>
-{/if}
-
 
 <table border=0 cellspacing=0 cellpadding=0 width=100% class="tagCloud">
 <tr>

Modified: vtigercrm/trunk/install/5createTables.inc.php
==============================================================================
--- vtigercrm/trunk/install/5createTables.inc.php (original)
+++ vtigercrm/trunk/install/5createTables.inc.php Tue Sep 12 14:42:48 2006
@@ -82,9 +82,7 @@
 	$user->column_fields["hour_format"] = 'am/pm';
 	$user->column_fields["start_hour"] = '08:00';
 	$user->column_fields["end_hour"] = '23:00';
-	// added by jeri to populate default image and tagcloud for admin	
-	$user->column_fields["imagename"] = 'shanky.jpg';
-        $user->column_fields["tagcloud"] = '';	
+	$user->column_fields["imagename"] = '';
         $user->column_fields["activity_view"] = 'This Year';	
 	$user->column_fields["lead_view"] = 'Today';
 	$user->column_fields["defhomeview"] = 'home_metrics';
@@ -127,11 +125,9 @@
         $user->column_fields["namedays"] = '';
         $user->column_fields["currency_id"] = 1;
 	$user->column_fields["date_format"] = 'yyyy-mm-dd';
-	// added by jeri to populate default image and tagcloud for admin	
-	$user->column_fields["imagename"] = 'ela.jpg';
+	$user->column_fields["imagename"] = '';
         $user->column_fields["activity_view"] = 'This Year';	
 	$user->column_fields["lead_view"] = 'Today';
-        $user->column_fields["tagcloud"] = '';	
 	$user->column_fields["defhomeview"] = 'home_metrics';
         //added by philip for default default admin emailid
 	if($admin_email == '')

Modified: vtigercrm/trunk/modules/Home/index.php
==============================================================================
--- vtigercrm/trunk/modules/Home/index.php (original)
+++ vtigercrm/trunk/modules/Home/index.php Tue Sep 12 14:42:48 2006
@@ -172,11 +172,6 @@
 
 }
 
-$query="select tagcloud from vtiger_users where id=".$current_user->id;
-$result=$adb->query($query);
-$tagcloud_js=$adb->query_result($result,0,'tagcloud');
-$smarty->assign("TAGCLOUD_JS",$tagcloud_js);
-$smarty->assign("TAGCLOUD_CSS",ereg_replace('/js/','/css/',$tagcloud_js));
 global $current_language;
 $current_module_strings = return_module_language($current_language, 'Calendar');
 

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Tue Sep 12 14:42:48 2006
@@ -903,7 +903,6 @@
 $this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'yahoo_id','vtiger_users',1,'13','yahoo_id','Yahoo id',1,0,0,100,6,80,1,'E~O',1,null,'BAS')");
 $this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'phone_home','vtiger_users',1,'1','phone_home','Home Phone',1,0,0,50,9,80,1,'V~O',1,null,'BAS')");
 $this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'date_format','vtiger_users',1,'15','date_format','Date Format',1,0,0,30,12,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'tagcloud','vtiger_users',1,'103','tagcloud','Tag Cloud',1,0,0,250,15,80,1,'V~O',1,null,'BAS')");
 $this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'signature','vtiger_users',1,'21','signature','Signature',1,0,0,250,13,80,1,'V~O',1,null,'BAS')");
 $this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'description','vtiger_users',1,'21','description','Notes',1,0,0,250,14,80,1,'V~O',1,null,'BAS')");
 $this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'address_street','vtiger_users',1,'21','address_street','Street Address',1,0,0,250,1,81,1,'V~O',1,null,'BAS')");

Modified: vtigercrm/trunk/modules/Users/User.php
==============================================================================
--- vtigercrm/trunk/modules/Users/User.php (original)
+++ vtigercrm/trunk/modules/Users/User.php Tue Sep 12 14:42:48 2006
@@ -82,7 +82,6 @@
 	'phone_home' =>'',
 	'imagename' =>'',
 	'date_format' =>'',
-	'tagcloud' =>'',
 	'signature' =>'',
 	'description' =>'',
 	'address_street' =>'',

Modified: vtigercrm/trunk/schema/DatabaseSchema.xml
==============================================================================
--- vtigercrm/trunk/schema/DatabaseSchema.xml (original)
+++ vtigercrm/trunk/schema/DatabaseSchema.xml Tue Sep 12 14:42:48 2006
@@ -74,7 +74,6 @@
 		<field name="lead_view" type="C" size="25">
 			<default value="Today" />
 		</field>
-		<field name="tagcloud" type="C" size="250" />
 		<field name="imagename" type="C" size="250" />
 		<field name="deleted" type="I" size="1">
 			<notnull />



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 14:34:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 21:34:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9457 -
	/vtigercrm/trunk/modules/Reports/ReportRun.php
Message-ID: <20060912213459.630AD76D6B3@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep 12 15:34:44 2006
New Revision: 9457

Log:
Done Currency Support for Reports- Potentials Amount -- By Philip

Modified:
    vtigercrm/trunk/modules/Reports/ReportRun.php

Modified: vtigercrm/trunk/modules/Reports/ReportRun.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/ReportRun.php (original)
+++ vtigercrm/trunk/modules/Reports/ReportRun.php Tue Sep 12 15:34:44 2006
@@ -1397,7 +1397,7 @@
 
 	function GenerateReport($outputformat,$filterlist)
 	{
-		global $adb;
+		global $adb,$current_user;
 		global $modules;
 		global $mod_strings,$current_language;
 
@@ -1418,7 +1418,6 @@
 				$noofrows = $adb->num_rows($result);
 				$custom_field_values = $adb->fetch_array($result);
 				$groupslist = $this->getGroupingList($this->reportid);
-
 				do
 				{
 					$arraylists = Array();
@@ -1447,8 +1446,10 @@
 					for ($i=0; $i<$y; $i++)
 					{
 						$fld = $adb->field_name($result, $i);
-						$fieldvalue = $custom_field_values[$i];
-
+						if ($fld->name == "Potentials_Amount")
+							$fieldvalue = convertFromMasterCurrency($custom_field_values[$i],$current_user->conv_rate);
+						else
+							$fieldvalue = $custom_field_values[$i];
 						if($fieldvalue == "" )
 						{
 							$fieldvalue = "-";
@@ -1532,12 +1533,16 @@
 					for ($i=0; $i<$y; $i++)
 					{
 						$fld = $adb->field_name($result, $i);
-						$fieldvalue = $custom_field_values[$i];
+						if ($fld->name == "Potentials_Amount")
+							$fieldvalue = convertFromMasterCurrency($custom_field_values[$i],$current_user->conv_rate);
+						else
+							$fieldvalue = $custom_field_values[$i];
+
 						if($fieldvalue == "" )
 						{
 							$fieldvalue = "-";
 						}
-						$arraylists[str_replace($modules," ",$fld->name)] = $fieldvalue;
+						$arraylists[str_replace($modules," ",$this->getLstringforReportHeaders($fld->name))] = $fieldvalue;
 					}
 					$arr_val[] = $arraylists;
 				}while($custom_field_values = $adb->fetch_array($result));
@@ -1568,6 +1573,7 @@
 					{
 						$fld = $adb->field_name($result, $i);
 						$keyhdr[$fld->name] = $custom_field_values[$i];
+
 					}
 					foreach($totclmnflds as $key=>$value)
 					{
@@ -1576,7 +1582,7 @@
 						$arraykey = trim($value).'_SUM';
 						if(isset($keyhdr[$arraykey]))
 						{
-							$coltotalhtml .= '<td class="rptTotal">'.$keyhdr[$arraykey].'</td>';
+							$coltotalhtml .= '<td class="rptTotal">'.convertFromMasterCurrency($keyhdr[$arraykey],$current_user->conv_rate).'</td>';
 						}else
 						{
 							$coltotalhtml .= '<td class="rptTotal">&nbsp;</td>';
@@ -1585,7 +1591,7 @@
 						$arraykey = trim($value).'_AVG';
 						if(isset($keyhdr[$arraykey]))
 						{
-							$coltotalhtml .= '<td class="rptTotal">'.$keyhdr[$arraykey].'</td>';
+							$coltotalhtml .= '<td class="rptTotal">'.convertFromMasterCurrency($keyhdr[$arraykey],$current_user->conv_rate).'</td>';
 						}else
 						{
 							$coltotalhtml .= '<td class="rptTotal">&nbsp;</td>';
@@ -1594,7 +1600,7 @@
 						$arraykey = trim($value).'_MIN';
 						if(isset($keyhdr[$arraykey]))
 						{
-							$coltotalhtml .= '<td class="rptTotal">'.$keyhdr[$arraykey].'</td>';
+							$coltotalhtml .= '<td class="rptTotal">'.convertFromMasterCurrency($keyhdr[$arraykey],$current_user->conv_rate).'</td>';
 						}else
 						{
 							$coltotalhtml .= '<td class="rptTotal">&nbsp;</td>';
@@ -1603,7 +1609,7 @@
 						$arraykey = trim($value).'_MAX';
 						if(isset($keyhdr[$arraykey]))
 						{
-							$coltotalhtml .= '<td class="rptTotal">'.$keyhdr[$arraykey].'</td>';
+							$coltotalhtml .= '<td class="rptTotal">'.convertFromMasterCurrency($keyhdr[$arraykey],$current_user->conv_rate).'</td>';
 						}else
 						{
 							$coltotalhtml .= '<td class="rptTotal">&nbsp;</td>';
@@ -1662,7 +1668,10 @@
 					for ($i=0; $i<$y; $i++)
 					{
 						$fld = $adb->field_name($result, $i);
-						$fieldvalue = $custom_field_values[$i];
+						if ($fld->name == "Potentials_Amount")
+							$fieldvalue = convertFromMasterCurrency($custom_field_values[$i],$current_user->conv_rate);
+						else
+							$fieldvalue = $custom_field_values[$i];
 
 						if($fieldvalue == "" )
 						{
@@ -1744,6 +1753,7 @@
 					{
 						$fld = $adb->field_name($result, $i);
 						$keyhdr[$fld->name] = $custom_field_values[$i];
+
 					}
 					foreach($totclmnflds as $key=>$value)
 					{
@@ -1895,13 +1905,19 @@
 	 **/ 
 	function getLstringforReportHeaders($fldname)
 	{
-		global $modules,$current_language;
+		global $modules,$current_language,$current_user;
 		$rep_header = ltrim(str_replace($modules," ",$fldname));
 		$rep_header_temp = ereg_replace(" ","_",$rep_header);
 		$rep_module = ereg_replace('_'.$rep_header_temp,"",$fldname);
 		$temp_mod_strings = return_module_language($current_language,$rep_module);	
-		if($temp_mod_strings[$rep_header] != '')
-			$rep_header = $temp_mod_strings[$rep_header];
+		$curr_symb = "";
+                if($rep_header == 'Amount')
+                        $curr_symb = "(in ".$current_user->currency_symbol.")";
+                if($temp_mod_strings[$rep_header] != '')
+                {
+                        $rep_header = $temp_mod_strings[$rep_header];
+                        $rep_header .=$curr_symb;
+                }
 		return $rep_header;  
 	}
 



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 14:42:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 21:42:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9458 -
	/vtigercrm/trunk/include/utils/SearchUtils.php
Message-ID: <20060912214203.62D8276D6AB@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep 12 15:41:51 2006
New Revision: 9458

Log:
Handled Product Code renaming to Part No in Advanced Search

Modified:
    vtigercrm/trunk/include/utils/SearchUtils.php

Modified: vtigercrm/trunk/include/utils/SearchUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/SearchUtils.php (original)
+++ vtigercrm/trunk/include/utils/SearchUtils.php Tue Sep 12 15:41:51 2006
@@ -468,6 +468,8 @@
 		{
 			if ($i==0)
 				$OPTION_SET .= "<option value=\'".$fieldtablename.".".$fieldcolname."\' selected>".$fieldlabel."</option>";
+			elseif($fieldlabel == "Product Code")
+				$OPTION_SET .= "<option value=\'".$fieldtablename.".".$fieldcolname."\'>".$mod_strings[$fieldlabel]."</option>";
 			else
 				$OPTION_SET .= "<option value=\'".$fieldtablename.".".$fieldcolname."\'>".$fieldlabel."</option>";
 		}



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 14:45:19 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 21:45:19 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9459 -
	/vtigercrm/trunk/modules/CustomView/ListViewTop.php
Message-ID: <20060912214519.0C41376D6B3@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep 12 15:45:08 2006
New Revision: 9459

Log:
Security check for home page key metrics done

Modified:
    vtigercrm/trunk/modules/CustomView/ListViewTop.php

Modified: vtigercrm/trunk/modules/CustomView/ListViewTop.php
==============================================================================
--- vtigercrm/trunk/modules/CustomView/ListViewTop.php (original)
+++ vtigercrm/trunk/modules/CustomView/ListViewTop.php Tue Sep 12 15:45:08 2006
@@ -138,8 +138,8 @@
 		$metricslist['name'] = $cvrow['viewname'];
 		$metricslist['module'] = $cvrow['entitytype'];
 		$metricslist['count'] = '';
-
-		$metriclists[] = $metricslist;
+		if(isPermitted($cvrow['entitytype'],"index") == "yes")
+			$metriclists[] = $metricslist;
 	}
 
 	return $metriclists;



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 14:51:06 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 21:51:06 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9460 - in
 /vtigertoolbar/trunk/firefox/chrome/skin: Notes.gif Products.gif Site.gif
 rss.png vendor.gif
Message-ID: <20060912215106.CC03076D6AB@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 15:50:41 2006
New Revision: 9460

Log:
Images added for toobar icon --Jeri

Added:
    vtigertoolbar/trunk/firefox/chrome/skin/Notes.gif   (with props)
    vtigertoolbar/trunk/firefox/chrome/skin/Products.gif   (with props)
    vtigertoolbar/trunk/firefox/chrome/skin/Site.gif   (with props)
    vtigertoolbar/trunk/firefox/chrome/skin/rss.png   (with props)
    vtigertoolbar/trunk/firefox/chrome/skin/vendor.gif   (with props)



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 14:52:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 21:52:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9461 -
 /vtigertoolbar/trunk/firefox/chrome/skin/vtigercrm_overlay.css
Message-ID: <20060912215230.726C376D6B3@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 15:52:20 2006
New Revision: 9461

Log:
Images added for toobar icon --Jeri

Modified:
    vtigertoolbar/trunk/firefox/chrome/skin/vtigercrm_overlay.css

Modified: vtigertoolbar/trunk/firefox/chrome/skin/vtigercrm_overlay.css
==============================================================================
Binary files - no diff available.



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 14:52:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 21:52:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9462 -
	/vtigercrm/trunk/Smarty/templates/ListView.tpl
Message-ID: <20060912215249.7414876D6B3@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep 12 15:52:37 2006
New Revision: 9462

Log:
Fixed the Custom View handling in basic search --by philip

Modified:
    vtigercrm/trunk/Smarty/templates/ListView.tpl

Modified: vtigercrm/trunk/Smarty/templates/ListView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ListView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ListView.tpl Tue Sep 12 15:52:37 2006
@@ -30,7 +30,7 @@
         	getObj(data_td_id).className = 'searchAlph';
     	{rdelim}
     	gPopupAlphaSearchUrl = '';
-	search_fld_val= document.basicSearch.search_field[document.basicSearch.search_field.selectedIndex].value;
+	search_fld_val= $('bas_searchfield').options[$('bas_searchfield').selectedIndex].value;
         search_txt_val=document.basicSearch.search_text.value;
         var urlstring = '';
         if(searchtype == 'Basic')
@@ -151,10 +151,13 @@
 		</td>
 		<td class="small" nowrap align=right><b>{$APP.LBL_SEARCH_FOR}</b></td>
 		<td class="small"><input type="text"  class="txtBox" style="width:120px" name="search_text"></td>
-		<td class="small" nowrap><b>{$APP.LBL_IN}</b>&nbsp;
-			<select name ="search_field" class="txtBox" style="width:150px">
+		<td class="small" nowrap><b>{$APP.LBL_IN}</b>&nbsp;</td>
+		<td class="small" nowrap>
+			<div id="basicsearchcolumns_real">
+			<select name="search_field" id="bas_searchfield" class="txtBox" style="width:150px">
 			 {html_options  options=$SEARCHLISTHEADER }
 			</select>
+			</div>
                         <input type="hidden" name="searchtype" value="BasicSearch">
                         <input type="hidden" name="module" value="{$MODULE}">
                         <input type="hidden" name="parenttab" value="{$CATEGORY}">
@@ -169,7 +172,7 @@
 		<td class="small" valign="top" onMouseOver="this.style.cursor='pointer';" onclick="moveMe('searchAcc');searchshowhide('searchAcc','advSearch')">[x]</td>
 	</tr>
 	<tr>
-		<td colspan="6" align="center" class="small">
+		<td colspan="7" align="center" class="small">
 			<table border=0 cellspacing=0 cellpadding=0 width=100%>
 				<tr>
                                                 {$ALPHABETICAL}



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 14:54:16 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 21:54:16 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9463 -
 /vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl
Message-ID: <20060912215416.E8ED276D6AB@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep 12 15:54:07 2006
New Revision: 9463

Log:
Fixed the Custom View handling in basic search --by philip

Modified:
    vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl

Modified: vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl Tue Sep 12 15:54:07 2006
@@ -217,3 +217,4 @@
 
    </form>	
 {$SELECT_SCRIPT}
+<div id="basicsearchcolumns" style="display:none;"><select name="search_field" id="bas_searchfield" class="txtBox" style="width:150px">{html_options  options=$SEARCHLISTHEADER}</select></div>



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 14:55:36 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 21:55:36 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9464 -
	/vtigercrm/trunk/include/js/ListView.js
Message-ID: <20060912215536.3993A76D6B3@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep 12 15:55:27 2006
New Revision: 9464

Log:
Fixed the Custom View handling in basic search --by philip

Modified:
    vtigercrm/trunk/include/js/ListView.js

Modified: vtigercrm/trunk/include/js/ListView.js
==============================================================================
--- vtigercrm/trunk/include/js/ListView.js (original)
+++ vtigercrm/trunk/include/js/ListView.js Tue Sep 12 15:55:27 2006
@@ -113,6 +113,9 @@
                         $("ListViewContents").innerHTML= result[2];
                         if(result[1] != '')
                                	alert(result[1]);
+			$('basicsearchcolumns_real').innerHTML = $('basicsearchcolumns').innerHTML
+			$('basicsearchcolumns').innerHTML = '';
+			document.basicSearch.search_text.value = '';
                         }
                 }
 	);



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 14:57:51 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 21:57:51 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9465 -
	/vtigercrm/trunk/modules/Reports/SaveAndRun.php
Message-ID: <20060912215751.D5DA576D6AB@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep 12 15:57:44 2006
New Revision: 9465

Log:
Changed the width of the error message -- by philip

Modified:
    vtigercrm/trunk/modules/Reports/SaveAndRun.php

Modified: vtigercrm/trunk/modules/Reports/SaveAndRun.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/SaveAndRun.php (original)
+++ vtigercrm/trunk/modules/Reports/SaveAndRun.php Tue Sep 12 15:57:44 2006
@@ -94,7 +94,7 @@
 		include('themes/'.$theme.'/header.php');
 	}	
 	echo "<table border='0' cellpadding='5' cellspacing='0' width='100%' height='450px'><tr><td align='center'>";
-	echo "<div style='border: 3px solid rgb(153, 153, 153); background-color: rgb(255, 255, 255); width: 55%; position: relative; z-index: 10000000;'>
+	echo "<div style='border: 3px solid rgb(153, 153, 153); background-color: rgb(255, 255, 255); width: 80%; position: relative; z-index: 10000000;'>
 
 		<table border='0' cellpadding='5' cellspacing='0' width='98%'>
 		<tbody><tr>



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 15:00:34 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 22:00:34 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9466 -
 /wordintegration/trunk/client/bin/Language/finnish.ini
Message-ID: <20060912220034.D84FE76D6B3@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 16:00:27 2006
New Revision: 9466

Log:
finish language added --Jeri

Added:
    wordintegration/trunk/client/bin/Language/finnish.ini



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 15:02:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 22:02:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9467 -
 /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php
Message-ID: <20060912220251.8A15E76D6CD@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep 12 16:02:43 2006
New Revision: 9467

Log:
Migration Fixes Done -- By Mickie

Modified:
    vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php

Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php
==============================================================================
--- vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php (original)
+++ vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php Tue Sep 12 16:02:43 2006
@@ -3731,8 +3731,9 @@
 //delete the entries from vtiger_profile2standardpermissions table for Emails
 Execute("delete from vtiger_profile2standardpermissions where tabid=10");
 
-
-
+//delete the tagcloud entry from users
+Execute("delete from vtiger_field where tabid=29 and fieldname='tagcloud'");
+Execute("alter table vtiger_users drop column tagcloud");
 
 
 



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 15:03:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 22:03:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9468 - in
 /wordintegration/trunk/client/bin/Language: deutsch.ini finnish.ini
 french.ini german.ini portuguese.ini
Message-ID: <20060912220358.13BCA76D6B3@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 16:03:45 2006
New Revision: 9468

Log:
string Unable to connect vtigerCRM Server with the given username and password added for all languages --Jeri

Modified:
    wordintegration/trunk/client/bin/Language/deutsch.ini
    wordintegration/trunk/client/bin/Language/finnish.ini
    wordintegration/trunk/client/bin/Language/french.ini
    wordintegration/trunk/client/bin/Language/german.ini
    wordintegration/trunk/client/bin/Language/portuguese.ini

Modified: wordintegration/trunk/client/bin/Language/deutsch.ini
==============================================================================
--- wordintegration/trunk/client/bin/Language/deutsch.ini (original)
+++ wordintegration/trunk/client/bin/Language/deutsch.ini Tue Sep 12 16:03:45 2006
@@ -63,4 +63,4 @@
 Msg015=Proxy Benutzername
 Msg016=Proxy Passwort
 Msg017=Erzeugen Sie ein Dokument, um das Mischfeld einzuf?gen.
-
+Msg018=Unable to connect vtigerCRM Server with the given username and password

Modified: wordintegration/trunk/client/bin/Language/finnish.ini
==============================================================================
--- wordintegration/trunk/client/bin/Language/finnish.ini (original)
+++ wordintegration/trunk/client/bin/Language/finnish.ini Tue Sep 12 16:03:45 2006
@@ -63,3 +63,4 @@
 Msg015=Proxyn k?ytt?j?tunnus
 Msg016=Proxyn salasana
 Msg017=Luo dokumentti yhdist?m?ll? kentti?
+Msg018=Unable to connect vtigerCRM Server with the given username and password

Modified: wordintegration/trunk/client/bin/Language/french.ini
==============================================================================
--- wordintegration/trunk/client/bin/Language/french.ini (original)
+++ wordintegration/trunk/client/bin/Language/french.ini Tue Sep 12 16:03:45 2006
@@ -63,3 +63,4 @@
 Msg015=Nom d'utilisateur
 Msg016=Mot de passe
 Msg017=Cr?er un document pour ins?rer des champs de fusion
+Msg018=Unable to connect vtigerCRM Server with the given username and password

Modified: wordintegration/trunk/client/bin/Language/german.ini
==============================================================================
Binary files - no diff available.

Modified: wordintegration/trunk/client/bin/Language/portuguese.ini
==============================================================================
--- wordintegration/trunk/client/bin/Language/portuguese.ini (original)
+++ wordintegration/trunk/client/bin/Language/portuguese.ini Tue Sep 12 16:03:45 2006
@@ -63,3 +63,4 @@
 Msg015=Nome de utilizador do Proxy
 Msg016=Palava chave do proxy
 Msg017=Criar um documento para inserir o campo ligado
+Msg018=Unable to connect vtigerCRM Server with the given username and password



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 15:06:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 22:06:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9469 -
	/vtigercrm/trunk/include/utils/InventoryUtils.php
Message-ID: <20060912220626.399B776D6D4@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep 12 16:06:19 2006
New Revision: 9469

Log:
When saving the po if status is delivered then the product qty in stock will be updated -- By mickie

Modified:
    vtigercrm/trunk/include/utils/InventoryUtils.php

Modified: vtigercrm/trunk/include/utils/InventoryUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/InventoryUtils.php (original)
+++ vtigercrm/trunk/include/utils/InventoryUtils.php Tue Sep 12 16:06:19 2006
@@ -466,9 +466,10 @@
 /**	Function used to save the Inventory product details for the passed entity
  *	@param object reference $focus - object reference to which we want to save the product details from REQUEST values where as the entity will be Purchase Order, Sales Order, Quotes or Invoice
  *	@param string $module - module name
+ *	@param $update_prod_stock - true or false (default), if true we have to update the stock for PO only
  *	@return void
  */
-function saveInventoryProductDetails($focus, $module)
+function saveInventoryProductDetails($focus, $module, $update_prod_stock='false')
 {
 	global $log, $adb;
 	$log->debug("Entering into function saveInventoryProductDetails($focus, $module).");
@@ -502,11 +503,11 @@
 		if($_REQUEST["deleted".$i] == 1)
 			continue;
 
-		// DG 15 Aug 2006
-		// We want to retain the sequence that the products were added to the quote (etc)
-		// so that way the printed quote (etc) retains the products in the order they were added
-		// and salepeople can control the order than their quote (etc) items print out
-		// so we create a new field "sequence_no" and stick the value of $i into it
+		//we have to update the Product stock for PurchaseOrder if $update_prod_stock is true
+		if($module == 'PurchaseOrder' && $update_prod_stock == 'true')
+		{
+			addToProductStock($prod_id,$qty);
+		}
 
 		$query ="insert into vtiger_inventoryproductrel(id, productid, sequence_no, quantity, listprice, comment) values($focus->id, $prod_id , $prod_seq, $qty, $listprice, '$comment')";
 		$prod_seq++;



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 15:08:01 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 22:08:01 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9470 -
	/vtigercrm/trunk/themes/woodspice/images/status.gif
Message-ID: <20060912220801.7970E76D6D4@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 16:07:54 2006
New Revision: 9470

Log:
Status image for wood spice --Jeri

Modified:
    vtigercrm/trunk/themes/woodspice/images/status.gif

Modified: vtigercrm/trunk/themes/woodspice/images/status.gif
==============================================================================
Binary files - no diff available.



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 15:09:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 22:09:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9471 -
	/vtigercrm/trunk/themes/bluelagoon/images/status.gif
Message-ID: <20060912220949.3641076D6D2@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 16:09:36 2006
New Revision: 9471

Log:
Status image for bluelagoon --Jeri

Modified:
    vtigercrm/trunk/themes/bluelagoon/images/status.gif

Modified: vtigercrm/trunk/themes/bluelagoon/images/status.gif
==============================================================================
Binary files - no diff available.



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 15:15:56 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 22:15:56 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9472 -
	/vtigercrm/trunk/modules/PurchaseOrder/Save.php
Message-ID: <20060912221556.D458B76D6BE@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep 12 16:15:50 2006
New Revision: 9472

Log:
When saving the po if status is delivered then the product qty in stock will be updated -- By mickie

Modified:
    vtigercrm/trunk/modules/PurchaseOrder/Save.php

Modified: vtigercrm/trunk/modules/PurchaseOrder/Save.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/Save.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/Save.php Tue Sep 12 16:15:50 2006
@@ -36,7 +36,7 @@
 
 //Added code for auto product stock updation on receiving goods
 $update_prod_stock='';
-if($focus->column_fields['postatus'] == 'Received Shipment' && $focus->mode == 'edit')
+if($focus->column_fields['postatus'] == 'Delivered' && $focus->mode == 'edit')
 {
         $prev_postatus=getPoStatus($focus->id);
         if($focus->column_fields['postatus'] != $prev_postatus)
@@ -50,7 +50,7 @@
 
 
 //Based on the total Number of rows we will save the product relationship with this entity
-saveInventoryProductDetails(&$focus, 'PurchaseOrder');
+saveInventoryProductDetails(&$focus, 'PurchaseOrder', $update_prod_stock);
 
 
 $return_id = $focus->id;



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 15:57:16 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 22:57:16 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9473 - in
 /vtigercrm/trunk/modules/Users: DefaultFieldPermissions.php
 EditDefOrgFieldLevelAccess.php UpdateDefaultFieldLevelAccess.php
Message-ID: <20060912225716.CD42876D6D4@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 16:57:07 2006
New Revision: 9473

Log:
Faq added in default field access --Jeri

Modified:
    vtigercrm/trunk/modules/Users/DefaultFieldPermissions.php
    vtigercrm/trunk/modules/Users/EditDefOrgFieldLevelAccess.php
    vtigercrm/trunk/modules/Users/UpdateDefaultFieldLevelAccess.php

Modified: vtigercrm/trunk/modules/Users/DefaultFieldPermissions.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultFieldPermissions.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultFieldPermissions.php Tue Sep 12 16:57:07 2006
@@ -31,7 +31,7 @@
 $image_path=$theme_path."images/";
 require_once($theme_path.'layout_utils.php');
 
-$field_module = Array('Leads','Accounts','Contacts','Potentials','HelpDesk','Products','Notes','Calendar','Events','Vendors','PriceBooks','Quotes','PurchaseOrder','SalesOrder','Invoice','Campaigns');
+$field_module = Array('Leads','Accounts','Contacts','Potentials','HelpDesk','Products','Notes','Calendar','Events','Vendors','PriceBooks','Quotes','PurchaseOrder','SalesOrder','Invoice','Campaigns','Faq');
 $allfields=Array();
 foreach($field_module as $fld_module)
 {

Modified: vtigercrm/trunk/modules/Users/EditDefOrgFieldLevelAccess.php
==============================================================================
--- vtigercrm/trunk/modules/Users/EditDefOrgFieldLevelAccess.php (original)
+++ vtigercrm/trunk/modules/Users/EditDefOrgFieldLevelAccess.php Tue Sep 12 16:57:07 2006
@@ -27,7 +27,7 @@
 require_once($theme_path.'layout_utils.php');
 
 
-$field_module = Array('Leads','Accounts','Contacts','Potentials','HelpDesk','Products','Notes','Emails','Calendar','Events','Vendors','PriceBooks','Quotes','PurchaseOrder','SalesOrder','Invoice','Campaigns');
+$field_module = Array('Leads','Accounts','Contacts','Potentials','HelpDesk','Products','Notes','Emails','Calendar','Events','Vendors','PriceBooks','Quotes','PurchaseOrder','SalesOrder','Invoice','Campaigns','Faq');
 $allfields=Array();
 foreach($field_module as $fld_module)
 {
@@ -58,7 +58,7 @@
 		$uitype = $adb->query_result($fieldListResult,$i,"uitype");
                 $mandatory = '';
 		$readonly = '';
-                if($uitype == 2 || $uitype == 6 || $uitype == 22 || $uitype == 73 || $uitype == 24 || $uitype == 81 || $uitype == 50 || $uitype == 23 || $uitype == 16)
+                if($uitype == 2 || $uitype == 6 || $uitype == 22 || $uitype == 73 || $uitype == 24 || $uitype == 81 || $uitype == 50 || $uitype == 23 || $uitype == 16 || $uitype == 20)
                 {
                         $mandatory = '<font color="red">*</font>';
 						$readonly = 'disabled';

Modified: vtigercrm/trunk/modules/Users/UpdateDefaultFieldLevelAccess.php
==============================================================================
--- vtigercrm/trunk/modules/Users/UpdateDefaultFieldLevelAccess.php (original)
+++ vtigercrm/trunk/modules/Users/UpdateDefaultFieldLevelAccess.php Tue Sep 12 16:57:07 2006
@@ -14,7 +14,7 @@
 require_once('include/utils/utils.php');
 global $adb;
 
-$field_module = Array('Leads','Accounts','Contacts','Potentials','HelpDesk','Products','Notes','Emails','Calendar','Events','Vendors','PriceBooks','Quotes','PurchaseOrder','SalesOrder','Invoice','Campaigns');
+$field_module = Array('Leads','Accounts','Contacts','Potentials','HelpDesk','Products','Notes','Emails','Calendar','Events','Vendors','PriceBooks','Quotes','PurchaseOrder','SalesOrder','Invoice','Campaigns','Faq');
 foreach($field_module as $fld_module)
 {
 	$fieldListResult = getDefOrgFieldList($fld_module);



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 16:00:58 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 23:00:58 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9474 -
	/vtigercrm/trunk/modules/Users/SaveProfile.php
Message-ID: <20060912230058.58D8D76D6DD@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 17:00:30 2006
New Revision: 9474

Log:
Seperate handling for Faq module removed as it comes under common code --Jeri

Modified:
    vtigercrm/trunk/modules/Users/SaveProfile.php

Modified: vtigercrm/trunk/modules/Users/SaveProfile.php
==============================================================================
--- vtigercrm/trunk/modules/Users/SaveProfile.php (original)
+++ vtigercrm/trunk/modules/Users/SaveProfile.php Tue Sep 12 17:00:30 2006
@@ -55,7 +55,7 @@
 	{
 		$tab_id = $adb->query_result($tab_perr_result,$i,"tabid");
 		$request_var = $tab_id.'_tab';
-		if($tab_id != 3 && $tab_id != 16 && $tab_id != 15)
+		if($tab_id != 3 && $tab_id != 16)
 		{
 			$permission = $_REQUEST[$request_var];
 			if($permission == 'on')
@@ -74,16 +74,6 @@
 				$sql4="insert into vtiger_profile2tab values(".$profileid.",16, ".$permission_value.")";
                         	$adb->query($sql4);	
 			}
-		}
-		elseif($tab_id == 13)
-		{
-			$sql4="insert into vtiger_profile2tab values(".$profileid.",13,0)";
-                        $adb->query($sql4);
-		}
-		elseif($tab_id == 15)
-		{
-			$sql4="insert into vtiger_profile2tab values(".$profileid.",15,0)";
-                        $adb->query($sql4);
 		}
 	}
 	
@@ -92,7 +82,7 @@
 	{
 		$tab_id = $adb->query_result($act_perr_result,$i,"tabid");
 		$action_id = $adb->query_result($act_perr_result,$i,"operation");
-		if($tab_id != 16 && $tab_id != 15)
+		if($tab_id != 16)
 		{
 			$action_name = getActionname($action_id);
 			if($action_name == 'EditView' || $action_name == 'Delete' || $action_name == 'DetailView')
@@ -129,12 +119,6 @@
 
 
 
-		}
-		elseif($tab_id == 15)
-		{
-			
-                          $sql7="insert into vtiger_profile2standardpermissions values(".$profileid.", 15, ".$action_id.",0)";
-                          $adb->query($sql7);
 		}
 	}
 



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 16:04:05 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 23:04:05 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9475 -
	/vtigercrm/trunk/include/utils/UserInfoUtil.php
Message-ID: <20060912230405.7F51B76D6DE@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 17:03:58 2006
New Revision: 9475

Log:
Faq module added in profile security --jeri

Modified:
    vtigercrm/trunk/include/utils/UserInfoUtil.php

Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php
==============================================================================
--- vtigercrm/trunk/include/utils/UserInfoUtil.php (original)
+++ vtigercrm/trunk/include/utils/UserInfoUtil.php Tue Sep 12 17:03:58 2006
@@ -4620,7 +4620,8 @@
                 'PurchaseOrder'=>'LBL_PO_FIELD_ACCESS',
                 'SalesOrder'=>'LBL_SO_FIELD_ACCESS',
                 'Invoice'=>'LBL_INVOICE_FIELD_ACCESS',
-                'Campaigns'=>'LBL_CAMPAIGN_FIELD_ACCESS'
+                'Campaigns'=>'LBL_CAMPAIGN_FIELD_ACCESS',
+		'Faq'=>'LBL_FAQ_FIELD_ACCESS'
               );
 
 	$log->debug("Exiting getFieldModuleAccessArray method ...");



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 16:04:43 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 23:04:43 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9476 -
 /vtigercrm/trunk/modules/Settings/language/en_us.lang.php
Message-ID: <20060912230443.228ED76D6DD@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 17:04:36 2006
New Revision: 9476

Log:
language strings updated --Jeri

Modified:
    vtigercrm/trunk/modules/Settings/language/en_us.lang.php

Modified: vtigercrm/trunk/modules/Settings/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Settings/language/en_us.lang.php Tue Sep 12 17:04:36 2006
@@ -720,7 +720,7 @@
 'LBL_WITH'=>'with',
 'LBL_TYPEALERT_2'=>'data type. Kindly map the same data types.',
 'LBL_ENABLE'=>'Enable',
-
+'LBL_FAQ_FIELD_ACCESS'=>'Faq Field Access',
 );
 
 



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 16:13:20 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 23:13:20 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9477 -
	/vtigercrm/branches/4.2/modules/Leads/Lead.php
Message-ID: <20060912231320.5EFD466A7FD@vtiger.fosslabs.com>

Author: allanbush
Date: Tue Sep 12 17:13:17 2006
New Revision: 9477

Log:
Search only non-converted leads.  Closes #2182.

Modified:
    vtigercrm/branches/4.2/modules/Leads/Lead.php

Modified: vtigercrm/branches/4.2/modules/Leads/Lead.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Leads/Lead.php (original)
+++ vtigercrm/branches/4.2/modules/Leads/Lead.php Tue Sep 12 17:13:17 2006
@@ -185,7 +185,7 @@
 			$the_where .= $clause;
 		}
 		
-		return $the_where;
+		return 'leaddetails.converted = 0 AND ('.$the_where.')';
 	}
 	
 //method added to construct the query to fetch the custom fields 



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 16:18:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 23:18:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9478 -
	/vtigercrm/trunk/include/utils/utils.php
Message-ID: <20060912231838.493BA66A7FD@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 17:18:31 2006
New Revision: 9478

Log:
Users module from profile2field table and def_org_field removed during installation --Jeri

Modified:
    vtigercrm/trunk/include/utils/utils.php

Modified: vtigercrm/trunk/include/utils/utils.php
==============================================================================
--- vtigercrm/trunk/include/utils/utils.php (original)
+++ vtigercrm/trunk/include/utils/utils.php Tue Sep 12 17:18:31 2006
@@ -1176,7 +1176,7 @@
 
 	global $adb;
 	$adb->database->SetFetchMode(ADODB_FETCH_ASSOC); 
-	$fld_result = $adb->query("select * from vtiger_field where generatedtype=1 and displaytype in (1,2)");
+	$fld_result = $adb->query("select * from vtiger_field where generatedtype=1 and displaytype in (1,2) and tabid != 29");
         $num_rows = $adb->num_rows($fld_result);
         for($i=0; $i<$num_rows; $i++)
         {
@@ -1196,7 +1196,7 @@
 	$log->debug("Entering insert_def_org_field() method ...");
 	global $adb;
 	$adb->database->SetFetchMode(ADODB_FETCH_ASSOC); 
-	$fld_result = $adb->query("select * from vtiger_field where generatedtype=1 and displaytype in (1,2)");
+	$fld_result = $adb->query("select * from vtiger_field where generatedtype=1 and displaytype in (1,2) and tabid != 29");
         $num_rows = $adb->num_rows($fld_result);
         for($i=0; $i<$num_rows; $i++)
         {



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 16:39:10 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 23:39:10 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9479 -
	/vtigercrm/trunk/include/utils/CommonUtils.php
Message-ID: <20060912233911.13F5266A7FD@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 17:39:04 2006
New Revision: 9479

Log:
vtiger prefixed for users table --Jeri

Modified:
    vtigercrm/trunk/include/utils/CommonUtils.php

Modified: vtigercrm/trunk/include/utils/CommonUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/CommonUtils.php (original)
+++ vtigercrm/trunk/include/utils/CommonUtils.php Tue Sep 12 17:39:04 2006
@@ -2457,7 +2457,7 @@
 			if(is_array($fields["users"]))
 			{
 				$columnfields = implode(',',$fields["users"]);
-				$query = 'select '.$columnfields.' from users where id='.$id;
+				$query = 'select '.$columnfields.' from vtiger_users where id='.$id;
 				$result = $adb->query($query);
 				foreach($fields["users"] as $columnname)
 				{



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 23:34:10 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 06:34:10 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9480 -
	/vtigercrm/branches/4.2/modules/uploads/add2db.php
Message-ID: <20060913063411.11A4866A7FD@vtiger.fosslabs.com>

Author: allanbush
Date: Wed Sep 13 00:34:08 2006
New Revision: 9480

Log:
Reduced memory used during upload by base 64 encoding the uploaded file in 1MB cunks and closing file handles when we're finished with them.  Refs #61.

Modified:
    vtigercrm/branches/4.2/modules/uploads/add2db.php

Modified: vtigercrm/branches/4.2/modules/uploads/add2db.php
==============================================================================
--- vtigercrm/branches/4.2/modules/uploads/add2db.php (original)
+++ vtigercrm/branches/4.2/modules/uploads/add2db.php Wed Sep 13 00:34:08 2006
@@ -46,8 +46,11 @@
 		$filenameBase64 = $filename.".base64";
 		$rfh = fopen($uploaddir.$filename, "r");
 		$wfh = fopen($uploaddir.$filenameBase64, "w");
-		//FIXME: find a way to stream data to base64_encode() to reduce memory usage -mikefedyk
-		fwrite($wfh,base64_encode(fread($rfh, $filesize)));
+		while(!feof($rfh)) {
+			fwrite($wfh,base64_encode(fread($rfh, 1024*1024)));
+		}
+		fclose($rfh);
+		fclose($wfh);
 		deleteFile($uploaddir,$filename);
 		
 		$query = "insert into crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values('";



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 03:27:08 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 10:27:08 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9481 - in
 /wordintegration/trunk/client/source: modLang.bas vtigerCRMWordPlugin.vbw
Message-ID: <20060913102708.CE92B66A5D4@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Wed Sep 13 04:26:40 2006
New Revision: 9481

Log:
Finnish Language added --Jeri

Modified:
    wordintegration/trunk/client/source/modLang.bas
    wordintegration/trunk/client/source/vtigerCRMWordPlugin.vbw

Modified: wordintegration/trunk/client/source/modLang.bas
==============================================================================
Binary files - no diff available.

Modified: wordintegration/trunk/client/source/vtigerCRMWordPlugin.vbw
==============================================================================
Binary files - no diff available.



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 03:49:14 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 10:49:14 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9482 -
	/customerportal/trunk/login.php
Message-ID: <20060913104914.A90F66C5946@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Wed Sep 13 04:49:05 2006
New Revision: 9482

Log:
Rc image removed in the login page --Mickie

Modified:
    customerportal/trunk/login.php

Modified: customerportal/trunk/login.php
==============================================================================
--- customerportal/trunk/login.php (original)
+++ customerportal/trunk/login.php Wed Sep 13 04:49:05 2006
@@ -50,7 +50,7 @@
 			   <tr>
 				<th align="left"><img src="images/loginVtigerCRM.gif" width="169" height="49"></th>
 				<th>&nbsp;</th>
-				<th align="right"><img src="images/loginAlpha.gif"></th>
+				<th align="right">&nbsp;</th>
 			   </tr>
 			   <tr class="tableTop"><td colspan="3"></td></tr>
 			   <tr>



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 03:49:36 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 10:49:36 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9483 -
	/customerportal/trunk/images/loginAlpha.gif
Message-ID: <20060913104936.29A3B66A5D4@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Wed Sep 13 04:49:28 2006
New Revision: 9483

Log:
Alpha Image removed --Jeri

Removed:
    customerportal/trunk/images/loginAlpha.gif



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 04:12:04 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 11:12:04 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9484 -
	/vtigercrm/trunk/modules/Leads/ListViewTop.php
Message-ID: <20060913111204.595726D302C@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Wed Sep 13 05:11:56 2006
New Revision: 9484

Log:
Home Page My New Leads issue has been fixed --Jeri

Modified:
    vtigercrm/trunk/modules/Leads/ListViewTop.php

Modified: vtigercrm/trunk/modules/Leads/ListViewTop.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/ListViewTop.php (original)
+++ vtigercrm/trunk/modules/Leads/ListViewTop.php Wed Sep 13 05:11:56 2006
@@ -74,7 +74,7 @@
 	$noofrows = $adb->num_rows($list_result);
 	$open_lead_list =array();
 	if ($noofrows > 0)
-		for($i=0;$i<$noofrows,$i<5;$i++) 
+		for($i=0;$i<$noofrows && $i<5;$i++) 
 		{
 			$open_lead_list[] = Array('leadname' => $adb->query_result($list_result,$i,'firstname').' '.$adb->query_result($list_result,$i,'lastname'),
 					'company' => $adb->query_result($list_result,$i,'company'),



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 04:20:28 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 11:20:28 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9485 - in
 /vtigercrm/trunk/modules/Calendar: Appointment.php CalendarCommon.php
 EditView.php addEventUI.php calendarLayout.php script.js
Message-ID: <20060913112028.53D136D302D@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 05:20:10 2006
New Revision: 9485

Log:
Fixes for Calendar Security Done -- Minnie

Modified:
    vtigercrm/trunk/modules/Calendar/Appointment.php
    vtigercrm/trunk/modules/Calendar/CalendarCommon.php
    vtigercrm/trunk/modules/Calendar/EditView.php
    vtigercrm/trunk/modules/Calendar/addEventUI.php
    vtigercrm/trunk/modules/Calendar/calendarLayout.php
    vtigercrm/trunk/modules/Calendar/script.js

Modified: vtigercrm/trunk/modules/Calendar/Appointment.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/Appointment.php (original)
+++ vtigercrm/trunk/modules/Calendar/Appointment.php Wed Sep 13 05:20:10 2006
@@ -10,6 +10,7 @@
  ********************************************************************************/
 require_once('modules/Calendar/CalendarCommon.php');
 require_once('include/utils/CommonUtils.php');
+require_once('include/utils/UserInfoUtil.php');
 require_once('include/database/PearDatabase.php');
 require_once('modules/Calendar/Activity.php');
 class Appointment
@@ -56,24 +57,18 @@
 	function readAppointment($userid, &$from_datetime, &$to_datetime, $view)
 	{
 		global $current_user,$adb;
-		$shared_ids = getSharedCalendarId($current_user->id);		
-		if(empty($shared_ids))
-			$shared_ids = $current_user->id;
-                $q= "select vtiger_activity.*, vtiger_crmentity.*, vtiger_activitygrouprelation.groupname FROM vtiger_activity inner join vtiger_crmentity on vtiger_activity.activityid = vtiger_crmentity.crmid left join vtiger_recurringevents on vtiger_activity.activityid=vtiger_recurringevents.activityid left outer join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid WHERE vtiger_activity.activitytype in ('Call','Meeting') AND ";
-
-                if(!is_admin($current_user))
-                {
-                        $q .= " ( ";
-                }
-
-                $q.=" ((vtiger_activity.date_start < '". $to_datetime->get_formatted_date() ."' AND vtiger_activity.date_start >= '". $from_datetime->get_formatted_date()."')";
-                if(!is_admin($current_user))
-                {
-                        $q .= "  ) AND ((vtiger_crmentity.smownerid ='".$current_user->id."' or vtiger_salesmanactivityrel.smid = '".$current_user->id."') or (vtiger_crmentity.smownerid in (".$shared_ids.") or vtiger_salesmanactivityrel.smid in (".$shared_ids.")))";
-                }
-                $q .= " AND vtiger_crmentity.deleted = 0) AND vtiger_recurringevents.activityid is NULL ";
+		require('user_privileges/user_privileges_'.$current_user->id.'.php');
+		require('user_privileges/sharing_privileges_'.$current_user->id.'.php');
+		$shared_ids = getSharedCalendarId($current_user->id);
+                $q= "select vtiger_activity.*, vtiger_crmentity.*, vtiger_activitygrouprelation.groupname FROM vtiger_activity inner join vtiger_crmentity on vtiger_activity.activityid = vtiger_crmentity.crmid left join vtiger_recurringevents on vtiger_activity.activityid=vtiger_recurringevents.activityid left outer join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid left join vtiger_groups on vtiger_groups.groupname = vtiger_activitygrouprelation.groupname inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid WHERE vtiger_crmentity.deleted = 0 and vtiger_activity.activitytype in ('Call','Meeting') AND (vtiger_activity.date_start < '". $to_datetime->get_formatted_date() ."' AND vtiger_activity.date_start >= '". $from_datetime->get_formatted_date()."') ";
+		if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[16] == 3)
+		{
+			$sec_parameter=getListViewSecurityParameter('Calendar');
+			$q .= $sec_parameter;
+		}
+									
+                $q .= " AND vtiger_recurringevents.activityid is NULL ";
                 $q .= " group by vtiger_activity.activityid ORDER by vtiger_activity.date_start,vtiger_activity.time_start";
-		//echo $q;
 		$r = $adb->query($q);
                 $n = $adb->getRowCount($r);
                 $a = 0;
@@ -88,20 +83,16 @@
                         unset($obj);
                 }
 		//Get Recurring events
-		$q = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.activitytype, vtiger_crmentity.description, vtiger_activity.time_start,vtiger_activity.time_end, vtiger_activity.duration_hours, vtiger_activity.duration_minutes,vtiger_activity.due_date, vtiger_activity.priority, vtiger_activity.location,vtiger_activity.eventstatus, vtiger_crmentity.*, vtiger_recurringevents.recurringid, vtiger_recurringevents.recurringdate as date_start ,vtiger_recurringevents.recurringtype,vtiger_activitygrouprelation.groupname from vtiger_activity inner join vtiger_crmentity on vtiger_activity.activityid = vtiger_crmentity.crmid inner join vtiger_recurringevents on vtiger_activity.activityid=vtiger_recurringevents.activityid left outer join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid";
-
-                $q.=" where ( vtiger_activity.activitytype in ('Call','Meeting') AND ";
-                if(!is_admin($current_user))
-                {
-                        $q .= " ( ";
-                }
-                $q .= "  (recurringdate < '".$to_datetime->get_formatted_date()."' AND recurringdate >= '".$from_datetime->get_formatted_date(). "') ";
-                if(!is_admin($current_user))
-                {
-			$q .= " ) AND ((vtiger_crmentity.smownerid ='".$current_user->id."' or vtiger_salesmanactivityrel.smid = '".$current_user->id."' ) or (vtiger_crmentity.smownerid in (".$shared_ids.") or vtiger_salesmanactivityrel.smid in (".$shared_ids.")))";
-                }
-
-                $q .= " AND vtiger_crmentity.deleted = 0 )" ;
+		$q = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.activitytype, vtiger_crmentity.description, vtiger_activity.time_start,vtiger_activity.time_end, vtiger_activity.duration_hours, vtiger_activity.duration_minutes,vtiger_activity.due_date, vtiger_activity.priority, vtiger_activity.location,vtiger_activity.eventstatus, vtiger_crmentity.*, vtiger_recurringevents.recurringid, vtiger_recurringevents.recurringdate as date_start ,vtiger_recurringevents.recurringtype,vtiger_activitygrouprelation.groupname from vtiger_activity inner join vtiger_crmentity on vtiger_activity.activityid = vtiger_crmentity.crmid inner join vtiger_recurringevents on vtiger_activity.activityid=vtiger_recurringevents.activityid left outer join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid left join vtiger_groups on vtiger_groups.groupname = vtiger_activitygrouprelation.groupname inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid";
+
+                $q.=" where vtiger_crmentity.deleted = 0 and vtiger_activity.activitytype in ('Call','Meeting') AND (recurringdate < '".$to_datetime->get_formatted_date()."' AND recurringdate >= '".$from_datetime->get_formatted_date(). "') ";
+
+		if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[16] == 3)
+		{
+			$sec_parameter=getListViewSecurityParameter('Calendar');
+			$q .= $sec_parameter;
+		}
+													
                 $q .= " ORDER by recurringid";
                 $r = $adb->query($q);
                 $n = $adb->getRowCount($r);

Modified: vtigercrm/trunk/modules/Calendar/CalendarCommon.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/CalendarCommon.php (original)
+++ vtigercrm/trunk/modules/Calendar/CalendarCommon.php Wed Sep 13 05:20:10 2006
@@ -9,14 +9,6 @@
 *
  ********************************************************************************/
 //Code Added by Minnie -Starts
-require_once('include/database/PearDatabase.php');
-
-global $mod_strings,$current_user;
-global $theme;
-$theme_path="themes/".$theme."/";
-$image_path=$theme_path."images/";
-require('user_privileges/sharing_privileges_'.$current_user->id.'.php');
-require('user_privileges/user_privileges_'.$current_user->id.'.php');
 /**
  * To get the lists of sharedids 
  * @param $id -- The user id :: Type integer
@@ -64,19 +56,35 @@
  */
 function getOtherUserName($id,$check)
 {
-	global $adb;
+	global $adb,$current_user;
+	require('user_privileges/user_privileges_'.$current_user->id.'.php');
+	require('user_privileges/sharing_privileges_'.$current_user->id.'.php');
+	$user_details=Array();
 	if($check)
+	{
 		$query="select * from vtiger_users where deleted=0 and status='Active' and id!=".$id;
+		$result = $adb->query($query);
+		$num_rows=$adb->num_rows($result);
+		for($i=0;$i<$num_rows;$i++)
+		{
+			$userid=$adb->query_result($result,$i,'id');
+			$username=$adb->query_result($result,$i,'user_name');
+			$user_details[$userid]=$username;
+		}
+
+	}
 	else
-		$query="select * from vtiger_users where deleted=0 and status='Active' and is_admin='off' and id!=".$id;
-	$result = $adb->query($query);
-	$num_rows=$adb->num_rows($result);
-	$user_details=Array();
-	for($i=0;$i<$num_rows;$i++)
-	{
-		$userid=$adb->query_result($result,$i,'id');
-		$username=$adb->query_result($result,$i,'user_name');
- 		$user_details[$userid]=$username;
+	{
+		if($is_admin==false && $profileGlobalPermission[2] == 1 && ($defaultOrgSharingPermission[getTabid('Calendar')] == 3 or $defaultOrgSharingPermission[getTabid('Calendar')] == 0))
+		{
+			$user_details = get_user_array(FALSE, "Active", $id, 'private');
+			unset($user_details[$id]);
+		}
+		else
+		{
+			$user_details = get_user_array(FALSE, "Active", $id);
+			unset($user_details[$id]);
+		}
 	}
 	return $user_details;
 }
@@ -200,7 +208,7 @@
 			$combo .= '<option value="'.$hrvalue.'" "'.$hrsel.'">'.$hrtext.'</option>';
 		}
 		$combo .= '</select>&nbsp;';
-		$combo .= '<select name="'.$bimode.'min" id="'.$bimode.'min" class=small value="'.$min.'">';
+		$combo .= '<select name="'.$bimode.'min" id="'.$bimode.'min" class=small>';
 		for($i=0;$i<12;$i++)
 		{
 			$minvalue = 5;
@@ -209,7 +217,7 @@
 			{
 				$value= '0'.$value;
 			}
-			else $value= $value;
+			else $value = $value;
 			if($min == $value)
 				$minsel = 'selected';
 			else
@@ -217,7 +225,7 @@
 				$combo .= '<option value="'.$value.'" "'.$minsel.'">'.$value.'</option>';
 		}
 		$combo .= '</select>&nbsp;';
-		$combo .= '<select name="'.$bimode.'fmt" id="'.$bimode.'fmt" value="'.$fmt.'" class=small>';
+		$combo .= '<select name="'.$bimode.'fmt" id="'.$bimode.'fmt" class=small>';
 		if($fmt == 'am')
 		{
 			$amselected = 'selected';
@@ -234,7 +242,7 @@
 		}
 		else
 		{
-			$combo .= '<select name="'.$bimode.'hr" id="'.$bimode.'hr" class=small value="'.$hour.'">';
+			$combo .= '<select name="'.$bimode.'hr" id="'.$bimode.'hr" class=small>';
 			for($i=0;$i<=23;$i++)
 			{
 				if($i <= 9 && strlen(trim($i)) < 2)
@@ -249,7 +257,7 @@
 				$combo .= '<option value="'.$hrvalue.'" "'.$hrsel.'">'.$hrvalue.'</option>';
 			}
 			$combo .= '</select>Hr&nbsp;';
-			$combo .= '<select name="'.$bimode.'min" id="'.$bimode.'min" class=small value="'.$min.'">';
+			$combo .= '<select name="'.$bimode.'min" id="'.$bimode.'min" class=small>';
 			for($i=0;$i<12;$i++)
 			{
 				$minvalue = 5;
@@ -265,7 +273,7 @@
 					$minsel = '';
 				$combo .= '<option value="'.$value.'" "'.$minsel.'">'.$value.'</option>';
 			}
-			$combo .= '</select>&nbsp;min<input type="hidden" name="'.$bimode.'fmt" id="'.$bimode.'fmt" value="'.$fmt.'">';
+			$combo .= '</select>&nbsp;min<input type="hidden" name="'.$bimode.'fmt" id="'.$bimode.'fmt">';
 		}
 		return $combo;
 }
@@ -300,11 +308,13 @@
 /*Fuction to get value for Assigned To field
  *returns values of Assigned To field in array format
 */
-function getAssignedTo()
+function getAssignedTo($tabid)
 {
 	global $current_user,$noof_group_rows,$adb;
 	$assigned_user_id = $current_user->id;
-	if($is_admin==false && $profileGlobalPermission[2] == 1 && ($defaultOrgSharingPermission[getTabid('Calendar')] == 3 or $defaultOrgSharingPermission[getTabid('Calendar')] == 0))
+	require('user_privileges/sharing_privileges_'.$current_user->id.'.php');
+	require('user_privileges/user_privileges_'.$current_user->id.'.php');
+	if($is_admin==false && $profileGlobalPermission[2] == 1 && ($defaultOrgSharingPermission[$tabid] == 3 or $defaultOrgSharingPermission[$tabid] == 0))
 	{
 		$result=get_current_user_access_groups('Calendar');
 	}
@@ -313,8 +323,8 @@
 		$result = get_group_options();
 	}
 	$nameArray = $adb->fetch_array($result);
-	global $current_user;
-	if($is_admin==false && $profileGlobalPermission[2] == 1 && ($defaultOrgSharingPermission[getTabid($module_name)] == 3 or $defaultOrgSharingPermission[getTabid($module_name)] == 0))
+	
+	if($is_admin==false && $profileGlobalPermission[2] == 1 && ($defaultOrgSharingPermission[$tabid] == 3 or $defaultOrgSharingPermission[$tabid] == 0))
 	{
 		$users_combo = get_select_options_array(get_user_array(FALSE, "Active", $assigned_user_id,'private'), $assigned_user_id);
 	}

Modified: vtigercrm/trunk/modules/Calendar/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/EditView.php (original)
+++ vtigercrm/trunk/modules/Calendar/EditView.php Wed Sep 13 05:20:10 2006
@@ -130,6 +130,7 @@
 $userDetails=getOtherUserName($current_user->id,true);
 //echo '<pre>';print_r($userDetails);echo '</pre>';
 $to_email = getUserEmailId('id',$current_user->id);
+$smarty->assign("CURRENTUSERID",$current_user->id);
 
 $disp_view = getView($focus->mode);
 if($disp_view == 'edit_view')

Modified: vtigercrm/trunk/modules/Calendar/addEventUI.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/addEventUI.php (original)
+++ vtigercrm/trunk/modules/Calendar/addEventUI.php Wed Sep 13 05:20:10 2006
@@ -24,7 +24,8 @@
  //echo '<pre>';print_r($userDetails);echo '</pre>';
  $to_email = getUserEmailId('id',$current_user->id);
  $date_format = parse_calendardate($app_strings['NTC_DATE_FORMAT']);
- $assignedto = getAssignedTo();
+ $taskassignedto = getAssignedTo(9);
+ $eventassignedto = getAssignedTo(16);
 $mysel= $_GET['view'];
 $calendar_arr = Array();
 $calendar_arr['IMAGE_PATH'] = $image_path;
@@ -79,6 +80,7 @@
 	$calendar_arr['calendar']->hour_format = 'am/pm';
 else
 	$calendar_arr['calendar']->hour_format = $current_user->hour_format;
+ 
 /** Function to construct HTML code for Assigned To field
  *  @param $assignedto  -- Assigned To values :: Type array
  *  @param $toggletype  -- String to different event and task  :: Type string
@@ -223,35 +225,57 @@
 			</tr>
 			<tr>
 				<td nowrap align="right"><b><?php echo $mod_strings['LBL_EVENTNAME']?></b></td>
-				<td align="left"><input name="subject" type="text" class="textbox" value="" style="width:50%">&nbsp;&nbsp;&nbsp; <input name="visibility" value="Public" type="checkbox"><?php echo $mod_strings['LBL_PUBLIC']; ?></td>
+				<td align="left"><input name="subject" type="text" class="textbox" value="" style="width:50%">&nbsp;&nbsp;&nbsp; 
+			<?php if(getFieldVisibilityPermission('Events',$current_user->id,'visibility') == '0') { ?>	
+			<input name="visibility" value="Public" type="checkbox"><?php echo $mod_strings['LBL_PUBLIC']; ?>
+			<?php } ?>	
+			</td>
 			</tr>
+			<?php if(getFieldVisibilityPermission('Events',$current_user->id,'description') == '0') { ?>
 			<tr>
 				<td valign="top" align="right"><b><?php echo $mod_strings['Description']?></b></td>
 				<td align="left"><textarea style = "width:100%; height : 60px;" name="description"></textarea></td>
 			</tr>
+			<?php } ?>
+			<?php if(getFieldVisibilityPermission('Events',$current_user->id,'location') == '0') { ?>
 			<tr>
 				<td nowrap align="right"><b><?php echo $mod_strings['Location']?></b></td>
 				<td align="left"><input name="location" type="text" class="textbox" value="" style="width:50%"></td>
 			</tr>
+		        <?php } ?>
 			<tr>
 				<td colspan=2 width=80% align="center">
 					<table border=0 cellspacing=0 cellpadding=3 width=80%>
 					<tr>
+						<?php if(getFieldVisibilityPermission('Events',$current_user->id,'eventstatus') == '0')	{ ?>
 						<td ><b><?php echo $mod_strings['Status'] ; ?></b></td>
+						<?php } ?>
+						<?php if(getFieldVisibilityPermission('Events',$current_user->id,'assigned_user_id') == '0') { ?>
 						<td ><b><?php echo $mod_strings['Assigned To']; ?></b></td>
+						<?php } ?>
 					</tr>
 					<tr>
+						<?php if(getFieldVisibilityPermission('Events',$current_user->id,'eventstatus') == '0') { ?>
 						<td valign=top><?php echo getActFieldCombo('eventstatus','vtiger_eventstatus'); ?></td>
+						<?php } ?>	
 						<td valign=top rowspan=2>
-							<?php echo getAssignedToHTML($assignedto,'event'); ?>
-							<br><input type="checkbox" name="sendnotification" >&nbsp;<?php echo $mod_strings['LBL_SENDNOTIFICATION'] ?>
+							<?php if(getFieldVisibilityPermission('Events',$current_user->id,'assigned_user_id') == '0') { ?>
+							<?php echo getAssignedToHTML($eventassignedto,'event'); ?>
+							<br><?php }else{
+								?><input name="assigned_user_id" value="<?php echo $current_user->id ?>" type="hidden">
+							<?php } ?>
+								<?php if(getFieldVisibilityPermission('Events',$current_user->id,'sendnotification') == '0') { ?>
+							<input type="checkbox" name="sendnotification" >&nbsp;<?php echo $mod_strings['LBL_SENDNOTIFICATION'] ?>
+							<?php } ?>
 						</td>
 					</tr>
+					<?php if(getFieldVisibilityPermission('Events',$current_user->id,'taskpriority') == '0') { ?>
 					<tr>
 						<td valign=top><b><?php echo $mod_strings['Priority'] ; ?></b>
 							<br><?php echo getActFieldCombo('taskpriority','vtiger_taskpriority'); ?>
 						</td>
 					</tr>
+				        <?php } ?>
 					</table>
 				</td>
 			</tr>		
@@ -269,7 +293,7 @@
 						<?php echo  getTimeCombo($calendar_arr['calendar']->hour_format,'start');?>
 					</td></tr>
                                         <tr><td>
-					<input type="text" name="date_start" id="jscal_field_date_start" class="textbox" style="width:90px" value="<?php echo $calendar_arr['calendar']->date_time->get_formatted_date() ?>"></td><td width=50%><img border=0 src="<?echo $image_path?>btnL3Calendar.gif" alt="Set date.." title="Set date.." id="jscal_trigger_date_start">
+					<input type="text" name="date_start" id="jscal_field_date_start" class="textbox" style="width:90px" value="<?php echo getDisplayDate($calendar_arr['calendar']->date_time->get_formatted_date()) ?>"></td><td width=50%><img border=0 src="<?echo $image_path?>btnL3Calendar.gif" alt="Set date.." title="Set date.." id="jscal_trigger_date_start">
 						<script type="text/javascript">
                 					Calendar.setup ({
 								inputField : "jscal_field_date_start", ifFormat : "<?php  echo $date_format; ?>", showsTime : false, button : "jscal_trigger_date_start", singleClick : true, step : 1
@@ -285,7 +309,7 @@
                                                 <?php echo getTimeCombo($calendar_arr['calendar']->hour_format,'end');?>
 					</td></tr>
 				        <tr><td>
-					<input type="text" name="due_date" id="jscal_field_due_date" class="textbox" style="width:90px" value="<?php echo $calendar_arr['calendar']->date_time->get_formatted_date() ?>"></td><td width=100%><img border=0 src="<?php echo $image_path?>btnL3Calendar.gif" alt="Set date.." title="Set date.." id="jscal_trigger_due_date">
+					<input type="text" name="due_date" id="jscal_field_due_date" class="textbox" style="width:90px" value="<?php echo getDisplayDate($calendar_arr['calendar']->date_time->get_formatted_date()) ?>"></td><td width=100%><img border=0 src="<?php echo $image_path?>btnL3Calendar.gif" alt="Set date.." title="Set date.." id="jscal_trigger_due_date">
 					<script type="text/javascript">
                                                         Calendar.setup ({
                                                                 inputField : "jscal_field_due_date", ifFormat : "<?php echo $date_format; ?>", showsTime : false, button : "jscal_trigger_due_date", singleClick : true, step : 1
@@ -377,6 +401,7 @@
 			
 			<!-- Reminder UI -->
 				<DIV id="addEventAlarmUI" style="display:none;width:100%">
+				<?php if(getFieldVisibilityPermission('Events',$current_user->id,'reminder_time') == '0') { ?>
 				<table bgcolor="#FFFFFF">
 					<tr><td><?php echo $mod_strings['LBL_SENDREMINDER']?></td>
 						<td>
@@ -435,14 +460,16 @@
 					<?php echo $mod_strings['LBL_SDRMD'] ?> :
 					</td>
 					<td >
-					<input type=text name="toemail" class=textbox style="width:90%" value="<?php echo $to_email ?>">
+					<input type=text name="toemail" readonly="readonly" class=textbox style="width:90%" value="<?php echo $to_email ?>">
 					</td>
 				</tr>
 				</table>
+				<?php } ?>
 				</DIV>
 				</DIV>
 			<!-- Repeat UI -->
 				<div id="addEventRepeatUI" style="display:none;width:100%">
+			<?php if(getFieldVisibilityPermission('Events',$current_user->id,'recurringtype') == '0') {  ?>
 				<table border=0 cellspacing=0 cellpadding=2  width=100% bgcolor="#FFFFFF">
 				<tr>
 					<td nowrap align=right width=20% valign=top>
@@ -537,9 +564,11 @@
 					</td>
 				</tr>
 				</table>
+				<?php } ?>
 				</div>
 				<div id="addEventRelatedtoUI" style="display:none;width:100%">
 					<table width="100%" cellpadding="5" cellspacing="0" border="0" bgcolor="#FFFFFF">
+				<?php if(getFieldVisibilityPermission('Events',$current_user->id,'parent_id') == '0') {  ?>
 						<tr>
 							<td><b><?php echo $mod_strings['LBL_RELATEDTO']?></b></td>
 							<td>
@@ -558,6 +587,7 @@
 								</div>
 							</td>
 						</tr>
+					<?php } ?>
 						<tr>
 						<td><b><?php echo $app_strings['Contacts'] ?></b></td>
 							<td colspan="2">
@@ -649,22 +679,50 @@
                         <td width="20%" align="right"><b><?php echo $mod_strings['LBL_TODONAME'] ?></b></td>
                         <td width="80%" align="left"><input name="task_subject" type="text" value="" class="textbox" style="width:70%"></td>
                 </tr>
+		<?php if(getFieldVisibilityPermission('Calendar',$current_user->id,'description') == '0') { ?>
 		<tr>
 			<td align="right"><b><?php echo $mod_strings['Description'] ?></b></td>
 			<td align="left"><textarea style="width: 100%; height: 60px;" name="task_description"></textarea></td>
 		</tr>
+		<?php } ?>
 		<tr>
 			<td colspan="2" align="center" width="80%">
 				<table border="0" cellpadding="3" cellspacing="0" width="80%">
 					<tr>
-						<td align="left"><b><?php echo $mod_strings['Status']; ?></b></td>
-						<td align="left"><b><?php echo $mod_strings['Priority']; ?></b></td>
-						<td align="left"><b><?php echo $mod_strings['Assigned To']; ?></b></td>
+						<td align="left">
+							<?php if(getFieldVisibilityPermission('Calendar',$current_user->id,'taskstatus') == '0') { ?>
+							<b><?php echo $mod_strings['Status']; ?></b>
+							<?php } ?>
+						</td>
+						<td align="left">
+							<?php if(getFieldVisibilityPermission('Calendar',$current_user->id,'taskpriority') == '0') { ?>
+							<b><?php echo $mod_strings['Priority']; ?></b>
+							<?php } ?>
+						</td>
+						<td align="left">
+							<?php if(getFieldVisibilityPermission('Calendar',$current_user->id,'assigned_user_id') == '0') { ?>
+							<b><?php echo $mod_strings['Assigned To']; ?></b>
+							<?php } ?>
+						</td>
 					</tr>
 					<tr>
-						<td align="left" valign="top"><?php echo getActFieldCombo('taskstatus','vtiger_taskstatus'); ?></td>
-						<td align="left" valign="top"><?php echo getActFieldCombo('taskpriority','vtiger_taskpriority'); ?></td>
-						<td align="left" valign="top"><?php echo getAssignedToHTML($assignedto,'task'); ?></td>
+						<td align="left" valign="top">
+							<?php if(getFieldVisibilityPermission('Calendar',$current_user->id,'taskstatus') == '0') { ?>
+							<?php echo getActFieldCombo('taskstatus','vtiger_taskstatus'); ?>
+							<?php } ?>	
+						</td>
+						<td align="left" valign="top">
+							<?php if(getFieldVisibilityPermission('Calendar',$current_user->id,'taskpriority') == '0') { ?>
+							<?php echo getActFieldCombo('taskpriority','vtiger_taskpriority'); ?>
+							<?php } ?>
+						</td>
+						<td align="left" valign="top">
+							<?php if(getFieldVisibilityPermission('Calendar',$current_user->id,'assigned_user_id') == '0') { ?>
+							<?php echo getAssignedToHTML($taskassignedto,'task'); ?>
+							<?php }else{
+						       	?><input name="task_assigned_user_id" value="<?php echo $current_user->id ?>" type="hidden">
+							<?php } ?>
+						</td>
 					</tr>
 				</table>
 			</td>
@@ -679,10 +737,10 @@
 						<tr><td colspan=3 ><b><?php echo $mod_strings['LBL_TODODATETIME'] ?></b></td></tr>
 						<tr><td colspan=3><?php echo getTimeCombo($calendar_arr['calendar']->hour_format,'start'); ?></td></tr>
 						<tr><td>
-							<input type="text" name="task_date_start" id="task_date_start" class="textbox" style="width:90px" value="<?php echo $calendar_arr['calendar']->date_time->get_formatted_date() ?>" ></td><td width=100%><img border=0 src="<?php echo $image_path ?>btnL3Calendar.gif" alt="Set date.." title="Set date.." id="jscal_trigger_date_start">
+							<input type="text" name="task_date_start" id="task_date_start" class="textbox" style="width:90px" value="<?php echo getDisplayDate($calendar_arr['calendar']->date_time->get_formatted_date()) ?>" ></td><td width=100%><img border=0 src="<?php echo $image_path ?>btnL3Calendar.gif" alt="Set date.." title="Set date.." id="jscal_trigger_task_date_start">
 						<script type="text/javascript">
 						Calendar.setup ({
-							inputField : "task_date_start", ifFormat : "<?php  echo $date_format; ?>", showsTime : false, button : "jscal_trigger_date_start", singleClick : true, step : 1
+							inputField : "task_date_start", ifFormat : "<?php  echo $date_format; ?>", showsTime : false, button : "jscal_trigger_task_date_start", singleClick : true, step : 1
 						})
 						</script>
 						</td></tr>
@@ -691,10 +749,10 @@
 						<table border="0" cellpadding="2" cellspacing="0" width="95%" align=center>
 							<tr><td colspan=3><b><?php echo $mod_strings['Due Date'] ?></b></td></tr>
 							<tr><td>
-								<input type="text" name="task_due_date" id="task_due_date" class="textbox" style="width:90px" value="<?php echo $calendar_arr['calendar']->date_time->get_formatted_date() ?>" ></td><td width=100%><img border=0 src="<?php echo $image_path ?>btnL3Calendar.gif" alt="Set date.." title="Set date.." id="jscal_trigger_due_date">
+								<input type="text" name="task_due_date" id="task_due_date" class="textbox" style="width:90px" value="<?php echo getDisplayDate($calendar_arr['calendar']->date_time->get_formatted_date()) ?>" ></td><td width=100%><img border=0 src="<?php echo $image_path ?>btnL3Calendar.gif" alt="Set date.." title="Set date.." id="jscal_trigger_task_due_date">
 						<script type="text/javascript">
 						Calendar.setup ({
-							inputField : "task_due_date", ifFormat : "<?php  echo $date_format; ?>", showsTime : false, button : "jscal_trigger_due_date", singleClick : true, step : 1
+							inputField : "task_due_date", ifFormat : "<?php  echo $date_format; ?>", showsTime : false, button : "jscal_trigger_task_due_date", singleClick : true, step : 1
 						})
 						</script>
 						</td></tr>
@@ -710,9 +768,9 @@
 				<table border=0 cellspacing=0 cellpadding=3 width=100%>
 					<tr>
 						<td class="dvtTabCache" style="width:10px" nowrap>&nbsp;</td>
-						<td id="cellTabNotification" class="dvtSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabNotification','on');switchClass('cellTabtodoRelatedto','off');gshow('addTaskAlarmUI','todo',document.createTodo.task_date_start.value,'',document.createTodo.starthr.value,document.createTodo.startmin.value,document.createTodo.startfmt.value,'','','',document.createTodo.viewOption.value,document.createTodo.subtab.value);ghide('addTaskRelatedtoUI');"><?php echo $mod_strings['LBL_NOTIFICATION']?></a></td>
+						<td id="cellTabNotification" class="dvtSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabNotification','on');switchClass('cellTabtodoRelatedto','off');gshow('addTaskAlarmUI','todo',document.createTodo.task_date_start.value,document.createTodo.task_due_date.value,document.createTodo.starthr.value,document.createTodo.startmin.value,document.createTodo.startfmt.value,'','','',document.createTodo.viewOption.value,document.createTodo.subtab.value);ghide('addTaskRelatedtoUI');"><?php echo $mod_strings['LBL_NOTIFICATION']?></a></td>
 						<td class="dvtTabCache" style="width: 10px;" nowrap="nowrap">
-						<td id="cellTabtodoRelatedto" class="dvtUnSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabtodoRelatedto','on'); switchClass('cellTabNotification','off');gshow('addTaskRelatedtoUI','todo',document.createTodo.task_date_start.value,'',document.createTodo.starthr.value,document.createTodo.startmin.value,document.createTodo.startfmt.value,'','','',document.createTodo.viewOption.value,document.createTodo.subtab.value);ghide('addTaskAlarmUI');"><?php echo $mod_strings['LBL_RELATEDTO']?></a></td>					
+						<td id="cellTabtodoRelatedto" class="dvtUnSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabtodoRelatedto','on'); switchClass('cellTabNotification','off');gshow('addTaskRelatedtoUI','todo',document.createTodo.task_date_start.value,document.createTodo.task_due_date.value,document.createTodo.starthr.value,document.createTodo.startmin.value,document.createTodo.startfmt.value,'','','',document.createTodo.viewOption.value,document.createTodo.subtab.value);ghide('addTaskAlarmUI');"><?php echo $mod_strings['LBL_RELATEDTO']?></a></td>					
 						<td class="dvtTabCache" style="width: 100%;">&nbsp;</td>
 					</tr>
 				</table>
@@ -722,14 +780,17 @@
 			<td width=100% valign=top align=left class="dvtContentSpace" style="padding:10px;height:120px">
 		<!-- Reminder UI -->
 		<DIV id="addTaskAlarmUI" style="display:block;width:100%">
+		<?php if(getFieldVisibilityPermission('Calendar',$current_user->id,'sendnotification') == '0') { ?>
                 <table>
 			<tr><td><?php echo $mod_strings['LBL_SENDNOTIFICATION'] ?></td><td>
 				<input name="task_sendnotification" type="checkbox">
 			</td></tr>
                 </table>
+		<?php } ?>
 		</DIV>
 		<div id="addTaskRelatedtoUI" style="display:none;width:100%">
 			<table width="100%" cellpadding="5" cellspacing="0" border="0">
+			<?php if(getFieldVisibilityPermission('Calendar',$current_user->id,'parent_id') == '0') { ?>
 			<tr>
 				<td><b><?php echo $mod_strings['LBL_RELATEDTO']?></b></td>
 				<td>
@@ -753,6 +814,8 @@
 					</div>
 				</td>
 			</tr>
+			<?php } ?>
+			<?php if(getFieldVisibilityPermission('Calendar',$current_user->id,'contact_id') == '0') { ?>	
 			<tr>
 			<td><b><?php echo $mod_strings['LBL_CONTACT_NAME'] ?></b></td>
 			<td colspan="2">
@@ -760,6 +823,7 @@
 				<input type="button" onclick="return window.open('index.php?module=Contacts&action=Popup&html=Popup_picker&popuptype=specific&form=EditView','test','width=640,height=602,resizable=0,scrollbars=0');" class="crmButton small edit" name="selectcnt" value="<?php echo $mod_strings['LBL_SELECT_CONTACT'] ; ?>">
 			</td>
 			  </tr>
+			<?php } ?>
 			                  </table>
 					                  </div>
 		</td></tr>

Modified: vtigercrm/trunk/modules/Calendar/calendarLayout.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/calendarLayout.php (original)
+++ vtigercrm/trunk/modules/Calendar/calendarLayout.php Wed Sep 13 05:20:10 2006
@@ -1308,10 +1308,10 @@
 	$Entries = Array();
 	$category = getParentTab();
 	global $adb,$current_user,$mod_strings,$cal_log;
+	require('user_privileges/user_privileges_'.$current_user->id.'.php');
+        require('user_privileges/sharing_privileges_'.$current_user->id.'.php');
 	$cal_log->debug("Entering getEventList() method...");
 	$shared_ids = getSharedCalendarId($current_user->id);
-	if(empty($shared_ids))
-		$shared_ids = $current_user->id;
 	$query = "SELECT vtiger_groups.groupname, vtiger_users.user_name,
        		vtiger_activity.* FROM vtiger_activity
 		INNER JOIN vtiger_crmentity
@@ -1330,26 +1330,30 @@
 				OR vtiger_recurringevents.recurringdate BETWEEN '".$start_date."' AND '".$end_date."') ";
 	if($info != '')
 	{
-		$pending_query = $query." AND (vtiger_activity.eventstatus = 'Planned')
-			AND vtiger_crmentity.smownerid = ".$current_user->id." 
-		GROUP BY vtiger_activity.activityid 
-		ORDER BY vtiger_activity.date_start,vtiger_activity.time_start ASC";
+		$com_q = " AND vtiger_crmentity.smownerid = ".$current_user->id."
+			GROUP BY vtiger_activity.activityid";
+		$pending_query = $query." AND (vtiger_activity.eventstatus = 'Planned')".$com_q;
+		$total_q =  $query."".$com_q;
+		$total_res = $adb->query($total_q);
+		$total = $adb->num_rows($total_res);
 		$res = $adb->query($pending_query);
 		$pending_rows = $adb->num_rows($res);
-	}
-	if(!is_admin($current_user))
-		$query .= " AND vtiger_crmentity.smownerid in (".$shared_ids.") ";
+		$cal_log->debug("Exiting getEventList() method...");
+		return Array('totalevent'=>$total,'pendingevent'=>$pending_rows);
+	}
+	if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[16] == 3)
+	{
+		$sec_parameter=getListViewSecurityParameter('Calendar');
+		$query .= $sec_parameter;
+	}
+	/*if(!is_admin($current_user))
+		$query .= " AND vtiger_crmentity.smownerid in (".$shared_ids.") ";*/
 		
 	$query .= "GROUP BY vtiger_activity.activityid ORDER BY vtiger_activity.date_start,vtiger_activity.time_start ASC";
  	if( $adb->dbType == "pgsql")
  	    $query = fixPostgresQuery( $query, $log, 0);
 	$result = $adb->query($query);
 	$rows = $adb->num_rows($result);
-	if($info != '')
-        {
-		$cal_log->debug("Exiting getEventList() method...");
-		return Array('totalevent'=>$rows,'pendingevent'=>$pending_rows);
-        }
 	for($i=0;$i<$rows;$i++)
 	{
 		$element = Array();
@@ -1429,8 +1433,8 @@
 	global $adb,$current_user,$mod_strings,$cal_log;
 	$cal_log->debug("Entering getTodoList() method...");
 	$shared_ids = getSharedCalendarId($current_user->id);
-	if(empty($shared_ids))
-		$shared_ids = $current_user->id;
+	require('user_privileges/user_privileges_'.$current_user->id.'.php');
+	require('user_privileges/sharing_privileges_'.$current_user->id.'.php');
         $query = "SELECT vtiger_groups.groupname, vtiger_users.user_name, vtiger_cntactivityrel.contactid, 
 		vtiger_activity.* FROM vtiger_activity
                 INNER JOIN vtiger_crmentity
@@ -1448,28 +1452,36 @@
                         AND (vtiger_activity.date_start BETWEEN '".$start_date."' AND '".$end_date."')";
         if($info != '')
         {
-                $pending_query = $query." AND (vtiger_activity.status != 'Completed')
-                        AND vtiger_crmentity.smownerid = ".$current_user->id."
-                ORDER BY vtiger_activity.date_start,vtiger_activity.time_start ASC";
+		$com_q = " AND vtiger_crmentity.smownerid = ".$current_user->id;
+                $pending_query = $query." AND (vtiger_activity.status != 'Completed')".$com_q;
+		$total_q =  $query."".$com_q;
 		if( $adb->dbType == "pgsql")
+		{
  		    $pending_query = fixPostgresQuery( $pending_query, $log, 0);
+		    $total_q = fixPostgresQuery( $total_q, $log, 0);
+		}
+		$total_res = $adb->query($total_q);
+		$total = $adb->num_rows($total_res);
                 $res = $adb->query($pending_query);
                 $pending_rows = $adb->num_rows($res);
+		$cal_log->debug("Exiting getTodoList() method...");
+		return Array('totaltodo'=>$total,'pendingtodo'=>$pending_rows);
         }
 	
-	if(!is_admin($current_user))
-                $query .= " AND vtiger_crmentity.smownerid in (".$shared_ids.")";
+	if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[9] == 3)
+	{
+		$sec_parameter=getListViewSecurityParameter('Calendar');
+		$query .= $sec_parameter;
+	}
+								
+	/*if(!is_admin($current_user))
+                $query .= " AND vtiger_crmentity.smownerid in (".$shared_ids.")";*/
         $query .= " ORDER BY vtiger_activity.date_start,vtiger_activity.time_start ASC";
 	if( $adb->dbType == "pgsql")
  	    $query = fixPostgresQuery( $query, $log, 0);
 
         $result = $adb->query($query);
         $rows = $adb->num_rows($result);
-        if($info != '')
-        {
-		$cal_log->debug("Exiting getTodoList() method...");
-                return Array('totaltodo'=>$rows,'pendingtodo'=>$pending_rows);
-        }
 	for($i=0;$i<$rows;$i++)
         {
                 $element = Array();

Modified: vtigercrm/trunk/modules/Calendar/script.js
==============================================================================
--- vtigercrm/trunk/modules/Calendar/script.js (original)
+++ vtigercrm/trunk/modules/Calendar/script.js Wed Sep 13 05:20:10 2006
@@ -94,8 +94,6 @@
 {
 	var y=document.getElementById(argg1).style;
 	
-	if (y.display=="none") 
-	{
 		if(type == 'call' || type == 'meeting')
 		{
 			if(type == 'call')
@@ -117,12 +115,15 @@
 		if(type == 'todo')
 		{
 			document.createTodo.task_date_start.value = startdate;
+			document.createTodo.task_due_date.value = enddate;
 			document.createTodo.starthr.value = starthr;
                         document.createTodo.startmin.value = startmin;
                         document.createTodo.startfmt.value = startfmt;
 			document.createTodo.viewOption.value = viewOption;
                         document.createTodo.subtab.value = subtab;
 		}
+	if (y.display=="none")
+        {
 		y.display="block";
 	}
 }
@@ -302,10 +303,6 @@
         }
         else
         {
-		if(document.EditView.recurringcheck.checked == false)
-		{
-			document.EditView.recurringtype.value = '--None--';
-		}
 		if(document.EditView.record.value != '')
                 {
                         document.EditView.mode.value = 'edit';
@@ -418,6 +415,10 @@
 			return false;
 		document.EditView.time_start.value = starthour+':'+startmin;
 		document.EditView.time_end.value = endhour+':'+endmin;
+		if(document.EditView.recurringcheck.checked == false)
+                {
+                        document.EditView.recurringtype.value = '--None--';
+                }
                 return true;
         }
 }



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 04:25:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 11:25:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9486 -
	/vtigercrm/trunk/modules/Accounts/Account.js
Message-ID: <20060913112559.248ED6D3033@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 05:25:48 2006
New Revision: 9486

Log:
Google Map issues fixed on change of label --By Minnie

Modified:
    vtigercrm/trunk/modules/Accounts/Account.js

Modified: vtigercrm/trunk/modules/Accounts/Account.js
==============================================================================
--- vtigercrm/trunk/modules/Accounts/Account.js (original)
+++ vtigercrm/trunk/modules/Accounts/Account.js Wed Sep 13 05:25:48 2006
@@ -85,21 +85,33 @@
         var mapParameter = '';
         if (addressType == 'Main')
         {
-                mapParameter = document.getElementById('dtlview_Billing Address').innerHTML+' '
-                           +document.getElementById("dtlview_Billing Po Box").innerHTML+' '
-                           +document.getElementById("dtlview_Billing City").innerHTML+' '
-                           +document.getElementById("dtlview_Billing State").innerHTML+' '
-                           +document.getElementById("dtlview_Billing Country").innerHTML+' '
-                           +document.getElementById("dtlview_Billing Code").innerHTML
+		if(fieldname.indexOf('bill_street') > -1)
+                        mapParameter = document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('bill_street')]).innerHTML+' ';
+                if(fieldname.indexOf('bill_pobox') > -1)
+                        mapParameter = mapParameter + document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('bill_pobox')]).innerHTML+' ';
+                if(fieldname.indexOf('bill_city') > -1)
+                        mapParameter = mapParameter + document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('bill_city')]).innerHTML+' ';
+		if(fieldname.indexOf('bill_state') > -1)
+                        mapParameter = mapParameter + document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('bill_state')]).innerHTML+' ';
+                if(fieldname.indexOf('bill_country') > -1)
+                        mapParameter = mapParameter + document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('bill_country')]).innerHTML+' ';
+                if(fieldname.indexOf('bill_code') > -1)
+                        mapParameter = mapParameter + document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('bill_code')]).innerHTML+' ';
         }
         else if (addressType == 'Other')
         {
-                mapParameter = document.getElementById("dtlview_Shipping Address").innerHTML+' '
-                           +document.getElementById("dtlview_Shipping Po Box").innerHTML+' '
-                           +document.getElementById("dtlview_Shipping City").innerHTML+' '
-                           +document.getElementById("dtlview_Shipping State").innerHTML+' '
-                           +document.getElementById("dtlview_Shipping Country").innerHTML+' '
-                           +document.getElementById("dtlview_Shipping Code").innerHTML
+		if(fieldname.indexOf('ship_street') > -1)
+                        mapParameter = document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('ship_street')]).innerHTML+' ';
+                if(fieldname.indexOf('ship_pobox') > -1)
+                        mapParameter = mapParameter + document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('ship_pobox')]).innerHTML+' ';
+                if(fieldname.indexOf('ship_city') > -1)
+                        mapParameter = mapParameter + document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('ship_city')]).innerHTML+' ';
+                if(fieldname.indexOf('ship_state') > -1)
+                        mapParameter = mapParameter + document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('ship_state')]).innerHTML+' ';
+		if(fieldname.indexOf('ship_country') > -1)
+                        mapParameter = mapParameter + document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('ship_country')]).innerHTML+' ';
+                if(fieldname.indexOf('bill_code') > -1)                                                                                            mapParameter = mapParameter + document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('ship_code')]).innerHTML+' ';
+
         }
 	 window.open('http://maps.google.com/maps?q='+mapParameter,'goolemap','height=450,width=700,resizable=no,titlebar,location,top=200,left=250');
 }



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 04:27:58 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 11:27:58 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9487 -
	/vtigercrm/trunk/modules/Contacts/Contact.js
Message-ID: <20060913112758.21FE26D302A@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 05:27:41 2006
New Revision: 9487

Log:
Google Map issues fixed on change of label --By Minnie

Modified:
    vtigercrm/trunk/modules/Contacts/Contact.js

Modified: vtigercrm/trunk/modules/Contacts/Contact.js
==============================================================================
--- vtigercrm/trunk/modules/Contacts/Contact.js (original)
+++ vtigercrm/trunk/modules/Contacts/Contact.js Wed Sep 13 05:27:41 2006
@@ -105,21 +105,31 @@
         var mapParameter = '';
         if (addressType == 'Main')
         {
-                mapParameter = document.getElementById("dtlview_Mailing Street").innerHTML+' '
-                           +document.getElementById("dtlview_Mailing Po Box").innerHTML+' '
-                           +document.getElementById("dtlview_Mailing City").innerHTML+' '
-                           +document.getElementById("dtlview_Mailing State").innerHTML+' '
-                           +document.getElementById("dtlview_Mailing Country").innerHTML+' '
-                           +document.getElementById("dtlview_Mailing Zip").innerHTML
+		if(fieldname.indexOf('mailingstreet') > -1)
+			mapParameter = document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('mailingstreet')]).innerHTML+' ';
+		if(fieldname.indexOf('mailingpobox') > -1)
+			mapParameter = mapParameter + document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('mailingpobox')]).innerHTML+' ';
+		if(fieldname.indexOf('mailingcity') > -1)
+			mapParameter = mapParameter + document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('mailingcity')]).innerHTML+' ';
+		if(fieldname.indexOf('mailingstate') > -1)
+                        mapParameter = mapParameter + document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('mailingstate')]).innerHTML+' ';
+		if(fieldname.indexOf('mailingcountry') > -1)
+			mapParameter = mapParameter + document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('mailingcountry')]).innerHTML+' ';
+		if(fieldname.indexOf('mailingzip') > -1)
+			mapParameter = mapParameter + document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('mailingzip')]).innerHTML;
         }
         else if (addressType == 'Other')
         {
-                mapParameter = document.getElementById("dtlview_Other Street").innerHTML+' '
-                           +document.getElementById("dtlview_Other Po Box").innerHTML+' '
-                           +document.getElementById("dtlview_Other City").innerHTML+' '
-                           +document.getElementById("dtlview_Other State").innerHTML+' '
-                           +document.getElementById("dtlview_Other Country").innerHTML+' '
-                           +document.getElementById("dtlview_Other Zip").innerHTML
+		if(fieldname.indexOf('otherstreet') > -1)
+			mapParameter = document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('otherstreet')]).innerHTML+' ';
+		if(fieldname.indexOf('otherpobox') > -1)
+			mapParameter = mapParameter + document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('otherpobox')]).innerHTML+' ';
+		if(fieldname.indexOf('otherstate') > -1)
+                        mapParameter = mapParameter + document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('otherstate')]).innerHTML+' ';
+                if(fieldname.indexOf('othercountry') > -1)
+			mapParameter = mapParameter + document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('othercountry')]).innerHTML+' ';
+                if(fieldname.indexOf('otherzip') > -1)
+                        mapParameter = mapParameter + document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('otherzip')]).innerHTML;
         }
          window.open('http://maps.google.com/maps?q='+mapParameter,'goolemap','height=450,width=700,resizable=no,titlebar,location,top=200,left=250');
 }



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 04:30:00 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 11:30:00 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9488 -
	/vtigercrm/trunk/modules/Leads/Lead.js
Message-ID: <20060913113000.F1CCD6D302A@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 05:29:38 2006
New Revision: 9488

Log:
Google Map issues fixed on change of label --By Minnie

Modified:
    vtigercrm/trunk/modules/Leads/Lead.js

Modified: vtigercrm/trunk/modules/Leads/Lead.js
==============================================================================
--- vtigercrm/trunk/modules/Leads/Lead.js (original)
+++ vtigercrm/trunk/modules/Leads/Lead.js Wed Sep 13 05:29:38 2006
@@ -98,12 +98,18 @@
         var mapParameter = '';
         if (addressType == 'Main')
         {
-                mapParameter = document.getElementById("dtlview_Street").innerHTML+' '
-                           +document.getElementById("dtlview_Po Box").innerHTML+' '
-                           +document.getElementById("dtlview_City").innerHTML+' '
-                           +document.getElementById("dtlview_State").innerHTML+' '
-                           +document.getElementById("dtlview_Country").innerHTML+' '
-                           +document.getElementById("dtlview_Postal Code").innerHTML
+		if(fieldname.indexOf('lane') > -1)
+                        mapParameter = document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('lane')]).innerHTML+' ';
+		if(fieldname.indexOf('pobox') > -1)
+			mapParameter = mapParameter + document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('pobox')]).innerHTML+' ';
+		if(fieldname.indexOf('city') > -1)
+			mapParameter = mapParameter + document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('city')]).innerHTML+' ';
+		if(fieldname.indexOf('state') > -1)
+			mapParameter = mapParameter + document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('state')]).innerHTML+' ';
+		if(fieldname.indexOf('country') > -1)
+			mapParameter = mapParameter + document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('country')]).innerHTML+' ';
+		if(fieldname.indexOf('code') > -1)
+                        mapParameter = mapParameter + document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('code')]).innerHTML+' ';
         }
         window.open('http://maps.google.com/maps?q='+mapParameter,'goolemap','height=450,width=700,resizable=no,titlebar,location,top=200,left=250');
 }



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 04:34:23 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 11:34:23 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9489 - in
 /vtigercrm/trunk/Smarty/templates: ActivityDetailView.tpl
 ActivityEditView.tpl
Message-ID: <20060913113423.C4BD06D3041@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 05:34:08 2006
New Revision: 9489

Log:
Security Support Done- Field Level --By Minnie

Modified:
    vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl
    vtigercrm/trunk/Smarty/templates/ActivityEditView.tpl

Modified: vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl Wed Sep 13 05:34:08 2006
@@ -113,36 +113,50 @@
 							 <!-- display of fields starts -->
 						     <table border=0 cellspacing=0 cellpadding=5 width=100% >
                						 <tr>
+								{if $LABEL.activitytype neq ''}
 								<td class="cellLabel" width="20%" align="right"><b>{$MOD.LBL_EVENTTYPE}</b></td>
 								<td class="cellInfo" width="30%"align="left">{$ACTIVITYDATA.activitytype}</td>
+								{/if}
+								{if $LABEL.visibility neq ''}
 								<td class="cellLabel" width="20%" align="right"><b>{$LABEL.visibility}</b></td>
                                                                 <td class="cellInfo" width="30%" align="left" >{$ACTIVITYDATA.visibility}</td>
+								{/if}
 							 </tr>
 							 <tr>
                         					<td class="cellLabel" align="right"><b>{$MOD.LBL_EVENTNAME}</b></td>
 					                        <td class="cellInfo" colspan=3 align="left" >{$ACTIVITYDATA.subject}</td>
              						 </tr>
+							 {if $LABEL.description neq ''}
 							 <tr>
 								<td class="cellLabel" align="right" nowrap valign="top"><b>{$LABEL.description}</b></td>
 								<td class="cellInfo" valign="top" align="left" colspan="3" height="60px">{$ACTIVITYDATA.description}</td>
 							 </tr>
+							{/if}
 							 <tr>
+								{if $LABEL.eventstatus neq ''}
 								<td class="cellLabel" align="right" nowrap valign="top"><b>{$LABEL.eventstatus}</b></td>
 								<td class="cellInfo" align="left" nowrap valign="top">{$ACTIVITYDATA.eventstatus}</td>
+								{/if}
+								{if $LABEL.assigned_user_id neq ''}
 								<td class="cellLabel" align="right" nowrap valign="top"><b>{$LABEL.assigned_user_id}</b></td>
 								<td class="cellInfo" align="left" nowrap valign="top">{$ACTIVITYDATA.assigned_user_id}</td>
+								{/if}
                                                          </tr>
 							 <tr>
+								{if $LABEL.taskpriority neq ''}
                                                                 <td class="cellLabel" align="right" nowrap valign="top"><b>{$LABEL.taskpriority}</b></td>
                                                                 <td class="cellInfo" align="left" nowrap valign="top">{$ACTIVITYDATA.taskpriority}</td>
+								{/if}
+								{if $LABEL.sendnotification neq ''}
                                                                 <td class="cellLabel" align="right" nowrap valign="top"><b>{$LABEL.sendnotification}</b></td>
                                                                 <td class="cellInfo" align="left" nowrap valign="top">{$ACTIVITYDATA.sendnotification}</td>
+								{/if}
                                                          </tr>
                                                          <tr>
-                                                                <td class="cellLabel" align="right" nowrap valign="top"align="right"><b>{$LABEL.createdtime}</b></td>
-                                                                <td class="cellInfo" align="left" nowrap valign="top">{$ACTIVITYDATA.createdtime}</td>
-                                                                <td class="cellLabel" align="right" nowrap valign="top"align="right"><b>{$LABEL.modifiedtime}</b></td>
-                                                                <td class="cellInfo" align="left" nowrap valign="top">{$ACTIVITYDATA.modifiedtime}</td>
+                                                                <td class="cellLabel" align="right" nowrap valign="top"align="right">{if $LABEL.createdtime neq ''}<b>{$LABEL.createdtime}</b>{/if}</td>
+                                                                <td class="cellInfo" align="left" nowrap valign="top">{if $LABEL.createdtime neq ''}{$ACTIVITYDATA.createdtime}{/if}</td>
+                                                                <td class="cellLabel" align="right" nowrap valign="top"align="right">{if $LABEL.modifiedtime neq ''}<b>{$LABEL.modifiedtime}</b>{/if}</td>
+                                                                <td class="cellInfo" align="left" nowrap valign="top">{if $LABEL.modifiedtime neq ''}{$ACTIVITYDATA.modifiedtime}{/if}</td>
                                                          </tr>
 						     </table>
 						     <table border=0 cellspacing=1 cellpadding=0 width=100%>
@@ -197,6 +211,7 @@
 									</DIV>
 									<!-- Reminder UI -->
 					                                <DIV id="addEventAlarmUI" style="display:none;width:100%">
+									{if $LABEL.reminder_time != ''}
 									<table width="100%" cellpadding="5" cellspacing="0" border="0">
                                                                                 <tr>
                                                                                         <td width="30%" align=right><b>{$MOD.LBL_SENDREMINDER}</b></td>
@@ -209,9 +224,11 @@
 										</tr>
 										{/if}
                                                                         </table>
+									{/if}
 									</DIV>
 									<!-- Repeat UI -->
                                 					<div id="addEventRepeatUI" style="display:none;width:100%">
+									{if $LABEL.recurringtype neq ''}
 									<table width="100%" cellpadding="5" cellspacing="0" border="0">
 										<tr>
                                                                                         <td width="30%" align=right><b>{$MOD.LBL_ENABLE_REPEAT}</b></td>
@@ -228,14 +245,17 @@
                                                                                 </tr>
 										{/if}
 									</table>
+									{/if}
 									</div>
 									<!-- Relatedto UI -->
 									<div id="addEventRelatedtoUI" style="display:none;width:100%">
 									<table width="100%" cellpadding="5" cellspacing="0" border="0">
+										{if $LABEL.parent_id neq ''}
 										<tr>
 											<td width="30%" align=right valign="top"><b>{$LABEL.parent_id}</b></td>
 											<td width="70%" align=left valign="top">{$ACTIVITYDATA.parent_name}</td>
 										</tr>
+										{/if}
 										<tr>
 											<td width="30%" valign="top" align=right><b>{$MOD.LBL_CONTACT_NAME}</b></td>	
 											<td width="70%" valign="top" align=left>
@@ -255,22 +275,24 @@
 								<td class="cellLabel" width="20%" align="right"><b>{$MOD.LBL_TODO}</b></td>
 								<td class="cellInfo" width="80%" align="left">{$ACTIVITYDATA.subject}</td>
 							</tr>
+							{if $LABEL.description neq ''}
 							<tr>
 								<td class="cellLabel" align="right" valign="top"><b>{$LABEL.description}</b></td>
                                                                 <td class="cellInfo" align="left" colspan="3" valign="top" height="60px">{$ACTIVITYDATA.description}</td>
                 					</tr>
+							{/if}
 							<tr>
                         					<td colspan="2" align="center" style="padding:0px">
                                 				<table border="0" cellpadding="5" cellspacing="1" width="100%" >
                                        					<tr>
-                                                				<td class="cellLabel" width=33% align="left"><b>{$LABEL.taskstatus}</b></td>
-										<td class="cellLabel" width=33% align="left"><b>{$LABEL.taskpriority}</b></td>
-										<td class="cellLabel" width=34% align="left"><b>{$LABEL.assigned_user_id}</b></td>
+                                                				<td class="cellLabel" width=33% align="left">{if $LABEL.taskstatus neq ''}<b>{$LABEL.taskstatus}</b>{/if}</td>
+										<td class="cellLabel" width=33% align="left">{if $LABEL.taskpriority neq ''}<b>{$LABEL.taskpriority}</b>{/if}</td>
+										<td class="cellLabel" width=34% align="left">{if $LABEL.assigned_user_id neq ''}<b>{$LABEL.assigned_user_id}</b>{/if}</td>
 									</tr>
 									<tr>
-                                                				<td class="cellInfo" align="left" valign="top">{$ACTIVITYDATA.taskstatus}</td>
-										<td class="cellInfo" align="left" valign="top">{$ACTIVITYDATA.taskpriority}</td>
-										<td class="cellInfo" align="left" valign="top">{$ACTIVITYDATA.assigned_user_id}</td>
+                                                				<td class="cellInfo" align="left" valign="top">{if $LABEL.taskstatus neq ''}{$ACTIVITYDATA.taskstatus}{/if}</td>
+										<td class="cellInfo" align="left" valign="top">{if $LABEL.taskpriority neq ''}{$ACTIVITYDATA.taskpriority}{/if}</td>
+										<td class="cellInfo" align="left" valign="top">{if $LABEL.taskpriority neq ''}{$ACTIVITYDATA.assigned_user_id}{/if}</td>
 									</tr>
 								</table>
 								</td>
@@ -294,10 +316,10 @@
 						     </table>
 						     <table border=0 cellspacing=0 cellpadding=5 width=100% >
 							<tr>
-								<td class="cellLabel" align=right nowrap width=20%><b>{$LABEL.createdtime}</b></td>
-                                                                <td class="cellInfo" align=left nowrap width=30%>{$ACTIVITYDATA.createdtime}</td>
-                                                                <td class="cellLabel" align=right nowrap width=20%><b>{$LABEL.modifiedtime}</b></td>
-                                                                <td class="cellInfo" align=left  nowrap width=30%>{$ACTIVITYDATA.modifiedtime}</td>
+								<td class="cellLabel" align=right nowrap width=20%>{if $LABEL.createdtime neq ''}<b>{$LABEL.createdtime}</b>{/if}</td>
+                                                                <td class="cellInfo" align=left nowrap width=30%>{if $LABEL.createdtime neq ''}{$ACTIVITYDATA.createdtime}{/if}</td>
+                                                                <td class="cellLabel" align=right nowrap width=20%>{if $LABEL.modifiedtime neq ''}<b>{$LABEL.modifiedtime}</b>{/if}</td>
+                                                                <td class="cellInfo" align=left  nowrap width=30%>{if $LABEL.modifiedtime neq ''}{$ACTIVITYDATA.modifiedtime}{/if}</td>
                                                         </tr>
                                                      </table>
 						     <br>
@@ -320,14 +342,17 @@
 								<td width=100% valign=top align=left class="dvtContentSpace" style="padding:10px;height:120px">
                                                                 <!-- Notification UI -->
                                                                         <DIV id="addTaskAlarmUI" style="display:block;width:100%">
+									{if $LABEL.sendnotification neq ''}
                                                                         <table width="100%" cellpadding="5" cellspacing="0" border="0">
                                                                                 <tr>
                                                                                         <td width="30%" align=right><b>{$MOD.LBL_SENDNOTIFICATION}</b></td>
                                                                                         <td width="70%" align=left>{$ACTIVITYDATA.sendnotification}</td>
                                                                                 </tr>
                                                                         </table>
+									{/if}
                                                                         </DIV>
 									<div id="addTaskRelatedtoUI" style="display:none;width:100%">
+									{if $LABEL.parent_id neq ''}
                                                                         <table width="100%" cellpadding="5" cellspacing="0" border="0">
                                                                                 <tr>
                                                                                         <td width="30%" align=right><b>{$LABEL.parent_id}</b></td>
@@ -338,6 +363,7 @@
                                                                                         <td align=left>{$ACTIVITYDATA.contact_id}</td>
                                                                                 </tr>
                                                                         </table>
+									{/if}
                                                                         </div>
 								</td>
 							</tr>

Modified: vtigercrm/trunk/Smarty/templates/ActivityEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ActivityEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ActivityEditView.tpl Wed Sep 13 05:34:08 2006
@@ -89,6 +89,7 @@
 							<input type="hidden" name="duration_hours" value="0">
 							<input type="hidden" name="duration_minutes" value="0">
 						     <table border=0 cellspacing=0 cellpadding=5 width=100% >
+							{if $LABEL.activitytype neq ''}
 							<tr>
 								<td class="cellLabel" nowrap  width=20% align="right"><b>{$MOD.LBL_EVENTTYPE}</b></td>
 								<td class="cellInfo" width=80% align="left">
@@ -111,9 +112,11 @@
 									</table>
 								</td>
 							</tr>
+							{/if}
 							<tr>
 								<td class="cellLabel" nowrap align="right"><b>{$MOD.LBL_EVENTNAME}</b></td>
 								<td class="cellInfo" align="left"><input name="subject" type="text" class="textbox" value="{$ACTIVITYDATA.subject}" style="width:50%">&nbsp;&nbsp;&nbsp;
+								{if $LABEL.visibility neq ''}
 								{foreach key=key_one item=arr from=$ACTIVITYDATA.visibility}
                                                                         {foreach key=sel_value item=value from=$arr}
                                                                         {if $value eq 'selected' && $sel_value eq 'Public'}
@@ -124,21 +127,27 @@
                                                                         {/foreach}
                                                                         {/foreach}
                                                                         <input name="visibility" value="Public" type="checkbox" {$visiblecheck}>{$MOD.LBL_PUBLIC}
+								{/if}
 								</td>
 							</tr>
+							{if $LABEL.description neq ''}
 							<tr>
                         					<td class="cellLabel" valign="top" nowrap align="right"><b>{$LABEL.description}</b></td>
 								<td class="cellInfo" align="left"><textarea style="width:100%; height : 60px;" name="description">{$ACTIVITYDATA.description}</textarea></td>
                 					</tr>
+							{/if}
 							<tr>
 								<td colspan=2 width=80% align="center">
 								<table border=0 cellspacing=0 cellpadding=3 width=80%>
 									<tr>
-										<td ><b>{$LABEL.eventstatus}</b></td>
-                                                                                <td ><b>{$LABEL.assigned_user_id}</b></td>
+										<td >{if $LABEL.eventstatus neq ''}<b>{$LABEL.eventstatus}</b>{/if}</td>
+                                                                                <td >{if $LABEL.assigned_user_id != ''}<b>
+											{$LABEL.assigned_user_id}</b>
+											{/if}</td>
 									</tr>
 									<tr>
 										<td valign=top>
+										{if $LABEL.eventstatus neq ''}
                                                                                 <select name="eventstatus" id="eventstatus" class=small>
                                                                                         {foreach item=arr from=$ACTIVITYDATA.eventstatus}
                                                                                         {foreach key=sel_value item=value from=$arr}
@@ -152,8 +161,10 @@
                                                                                         {/foreach}
                                                                                         {/foreach}
                                                                                 </select>
+										{/if}
                                                                         	</td>
 										<td valign=top rowspan=2>
+											{if $ACTIVITYDATA.assigned_user_id != ''}
 											{assign var=check value=1}
                                         						{foreach key=key_one item=arr from=$ACTIVITYDATA.assigned_user_id}
                                                 					{foreach key=sel_value item=value from=$arr}
@@ -199,9 +210,13 @@
                                                         					</select>
                                                 					</span>
                                         						{/if}
-											<br><input type="checkbox" name="sendnotification" >&nbsp;{$LABEL.sendnotification}
+											{else}
+											<input name="assigned_user_id" value="{$CURRENTUSERID}" type="hidden">
+											{/if}
+											<br>{if $LABEL.sendnotification neq ''}<input type="checkbox" name="sendnotification" >&nbsp;{$LABEL.sendnotification}{/if}
 										</td>
 									</tr>
+									{if $LABEL.taskpriority neq ''}
 									<tr>
 										<td valign=top><b>{$LABEL.taskpriority}</b>
 										<br>
@@ -221,6 +236,7 @@
 										</td> 
 										
 									</tr>
+									{/if}
 								</table>
 							</td></tr>
 						     </table>
@@ -344,6 +360,7 @@
 									</DIV>
 									<!-- Reminder UI -->	
 									<DIV id="addEventAlarmUI" style="display:none;width:100%">
+									{if $LABEL.reminder_time neq ''}
 										<table>
 											{assign var=secondval value=$secondvalue.reminder_time}
 											{assign var=check value=$secondval[0]}
@@ -396,15 +413,16 @@
 													{$MOD.LBL_SDRMD}
 												</td>
 												<td >
-													<input type=text name="toemail" class=textbox style="width:90%" value="{$USEREMAILID}">
+													<input type=text name="toemail" readonly="readonly" class=textbox style="width:90%" value="{$USEREMAILID}">
 												</td>
 											</tr>
 										</table>
+									{/if}
 									</DIV>
 									</DIV>
 									<!-- Repeat UI -->
 									<div id="addEventRepeatUI" style="display:none;width:100%">
-
+									{if $LABEL.recurringtype neq ''}
 									<table border=0 cellspacing=0 cellpadding=2  width=100%>
 										<tr>
 											<td nowrap align=right width=20% valign=top>
@@ -517,9 +535,11 @@
 								</td>
 							</tr>
 						</table>
+						{/if}
 						</div>
 						<div id="addEventRelatedtoUI" style="display:none;width:100%">
 						<table width="100%" cellpadding="5" cellspacing="0" border="0">
+							{if $LABEL.parent_id neq ''}	
 							<tr>
 								<td><b>{$MOD.LBL_RELATEDTO}</b></td>
 								<td>
@@ -537,6 +557,7 @@
 									</div>
 								</td>
 							</tr>
+							{/if}
 							<tr>
 								<td><b>{$APP.Contacts}</b></td>
 								<td colspan="2">
@@ -559,19 +580,30 @@
                         	<td class="cellLabel" width="20%" align="right"><b>{$MOD.LBL_TODO}</b></td>
                         	<td class="cellInfo" width="80%" align="left"><input name="subject" value="{$ACTIVITYDATA.subject}" class="textbox" style="width: 70%;" type="text"></td>
            		</tr>
+			
 			<tr>
+				{if $LABEL.description != ''}
 				<td class="cellLabel" align="right"><b>{$LABEL.description}</b></td>
 				<td class="cellInfo" align="left"><textarea style="width: 90%; height: 60px;" name="description">{$ACTIVITYDATA.description}</textarea>
+				{/if}
+				
 			</tr>
 			<tr>
 		    		<td colspan="2" align="center" width="100%" style="padding:0px">
 					<table border="0" cellpadding="5" cellspacing="1" width="100%">
             					<tr>
-							<td class="cellLabel" width=33% align="left"><b>{$LABEL.taskstatus}</td>
+							{if $LABEL.taskstatus != ''}
+							<td class="cellLabel" width=33% align="left"><b>{$LABEL.taskstatus}</b></td>
+							{/if}
+							{if $LABEL.taskpriority != ''}
               						<td class="cellLabel" width=33% align="left"><b>{$LABEL.taskpriority}</b></td>
-              						<td class="cellLabel" width=34% align="left"><b>{$LABEL.assigned_user_id}</b></td>
+							{/if}
+              						{if $LABEL.assigned_user_id != ''}
+							<td class="cellLabel" width=34% align="left"><b>{$LABEL.assigned_user_id}</b></td>
+							{/if}
 						</tr>
 						<tr>
+							{if $LABEL.taskstatus != ''}
 							<td align="left" valign="top">
 								<select name="taskstatus" id="taskstatus" class=small>
                                         			{foreach item=arr from=$ACTIVITYDATA.taskstatus}
@@ -587,6 +619,8 @@
                                         			{/foreach}
                                 				</select>
 							</td>
+							{/if}
+							{if $LABEL.taskpriority != ''}
 							<td align="left" valign="top">
 								<select name="taskpriority" id="taskpriority" class=small>
         			                                {foreach item=arr from=$ACTIVITYDATA.taskpriority}
@@ -602,6 +636,8 @@
                                         			{/foreach}
                                 				</select>
 							</td>
+							{/if}
+							{if $LABEL.assigned_user_id != ''}
 							<td align="left" valign="top">
 								{assign var=check value=1}
                                         			{foreach key=key_one item=arr from=$ACTIVITYDATA.assigned_user_id}
@@ -647,6 +683,9 @@
 				                                </span>
                                 				{/if}	
 							</td>
+							{else}
+								<input name="assigned_user_id" value="{$CURRENTUSERID}" type="hidden">
+							{/if}
 						</tr>
 					</table>
 				</td>
@@ -687,7 +726,7 @@
                                         			{/foreach}
 				      				<script type="text/javascript">
 								Calendar.setup ({ldelim}
-	                                        			inputField : "date_start", ifFormat : "{$date_vl}", showsTime : false, button : "jscal_trigger_due_date", singleClick : true, step : 1
+	                                        			inputField : "due_date", ifFormat : "{$date_vl}", showsTime : false, button : "jscal_trigger_due_date", singleClick : true, step : 1
 					   			{rdelim})
 								</script>
         						</td></tr>
@@ -714,6 +753,7 @@
 				<td class="dvtContentSpace" style="padding: 10px; height: 120px;" align="left" valign="top" width="100%">
 			<!-- Reminder UI -->
 			<div id="addTaskAlarmUI" style="display: block; width: 100%;">
+			{if $LABEL.sendnotification != ''}
                 	<table>
 				<tr><td>{$LABEL.sendnotification}</td>
 					{if $ACTIVITYDATA.sendnotification eq 1}
@@ -727,9 +767,11 @@
                                 	{/if}
 				</tr>
 			</table>
+			{/if}
 			</div>
 			<div id="addTaskRelatedtoUI" style="display:none;width:100%">
            		     <table width="100%" cellpadding="5" cellspacing="0" border="0">
+			     {if $LABEL.parent_id neq ''}
                 	     <tr>
                         	     <td><b>{$MOD.LBL_RELATEDTO}</b></td>
                                      <td>
@@ -747,6 +789,8 @@
 					 </div>
                                      </td>
 			     </tr>
+			     {/if}
+			     {if $LABEL.contact_id neq ''}	
 			     <tr>
                                      <td><b>{$LABEL.contact_id}</b></td>
 				     <td colspan="2">
@@ -754,6 +798,7 @@
 						<input type="button" onclick="return window.open('index.php?module=Contacts&action=Popup&html=Popup_picker&popuptype=specific&form=EditView','test','width=640,height=602,resizable=0,scrollbars=0');" class="crmButton small edit" name="selectcnt" value="Select Contact">
 				     </td>
                              </tr>
+			     {/if}
 		</table>
               	</div>
                 </td></tr></table>



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 04:35:25 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 11:35:25 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9490 -
	/vtigercrm/trunk/include/install/images/loading.gif
Message-ID: <20060913113525.DD5FA6D3042@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Wed Sep 13 05:35:15 2006
New Revision: 9490

Log:
Loading image changed --Jeri

Modified:
    vtigercrm/trunk/include/install/images/loading.gif

Modified: vtigercrm/trunk/include/install/images/loading.gif
==============================================================================
Binary files - no diff available.



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 04:36:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 11:36:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9491 -
 /vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php
Message-ID: <20060913113650.57E756D303C@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 05:36:41 2006
New Revision: 9491

Log:
Fixed the Contact Potential Not getting added issue

Modified:
    vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php

Modified: vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php (original)
+++ vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php Wed Sep 13 05:36:41 2006
@@ -320,7 +320,7 @@
 
 //Saving Contact - starts
 $crmcontactid = $adb->getUniqueID("vtiger_crmentity");
-$sql_crmentity1 = "insert into vtiger_crmentity(crmid,smcreatorid,smownerid,setype,presence,deleted,description,createdtime) values(".$crmcontactid.",".$current_user_id.",".$assigned_user_id.",'Contacts',0,0,'".$row['description']."','".$date_entered."')";
+$sql_crmentity1 = "insert into vtiger_crmentity(crmid,smcreatorid,smownerid,setype,presence,deleted,description,createdtime) values(".$crmcontactid.",".$current_user_id.",".$assigned_user_id.",'Contacts',0,0,'".$row['description']."',".$date_entered.")";
 
 $adb->query($sql_crmentity1);
 
@@ -382,7 +382,7 @@
   
 
 	$oppid = $adb->getUniqueID("vtiger_crmentity");
-	$sql_crmentity = "insert into vtiger_crmentity(crmid,smcreatorid,smownerid,setype,presence,deleted,createdtime,description) values(".$oppid.",".$current_user_id.",".$assigned_user_id.",'Potentials',0,0,'".$date_entered."','".$row['description']."')";
+	$sql_crmentity = "insert into vtiger_crmentity(crmid,smcreatorid,smownerid,setype,presence,deleted,createdtime,description) values(".$oppid.",".$current_user_id.",".$assigned_user_id.",'Potentials',0,0,".$date_entered.",'".$row['description']."')";
   
 	$adb->query($sql_crmentity);
 



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 04:38:58 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 11:38:58 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9492 -
	/vtigercrm/trunk/include/FormValidationUtil.php
Message-ID: <20060913113858.34AC36D303C@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 05:38:49 2006
New Revision: 9492

Log:
i18n support for validation --By minnie

Modified:
    vtigercrm/trunk/include/FormValidationUtil.php

Modified: vtigercrm/trunk/include/FormValidationUtil.php
==============================================================================
--- vtigercrm/trunk/include/FormValidationUtil.php (original)
+++ vtigercrm/trunk/include/FormValidationUtil.php Wed Sep 13 05:38:49 2006
@@ -28,7 +28,7 @@
   $sql = '';
   $tab_con = "";
   $numValues = count($tablearray);
-  global $adb;
+  global $adb,$mod_strings;
 
   if($tabid!='') $tab_con = ' and tabid='.$tabid;
 	
@@ -63,7 +63,7 @@
   $fieldName_array = Array();
   for($i=0;$i<$noofrows;$i++)
   {
-    $fieldlabel = $adb->query_result($result,$i,'fieldlabel');
+    $fieldlabel = $mod_strings[$adb->query_result($result,$i,'fieldlabel')];
     $fieldname = $adb->query_result($result,$i,'fieldname');
     $typeofdata = $adb->query_result($result,$i,'typeofdata');
    //echo '<br> '.$fieldlabel.'....'.$fieldname.'....'.$typeofdata;



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 04:43:16 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 11:43:16 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9493 -
	/vtigercrm/trunk/include/utils/UserInfoUtil.php
Message-ID: <20060913114316.58CB56C5946@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 05:43:08 2006
New Revision: 9493

Log:
Fix for Calendar Security Done

Modified:
    vtigercrm/trunk/include/utils/UserInfoUtil.php

Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php
==============================================================================
--- vtigercrm/trunk/include/utils/UserInfoUtil.php (original)
+++ vtigercrm/trunk/include/utils/UserInfoUtil.php Wed Sep 13 05:43:08 2006
@@ -1534,7 +1534,21 @@
 		if($actionid == 1 || $actionid == 0)
 		{
 
-			$permission = isReadWritePermittedBySharing($module,$tabid,$actionid,$record_id);
+			if($module == 'Calendar')
+			{
+				if($recOwnType == 'Users')
+				{
+					$permission = isCalendarPermittedBySharing($record_id);
+				}
+				else
+				{
+					$permission='no'; 
+				}		
+			}
+			else
+			{
+				$permission = isReadWritePermittedBySharing($module,$tabid,$actionid,$record_id);
+			}		
 			$log->debug("Exiting isPermitted method ...");
 			return $permission;	
 		}
@@ -1578,13 +1592,41 @@
 		
 		if($actionid == 3 || $actionid == 4)
 		{
-			$permission = isReadPermittedBySharing($module,$tabid,$actionid,$record_id);
+			if($module == 'Calendar')
+			{
+				if($recOwnType == 'Users')
+				{
+					$permission = isCalendarPermittedBySharing($record_id);
+				}
+				else
+				{
+					$permission='no'; 
+				}		
+			}
+			else
+			{
+				$permission = isReadPermittedBySharing($module,$tabid,$actionid,$record_id);
+			}	
 			$log->debug("Exiting isPermitted method ...");
 			return $permission;	
 		}
 		elseif($actionid ==0 || $actionid ==1)
 		{
-			$permission = isReadWritePermittedBySharing($module,$tabid,$actionid,$record_id);
+			if($module == 'Calendar')
+			{
+				if($recOwnType == 'Users')
+				{
+					$permission = isCalendarPermittedBySharing($record_id);
+				}
+				else
+				{
+					$permission='no'; 
+				}		
+			}
+			else
+			{
+				$permission = isReadWritePermittedBySharing($module,$tabid,$actionid,$record_id);
+			}	
 			$log->debug("Exiting isPermitted method ...");
 			return $permission;	
 		}
@@ -1635,7 +1677,6 @@
 		return $sharePer;
 	}
 
-	
 	$recordOwnerArr=getRecordOwnerId($record_id);
 	foreach($recordOwnerArr as $type=>$id)
 	{
@@ -4368,7 +4409,13 @@
 	}
 	elseif($module == 'Calendar')
 	{
-		$sec_query .= "and (vtiger_crmentity.smownerid in($current_user->id) or vtiger_crmentity.smownerid in(select vtiger_user2role.userid from vtiger_user2role inner join vtiger_users on vtiger_users.id=vtiger_user2role.userid inner join vtiger_role on vtiger_role.roleid=vtiger_user2role.roleid where vtiger_role.parentrole like '".$current_user_parent_role_seq."::%')";
+		require_once('modules/Calendar/CalendarCommon.php');
+		$shared_ids = getSharedCalendarId($current_user->id);
+		if(isset($shared_ids) && $shared_ids != '')
+			$condition = " or (vtiger_crmentity.smownerid in($shared_ids) and vtiger_activity.visibility = 'Public')";
+		else
+			$condition = null;
+		$sec_query .= "and (vtiger_crmentity.smownerid in($current_user->id) $condition or vtiger_crmentity.smownerid in(select vtiger_user2role.userid from vtiger_user2role inner join vtiger_users on vtiger_users.id=vtiger_user2role.userid inner join vtiger_role on vtiger_role.roleid=vtiger_user2role.roleid where vtiger_role.parentrole like '".$current_user_parent_role_seq."::%')";
 
 		if(sizeof($current_user_groups) > 0)
 		{
@@ -4756,6 +4803,19 @@
 }
 
 
+function isCalendarPermittedBySharing($recordId)
+{
+	global $adb;
+	global $current_user;
+	$permission = 'no';
+	$query = "select * from vtiger_sharedcalendar where userid in(select smownerid from vtiger_activity inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid where activityid=".$recordId." and visibility='Public' and smownerid !=0) and sharedid=".$current_user->id;
+	$result=$adb->query($query);
+	if($adb->num_rows($result) >0)
+	{
+		$permission = 'yes';
+	}
+	return $permission;	
+}	
 
 //end					   
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 04:45:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 11:45:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9494 -
	/vtigercrm/trunk/include/images/vtigercrm_icon.ico
Message-ID: <20060913114545.56F806C5946@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Wed Sep 13 05:45:04 2006
New Revision: 9494

Log:
fav icon deleted--Jeri

Removed:
    vtigercrm/trunk/include/images/vtigercrm_icon.ico



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 04:46:54 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 11:46:54 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9495 -
	/vtigercrm/trunk/include/images/vtigercrm_icon.ico
Message-ID: <20060913114654.E47BF6C5946@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Wed Sep 13 05:46:12 2006
New Revision: 9495

Log:
fav icon image added --Jeri

Added:
    vtigercrm/trunk/include/images/vtigercrm_icon.ico   (with props)



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 04:47:24 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 11:47:24 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9496 -
	/vtigercrm/trunk/log4php.properties
Message-ID: <20060913114724.4F64D6D3049@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 05:46:57 2006
New Revision: 9496

Log:
Modified log level from debug to fatal

Modified:
    vtigercrm/trunk/log4php.properties

Modified: vtigercrm/trunk/log4php.properties
==============================================================================
--- vtigercrm/trunk/log4php.properties (original)
+++ vtigercrm/trunk/log4php.properties Wed Sep 13 05:46:57 2006
@@ -25,7 +25,7 @@
 log4php.appender.A1.layout.DateFormat="%c"
 log4php.appender.A1.File=logs/vtigercrm.log
 
-log4php.logger.MIGRATION=DEBUG,A4
+log4php.logger.MIGRATION=FATAL,A4
 log4php.appender.A4=LoggerAppenderRollingFile
 log4php.appender.A4.MaxFileSize=3MB
 log4php.appender.A4.MaxBackupIndex=10
@@ -35,7 +35,7 @@
 log4php.appender.A4.File=logs/migration.log
 
 
-log4php.logger.SOAP=DEBUG,A5
+log4php.logger.SOAP=FATAL,A5
 log4php.appender.A5=LoggerAppenderRollingFile
 log4php.appender.A5.MaxFileSize=3MB
 log4php.appender.A5.MaxBackupIndex=10



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 04:49:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 11:49:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9497 -
	/vtigercrm/trunk/getCompanyProfile.php
Message-ID: <20060913114939.6958966A5D4@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 05:49:18 2006
New Revision: 9497

Log:
Fixed the Ticker Symbol Issue --By Minnie

Modified:
    vtigercrm/trunk/getCompanyProfile.php

Modified: vtigercrm/trunk/getCompanyProfile.php
==============================================================================
--- vtigercrm/trunk/getCompanyProfile.php (original)
+++ vtigercrm/trunk/getCompanyProfile.php Wed Sep 13 05:49:18 2006
@@ -34,9 +34,16 @@
         	{
 			$desc=$msft_stats[0];
 			$data=getQuoteData($variable);
-			foreach($data as $key=>$value)
-				array_push($desc,$value);
-			return $desc;
+			if(is_array($data))
+			{
+				foreach($data as $key=>$value)
+					array_push($desc,$value);
+				return $desc;
+			}
+			else
+			{
+				die;
+			}
 		}
 		else
 		        return "Information on ".$variable." is not available or '".$variable."' is not a valid ticker symbol.";
@@ -45,7 +52,7 @@
 	{
 		$headlines = array();
 		$news = http::table_into_array($h->body, 'HEADLINES',0, null);
-		if($news != '')
+		if(is_array($news))
 		{
 			$headlines[] = $news[35];
 			$headlines[] = $news[37];
@@ -75,13 +82,17 @@
         }
 	$res_arr=array();
 	$quote_data = http::table_into_array($h->body, 'Delayed quote data', 0, null);
-        if($quote_data[0][0] == '')
+        if(is_array($quote_data))
         {
                 array_shift($quote_data);
                 array_shift($quote_data);
                 if($quote_data[0][0]!= 'Last Trade:')
                         array_shift($quote_data);
         }
+	else
+	{
+		die;
+	}
         for($i=0;$i<16;$i++)
         {
                 if($quote_data !='')



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 05:11:44 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 12:11:44 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9498 - in
 /wordintegration/trunk/client/bin/Language: deutsch.ini english.ini
 finnish.ini french.ini german.ini
Message-ID: <20060913121144.6CC556D305D@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Wed Sep 13 06:11:22 2006
New Revision: 9498

Log:
Copyright year changed --Jeri

Modified:
    wordintegration/trunk/client/bin/Language/deutsch.ini
    wordintegration/trunk/client/bin/Language/english.ini
    wordintegration/trunk/client/bin/Language/finnish.ini
    wordintegration/trunk/client/bin/Language/french.ini
    wordintegration/trunk/client/bin/Language/german.ini

Modified: wordintegration/trunk/client/bin/Language/deutsch.ini
==============================================================================
--- wordintegration/trunk/client/bin/Language/deutsch.ini (original)
+++ wordintegration/trunk/client/bin/Language/deutsch.ini Wed Sep 13 06:11:22 2006
@@ -7,7 +7,7 @@
 
 [vtigerCRM_frmAbout]
 FormName=?ber
-Label2=Copyright ? 2003-2005 vtiger.com. Alle Rechte vorbehalten.
+Label2=Copyright ? 2003-2006 vtiger.com. Alle Rechte vorbehalten.
 Label3=
 Button1=OK
 

Modified: wordintegration/trunk/client/bin/Language/english.ini
==============================================================================
Binary files - no diff available.

Modified: wordintegration/trunk/client/bin/Language/finnish.ini
==============================================================================
--- wordintegration/trunk/client/bin/Language/finnish.ini (original)
+++ wordintegration/trunk/client/bin/Language/finnish.ini Wed Sep 13 06:11:22 2006
@@ -7,7 +7,7 @@
 
 [vtigerCRM_frmAbout]
 FormName=About
-Label2=Copyright ? 2003-2005 vtiger.com. All rights reserverd.
+Label2=Copyright ? 2003-2006 vtiger.com. All rights reserverd.
 Label3=
 Button1=Hyv?ksy
 
@@ -36,7 +36,7 @@
 Frame1_Label1=vtiger K?ytt?j?tunnus:
 Frame1_Label2=vtiger Salasana:
 Frame1_Label3=vtiger URL:
-Frame1_Label4=(Esim. http://localhost/)
+Frame1_Label4=(Esim. http://en.vtiger.com/)
 Frame2=M??rittele Proxyn asetukset yhteytt? varten.
 Frame2_Label1=Osoite:
 Frame2_Label2=Portti:

Modified: wordintegration/trunk/client/bin/Language/french.ini
==============================================================================
--- wordintegration/trunk/client/bin/Language/french.ini (original)
+++ wordintegration/trunk/client/bin/Language/french.ini Wed Sep 13 06:11:22 2006
@@ -7,7 +7,7 @@
 
 [vtigerCRM_frmAbout]
 FormName=A propos
-Label2=Copyright ? 2003-2005 vtiger.com. Tous droits r?serv?s.
+Label2=Copyright ? 2003-2006 vtiger.com. Tous droits r?serv?s.
 Label3=French by Abos : contact at abonlinesolutions.com
 Button1=OK
 

Modified: wordintegration/trunk/client/bin/Language/german.ini
==============================================================================
Binary files - no diff available.



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 05:14:46 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 12:14:46 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9499 -
	/wordintegration/trunk/resources/images/vtiger.ico
Message-ID: <20060913121446.379226D3060@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Wed Sep 13 06:14:22 2006
New Revision: 9499

Log:
fav icon changed --Jeri

Modified:
    wordintegration/trunk/resources/images/vtiger.ico

Modified: wordintegration/trunk/resources/images/vtiger.ico
==============================================================================
Binary files - no diff available.



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 05:17:08 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 12:17:08 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9500 - in
 /wordintegration/trunk/client/source: frmAbout.frm frmAbout.frx frmConf.frm
 frmConf.frx frmvtigerLogin.frx frmvtigerTempate.frm frmvtigerTempate.frx
 vtigerCRMWordPlugin.vbw
Message-ID: <20060913121708.7CDF06D3060@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Wed Sep 13 06:16:44 2006
New Revision: 9500

Log:
fav icon modified --Jeri

Modified:
    wordintegration/trunk/client/source/frmAbout.frm
    wordintegration/trunk/client/source/frmAbout.frx
    wordintegration/trunk/client/source/frmConf.frm
    wordintegration/trunk/client/source/frmConf.frx
    wordintegration/trunk/client/source/frmvtigerLogin.frx
    wordintegration/trunk/client/source/frmvtigerTempate.frm
    wordintegration/trunk/client/source/frmvtigerTempate.frx
    wordintegration/trunk/client/source/vtigerCRMWordPlugin.vbw

Modified: wordintegration/trunk/client/source/frmAbout.frm
==============================================================================
Binary files - no diff available.

Modified: wordintegration/trunk/client/source/frmAbout.frx
==============================================================================
Binary files - no diff available.

Modified: wordintegration/trunk/client/source/frmConf.frm
==============================================================================
Binary files - no diff available.

Modified: wordintegration/trunk/client/source/frmConf.frx
==============================================================================
Binary files - no diff available.

Modified: wordintegration/trunk/client/source/frmvtigerLogin.frx
==============================================================================
Binary files - no diff available.

Modified: wordintegration/trunk/client/source/frmvtigerTempate.frm
==============================================================================
Binary files - no diff available.

Modified: wordintegration/trunk/client/source/frmvtigerTempate.frx
==============================================================================
Binary files - no diff available.

Modified: wordintegration/trunk/client/source/vtigerCRMWordPlugin.vbw
==============================================================================
Binary files - no diff available.



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 06:00:42 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 13:00:42 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9501 -
	/vtigertoolbar/trunk/firefox/chrome/skin/Site.gif
Message-ID: <20060913130042.E9F966D3087@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Wed Sep 13 07:00:20 2006
New Revision: 9501

Log:
Site Image Changed --Jeri

Modified:
    vtigertoolbar/trunk/firefox/chrome/skin/Site.gif

Modified: vtigertoolbar/trunk/firefox/chrome/skin/Site.gif
==============================================================================
Binary files - no diff available.



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 06:11:18 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 13:11:18 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9502 -
	/vtigercrm/trunk/modules/Users/User.php
Message-ID: <20060913131118.B589B6D3055@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Wed Sep 13 07:11:08 2006
New Revision: 9502

Log:
Typo error has been fixed --Jeri

Modified:
    vtigercrm/trunk/modules/Users/User.php

Modified: vtigercrm/trunk/modules/Users/User.php
==============================================================================
--- vtigercrm/trunk/modules/Users/User.php (original)
+++ vtigercrm/trunk/modules/Users/User.php Wed Sep 13 07:11:08 2006
@@ -921,7 +921,7 @@
 		{
 
 			$sql1 = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values(".$current_id.",".$current_user->id.",".$ownerid.",'".$module." Attachment','".$this->column_fields['description']."',".$this->db->formatString("vtiger_crmentity","createdtime",$date_var).",".$this->db->formatString("vtiger_crmentity","modifiedtime",$date_var).")";
-- 			$this->db->query($sql1);
+ 			$this->db->query($sql1);
 
 			$sql2="insert into vtiger_attachments(attachmentsid, name, description, type, path) values(".$current_id.",'".$filename."','".$this->column_fields['description']."','".$filetype."','".$upload_file_path."')";
 			$result=$this->db->query($sql2);



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 07:11:43 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 14:11:43 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9503 -
	/vtigercrm/trunk/themes/bluelagoon/style.css
Message-ID: <20060913141143.9CD436D3099@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Wed Sep 13 08:11:36 2006
New Revision: 9503

Log:
Tagcloud Css modified for blue lagoon --Jeri

Modified:
    vtigercrm/trunk/themes/bluelagoon/style.css

Modified: vtigercrm/trunk/themes/bluelagoon/style.css
==============================================================================
--- vtigercrm/trunk/themes/bluelagoon/style.css (original)
+++ vtigercrm/trunk/themes/bluelagoon/style.css Wed Sep 13 08:11:36 2006
@@ -2690,7 +2690,7 @@
 
 
 .tagCloud {
-    border:1px solid #737373;
+    border:1px solid #aaf;
 }
 
    
@@ -2700,7 +2700,7 @@
 }
 
 .tagCloudDisplay {
-    background-color:#e5e5e5;
+    background-color:#fff;
     padding:10px;
     font-family: Arial, Helvetica, sans-serif;
     font-size: 11px;
@@ -2761,7 +2761,7 @@
 }
 
 .tagCloudDisplay {
-	background-color:#e5e5e5;
+	background-color:#fff;
 	padding:5px;
 }
 	



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 07:12:22 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 14:12:22 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9504 - in
 /vtigercrm/trunk/themes/bluelagoon/images: tagCloudBg.gif tagCloudName.gif
Message-ID: <20060913141222.6B1646D3096@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Wed Sep 13 08:12:12 2006
New Revision: 9504

Log:
Tagcloud modified for blue lagoon --Jeri

Modified:
    vtigercrm/trunk/themes/bluelagoon/images/tagCloudBg.gif
    vtigercrm/trunk/themes/bluelagoon/images/tagCloudName.gif

Modified: vtigercrm/trunk/themes/bluelagoon/images/tagCloudBg.gif
==============================================================================
Binary files - no diff available.

Modified: vtigercrm/trunk/themes/bluelagoon/images/tagCloudName.gif
==============================================================================
Binary files - no diff available.



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 07:35:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 14:35:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9505 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060913143555.C76F76D3096@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 08:35:48 2006
New Revision: 9505

Log:
Fixed the default group population issue --by Don

Modified:
    vtigercrm/trunk/modules/Users/DefaultDataPopulator.php

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Wed Sep 13 08:35:48 2006
@@ -44,10 +44,6 @@
 		$profile2_id = $this->db->getUniqueID("vtiger_profile");
 		$profile3_id = $this->db->getUniqueID("vtiger_profile");
 		$profile4_id = $this->db->getUniqueID("vtiger_profile");
-
-		$group1_id = $this->db->getUniqueID("vtiger_groups");
-		$group2_id = $this->db->getUniqueID("vtiger_groups");
-		$group3_id = $this->db->getUniqueID("vtiger_groups");
 
                 $this->db->query("insert into vtiger_role values('H".$role1_id."','Organisation','H".$role1_id."',0)");
                 $this->db->query("insert into vtiger_role values('H".$role2_id."','CEO','H".$role1_id."::H".$role2_id."',1)");
@@ -920,21 +916,21 @@
                 // Insert End
 		
 		//Inserting into vtiger_groups table
+		$group1_id = $this->db->getUniqueID("vtiger_groups");
+ 		$group2_id = $this->db->getUniqueID("vtiger_groups");
+ 		$group3_id = $this->db->getUniqueID("vtiger_groups");
+		
 		$this->db->query("insert into vtiger_groups values ('".$group1_id."','Team Selling','Group Related to Sales')");	
 		$this->db->query("insert into vtiger_group2role values ('".$group1_id."','H".$role4_id."')");	
 		$this->db->query("insert into vtiger_group2rs values ('".$group1_id."','H".$role5_id."')");	
-		$this->db->query("insert into vtiger_users2group values ('".$group1_id."',2)");	
 
 		$this->db->query("insert into vtiger_groups values ('".$group2_id."','Marketing Group','Group Related to Marketing Activities')");	
 		$this->db->query("insert into vtiger_group2role values ('".$group2_id."','H".$role2_id."')");	
 		$this->db->query("insert into vtiger_group2rs values ('".$group2_id."','H".$role3_id."')");	
-		$this->db->query("insert into vtiger_users2group values ('".$group2_id."',1)");	
-		$this->db->query("insert into vtiger_users2group values ('".$group2_id."',2)");	
 
 		$this->db->query("insert into vtiger_groups values ('".$group3_id."','Support Group','Group Related to providing Support to Customers')");
 		$this->db->query("insert into vtiger_group2role values ('".$group3_id."','H".$role3_id."')");
 		$this->db->query("insert into vtiger_group2rs values ('".$group3_id."','H".$role3_id."')");
-		$this->db->query("insert into vtiger_users2group values ('".$group3_id."',2)");	
 
 		//New Security Start
 		//Inserting into vtiger_profile vtiger_table



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 07:40:33 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 14:40:33 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9506 -
	/vtigercrm/trunk/modules/Portal/Popup.php
Message-ID: <20060913144033.497526D305A@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Wed Sep 13 08:40:26 2006
New Revision: 9506

Log:
Theme path assigned to the close image in MySite Popup --Jeri

Modified:
    vtigercrm/trunk/modules/Portal/Popup.php

Modified: vtigercrm/trunk/modules/Portal/Popup.php
==============================================================================
--- vtigercrm/trunk/modules/Portal/Popup.php (original)
+++ vtigercrm/trunk/modules/Portal/Popup.php Wed Sep 13 08:40:26 2006
@@ -14,6 +14,10 @@
 global $app_list_strings;
 global $mod_strings;
 global $adb;
+
+global $theme;
+$theme_path="themes/".$theme."/";
+$image_path=$theme_path."images/";
 if(isset($_REQUEST['record']) && $_REQUEST['record'] !='')
 {
 	$portalid = $_REQUEST['record'];
@@ -27,7 +31,7 @@
 		<table border="0" cellpadding="3" cellspacing="0" width="100%" class="layerHeadingULine">
 		<tr>
 			<td class="layerPopupHeading" align="left" width="60%">' .$mod_strings['LBL_ADD'] .' '.$mod_strings['LBL_BOOKMARK'].'</td>
-			<td align="right" width="40%"><a href="javascript:fninvsh(\'orgLay\');"><img src="../themes/blue/images/close.gif" align="absmiddle" border="0"></a></td>
+			<td align="right" width="40%"><a href="javascript:fninvsh(\'orgLay\');"><img src="'.$image_path.'close.gif" align="absmiddle" border="0"></a></td>
 		</tr>
 		</table>
 <table border="0" cellspacing="0" cellpadding="5" width="95%" align="center"> 



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 07:47:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 14:47:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9507 -
 /vtigercrm/trunk/themes/woodspice/images/vtiger-crm.gif
Message-ID: <20060913144750.33AD56D4949@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Wed Sep 13 08:47:39 2006
New Revision: 9507

Log:
Vtiger Paw image icon changed --Jeri

Modified:
    vtigercrm/trunk/themes/woodspice/images/vtiger-crm.gif

Modified: vtigercrm/trunk/themes/woodspice/images/vtiger-crm.gif
==============================================================================
Binary files - no diff available.



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 07:49:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 14:49:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9508 -
 /vtigercrm/trunk/themes/images/loginTopHeaderName.gif
Message-ID: <20060913144902.AEE636D494C@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Wed Sep 13 08:48:54 2006
New Revision: 9508

Log:
Vtiger Paw image icon changed --Jeri

Modified:
    vtigercrm/trunk/themes/images/loginTopHeaderName.gif

Modified: vtigercrm/trunk/themes/images/loginTopHeaderName.gif
==============================================================================
Binary files - no diff available.



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 08:02:13 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 15:02:13 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9509 -
	/vtigercrm/trunk/install/5createTables.inc.php
Message-ID: <20060913150213.DC1736D3056@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 09:02:06 2006
New Revision: 9509

Log:
Fixed the default group population issue --by Don

Modified:
    vtigercrm/trunk/install/5createTables.inc.php

Modified: vtigercrm/trunk/install/5createTables.inc.php
==============================================================================
--- vtigercrm/trunk/install/5createTables.inc.php (original)
+++ vtigercrm/trunk/install/5createTables.inc.php Wed Sep 13 09:02:06 2006
@@ -100,6 +100,16 @@
 
         $user->save("Users");
 
+	//Inserting Entries into vtiger_groups table
+	$result = $db->query("select groupid from vtiger_groups where groupname='Team Selling';");
+ 	$group1_id = $db->query_result($result,0,"groupid");
+ 	$result = $db->query("select groupid from vtiger_groups where groupname='Marketing Group';");
+ 	$group2_id = $db->query_result($result,0,"groupid");
+ 	$result = $db->query("select groupid from vtiger_groups where groupname='Support Group';");
+ 	$group3_id = $db->query_result($result,0,"groupid");
+
+ 	$db->query("insert into vtiger_users2group values ('".$group2_id."',".$user->id.")");
+
         // we need to change the admin user to a fixed id of 1.
         //$query = "update vtiger_users set id='1' where user_name='$user->user_name'";
         //$result = $db->query($query, true, "Error updating admin user ID: ");
@@ -145,6 +155,10 @@
 	//Creating the flat vtiger_files
 	createUserPrivilegesfile($user->id);
         createUserSharingPrivilegesfile($user->id);
+
+	$db->query("insert into vtiger_users2group values ('".$group1_id."',".$user->id.")");
+ 	$db->query("insert into vtiger_users2group values ('".$group2_id."',".$user->id.")");
+ 	$db->query("insert into vtiger_users2group values ('".$group3_id."',".$user->id.")");
 
 }
 



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 08:04:54 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 15:04:54 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9510 -
 /vtigercrm/trunk/modules/Migration/MigrationCheck.php
Message-ID: <20060913150454.728886D3056@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 09:04:47 2006
New Revision: 9510

Log:
Modified the Migration Message -- By Mickie

Modified:
    vtigercrm/trunk/modules/Migration/MigrationCheck.php

Modified: vtigercrm/trunk/modules/Migration/MigrationCheck.php
==============================================================================
--- vtigercrm/trunk/modules/Migration/MigrationCheck.php (original)
+++ vtigercrm/trunk/modules/Migration/MigrationCheck.php Wed Sep 13 09:04:47 2006
@@ -395,7 +395,23 @@
 {
 	//Return to the MigrationStep1
 	include("modules/Migration/MigrationStep1.php");
-}
-
+	exit;
+}
 
 ?>
+	<script>
+		function displayMigrationSuccess()
+		{
+			document.getElementById("migration_image").style.display = "block";
+			document.getElementById("migration_message1").innerHTML = "Migration has been completed";
+			document.getElementById("migration_message2").innerHTML = "Your old data is now moved into new vtigerCRM";
+		}
+	</script>
+	<script>
+		displayMigrationSuccess();
+	</script>
+
+<?php
+
+
+?>



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 08:14:32 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 15:14:32 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9512 -
	/vtigercrm/trunk/modules/PurchaseOrder/Save.php
Message-ID: <20060913151432.678296D4954@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 09:14:24 2006
New Revision: 9512

Log:
Changed the status from delivered to received shipment when updating the stock -- BY Mickie

Modified:
    vtigercrm/trunk/modules/PurchaseOrder/Save.php

Modified: vtigercrm/trunk/modules/PurchaseOrder/Save.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/Save.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/Save.php Wed Sep 13 09:14:24 2006
@@ -36,7 +36,7 @@
 
 //Added code for auto product stock updation on receiving goods
 $update_prod_stock='';
-if($focus->column_fields['postatus'] == 'Delivered' && $focus->mode == 'edit')
+if($focus->column_fields['postatus'] == 'Received Shipment' && $focus->mode == 'edit')
 {
         $prev_postatus=getPoStatus($focus->id);
         if($focus->column_fields['postatus'] != $prev_postatus)



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 11:19:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 18:19:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9513 -
	/vtigercrm/trunk/install/2setConfig.php
Message-ID: <20060913181909.E475E6D306F@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 12:19:02 2006
New Revision: 9513

Log:
Fixed the Currency issue during installation -- By Philip

Modified:
    vtigercrm/trunk/install/2setConfig.php

Modified: vtigercrm/trunk/install/2setConfig.php
==============================================================================
--- vtigercrm/trunk/install/2setConfig.php (original)
+++ vtigercrm/trunk/install/2setConfig.php Wed Sep 13 12:19:02 2006
@@ -132,7 +132,9 @@
 	$admin_password = $_REQUEST['admin_password'];
 	
 	if (isset($_REQUEST['currency_name']))
-	$currency_name = $_REQUEST['currency_name'];
+		$currency_name = $_REQUEST['currency_name'];
+	else
+		$currency_name = '';
 	
 	if (isset($_REQUEST['currency_symbol']))
 	$currency_symbol = $_REQUEST['currency_symbol'];



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 11:30:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 18:30:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9514 -
	/customerportal/trunk/header.html
Message-ID: <20060913183057.4DD526D3049@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 12:30:50 2006
New Revision: 9514

Log:
added nowrap -- by mickie

Modified:
    customerportal/trunk/header.html

Modified: customerportal/trunk/header.html
==============================================================================
--- customerportal/trunk/header.html (original)
+++ customerportal/trunk/header.html Wed Sep 13 12:30:50 2006
@@ -31,7 +31,7 @@
    <tr>
     <th align="left"><img src="images/loginVtigerCRM.gif" width="169" height="49"></th>
     <th>&nbsp;</th>
-    <th align="right" style="padding-right:15px;">
+    <th align="right" style="padding-right:15px;" nowrap>
 	<span onclick="fnMySettings();" class="MySettingsHdr">My Settings</span>&nbsp;|&nbsp;
 	<a href="index.php?logout=true" class="hdr">Log Out</a></th>
    </tr>



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 11:35:17 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 18:35:17 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9515 -
	/vtigercrm/trunk/Smarty/templates/salesEditView.tpl
Message-ID: <20060913183517.E14876D306F@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 12:35:10 2006
New Revision: 9515

Log:
HardCoded Style removed and class added

Modified:
    vtigercrm/trunk/Smarty/templates/salesEditView.tpl

Modified: vtigercrm/trunk/Smarty/templates/salesEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/salesEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/salesEditView.tpl Wed Sep 13 12:35:10 2006
@@ -118,12 +118,12 @@
 							{if $header eq 'Comments' || $header eq 'Comment Information'}
 							   <tr><td>&nbsp;</td></tr>
 							   <tr>
-								<td colspan=4 style="border-bottom:1px solid #999999;padding:5px;" bgcolor="#e5e5e5">
-						        	<b>{$MOD.LBL_COMMENT_INFORMATION}</b>
+								<td colspan=4 class="dvInnerHeader">
+							        	<b>{$MOD.LBL_COMMENT_INFORMATION}</b>
 								</td>
 							   </tr>
 							   <tr>
-							   			<td colspan=4 class="dvtCellInfo">{$COMMENT_BLOCK}</td>
+								<td colspan=4 class="dvtCellInfo">{$COMMENT_BLOCK}</td>
 							   </tr>
 							   <tr><td>&nbsp;</td></tr>
 							{/if}



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 13:38:32 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 20:38:32 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9516 -
	/vtigercrm/trunk/log4php.properties
Message-ID: <20060913203833.15BE06D3049@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 14:38:26 2006
New Revision: 9516

Log:
Modified the logger level for installation and migration to debug from fatal -- By Don

Modified:
    vtigercrm/trunk/log4php.properties

Modified: vtigercrm/trunk/log4php.properties
==============================================================================
--- vtigercrm/trunk/log4php.properties (original)
+++ vtigercrm/trunk/log4php.properties Wed Sep 13 14:38:26 2006
@@ -7,7 +7,7 @@
 log4php.appender.A2.layout.DateFormat="%c"
 log4php.appender.A2.File=logs/security.log
 
-log4php.logger.INSTALL=FATAL,A3
+log4php.logger.INSTALL=DEBUG,A3
 log4php.appender.A3=LoggerAppenderRollingFile
 log4php.appender.A3.MaxFileSize=3MB
 log4php.appender.A3.MaxBackupIndex=10
@@ -25,7 +25,7 @@
 log4php.appender.A1.layout.DateFormat="%c"
 log4php.appender.A1.File=logs/vtigercrm.log
 
-log4php.logger.MIGRATION=FATAL,A4
+log4php.logger.MIGRATION=DEBUG,A4
 log4php.appender.A4=LoggerAppenderRollingFile
 log4php.appender.A4.MaxFileSize=3MB
 log4php.appender.A4.MaxBackupIndex=10



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 13:40:06 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 20:40:06 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9517 -
	/vtigercrm/trunk/soap/firefoxtoolbar.php
Message-ID: <20060913204007.659E16D3049@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 14:39:59 2006
New Revision: 9517

Log:
Title field renamed to notes_title -- By Don

Modified:
    vtigercrm/trunk/soap/firefoxtoolbar.php

Modified: vtigercrm/trunk/soap/firefoxtoolbar.php
==============================================================================
--- vtigercrm/trunk/soap/firefoxtoolbar.php (original)
+++ vtigercrm/trunk/soap/firefoxtoolbar.php Wed Sep 13 14:39:59 2006
@@ -447,7 +447,7 @@
 	$focus = new Note();
 	if(isPermitted("Notes","EditView") == "yes")
 	{
-		$focus->column_fields['title'] = $subject;
+		$focus->column_fields['notes_title'] = $subject;
 		$focus->column_fields['notecontent'] = $desc;
 
 		$focus->save("Notes");



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 14:22:24 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 21:22:24 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9518 -
	/vtigercrm/trunk/soap/vtigerolservice.php
Message-ID: <20060913212224.DBFA576D5F9@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 15:22:17 2006
New Revision: 9518

Log:
Removed the call for htmlentities. It is handled in crmentity save itself. -- By Jeri

Modified:
    vtigercrm/trunk/soap/vtigerolservice.php

Modified: vtigercrm/trunk/soap/vtigerolservice.php
==============================================================================
--- vtigercrm/trunk/soap/vtigerolservice.php (original)
+++ vtigercrm/trunk/soap/vtigerolservice.php Wed Sep 13 15:22:17 2006
@@ -327,7 +327,7 @@
         $email->column_fields[subject] = $email_subject;
         $email->column_fields[assigned_user_id] = $user_id;
         $email->column_fields[date_start] = $date_sent;
-        $email->column_fields[description]  = htmlentities($email_body);
+        $email->column_fields[description]  = $email_body;
         $email->column_fields[activitytype] = 'Emails'; 
         $email->plugin_save = true; 
         $email->save("Emails");



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 14:26:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 21:26:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9519 -
 /vtigertoolbar/trunk/firefox/chrome/content/vtiger_loginconfig.xul
Message-ID: <20060913212637.3F1466C87F3@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 15:26:30 2006
New Revision: 9519

Log:
Modified the Demo URL

Modified:
    vtigertoolbar/trunk/firefox/chrome/content/vtiger_loginconfig.xul

Modified: vtigertoolbar/trunk/firefox/chrome/content/vtiger_loginconfig.xul
==============================================================================
Binary files - no diff available.



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 14:31:10 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 21:31:10 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9520 -
	/thunderbirdextn/trunk/install.rdf
Message-ID: <20060913213110.1B04D6C87F3@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 15:31:02 2006
New Revision: 9520

Log:
version changed to 5.0.0 --Jeri

Modified:
    thunderbirdextn/trunk/install.rdf

Modified: thunderbirdextn/trunk/install.rdf
==============================================================================
Binary files - no diff available.



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 15:39:03 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 22:39:03 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9521 -
	/vtigercrm/trunk/Release_Notes.html
Message-ID: <20060913223903.9E9E366AE3F@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 16:38:55 2006
New Revision: 9521

Log:
Release Notes added for 5.0 GA

Modified:
    vtigercrm/trunk/Release_Notes.html

Modified: vtigercrm/trunk/Release_Notes.html
==============================================================================
--- vtigercrm/trunk/Release_Notes.html (original)
+++ vtigercrm/trunk/Release_Notes.html Wed Sep 13 16:38:55 2006
@@ -18,11 +18,90 @@
 	color: #FF0000;
 	font-weight: bold;
 }
+  .style2 {
+	color: #0000FF;
+	font-weight: bold;
+}
   </style>
 </head>
 
 <body class="background">
-<p><img src="themes/images/vtiger.jpg" height="48" width="112"> </p>
+<p><img src="themes/images/vtiger.jpg" height="48" width="112"></p>
+<h1>vtiger CRM 5.0: Release Notes</h1>
+<p><b>Date: Sep 14, 2006</b></p>
+<p>Welcome to vtiger CRM!</p>
+<p>vtiger CRM is an enterprise-ready open source CRM solution for managing sales, marketing, customer support and order management functions effectively. Before version 5 release, vtiger CRM has passed through more than 10 development cycles.  </p>
+<p>&nbsp;</p>
+<p><b><i>Appeal to Developers, Testers, Analysts, Writers, and real end users! </i> </b></p>
+<p>Jump-start to the vtiger Public Discussions and post your valuable suggestions &amp; comments to help us deliver a world class open source CRM for you in another few weeks time. It is very simple to start working with vtiger CRM 5,</p>
+<p><b><font size="3">Step 1:</font></b> Browse through <a href="http://en.vtiger.com"><b>Live Demo</b></a></p>
+<p><b><font size="3">Step 2:</font></b> Download product from the <a href="http://vtiger.com/index.php?option=com_content&amp;task=view&amp;id=70&amp;Itemid=109"><b>vtiger.com</b></a> and install in your favorite OS.</p>
+<p><b><font size="3">Step 3:</font></b> Post your suggestions &amp; comments at vtiger Discussions under : <a href="http://forums.vtiger.com/index.php?c=10"><b>vtiger CRM 5.x</b></a> category</p>
+<p><b><a name="TOC3" id="TOC3"></a>Table of Contents</b></p>
+<ol>
+  <li><a href="#Summary5-v5">Summary</a></li>
+  <li><a href="#Features5-v5">Features</a></li>
+  <li><a href="#v5_Bug_Fixes-v5">Bug Fixes</a></li>
+  <li><a href="#KI5-v5">Known Issues </a></li>
+</ol>
+<h3><a name="Summary5-v5" id="Summary5-v5"></a>1. Summary</h3>
+<table border="1" cellpadding="5" cellspacing="0" width="73%">
+  <tbody>
+    <tr bgcolor="#ccccff">
+      <td width="5%"><b><font color="#990000">S. No</font></b></td>
+      <td width="40%"><b><font color="#990000">Item</font></b></td>
+      <td width="55%"><b><font color="#990000">Status</font></b></td>
+    </tr>
+    <tr>
+      <td width="5%">1 </td>
+      <td width="40%">Features</td>
+      <td width="55%">
+        <p>10</p></td>
+    </tr>
+    <tr>
+      <td width="5%">3</td>
+      <td width="40%">Product Size</td>
+      <td width="55%">Platform Independent - <b>6.1 MB<br />
+        </b>Windows (EXE) - <b>26 MB</b><br />
+        Linux (BIN) - <b>40 MB</b></td>
+    </tr>
+    <tr>
+      <td width="5%">4</td>
+      <td width="40%">Database Migration</td>
+      <td width="55%"><span class="style2">Available for migrating data from 4.2.3 , 4.2.4, or 5.0 RC to v5.0</span></td>
+    </tr>
+    <tr>
+      <td width="5%">5</td>
+      <td width="40%">vtiger CRM - PHP Documentation</td>
+      <td width="55%"> URL: <a href="http://api.vtiger.com/index.php">Click Here</a></td>
+    </tr>
+    <tr>
+      <td width="5%">6</td>
+      <td width="40%">Product Documentation</td>
+      <td width="55%"><p>Available at the <a href="http://wiki.vtiger.com/index.php">Wiki</a></p></td>
+    </tr>
+  </tbody>
+</table>
+<h3><a name="Features5-v5" id="Features5-v5"></a>2. Features</h3>
+<ul>
+  <li>AJAX based User Interface</li>
+  <li>Color Schemes</li>
+  <li> Enterprise-grade Security Management</li>
+  <li>Calendaring</li>
+  <li>Email Client</li>
+  <li> Customization</li>
+  <li>Reports &amp; Dashboard </li>
+  <li>Order Management </li>
+  <li> Marketing Automation </li>
+</ul>
+<p>For more details refer to: <a href="http://www.vtiger.com/products/crm/v5-release-notes.pdf">http://www.vtiger.com/products/crm/v5-release-notes.pdf</a></p>
+<h3><a name="v5_Bug_Fixes-v5" id="v5_Bug_Fixes-v5"></a>Bug Fixes</h3>
+<p>We have fixed about 200 issues after v5 RC release. For more details, kindly refer to the vtiger CRM Bug Tracker:</p>
+<p><a href="http://vtiger.fosslabs.com/cgi-bin/trac.cgi/query?status=closed&amp;group=owner&amp;version=5.0.0&amp;order=priority%20">http://vtiger.fosslabs.com/cgi-bin/trac.cgi/query?status=closed&amp;group=owner&amp;version=5.0.0&amp;order=priority </a></p>
+<h3><a name="KI5-v5" id="KI5-v5"></a>4. Known Issues</h3>
+<p>As on Sep 14, 2006 there are about 240 open issues. For more details, kindly refer to the vtiger CRM Bug Tracker:</p>
+<p><a href="http://vtiger.fosslabs.com/cgi-bin/trac.cgi/query?status=new&status=assigned&status=reopened&milestone=5.0.1&milestone=&order=priority">http://vtiger.fosslabs.com/cgi-bin/trac.cgi/query?status=new&amp;status=assigned&amp;status=reopened&amp;milestone=5.0.1&amp;milestone=&amp;order=priority</a></p>
+<hr />
 <h1>vtiger CRM 5.0 RC1: Release Notes</h1>
 <p><b>Date: Aug 14, 2006</b></p>
 <p> vtiger CRM 5.0 RC1, is ready for the last-round of validation before GA release!</p>



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 16:03:06 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 23:03:06 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9522 -
 /thunderbirdextn/trunk/chrome/vtiger/content/vtiger/vtiger.js
Message-ID: <20060913230306.0F20276CEC5@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 17:02:58 2006
New Revision: 9522

Log:
Fixed issue while adding email to vtiger -- By Jeri

Modified:
    thunderbirdextn/trunk/chrome/vtiger/content/vtiger/vtiger.js

Modified: thunderbirdextn/trunk/chrome/vtiger/content/vtiger/vtiger.js
==============================================================================
Binary files - no diff available.



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 16:16:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 23:16:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9523 -
	/vtigercrm/trunk/Release_Notes.html
Message-ID: <20060913231640.1F19676E197@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 17:16:32 2006
New Revision: 9523

Log:
Issues in Release Notes Fixed --By gopal

Modified:
    vtigercrm/trunk/Release_Notes.html

Modified: vtigercrm/trunk/Release_Notes.html
==============================================================================
--- vtigercrm/trunk/Release_Notes.html (original)
+++ vtigercrm/trunk/Release_Notes.html Wed Sep 13 17:16:32 2006
@@ -27,16 +27,10 @@
 
 <body class="background">
 <p><img src="themes/images/vtiger.jpg" height="48" width="112"></p>
-<h1>vtiger CRM 5.0: Release Notes</h1>
+<h1>vtiger CRM 5.0.0: Release Notes</h1>
 <p><b>Date: Sep 14, 2006</b></p>
 <p>Welcome to vtiger CRM!</p>
-<p>vtiger CRM is an enterprise-ready open source CRM solution for managing sales, marketing, customer support and order management functions effectively. Before version 5 release, vtiger CRM has passed through more than 10 development cycles.  </p>
-<p>&nbsp;</p>
-<p><b><i>Appeal to Developers, Testers, Analysts, Writers, and real end users! </i> </b></p>
-<p>Jump-start to the vtiger Public Discussions and post your valuable suggestions &amp; comments to help us deliver a world class open source CRM for you in another few weeks time. It is very simple to start working with vtiger CRM 5,</p>
-<p><b><font size="3">Step 1:</font></b> Browse through <a href="http://en.vtiger.com"><b>Live Demo</b></a></p>
-<p><b><font size="3">Step 2:</font></b> Download product from the <a href="http://vtiger.com/index.php?option=com_content&amp;task=view&amp;id=70&amp;Itemid=109"><b>vtiger.com</b></a> and install in your favorite OS.</p>
-<p><b><font size="3">Step 3:</font></b> Post your suggestions &amp; comments at vtiger Discussions under : <a href="http://forums.vtiger.com/index.php?c=10"><b>vtiger CRM 5.x</b></a> category</p>
+<p>vtiger CRM is an enterprise-ready open source CRM solution for managing sales, marketing, customer support and order management functions effectively. Before version 5 release, vtiger CRM has passed through more than 10 development cycles. </p>
 <p><b><a name="TOC3" id="TOC3"></a>Table of Contents</b></p>
 <ol>
   <li><a href="#Summary5-v5">Summary</a></li>
@@ -71,14 +65,19 @@
       <td width="55%"><span class="style2">Available for migrating data from 4.2.3 , 4.2.4, or 5.0 RC to v5.0</span></td>
     </tr>
     <tr>
-      <td width="5%">5</td>
+      <td>5</td>
+      <td>Product Download </td>
+      <td><a href="http://www.vtiger.com/index.php?option=com_content&task=view&id=30&Itemid=57" target="_blank">Click Here</a></td>
+    </tr>
+    <tr>
+      <td width="5%">6</td>
       <td width="40%">vtiger CRM - PHP Documentation</td>
-      <td width="55%"> URL: <a href="http://api.vtiger.com/index.php">Click Here</a></td>
-    </tr>
-    <tr>
-      <td width="5%">6</td>
+      <td width="55%"> URL: <a href="http://api.vtiger.com/index.php" target="_blank">Click Here</a></td>
+    </tr>
+    <tr>
+      <td width="5%">7</td>
       <td width="40%">Product Documentation</td>
-      <td width="55%"><p>Available at the <a href="http://wiki.vtiger.com/index.php">Wiki</a></p></td>
+      <td width="55%"><p>Available at the <a href="http://wiki.vtiger.com/index.php" target="_blank">Wiki</a></p></td>
     </tr>
   </tbody>
 </table>
@@ -94,13 +93,11 @@
   <li>Order Management </li>
   <li> Marketing Automation </li>
 </ul>
-<p>For more details refer to: <a href="http://www.vtiger.com/products/crm/v5-release-notes.pdf">http://www.vtiger.com/products/crm/v5-release-notes.pdf</a></p>
+<p>For more details refer to: <a href="http://www.vtiger.com/products/crm/vtigercrm-5-release-notes.pdf">http://www.vtiger.com/products/crm/v5-release-notes.pdf</a></p>
 <h3><a name="v5_Bug_Fixes-v5" id="v5_Bug_Fixes-v5"></a>Bug Fixes</h3>
-<p>We have fixed about 200 issues after v5 RC release. For more details, kindly refer to the vtiger CRM Bug Tracker:</p>
-<p><a href="http://vtiger.fosslabs.com/cgi-bin/trac.cgi/query?status=closed&amp;group=owner&amp;version=5.0.0&amp;order=priority%20">http://vtiger.fosslabs.com/cgi-bin/trac.cgi/query?status=closed&amp;group=owner&amp;version=5.0.0&amp;order=priority </a></p>
+<p>We have fixed about 200 issues after v5 RC release. For more details, kindly refer to the <strong><a href="http://vtiger.fosslabs.com/cgi-bin/trac.cgi/query?status=closed&group=owner&version=5.0.0&order=priority%20" target="_blank">vtiger CRM Bug Tracker</a>.</strong></p>
 <h3><a name="KI5-v5" id="KI5-v5"></a>4. Known Issues</h3>
-<p>As on Sep 14, 2006 there are about 240 open issues. For more details, kindly refer to the vtiger CRM Bug Tracker:</p>
-<p><a href="http://vtiger.fosslabs.com/cgi-bin/trac.cgi/query?status=new&status=assigned&status=reopened&milestone=5.0.1&milestone=&order=priority">http://vtiger.fosslabs.com/cgi-bin/trac.cgi/query?status=new&amp;status=assigned&amp;status=reopened&amp;milestone=5.0.1&amp;milestone=&amp;order=priority</a></p>
+<p>As on Sep 14, 2006 there are about 178 open issues. For more details, kindly refer to the<a href="http://vtiger.fosslabs.com/cgi-bin/trac.cgi/query?status=new&status=assigned&status=reopened&milestone=5.0.1&milestone=&type=defect&order=priority" target="_blank"><strong> vtiger CRM Bug Tracker</strong></a>:</p>
 <hr />
 <h1>vtiger CRM 5.0 RC1: Release Notes</h1>
 <p><b>Date: Aug 14, 2006</b></p>



From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 23:35:28 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 14 Sep 2006 06:35:28 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9524 -
	/vtigercrm/trunk/modules/Home/index.php
Message-ID: <20060914063528.EDB3E76F91E@vtiger.fosslabs.com>

Author: richie
Date: Thu Sep 14 00:35:13 2006
New Revision: 9524

Log:
My Group Allocation link in home page fixed

Modified:
    vtigercrm/trunk/modules/Home/index.php

Modified: vtigercrm/trunk/modules/Home/index.php
==============================================================================
--- vtigercrm/trunk/modules/Home/index.php (original)
+++ vtigercrm/trunk/modules/Home/index.php Thu Sep 14 00:35:13 2006
@@ -280,8 +280,9 @@
 					$list = '<a href=index.php?module=HelpDesk';
 					$list .= '&action=DetailView&record='.$row["id"].'>'.$row["name"].'</a>';
 				}
-				elseif($row["type"] == "Calendar")
+				elseif($row["type"] == "Activities")
 				{
+					$row["type"] = 'Calendar';
 					$acti_type = getActivityType($row["id"]);
 					$list = '<a href=index.php?module='.$row["type"];
 					if($acti_type == 'Task')



From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep 14 00:52:17 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 14 Sep 2006 07:52:17 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9525 -
	/vtigercrm/trunk/modules/Quotes/CreatePDF.php
Message-ID: <20060914075217.22F5076F934@vtiger.fosslabs.com>

Author: richie
Date: Thu Sep 14 01:52:08 2006
New Revision: 9525

Log:
Create PDF issue in windows machine has been fixed --By Jeri

Modified:
    vtigercrm/trunk/modules/Quotes/CreatePDF.php

Modified: vtigercrm/trunk/modules/Quotes/CreatePDF.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/CreatePDF.php (original)
+++ vtigercrm/trunk/modules/Quotes/CreatePDF.php Thu Sep 14 01:52:08 2006
@@ -229,5 +229,5 @@
 
 
 $pdf->Output('Quotes.pdf','D'); //added file name to make it work in IE, also forces the download giving the user the option to save
-
+exit();
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep 14 00:53:24 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 14 Sep 2006 07:53:24 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9526 -
	/vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php
Message-ID: <20060914075324.286F276F932@vtiger.fosslabs.com>

Author: richie
Date: Thu Sep 14 01:53:14 2006
New Revision: 9526

Log:
Create PDF issue in windows machine has been fixed --By Jeri

Modified:
    vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php

Modified: vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php Thu Sep 14 01:53:14 2006
@@ -228,5 +228,5 @@
 
 
 $pdf->Output('PurchaseOrder.pdf','D'); //added file name to make it work in IE, also forces the download giving the user the option to save
-
+exit();
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep 14 01:01:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 14 Sep 2006 08:01:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9527 -
	/vtigercrm/trunk/modules/Invoice/EditView.php
Message-ID: <20060914080157.7C82B76F932@vtiger.fosslabs.com>

Author: richie
Date: Thu Sep 14 02:01:26 2006
New Revision: 9527

Log:
Fixed the Sales Order Handling -- By Mickie

Modified:
    vtigercrm/trunk/modules/Invoice/EditView.php

Modified: vtigercrm/trunk/modules/Invoice/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/EditView.php (original)
+++ vtigercrm/trunk/modules/Invoice/EditView.php Thu Sep 14 02:01:26 2006
@@ -111,6 +111,18 @@
         $focus->mode = 'edit';
         $focus->name=$focus->column_fields['subject'];
 
+	/*
+	//Added to display the SO's associated products -- when we select SO in Edit Invoice page
+	if(isset($_REQUEST['salesorder_id']) && $_REQUEST['salesorder_id'] !='')
+	{
+		$associated_prod = getAssociatedProducts("SalesOrder",$so_focus,$focus->column_fields['salesorder_id']);
+	}
+
+	$smarty->assign("SALESORDER_ID", $focus->column_fields['salesorder_id']);
+	$smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
+	$smarty->assign("MODE", $so_focus->mode);
+	$smarty->assign("AVAILABLE_PRODUCTS", 'true');
+	*/
     }		
     else
     {	
@@ -146,6 +158,17 @@
 		$so_focus->id = $soid;
 		$so_focus->retrieve_entity_info($soid,"SalesOrder");
 		$focus = getConvertSoToInvoice($focus,$so_focus,$soid);
+
+		//Added to display the SO's associated products -- when we select SO in New Invoice page
+		if(isset($_REQUEST['salesorder_id']) && $_REQUEST['salesorder_id'] !='')
+		{
+			$associated_prod = getAssociatedProducts("SalesOrder",$so_focus,$focus->column_fields['salesorder_id']);
+		}
+
+		$smarty->assign("SALESORDER_ID", $focus->column_fields['salesorder_id']);
+		$smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
+		$smarty->assign("MODE", $so_focus->mode);
+		$smarty->assign("AVAILABLE_PRODUCTS", 'true');
 
 	}
 }
@@ -240,6 +263,13 @@
 {
 	$smarty->assign("MODE", $focus->mode);
 	$se_array=getProductDetailsBlockInfo($focus->mode,"SalesOrder",$so_focus);
+
+	$txtTax = (($so_focus->column_fields['txtTax'] != '')?$so_focus->column_fields['txtTax']:'0.000');
+	$txtAdj = (($so_focus->column_fields['txtAdjustment'] != '')?$so_focus->column_fields['txtAdjustment']:'0.000');
+	
+	$associated_prod = getAssociatedProducts("SalesOrder",$so_focus);
+	$smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
+	$smarty->assign("MODE", $focus->mode);
 }
 elseif($focus->mode == 'edit')
 {



From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep 14 01:05:35 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 14 Sep 2006 08:05:35 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9528 -
	/vtigercrm/trunk/Release_Notes.html
Message-ID: <20060914080536.210586FDF50@vtiger.fosslabs.com>

Author: richie
Date: Thu Sep 14 02:05:27 2006
New Revision: 9528

Log:
Fixed issues --By philip

Modified:
    vtigercrm/trunk/Release_Notes.html

Modified: vtigercrm/trunk/Release_Notes.html
==============================================================================
--- vtigercrm/trunk/Release_Notes.html (original)
+++ vtigercrm/trunk/Release_Notes.html Thu Sep 14 02:05:27 2006
@@ -50,32 +50,32 @@
       <td width="5%">1 </td>
       <td width="40%">Features</td>
       <td width="55%">
-        <p>10</p></td>
-    </tr>
-    <tr>
-      <td width="5%">3</td>
+        &nbsp;</td>
+    </tr>
+    <tr>
+	    <td width="5%">2</td>
       <td width="40%">Product Size</td>
       <td width="55%">Platform Independent - <b>6.1 MB<br />
         </b>Windows (EXE) - <b>26 MB</b><br />
         Linux (BIN) - <b>40 MB</b></td>
     </tr>
     <tr>
-      <td width="5%">4</td>
+	    <td width="5%">3</td>
       <td width="40%">Database Migration</td>
       <td width="55%"><span class="style2">Available for migrating data from 4.2.3 , 4.2.4, or 5.0 RC to v5.0</span></td>
     </tr>
     <tr>
-      <td>5</td>
+	    <td>4</td>
       <td>Product Download </td>
       <td><a href="http://www.vtiger.com/index.php?option=com_content&task=view&id=30&Itemid=57" target="_blank">Click Here</a></td>
     </tr>
     <tr>
-      <td width="5%">6</td>
+	    <td width="5%">5</td>
       <td width="40%">vtiger CRM - PHP Documentation</td>
       <td width="55%"> URL: <a href="http://api.vtiger.com/index.php" target="_blank">Click Here</a></td>
     </tr>
     <tr>
-      <td width="5%">7</td>
+	    <td width="5%">6</td>
       <td width="40%">Product Documentation</td>
       <td width="55%"><p>Available at the <a href="http://wiki.vtiger.com/index.php" target="_blank">Wiki</a></p></td>
     </tr>
@@ -94,7 +94,7 @@
   <li> Marketing Automation </li>
 </ul>
 <p>For more details refer to: <a href="http://www.vtiger.com/products/crm/vtigercrm-5-release-notes.pdf">http://www.vtiger.com/products/crm/v5-release-notes.pdf</a></p>
-<h3><a name="v5_Bug_Fixes-v5" id="v5_Bug_Fixes-v5"></a>Bug Fixes</h3>
+<h3><a name="v5_Bug_Fixes-v5" id="v5_Bug_Fixes-v5"></a>3. Bug Fixes</h3>
 <p>We have fixed about 200 issues after v5 RC release. For more details, kindly refer to the <strong><a href="http://vtiger.fosslabs.com/cgi-bin/trac.cgi/query?status=closed&group=owner&version=5.0.0&order=priority%20" target="_blank">vtiger CRM Bug Tracker</a>.</strong></p>
 <h3><a name="KI5-v5" id="KI5-v5"></a>4. Known Issues</h3>
 <p>As on Sep 14, 2006 there are about 178 open issues. For more details, kindly refer to the<a href="http://vtiger.fosslabs.com/cgi-bin/trac.cgi/query?status=new&status=assigned&status=reopened&milestone=5.0.1&milestone=&type=defect&order=priority" target="_blank"><strong> vtiger CRM Bug Tracker</strong></a>:</p>



From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep 14 04:37:58 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 14 Sep 2006 11:37:58 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9529 -
	/vtigercrm/tags/vtigercrm-5.0.0/
Message-ID: <20060914113758.3D59376F949@vtiger.fosslabs.com>

Author: richie
Date: Thu Sep 14 05:37:04 2006
New Revision: 9529

Log:
made a copy

Added:
    vtigercrm/tags/vtigercrm-5.0.0/
      - copied from r9528, vtigercrm/trunk/



From vtigercrm-commits at vtiger.fosslabs.com  Fri Sep 15 04:33:17 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 15 Sep 2006 11:33:17 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9530 -
	/vtigercrm/tags/vtigercrm-outlook-plugin-5.0.0/
Message-ID: <20060915113317.6713666A734@vtiger.fosslabs.com>

Author: richie
Date: Fri Sep 15 05:33:03 2006
New Revision: 9530

Log:
Tagging the v5 Outlook Plugin source

Added:
    vtigercrm/tags/vtigercrm-outlook-plugin-5.0.0/
      - copied from r9529, vtigercrmoutlook/trunk/



From vtigercrm-commits at vtiger.fosslabs.com  Fri Sep 15 04:38:04 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 15 Sep 2006 11:38:04 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9531 -
	/vtigercrm/tags/vtigercrm-office-plugin-5.0.0/
Message-ID: <20060915113804.19EF7748327@vtiger.fosslabs.com>

Author: richie
Date: Fri Sep 15 05:37:50 2006
New Revision: 9531

Log:
Tagging the v5 Office Plugin source

Added:
    vtigercrm/tags/vtigercrm-office-plugin-5.0.0/
      - copied from r9530, wordintegration/trunk/



From vtigercrm-commits at vtiger.fosslabs.com  Fri Sep 15 04:41:05 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 15 Sep 2006 11:41:05 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9532 -
	/vtigercrm/tags/vtigercrm-tbird-plugin-5.0.0/
Message-ID: <20060915114105.63D096D3073@vtiger.fosslabs.com>

Author: richie
Date: Fri Sep 15 05:40:46 2006
New Revision: 9532

Log:
Tagging the v5 ThunderBird Plugin source

Added:
    vtigercrm/tags/vtigercrm-tbird-plugin-5.0.0/
      - copied from r9531, thunderbirdextn/trunk/



From vtigercrm-commits at vtiger.fosslabs.com  Fri Sep 15 04:46:14 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 15 Sep 2006 11:46:14 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9533 -
	/vtigercrm/tags/vtigercrm-fxtoolbar-5.0.0/
Message-ID: <20060915114614.192F376FE98@vtiger.fosslabs.com>

Author: richie
Date: Fri Sep 15 05:45:53 2006
New Revision: 9533

Log:
Tagging the v5 FireFox ToolBar source

Added:
    vtigercrm/tags/vtigercrm-fxtoolbar-5.0.0/
      - copied from r9532, vtigertoolbar/trunk/



From vtigercrm-commits at vtiger.fosslabs.com  Fri Sep 15 04:56:25 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 15 Sep 2006 11:56:25 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9534 -
	/vtigercrm/tags/vtigercrm-customerportal-5.0.0/
Message-ID: <20060915115625.A32ED76FE9D@vtiger.fosslabs.com>

Author: richie
Date: Fri Sep 15 05:55:55 2006
New Revision: 9534

Log:
Tagging the v5 Customer Portal source

Added:
    vtigercrm/tags/vtigercrm-customerportal-5.0.0/
      - copied from r9533, customerportal/trunk/



From vtigercrm-commits at vtiger.fosslabs.com  Fri Sep 15 05:13:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 15 Sep 2006 12:13:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9535 -
	/vtigercrm/tags/vtigercrm-webforms-5.0.0/
Message-ID: <20060915121337.56CF176FE9F@vtiger.fosslabs.com>

Author: richie
Date: Fri Sep 15 06:13:03 2006
New Revision: 9535

Log:
Tagging the v5 web forms source

Added:
    vtigercrm/tags/vtigercrm-webforms-5.0.0/
      - copied from r9534, vtiger_webforms/trunk/



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 19 04:53:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 19 Sep 2006 11:53:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9536 -
	/vtigercrm/branches/5.0.1/
Message-ID: <20060919115338.364FB76FEA6@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep 19 05:53:16 2006
New Revision: 9536

Log:
Creating a branch for 5.0.1

Added:
    vtigercrm/branches/5.0.1/
      - copied from r9529, vtigercrm/trunk/



From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 19 04:56:15 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 19 Sep 2006 11:56:15 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9537 -
	/vtigercrm/branches/5.1/
Message-ID: <20060919115615.4A74076FEE9@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep 19 05:56:02 2006
New Revision: 9537

Log:
Creating a branch for 5.1 release

Added:
    vtigercrm/branches/5.1/
      - copied from r9529, vtigercrm/trunk/



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 25 02:44:58 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 25 Sep 2006 09:44:58 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9538 -
	/vtigercrm/branches/5.0.1/jscalendar/calendar.js
Message-ID: <20060925094458.9514B76FF14@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep 25 03:44:35 2006
New Revision: 9538

Log:
Year selection fix in IE - contribution by brian

Modified:
    vtigercrm/branches/5.0.1/jscalendar/calendar.js

Modified: vtigercrm/branches/5.0.1/jscalendar/calendar.js
==============================================================================
--- vtigercrm/branches/5.0.1/jscalendar/calendar.js (original)
+++ vtigercrm/branches/5.0.1/jscalendar/calendar.js Mon Sep 25 03:44:35 2006
@@ -1703,7 +1703,9 @@
 	return str;
 };
 
+if ( Date.prototype.__msh_oldSetFullYear == null ) {
 Date.prototype.__msh_oldSetFullYear = Date.prototype.setFullYear;
+}
 Date.prototype.setFullYear = function(y) {
 	var d = new Date(this);
 	d.__msh_oldSetFullYear(y);



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 25 03:52:16 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 25 Sep 2006 10:52:16 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9539 -
	/vtigercrm/branches/5.0.1/include/utils/utils.php
Message-ID: <20060925105216.BA2C077049B@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep 25 04:52:10 2006
New Revision: 9539

Log:
Quick fix for Firefox toolbar - contribution by Devis

Modified:
    vtigercrm/branches/5.0.1/include/utils/utils.php

Modified: vtigercrm/branches/5.0.1/include/utils/utils.php
==============================================================================
--- vtigercrm/branches/5.0.1/include/utils/utils.php (original)
+++ vtigercrm/branches/5.0.1/include/utils/utils.php Mon Sep 25 04:52:10 2006
@@ -837,7 +837,8 @@
 	$log->debug("Entering to_html(".$string.",".$encode.") method ...");
         global $toHtml;
         if($encode && is_string($string)){//$string = htmlentities($string, ENT_QUOTES);
-        $string = str_replace(array_keys($toHtml), array_values($toHtml), $string);
+		if (is_array($toHtml))
+        		$string = str_replace(array_keys($toHtml), array_values($toHtml), $string);
         }
 	$log->debug("Exiting to_html method ...");
         return $string;



From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 25 06:06:23 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 25 Sep 2006 13:06:23 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9540 - in
 /vtigercrm/branches/5.0.1/themes: alphagrey/style.css bluelagoon/style.css
 woodspice/style.css
Message-ID: <20060925130623.E45737704A7@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep 25 07:06:16 2006
New Revision: 9540

Log:
AllMenu div problem - contribution by brian

Modified:
    vtigercrm/branches/5.0.1/themes/alphagrey/style.css
    vtigercrm/branches/5.0.1/themes/bluelagoon/style.css
    vtigercrm/branches/5.0.1/themes/woodspice/style.css

Modified: vtigercrm/branches/5.0.1/themes/alphagrey/style.css
==============================================================================
--- vtigercrm/branches/5.0.1/themes/alphagrey/style.css (original)
+++ vtigercrm/branches/5.0.1/themes/alphagrey/style.css Mon Sep 25 07:06:16 2006
@@ -2090,7 +2090,7 @@
     left:200px;
     top:100px;
     position:absolute;
-    z-index:1000001;
+    z-index:10000001;
     display:none;
     padding:10px;
     background:#ffffff url(images/layerPopUpBg.gif);

Modified: vtigercrm/branches/5.0.1/themes/bluelagoon/style.css
==============================================================================
--- vtigercrm/branches/5.0.1/themes/bluelagoon/style.css (original)
+++ vtigercrm/branches/5.0.1/themes/bluelagoon/style.css Mon Sep 25 07:06:16 2006
@@ -2091,7 +2091,7 @@
     left:300px;
     top:100px;
     position:absolute;
-    z-index:1000001;
+    z-index:10000001;
     display:none;
     padding:10px;
     background:#ffffff url(images/layerPopUpBg.gif);

Modified: vtigercrm/branches/5.0.1/themes/woodspice/style.css
==============================================================================
--- vtigercrm/branches/5.0.1/themes/woodspice/style.css (original)
+++ vtigercrm/branches/5.0.1/themes/woodspice/style.css Mon Sep 25 07:06:16 2006
@@ -2125,7 +2125,7 @@
     left:300px;
     top:100px;
     position:absolute;
-    z-index:1000001;
+    z-index:10000001;
     display:none;
     padding:10px;
     background:#ffffff url(images/layerPopUpBg.gif);



From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep 28 05:15:00 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 28 Sep 2006 12:15:00 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9541 -
 /vtigercrm/branches/5.0.1/Smarty/templates/ListEmailTemplates.tpl
Message-ID: <20060928121500.ABDFA78768B@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Thu Sep 28 06:14:52 2006
New Revision: 9541

Log:
If Email Selected then hide the Add button --By Vashini

Modified:
    vtigercrm/branches/5.0.1/Smarty/templates/ListEmailTemplates.tpl

Modified: vtigercrm/branches/5.0.1/Smarty/templates/ListEmailTemplates.tpl
==============================================================================
--- vtigercrm/branches/5.0.1/Smarty/templates/ListEmailTemplates.tpl (original)
+++ vtigercrm/branches/5.0.1/Smarty/templates/ListEmailTemplates.tpl Thu Sep 28 06:14:52 2006
@@ -9,10 +9,43 @@
   *
  ********************************************************************************/
 -->*}
+
 <script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
 <script>
+function ifselected()
+{ldelim}
+  
+      
+      var sel =document.massdelete.selected_id.length;
+      var returnval=false;
+      
+     for(i=0; i < sel; i++)
+     {ldelim}
+     
+      if(document.massdelete.selected_id[i].checked == true)
+        {ldelim}
+            returnval=true;
+            break;
+        {rdelim}
+        
+      {rdelim}
+      
+      
+          if(returnval==true)
+           {ldelim}
+               document.getElementById("myProfile").style.display="none";
+           {rdelim}
+          else
+           {ldelim}
+              document.getElementById("myProfile").style.display="block";
+          {rdelim}
+    	
+{rdelim}
+
+
 function massDelete()
 {ldelim}
+        
         x = document.massdelete.selected_id.length;
         idstring = "";
 
@@ -22,11 +55,15 @@
                 if (document.massdelete.selected_id.checked)
                {ldelim}
                         document.massdelete.idlist.value=document.massdelete.selected_id.value+';';
+                          
+                        
 			xx=1;
                 {rdelim}
                 else
                 {ldelim}
+                         document.massdelete.profile.style.display="none";
                         alert("Please select at least one entity");
+                        
                         return false;
                 {rdelim}
         {rdelim}
@@ -103,7 +140,7 @@
 					<table border=0 cellspacing=0 cellpadding=5 width=100% class="listTableTopButtons">
 					<tr>
 						<td class=small><input type="submit" value="{$UMOD.LBL_DELETE}" onclick="return massDelete();" class="crmButton delete small"></td>
-						<td class=small align=right><input class="crmButton create small" type="submit" value="{$UMOD.LBL_NEW_TEMPLATE}" name="profile"  class="classBtn" onclick="this.form.action.value='createemailtemplate';this.form.parenttab.value='Settings';"></td>
+						<td class=small align=right id="new_template"><div id = "myProfile"><input class="crmButton create small" type="submit" value="{$UMOD.LBL_NEW_TEMPLATE}" name="profile"  class="classBtn" onclick="this.form.action.value='createemailtemplate';this.form.parenttab.value='Settings';"></div></td>
 					</tr>
 					</table>
 					<table border="0" cellspacing="0" cellpadding="5" width="100%" class="listTable">
@@ -117,7 +154,7 @@
 					{foreach name=emailtemplate item=template from=$TEMPLATES}
 					<tr>
 						<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=toggleSelectAll(this.name,"selectall") class=small></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>
 						</td>



From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep 28 05:17:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 28 Sep 2006 12:17:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9542 -
 /vtigercrm/branches/5.0.1/themes/bluelagoon/style.css
Message-ID: <20060928121727.A4AAE787B74@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Thu Sep 28 06:17:09 2006
New Revision: 9542

Log:
Css Trimed --By Vashini

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

Modified: vtigercrm/branches/5.0.1/themes/bluelagoon/style.css
==============================================================================
--- vtigercrm/branches/5.0.1/themes/bluelagoon/style.css (original)
+++ vtigercrm/branches/5.0.1/themes/bluelagoon/style.css Thu Sep 28 06:17:09 2006
@@ -166,13 +166,6 @@
 	padding-top:5px;
 	padding-bottom:5px;
 }
-
-
-.tabLiner {
-	background:#9abffc url(images/moduleSelectorBg.gif) bottom repeat-x;
-	padding:0px;
-}
-
 .sep1 {
 	background:#999999;
 }
@@ -184,15 +177,10 @@
 a {
 	text-decoration:none;
 	color:#3344bb;
-	
-	
-	
 }
 
 a:hover {
 	text-decoration:underline;
-	
-	
 }
 
 .hdrLink {
@@ -240,8 +228,6 @@
 }
 
 .lvtBg {
-	
-
 }
 
 .lvtHeaderText {
@@ -321,15 +307,6 @@
 	padding-left:0px;
 }
 
-.rightAddInfo {
-	border-left:1px solid #a2a2a2;
-	border-right:1px solid #dddddd;
-	border-bottom:1px solid #dddddd;
-	border-top:1px solid #a2a2a2;
-	background-color:#fafafa;
-	padding:5px;
-}
-
 .dvtCellLabel, .cellLabel {
 	background-color:#f5f5ff;
 	padding-right:10px;
@@ -364,22 +341,10 @@
 
 }
 
-.rightUpcomingActivitiesHeader{
-	border-bottom:1px solid #ddddcc;
-	padding:5px;
-	background-color:#ffffdd;
-}
-
-.rightUpcomingActivitiesContent {
-	padding:5px;
-	background-color:#ffffef;
-}
-
 .detailedViewHeader{
 	border-bottom:2px solid #4F94CD;
 	padding:5px; 
 	background-color:#afdbff;
-
 }
 
 .detailedViewTextBox {
@@ -392,16 +357,6 @@
 	background-color:#ffffff;
 }
 
-.detailedViewProdTextBox {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	color: #000000;
-	border:1px solid #bababa;
-	padding-left:5px;
-	width:85%;
-	background-color:#ffffff;
-}
-
 .detailedViewTextBoxOn {
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 11px;
@@ -410,32 +365,6 @@
 	padding-left:5px;
 	width:90%;
 	background-color:#ffffdd;
-}
-
-.detailedViewTextArea {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	color: #000000;
-	border:1px solid #bababa;
-	padding-left:5px;
-	width:95%;
-	height:100px;
-	background-color:#ffffff;
-	text-align:left;
-}
-
-
-/* Detailed View classes ends  ------------------------------------------- */
-
-.moduleSearch {
-	border:1px solid #dddddd;
-	background-color:#ffffef;
-
-}
-
-.searchHdrBox {
-
-	border-bottom:1px dashed #dddddd;
 }
 
 .advSearch {
@@ -464,29 +393,6 @@
 	width:10px
 
 }
-.searchNotFound {
-	border:2px solid #ff3333;
-	background-color:#fafafa;
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #ff0000;
-	height:50px;
-	width:640px;
-}
-
-
-.loginTopBg {
-	background:url(images/loginTopBg.gif) repeat-x;
-}
-
-.loginTopShade {
-	background:url(images/loginTopShade.gif) repeat-x;
-}
-
-.loginBg{
-	background:#448cEB url(images/loginBg.gif) repeat-x;
-}
-
 .textbox {
 	border:1px solid #999999;
 	background-color:#ffffff;
@@ -497,28 +403,8 @@
 
 }
 
-.loginBottomBg {
-	background:url(images/loginBottomBg.gif) repeat-x;
-}
-
-.loginSignin {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 18px;
-	color: #448ceb;
-	font-weight:bold;
-}
-
-.loginBillBoard {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	color:#ffffff;
-}
 
 .mx {
-}
-
-.calTopBg {
-	background:url(images/calBg.gif) repeat-x;
 }
 
 .calListTable td{
@@ -530,52 +416,13 @@
 	border:1px solid #999999;
 	
 }
-.calDisplay {
-	border-left:1px solid #d0d0d0;
-	border-right:1px solid #d0d0d0;
-}
-.calBottomBg {
-	background:url(images/calBottomBg.gif) repeat-x;
-}
-
-.calDayHourCell {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 18px;
-}
+
 .calDayHour {
 	border-top:1px solid #c5d5ff;
 	border-left:1px solid #c5d5ff;
 	border-bottom:1px solid #c5d5ff;
 	border-right:1px solid #c5d5ff;
 	background-color:#eae7da;
-}
-.calDiv {
-	overflow:auto; width:95%;height:200px;padding:0px;background-color:#fefefe;
-	border-top: 1px solid #bababa;
-	border-bottom: 1px solid #bababa;
-}
-.calColHdr{
-	border-top:1px solid #fefefa;
-	border-left:1px solid #fefefa;
-	
-	border-right:1px solid #a8a591;
-	background-color:#eae7da;
-}
-.calHourCol {
-	border-top: 1px solid #fefefa; 
-	border-left: 1px solid #fefefa; 
-	border-right: 1px solid #a8a591; 
-	border-bottom: 1px solid #a8a591; 
-	background-color: #eae7da; 
-	height: 30px;
-
-}
-.calHourOccupied {
-	background-color:#ffffbb;
-
-}
-.calListViewRow {
-	border-bottom:1px solid eae3d1;
 }
 
 .calAddEvent {
@@ -586,108 +433,17 @@
 	top:150px;
 	background-color:#ffffff;
 }
-
-.addEventHeader{
-	border-bottom:2px dotted #cccccc;
-}
-
-.addEventFooter{
-	border-top:2px dotted #cccccc;
-	height:40px;
-}
-
 .addEventInnerBox {
 	border:1px dotted #dadada;
 
 }
 
-.cellScheduled {
-	background-color:#ffffef;
-	color:#7a7a7a;
-}
-
-.cellSchHover {
-	border-bottom:1px solid #999999;
-	border-right:1px solid #999999;
-	border-left:1px solid #dadada;
-	border-top:1px solid #dadada;
-	background-color:#ffffef;	
-	color:#7a7a7a;	
-}
-
-.cellSch{
-	border:0px;
-	background-color:#ffffef;
-	color:#7a7a7a;
-}
-
-.cellNormalHover {
-	border-bottom:1px solid #999999;
-	border-right:1px solid #999999;
-	border-left:1px solid #dadada;
-	border-top:1px solid #dadada;
-	background-color:#ffffff;	
-	color:#7a7a7a;	
-}
 
 .cellNormal {
 	border:0px;
 	background-color:#ffffff;
 }
 
-.calEventNormal {
-        border:1px solid #999999;
-        background-color:#99ffcc;
-
-}
-
-.calEventCritical {
-        border:1px solid #999999;
-        background-color:#FFCC33;
-}
-.tblPro1 {
-
-border:2px solid #dadada;
-       background-color:white;
-
-}
-
-.tblPro1IconCell {
-    border-right:1px solid #dadada;
-}
-
-.tblPro1HeadingCell {
-    font-weight:bold;
-color:#4a4a4a;
-}
-
-.tblPro1ColHeader {
-    background-color:#dadada;
-    border-left:1px solid white;
-    border-right:1px solid #999999;
-    font-size: 11px;
-    line-height: 14px;
-    background-image:url(images/tblPro1ColBg.gif);
-}
-
-.tblPro1DataCell {
-    border-bottom:1px solid #f5f5f5;
-    color:#5a5a5a;
-    font-size: 11px;
-    line-height: 14px;
-
-}
-
-.divEventToDo {
-overflow:auto;
-height:150px;
-border:1px solid #dadada;
-
-}
-
-.EventToDo{
-
-}
 
 .thumbnail{
     background-color:#ffffff;
@@ -698,117 +454,6 @@
 	   margin-bottom: 15px;
 }
 
-.thumbnailcaption
-{ font-size: 0.9em; padding-top: 0.2em ;	}
-
-/* For Settings */
-
-.lftMnuTab{
-    font-family:Verdana, Arial, Helvetica, sans-serif;
-    font-size:12px;
-    color:#FFFFFF;
-    background-color:#BBBBBB;
-    border-left:1px solid #666666;
-    border-right:1px solid #666666;
-    border-top:0px solid #666666;
-    border-collapse:collapse;
-    text-align:right;
-    padding-top:0px;
-    padding-left:5px;
-    padding-right:5px;
-    vertical-align:top;
-}
-
-.lftMnuHdr{
-    font-family:Arial, Helvetica, sans-serif;
-    font-size:12px;
-    font-weight:bold;
-    color:white;
-    background-color:#DDDDDD;
-    border-bottom:1px solid #BBBBBB;
-    text-decoration:none;
-    width:99%;
-}
-
-.lftMnuHdr tr td{
-    font-family:Arial, Helvetica, sans-serif;
-    font-size:12px;
-    font-weight:bold;
-    color:white;
-    background-color:#DDDDDD;
-    border-bottom:1px solid #BBBBBB;
-    text-align:left;
-    text-decoration:none;
-    height:25px;
-    padding-right:0px;
-    padding-left:0px;
-}
-
-a.lftMnuHdr{
-    font-family:Arial, Helvetica, sans-serif;
-    font-size:12px;
-    font-weight:bold;
-    color:white;
-    background-color:#666666;
-    border-top:1px solid #BBBBBB;
-    border-bottom:1px solid #999999;
-    text-align:left;
-    text-decoration:none;
-    height:25px;
-    padding-left:5px;
-    width:100%;
-    display:block;
-    vertical-align:middle;
-}
-
-a.lftMnuHdr:Hover{
-    font-family:Arial, Helvetica, sans-serif;
-    font-size:12px;
-    font-weight:bold;
-    color:white;
-    background-color:#666666;
-    border-top:1px solid #BBBBBB;
-    border-bottom:1px solid #999999;
-    text-align:left;
-    text-decoration:none;
-    height:25px;
-    padding-left:5px;
-    width:100%;
-    display:block;
-}
-
-a.lftSubMnu{
-    font-family:Arial, Helvetica, sans-serif;
-    font-size:11px;
-    font-weight:normal;
-    display:block;
-    color:#666666;
-    height:20px;
-    width:93%;
-    text-align:left;
-    padding-left:15px;
-    text-decoration:none;
-    border-bottom:1px solid #BBBBBB;
-    padding-top:2px;
-    white-space:nowrap;
-}
-
-a.lftSubMnu:Hover{
-    font-family:Arial, Helvetica, sans-serif;
-    font-size:11px;
-    font-weight:normal;
-    display:block;
-    color:#666666;
-    height:20px;
-    width:93%;
-    text-align:left;
-    padding-left:15px;
-    text-decoration:none;
-    border-bottom:1px solid #BBBBBB;
-    padding-top:2px;
-    white-space:nowrap;
-    background-color:#CCCCCC;
-}
 
 .padTab{
     padding-top:0px;
@@ -818,26 +463,6 @@
     vertical-align:top;
 
 }
-
-.controlTab{
-    font-family:Arial, Helvetica, sans-serif;
-    font-size:12px;
-    text-align:center;
-    font-weight:bold;
-    text-decoration:none;
-    width:100%;
-    border:0px;
-}   
-
-.controlTab tr td{
-    font-family:Arial, Helvetica, sans-serif;
-    font-size:12px;
-    text-align:center;
-    font-weight:bold;
-    text-decoration:none;
-    vertical-align:bottom;
-}
-
 #company{
     position:relative;
     width:100%;
@@ -851,32 +476,11 @@
                                
 
 #user{position:relative;left:0px;top:0px;width:100%;display:block;}
-#studio{position:relative;left:0px;top:0px;width:100%;display:block;}
+/*#studio{position:relative;left:0px;top:0px;width:100%;display:block;}*/
 #communication{position:relative;left:0px;top:0px;width:100%;display:block;}
 #config{position:relative;left:0px;top:0px;width:100%;display:block;}
 
 #userTab{position:relative;left:0px;top:0px;width:100%;display:none;}
-#studioTab{position:relative;left:0px;top:0px;width:100%;display:none;}
-
-#scrollTab{
-	position:relative;
-	width:100%;
-	height:350px;
-	overflow:auto;
-	border:0px solid #CCCCCC;
-	display:block;
-}
-
-.dock{
-	vertical-align:middle;
-	text-align:left;
-	padding-left:0px;
-}
-.imgDoc{
-	cursor:pointer;
-	border:0px;
-}
-
 #one{
 	position:relative;
 	display:block;
@@ -910,9 +514,6 @@
 
 /* End of Settings */
 
-.bggray{
-	background-color: #dfdfdf;
-}
 .bgwhite{
 	background-color: #FFFFFF;
 }
@@ -937,82 +538,11 @@
 
 /*Added for Advance Seearch*/
 
-#scrollTab{
-	position:relative;
-	width:100%;
-	height:350px;
-	overflow:auto;
-	border:0px solid #CCCCCC;
-	display:block;
-}
-
-.dock{
-	vertical-align:middle;
-	text-align:left;
-	padding-left:0px;
-}
-
-.imgDoc{
-	cursor:pointer;
-	border:0px;
-}
-#slideMnu{
-	background-color:#BBBBBB;
-	vertical-align:top;
-}
 
 #one{
 	position:relative;
 	display:block;
 	width:245px;
-}
-
-.prdTab{
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:11px;
-	text-align:left;
-	width:100%;
-	border-left:0px solid #CCCCCC;
-	border-right:0px solid #CCCCCC;
-	border-collapse:collapse;
-}
-
-.prdTab tr th{
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:11px;
-	text-align:left;
-	border-right:1px solid #CCCCCC;
-	border-left:1px solid #CCCCCC;
-	padding-left:5px;
-	background-color:#E5E5E5;
-	height:20px;
-	color:#000000;
-	font-weight:bold;
-	text-decoration:none;
-	border-bottom:1px solid #CCCCCC;
-}
-
-.prdTab tr td{
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:11px;
-	text-align:left;
-	border-right:1px solid #CCCCCC;
-	border-left:1px solid #CCCCCC;
-	border-bottom:1px solid #CCCCCC;
-	padding-left:5px;
-	color:#000000;
-	text-decoration:none;
-	font-weight:normal;
-	height:20px;
-}
-
-.delTxt{
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:11px;
-	text-decoration:underline;
-	font-weight:normal;
-	color:#000099;
-	cursor:pointer;
 }
 
 /* Dashboard CSS */
@@ -1022,15 +552,12 @@
 	vertical-align:middle;
 	margin-top:10px;
 }
-
-
 .dashHeading {
 	font-family:Arial, Helvetica, sans-serif;
 	font-size:24px;
 	font-weight:bold;
 	color:#fff;
 }
-
 .dashSelectBg{
 	background-image:url(images/dashSelectBg.gif);
 	background-repeat:repeat-x;
@@ -1047,11 +574,6 @@
 	padding:5px;
 }
 
-.dash_shadow{
-	background-image:url(images/dash_top_shadow.jpg);
-	background-repeat:repeat-x;
-	height:10px;
-}
 
 .dash_white{
 	background-color:#FFFFFF;
@@ -1069,15 +591,6 @@
 	color:#000000;
 	padding-left:10px;padding-right:10px;	
 }
-.dashMatrixSeperator{
-	border-left:2px dashed #dadada;
-
-}
-.dashMatrixBottomLiner{
-	border-bottom:2px dashed #dadada;
-
-}
-
 .dash_switch{
 	cursor:pointer;
 	width:26px;
@@ -1127,108 +640,6 @@
 	position:top;
 }
 
-.dash_sel_top{
-	background-image:url(images/dash_sel_top.jpg);
-	background-repeat:repeat-x;
-	height:5px;
-	background-position:left top;
-	font-size:0px;
-}
-
-.dash_sel_btm{
-	background-image:url(images/dash_sel_btm.jpg);
-	background-repeat:repeat-x;
-	height:4px;
-	background-position:left top;
-	font-size:0px;
-}
-
-.dash_sel_left{
-	background-color:#F9F7C9;
-	border-left:1px solid #000000;
-	border-top:1px solid #000000;
-	border-bottom:1px solid #000000;
-	width:200px;
-	text-align:left;
-	padding-left:5px;
-	font-size:11px;
-	font-weight:bold;
-	color:#000000;
-}
-
-.dash_sel_right{
-	background-color:#F9F7C9;
-	border-right:1px solid #000000;
-	border-top:1px solid #000000;
-	border-bottom:1px solid #000000;
-	width:25px;
-	padding-left:5px;	
-	cursor:pointer;
-}
-
-/*  menu */
-
-#mnuSlide{
-	position:absolute;
-	left:0px;
-	top:100px;
-/*	width:110px;*/
-}
-
-/* a.submenu{
-	font-family:Verdana, Arial, Helvetica, sans-serif;
-	font-size:11px;
-	padding-top:5px;
-	padding-bottom:5px;
-	padding-left:10px;
-	border-bottom:1px solid #CCCCCC;
-	background-color:#ECECEC;
-	color:#000000;
-	text-align:left;
-	text-decoration:none;
-	display:block;
-}
-
-a.submenu:Hover{
-	background-color:#DDDDDD;
-	font-family:Verdana, Arial, Helvetica, sans-serif;
-	font-size:11px;
-	padding-top:5px;
-	padding-bottom:5px;
-	padding-left:10px;
-	border-bottom:1px solid #CCCCCC;
-	color:#000000;
-	text-align:left;
-	text-decoration:none;
-	display:block;
-} */
-
-#mnuKey{
-	font-family:Verdana, Arial, Helvetica, sans-serif;
-	font-size:11px;
-	background-color:#666666;
-	color:#FFFFFF;
-	text-decoration:none;
-	padding:5px;
-	font-weight:bold;
-	width:8px;
-	cursor:pointer;
-	vertical-align:top;
-	height:100px;
-	position:relative;
-	top:0px;
-	left:0px;
-}
-
-#slidemenu{
-	height:525px;
-	vertical-align:top;
-	width:100px;
-	background-color:#CCCCCC;
-	border-right:1px solid #CCCCCC;
-	opacity:.9;
-	display:none;
-}
 
 /* clock */
 
@@ -1309,11 +720,6 @@
 
 
 /* Calculator */
-.calcBg {
-	/*background-color: #666;*//*BFC1B7*/
-	background: url(images/cal_bg.gif);
-	border: 1px solid #009900;
-}
 .calcResult {
 	width: 100%;
 	height: 25px;
@@ -1367,6 +773,7 @@
 	width:25px;
 	/*background-color: #CCC;*/
 }
+
 #calc{
 	position:absolute;
 	left:100px;
@@ -1443,20 +850,6 @@
 	
 }
 
-.frameHdr{
-	height:32px;
-	background-image:url(images/rssframeHdr.gif);
-	background-repeat:repeat-x;
-	background-position:top left;
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:12px;
-	font-weight:bold;
-	text-align:left;
-	padding-left:5px;
-	color:#FFFF00;
-	vertical-align:middle;
-	border:0px solid #000000;
-}
 
 .forwardBg{
 	font-family:Arial, Helvetica, sans-serif;
@@ -1474,45 +867,6 @@
 
 /*  New Styles */
 
-.hometop{
-	font-family:Verdana, Arial, Helvetica, sans-serif;
-	font-size:14px;
-	color:white;
-	text-decoration:none;
-	text-align:left;
-	padding-left:10px;
-	background-image:url(../images/hometop.gif);
-	background-position:top left;
-	background-repeat:repeat-x;
-	height:35px;
-	vertical-align:middle;
-}
-
-.homeBtm{
-	background-image:url(../images/HomeBtm.gif);
-	background-position:top left;
-	background-repeat:repeat-x;
-	height:29px;
-}
-
-.imageTab{
-	background-color:#F5F5F5;
-	border:0px solid #EBEBEB;
-	width:30px;
-	height:30px;
-	position:relative;
-	visibility:visible;
-}
-
-a.imageTab:Hover{
-	background-color:#BFBFFF;
-	border:0px solid #EBEBEB;
-	width:30px;
-	height:30px;
-	display:block;
-	opacity:.5;
-}
-
 .mnuTab{
 	font-family:Verdana, Arial, Helvetica, sans-serif;
 	font-size:12px;
@@ -1527,106 +881,6 @@
 	vertical-align:middle;
 }
 
-.mnuSel td{
-	font-family:Verdana, Arial, Helvetica, sans-serif;
-	font-size:11px;
-	color:#000000;
-	padding-left:5px;
-	background-color:#EBEBEB;
-	height:30px;
-	text-decoration:none;
-	padding-top:5px;
-	cursor:pointer;
-	padding-top:5px;
-}
-	
-.mnuSel td:Hover{
-	font-family:Verdana, Arial, Helvetica, sans-serif;
-	font-size:11px;
-	color:#000000;
-	padding-left:5px;
-	height:30px;
-	text-decoration:underline;
-	padding-top:5px;
-	cursor:pointer;
-	padding-top:5px;
-	background-color:#EBEBEB;
-}
-
-.mnuUnSel td{
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:11px;
-	color:#00487F;
-	padding-left:5px;
-	background-color:#D7D7D7;
-	height:30px;
-	text-decoration:none;
-	padding-top:5px;
-	cursor:pointer;
-	padding-top:5px;
-}
-	
-.mnuUnSel td:Hover{
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:11px;
-	color:#00487F;
-	padding-left:5px;
-	height:30px;
-	text-decoration:underline;
-	padding-top:5px;
-	cursor:pointer;
-	padding-top:5px;
-	background-color:#D7D7D7;
-}		
-
-.tabRht{
-	background-image:url(../images/tabRht.gif);
-	background-position:top left;
-	background-repeat:repeat-y;
-	width:31px;
-}
-
-
-.frmSelect{
-	font-family:Verdana, Arial, Helvetica, sans-serif;
-	font-size:11px;
-	border:1px #EBEBEB;
-}
-
-#mnuSlide{
-	position:absolute;
-	left:0px;
-	top:100px;
-	width:110px;
-}
-
-
-#mnuKey{
-	font-family:Verdana, Arial, Helvetica, sans-serif;
-	font-size:11px;
-	background-color:#666666;
-	color:#FFFFFF;
-	text-decoration:none;
-	padding:5px;
-	font-weight:bold;
-	width:8px;
-	cursor:pointer;
-	vertical-align:top;
-	height:100px;
-	position:relative;
-	top:0px;
-	left:0px;
-}
-
-#slidemenu{
-	height:525px;
-	vertical-align:top;
-	width:100px;
-	background-color:#ECECEC;
-	border-right:1px solid #CCCCCC;
-	opacity:.8;
-}
-
 /* profile */
 
 .prvPrfBigText {
@@ -1646,56 +900,13 @@
 	border:1px solid #ebebeb;
 }
 
-.prvPrfSelectedTab {
-	background:url(images/prvPrfSelectedTab.gif) repeat-x;
-	cursor:pointer;
-
-}
-
-.prvPrfUnSelectedTab {
-	background:url(images/prvPrfUnSelectedTab.gif) repeat-x;
-	cursor:pointer;
-}
-
 .prvPrfTexture {
 	background:url(images/prvPrfTexture1.gif);
 
 }
-.prvPrfBgOn{
-	background-color:#33ee33;
-}
-.prvPrfBgOff{
-	background-color:#cccccc;
-}
-
 .prvPrfHoverOn {
 	background-color:#ffffef;
 	
-}
-.prvPrfHoverOut {
-	background-color:#ffffff;
-}
-
-.prvPrfBgImgGlobal {
-	background:url(images/prvPrfBgImgGlobal.jpg) top right no-repeat;
-}
-.prvPrfBgImgTab {
-	background:url(images/prvPrfBgImgTab.jpg) top right no-repeat;
-}
-.prvPrfBgImgStandard {
-	background:url(images/prvPrfBgImgStandard.jpg) top right no-repeat;
-}
-.prvPrfBgImgUtils {
-	background:url(images/prvPrfBgImgUtils.jpg) top right no-repeat;
-}
-.prvPrfBgImgField {
-	background:url(images/prvPrfBgImgField.jpg) top right no-repeat;
-}
-
-.prvPrfTabSample {
-	border-top:1px solid #ababab;
-	border-left:1px solid #ababab;
-	border-right:1px solid #a1a1a1;
 }
 
 /*  Organization */
@@ -1731,55 +942,6 @@
 	border-right:1px solid #CCCCCC;
 }
 
-.globTab{
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:11px;
-	font-weight:normal;
-	color:#000000;
-	border:1px solid #999999;
-	border-collapse:collapse;
-	width:100%;
-}
-
-.globTab tr th{
-	text-align:right;
-	background-color:#CCCCCC;
-	border-bottom:1px solid #999999;
-	border-right:2px solid #999999;
-	color:#000000;
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:12px;
-	text-decoration:none;
-	font-weight:bold;
-	height:20px;
-	padding-right:5px;
-	
-}
-
-.globTab tr td{
-	text-align:left;
-	border:1px solid #CCCCCC;
-	color:#666666;
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:11px;
-	text-decoration:none;
-	font-weight:normal;
-	padding-left:5px;
-	height:20px;
-}
-
-
-/* Groups */
-
-.groupul{
-	margin:0px;
-	font-family:Arial, Helvetica, sans-serif;
-	font-weight:bold;
-	font-size:12px;
-	color:#000000;
-	text-decoration:underline;
-	text-align:left;
-}
 
 .groupli{
 	margin-left:20px;
@@ -1838,35 +1000,6 @@
 	padding-bottom:3px;
 }
 
-.classBtnSmall{
-	font-family:Verdana, Arial, Helvetica, sans-serif;
-	text-decoration:none;
-	font-weight:normal;
-	font-size:9px;
-	background-color:#DBDBDB;
-	border-bottom:2px solid #999999;
-	border-right:2px solid #999999;
-	border-top:2px solid #F5F5F5;
-	border-left:2px solid #F5F5F5;
-	color:#000000;
-	text-align:center;
-}
-
-.classBtnDisable{
-	font-family:Verdana, Arial, Helvetica, sans-serif;
-	text-decoration:none;
-	font-weight:normal;
-	font-size:10px;
-	background-color:#DBDBDB;
-	border-bottom:2px solid #CCCCCC;
-	border-right:2px solid #CCCCCC;
-	border-top:2px solid #F5F5F5;
-	border-left:2px solid #F5F5F5;
-	color:#666666;
-	text-align:center;
-	padding-top:3px;
-	padding-bottom:3px;
-}
 
 .txtBox{
 	width:85%;
@@ -1909,13 +1042,6 @@
 	font-size:11px;
 }
 
-#imLead{
-	width:100%;
-	overflow:auto;
-	position:relative;
-	border:1px solid #666666;
-	height:175px;
-}
 
 .txtGreen{
 	color:green;
@@ -1928,14 +1054,6 @@
 }
 /* MY PREFERENCES */		
 
-#chPhoto{
-	position:relative;
-	display:none;
-	top:20px;
-	width:100%;
-	border:1px dashed #666666;
-	background-color:#FFFFEC;
-}
 
 /* CSS FOR REPORTS */
 
@@ -1972,7 +1090,7 @@
 }
 
 
-/* a.reportMnu{
+a.reportMnu{
 	font-size:11px;
 	color:#0070BA;
 	text-decoration:none;
@@ -1994,37 +1112,17 @@
 	border-bottom:1px solid #E1E1E1;
 	padding-left:20px;
 	padding-top:3px;
-}	*/
-
-.reportGenarateTable{
-	border-bottom:1px solid #6D6D6D;
-	border-left:1px solid #6D6D6D;
-	border-right:1px solid #6D6D6D;
-	border-top:0px solid #6D6D6D;
-	background-image:url(../images/report_bg.gif);
-	background-repeat:repeat-x;
-}
-
-.reportGenarateTable tr td{
-	padding:5px;
-}
+}	
+
 #Generate{
 	position:relative;
 	width:100%;
 	text-align:center;
 	display:none;
 }
-
-.lvtSel{
-	font-weight:bold;
-}
-	
 /* END OF REPORT */
-
-
-
 /* WEB MAIL */
-/* a.webMnu{
+a.webMnu{
 	font-size:11px;
 	color:#0070BA;
 	text-decoration:underline;
@@ -2033,14 +1131,14 @@
 	font-size:11px;
 	color:#0070BA;
 	text-decoration:underline;
-} */
+} 
 
 
 /*  END OF WEB MAIL */
 
 /* POPUP */
 
-/* a.alpha{
+ a.alpha{
 	font-size:11px;
 	color:gray;
 	text-decoration:none;
@@ -2058,7 +1156,7 @@
 	padding-right:5px;
 	border:1px dotted #CCCCCC;
 	background-color:#FFFFCC;
-} */
+} 
 
 /* Home Page */
 .MatrixLayer{
@@ -2091,7 +1189,7 @@
     left:300px;
     top:100px;
     position:absolute;
-    z-index:10000001;
+    z-index:1000001;
     display:none;
     padding:10px;
     background:#ffffff url(images/layerPopUpBg.gif);
@@ -2189,12 +1287,6 @@
 
 }
 
-.calSelTabMask {
-	background-color:#D6D2AB;
-	height:5px;
-
-}
-
 .calInnerBorder {
 	border-left:2px solid #A5B5EE;
 	border-right:2px solid #A5B5EE;
@@ -2208,15 +1300,9 @@
 	background:#fefefe url(images/layerPopupBg.gif);
 
 }
-.calTopLeft {
-	border-left: 1px solid #A5B5EE; 
-}
-
 .calTopRight {
 	border-right: 1px solid #A5B5EE; 
 }
-
-
 .calUnSel{
 	color:#000000;
 	font-weight:normal;
@@ -2224,32 +1310,6 @@
 	width:8%;
 }
 
-.calTitle{
-	background-position:right top;
-	background-repeat:no-repeat;
-	background-image:url(images/cal_title.jpg);
-	width:150px;
-}
-
-.tabBorder{
-	background-color:#EBEBEB;
-	border-bottom:1px solid #666666;
-	border-left:1px solid #666666;
-	border-right:1px solid #666666;
-	padding:10px;
-}
-
-.eventLay{
-	background-color:#DBF3FD;
-	position:relative;
-	left:0px;
-	top:0px;
-	width:100%;
-	visibility:visible;
-	padding:5px 5px 5px 5px;
-	display:block;
-	z-index:1000;
-}
 
 a.calMnu{
 	font-size:11px;
@@ -2271,9 +1331,6 @@
 	padding-top:3px;
 }
 
-.bggray{
-	background-color: #dfdfdf;
-}
 .bgwhite{
 	background-color: #FFFFFF;
 }
@@ -2296,16 +1353,6 @@
 }
 .style1 {color: #FF0000}
 
-#hrViewContent{
-	width:100%;
-	height:150px;
-	overflow:auto;
-	position:relative;
-	border-top:1px solid #CCCCCC;
-	border-bottom:0px solid white;
-	border-left:0px solid white;
-	border-right:0px solid white;
-}
 
 .event{
 	background-color:#D3EAF0;
@@ -2323,9 +1370,6 @@
 	display:block;
 }
 
-#lstView{
-	display:none;
-}	
 
 .calendarNav{
 	font-size:12px;
@@ -2369,15 +1413,6 @@
 	background-color:#ffffff;
 }
 
-#cal_popup{
-	width:600px;
-	border:3px solid #CCCCCC;
-	background-color:#FFFFFF;
-	padding:5px;
-	position:absolute;
-	left:100px;
-	top:100px;
-}
 
 .outer{
 	border-bottom:1px solid #CCCCCC;
@@ -2385,18 +1420,6 @@
 	border-right:1px solid #CCCCCC;
 }
 
-.outerBorder{
-	border:1px solid #CCCCCC;
-	width:95%;
-}
-
-.fieldHead{
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:12px;
-	font-weight:bold;
-	border:0px solid #CCCCCC;
-	padding:2px 5px 2px 5px;
-}
 
 .calTxt{
 	width:50%;
@@ -2419,39 +1442,6 @@
 /* End of Calendar */
 
 /* Cal Year View */
-.month_table{
-	border:2px solid #CCCCCC;
-	width:100%;
-	background-color:white;
-}
-
-.month_table tr th{
-	background-color:#E9E9E9;
-	color:#000000;
-	text-align:center;
-	border:1px dotted #CCCCCC;
-	height:20px;
-	width:14%;
-	font-weight:normal;
-}
-
-.month_table tr td{
-	border:1px dotted #CCCCCC;
-	color:#000000;
-	text-align:center;
-	height:20px;
-}
-
-.cal_Hdr{
-	background-image:url(images/cal_Hdr.gif);
-	background-repeat:repeat-x;
-	background-position:left top;
-	font-weight:bold;
-	color:#000000;
-	text-align:left;
-	border:0px solid #000000;
-}
-
 .eventDay{
 	background-color:#FF9966;
 	font-weight:bold;
@@ -2534,12 +1524,6 @@
 	padding: 4px;
     border-right: 1px solid #DDDDDD;
     border-bottom: 1px solid #DDDDDD;
-}
-.rptTitle {
-    border-right: 1px solid #333;
-    border-bottom: 1px solid #333;
-	background: #2C527C;
-	color: #FFF;
 }
 .rptGrpHead {
 	background: #FFF;
@@ -2591,31 +1575,6 @@
 
 /* Css for quick Create */
 
-.qcWindow {
-	    background-color:white;
-            border:2px solid #999999;
-}
-
-.qcHeader{
-	    background:url(images/qcBg.gif) repeat-x;
-	    background-color:gray;
-	    color:black;
-	    font-family: Arial, Helvetica, sans-serif;
-	    font-size: 12px;
-	    line-height: 19px;
-	    padding-left:10px;
-}
-.qcTextBox{
-        border:1px solid #999999;
-	    width:90%;
-}
-.qcTextArea{
-	    border:1px solid #999999;
-	    width:90%;
-	    height:70px;
-	    font-family: Arial, Helvetica, sans-serif;
-	    font-size: 11px;
-}
 .qcTransport{
 	    background-color:#d5d6ff;
 
@@ -2640,50 +1599,6 @@
 								    
 /* MY SITES */
 
-.SiteSel{
-	font-family:Arial, Helvetica, sans-serif;
-	background-image:url(images/site_sel.jpg);
-	background-position:left bottom;
-	background-repeat:no-repeat;
-	height:33px;
-	width:194px;
-	text-align:center;
-	vertical-align:middle;
-	color:#000000;
-	font-weight:bold;
-	font-size:11px;
-	text-decoration:none;
-}
-
-.SiteUnSel{
-	font-family:Arial, Helvetica, sans-serif;
-	background-image:url(images/site_unsel.jpg);
-	background-position:left bottom;
-	background-repeat:no-repeat;
-	height:33px;
-	width:194px;
-	text-align:center;
-	vertical-align:middle;
-	color:#000000;
-	font-weight:normal;
-	font-size:11px;
-	text-decoration:none;
-	cursor:pointer;
-}
-
-.SiteHdr{
-	font-family:Arial, Helvetica, sans-serif;
-	background-image:url(images/site_hdr.jpg);
-	background-position:right bottom;
-	background-repeat:no-repeat;
-	height:33px;
-	text-align:center;
-	vertical-align:middle;
-	color:#000000;
-	font-weight:normal;
-	font-size:11px;
-	text-decoration:none;
-}
 .unread_email {
 	font-weight:bold;
 }
@@ -2708,12 +1623,6 @@
     color: #000000;
 
 }
-.adProgressBar {
-	border-style:solid;
-	border-width:2px;
-	border-color:blue;
-
-}
 
 .h2 {
 
@@ -2727,17 +1636,6 @@
 	color:gray;
 }
 
-.hdeskComments {
-
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	line-height: 14px;
-	color: #999999;
-	border:0px;
-	background-color:#ffffef;
-	width:100%;
-
-}
 
 ul {
 	list-style:circle;
@@ -2747,14 +1645,6 @@
 	font-weight:normal;
 
 }
-
-	
-.branch {
-	list-style-image: url("secAdd.gif");
-}	
-
-
-
 .tagCloudTopBg {
 	background-image: url(images/tagCloudBg.gif);
 	background-repeat: repeat-x;	
@@ -2764,16 +1654,6 @@
 	background-color:#fff;
 	padding:5px;
 }
-	
-	
-	
-.heading1 {
-	font-family:  Arial, Helvetica, sans-serif;
-	font-size: 19px;
-	line-height: 14px;
-	color: #000000;
-}
-
 .heading2 {
 	font-family:  Arial, Helvetica, sans-serif;
 	font-size: 16px;
@@ -2781,30 +1661,13 @@
 	font-weight:bold;
 	color: #000000;
 }
-
-.heading3 {
-	font-family:  Arial, Helvetica, sans-serif;
-	font-size: 14px;
-	line-height: 14px;
-	color: #999999;
-}
-
-.heading4 {
-	font-family:  Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	line-height: 14px;
-	color: #999999;
-}
-
 .settingsUI {
 	
 	text-align:left;
 	background-color:#fff;
 	background-image:url(images/layerPopupBg.gif);
 	border:2px solid #aaaaff;
-
-}
-
+}
 
 .settingsTabHeader {
 	text-align:left;
@@ -2881,7 +1744,7 @@
 	font-weight:bold;
 
 }
-/*.cellLabel {
+.cellLabel {
 	background-color:#eaebd9;
 	border-top:1px solid #efefef;
 	border-bottom:1px solid #dadada;
@@ -2891,7 +1754,7 @@
 .cellText {
 	color:#333333;
 	border-bottom:1px solid #dadada;
-} */
+}
 
 .listTable{
 	border-left:1px solid #cccccc;
@@ -2992,55 +1855,16 @@
 	border:1px solid #ebebeb;
 }
 
-.prvPrfSelectedTab {
-	background:url(images/prvPrfSelectedTab.gif) repeat-x;
-
-}
-
-.prvPrfUnSelectedTab {
-	background:url(images/prvPrfUnSelectedTab.gif) repeat-x;
-
-}
+
 
 .prvPrfTexture {
 	background:url(images/prvPrfTexture1.gif);
 
-}
-.prvPrfBgOn{
-	background-color:#33ee33;
-}
-.prvPrfBgOff{
-	background-color:#cccccc;
 }
 
 .prvPrfHoverOn {
 	background-color:#ffffef;
 	
-}
-.prvPrfHoverOut {
-	background-color:#ffffff;
-}
-
-.prvPrfBgImgGlobal {
-	background:url(images/prvPrfBgImgGlobal.jpg) top right no-repeat;
-}
-.prvPrfBgImgTab {
-	background:url(images/prvPrfBgImgTab.jpg) top right no-repeat;
-}
-.prvPrfBgImgStandard {
-	background:url(images/prvPrfBgImgStandard.jpg) top right no-repeat;
-}
-.prvPrfBgImgUtils {
-	background:url(images/prvPrfBgImgUtils.jpg) top right no-repeat;
-}
-.prvPrfBgImgField {
-	background:url(images/prvPrfBgImgField.jpg) top right no-repeat;
-}
-
-.prvPrfTabSample {
-	border-top:1px solid #ababab;
-	border-left:1px solid #ababab;
-	border-right:1px solid #a1a1a1;
 }
 
 .cellBottomDotLine {
@@ -3061,14 +1885,8 @@
 	border-bottom-color: #CCCCCC;
 	
 }
-.crmFormDropDown {
-border-width:1px;
-}
 .thickBorder {
 	border: 2px solid #999999;
-}
-.trackerBorder {
-	background-color:#ffffff;
 }
 .trackerHeading {
 	background-color:#efefef;
@@ -3085,21 +1903,10 @@
 .crmTable {
 	border:1px solid #dadada;
 }
-.crmTableColHeading {
-	background-color:#CCCCCC;
-	border-left:1px solid #eaeaea;
-	border-top:1px solid #eaeaea;
-	border-right:1px solid #999999;
-	border-bottom:1px solid #999999;
-}
 .crmTableRow {
 	border-bottom:1px dotted #dadada;
 	border-right:1px dotted #dadada
 }
-
-
-
-
 /* Inventory */
 
 .lineOnTop {
@@ -3130,9 +1937,9 @@
 
 
 /* styles for RSS Display starts */
-.rssDisplay{
+/*.rssDisplay{
 	background-color:#e8e3ca;
-}
+}*/
 
 
 /* styles for RSS Display ends */
@@ -3165,10 +1972,6 @@
 .mailSubHeader {
 	background:#b4b8ff url(images/mailSubHeaderBg.gif) repeat-x;
 	padding:4px;
-}
-.mailDetailsHeader {
-	border-top:2px dotted #999;
-	border-bottom:1px solid #ddd;
 }
 
 .mailClientWriteEmailHeader {



From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep 28 23:35:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 29 Sep 2006 06:35:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9543 -
 /vtigercrm/branches/5.0.1/include/utils/CommonUtils.php
Message-ID: <20060929063545.5E2E1787DC7@vtiger.fosslabs.com>

Author: richie
Date: Fri Sep 29 00:35:30 2006
New Revision: 9543

Log:
Fixed the send enail not working when the salutationtype field is added in contacts

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

Modified: vtigercrm/branches/5.0.1/include/utils/CommonUtils.php
==============================================================================
--- vtigercrm/branches/5.0.1/include/utils/CommonUtils.php (original)
+++ vtigercrm/branches/5.0.1/include/utils/CommonUtils.php Fri Sep 29 00:35:30 2006
@@ -2430,6 +2430,13 @@
 		case 'Contacts':
 			if(is_array($fields["contacts"]))
 			{
+				//Checking for salutation type and checking the table column to be queried
+				$key = array_search('salutationtype',$fields["contacts"]);
+				if(isset($key) && $key !='')
+				{
+					$fields["contacts"][$key]='salutation';
+				}	
+				
 				$columnfields = implode(',',$fields["contacts"]);
 				$query = 'select '.$columnfields.' from vtiger_contactdetails where contactid='.$id;
 				$result = $adb->query($query);
@@ -2443,6 +2450,12 @@
 		case 'Leads':	
 			if(is_array($fields["leads"]))
 			{
+				//Checking for salutation type and checking the table column to be queried
+				$key = array_search('salutationtype',$fields["contacts"]);
+				if(isset($key) && $key !='')
+				{
+					$fields["contacts"][$key]='salutation';
+				}
 				$columnfields = implode(',',$fields["leads"]);
 				$query = 'select '.$columnfields.' from vtiger_leaddetails where leadid='.$id;
 				$result = $adb->query($query);



From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep 28 23:37:31 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 29 Sep 2006 06:37:31 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9544 -
 /vtigercrm/branches/5.0.1/Smarty/templates/CreateEmailTemplate.tpl
Message-ID: <20060929063731.F179E787DCC@vtiger.fosslabs.com>

Author: richie
Date: Fri Sep 29 00:37:24 2006
New Revision: 9544

Log:
The field name for leads salutation is changed to salutation type

Modified:
    vtigercrm/branches/5.0.1/Smarty/templates/CreateEmailTemplate.tpl

Modified: vtigercrm/branches/5.0.1/Smarty/templates/CreateEmailTemplate.tpl
==============================================================================
--- vtigercrm/branches/5.0.1/Smarty/templates/CreateEmailTemplate.tpl (original)
+++ vtigercrm/branches/5.0.1/Smarty/templates/CreateEmailTemplate.tpl Fri Sep 29 00:37:24 2006
@@ -86,7 +86,7 @@
                 options[8] = new Option('Lead: Email', '$leads-email$'); 
                 options[9] = new Option('Lead: Annual Revenue', '$leads-annualrevenue$'); 
                 options[10] = new Option('Lead: Title', '$leads-designation$'); 
-                options[11] = new Option('Lead: Salutation', '$leads-salutation$'); 
+                options[11] = new Option('Lead: Salutation', '$leads-salutationtype$'); 
             
 	        allOpts[3] = options;
 



From vtigercrm-commits at vtiger.fosslabs.com  Fri Sep 29 10:58:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 29 Sep 2006 17:58:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9545 -
 /vtigercrm/branches/5.0.1/Smarty/templates/Settings/PickList.tpl
Message-ID: <20060929175855.EDA75787DC7@vtiger.fosslabs.com>

Author: richie
Date: Fri Sep 29 11:58:43 2006
New Revision: 9545

Log:
Duplicate validation done for the picklist entries -- By Don

Modified:
    vtigercrm/branches/5.0.1/Smarty/templates/Settings/PickList.tpl

Modified: vtigercrm/branches/5.0.1/Smarty/templates/Settings/PickList.tpl
==============================================================================
--- vtigercrm/branches/5.0.1/Smarty/templates/Settings/PickList.tpl (original)
+++ vtigercrm/branches/5.0.1/Smarty/templates/Settings/PickList.tpl Fri Sep 29 11:58:43 2006
@@ -217,8 +217,33 @@
                 }
         );
 }
+
 function picklist_validate(mode,fieldname,module,uitype)
 {
+	
+	//alert(trim($("picklist_values").value));
+	
+	var pick_arr=new Array();
+	pick_arr=trim($("picklist_values").value).split('\n');	
+	var len=pick_arr.length;
+	for(i=0;i<len;i++)
+	{
+		var valone;
+		curr_iter = i;
+		valone=pick_arr[curr_iter];
+		for(j=curr_iter+1;j<len;j++)
+		{
+			var valnext;
+			valnext=pick_arr[j];
+			if(trim(valone) == trim(valnext))
+			{
+				alert("Duplicate entries found for the value '"+valone+"'");
+				return false;
+			}
+		}
+		i = curr_iter		
+
+	}
 	if(mode == 'edit')
 	{
 		if(trim($("picklist_values").value) == '')



From vtigercrm-commits at vtiger.fosslabs.com  Fri Sep  1 08:35:19 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 01 Sep 2006 12:35:19 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9235 -
	/vtigercrm/trunk/soap/vtigerolservice.php
Message-ID: <20060901123519.AC378748183@vtiger.fosslabs.com>

Author: richie
Date: Fri Sep  1 06:35:09 2006
New Revision: 9235

Log:
Issue in Task Plugin has been fixed --Jeri

Modified:
    vtigercrm/trunk/soap/vtigerolservice.php

Modified: vtigercrm/trunk/soap/vtigerolservice.php
==============================================================================
--- vtigercrm/trunk/soap/vtigerolservice.php (original)
+++ vtigercrm/trunk/soap/vtigerolservice.php Fri Sep  1 06:35:09 2006
@@ -799,11 +799,11 @@
 	{
   		if($task["date_start"] == "0000-00-00" || $task["date_start"] == NULL)
         	{
-		       	$task["startdate"] = "";
+		       	$task["date_start"] = "";
         	}
         	if($task["due_date"] == "0000-00-00" || $task["due_date"] == NULL)
         	{
-		       	$task["duedate"] = "";
+		       	$task["due_date"] = "";
         	}
         
         	if($task["status"] == "Not Started")
@@ -840,8 +840,8 @@
 		$output_list[] = Array(
 						"id" => $task["taskid"],
 						"subject" => $task["subject"],
-						"startdate" => $task["startdate"],
-						"duedate" => $task["duedate"],
+						"startdate" => $task["date_start"],
+						"duedate" => $task["due_date"],
 						"status" => $task["status"],
 						"priority" => $task["priority"],
 						"description" => $task["description"],




From vtigercrm-commits at vtiger.fosslabs.com  Sun Sep  3 23:43:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 03:43:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9236 -
 /vtigercrm/trunk/modules/Settings/CreateCustomField.php
Message-ID: <20060904034359.EF27B6E0E6D@vtiger.fosslabs.com>

Author: saraj
Date: Sun Sep  3 21:43:56 2006
New Revision: 9236

Log:
changes done to make multiselect combo box/picklist values editable --Minnie

Modified:
    vtigercrm/trunk/modules/Settings/CreateCustomField.php

Modified: vtigercrm/trunk/modules/Settings/CreateCustomField.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/CreateCustomField.php (original)
+++ vtigercrm/trunk/modules/Settings/CreateCustomField.php Sun Sep  3 21:43:56 2006
@@ -121,10 +121,7 @@
                 $sel_val = 'selected';
         else
                 $sel_val = '';
-       if($disable_str == 'disabled')
-	    $combo_output.= '<a href="#" onClick="makeFieldSelected(this,'.$i.');" id="field'.$i.'" style="text-decoration:none;background-image:url('.$cfimagecombo[$i].');" class="customMnu" '.$disable_str.'>'.$cftextcombo[$i].'</a>';
-	   else		
-    	$combo_output.= '<a href="javascript:;" onClick="makeFieldSelected(this,'.$i.');" id="field'.$i.'" style="text-decoration:none;background-image:url('.$cfimagecombo[$i].');" class="customMnu" '.$disable_str.'>'.$cftextcombo[$i].'</a>';
+	$combo_output.= '<a href="javascript:void(0);" onClick="makeFieldSelected(this,'.$i.');" id="field'.$i.'" style="text-decoration:none;background-image:url('.$cfimagecombo[$i].');" class="customMnu" '.$disable_str.'>'.$cftextcombo[$i].'</a>';
 
 }
 $output .= '<div id="orgLay" style="display:block;" class="layerPopup"><script language="JavaScript" type="text/javascript" src="include/js/customview.js"></script>
@@ -194,7 +191,7 @@
 							case 15:
 								$output .= '<tr id="picklist">
 									<td class="dataLabel" nowrap="nowrap" align="right" valign="top"><b>'.$mod_strings['LBL_PICK_LIST_VALUES'].'</b></td>
-									<td align="left" valign="top"><textarea name="fldPickList" rows="10" class="txtBox" '.$readonly.'>'.$fldVal.'</textarea></td>
+									<td align="left" valign="top"><textarea name="fldPickList" rows="10" class="txtBox" >'.$fldVal.'</textarea></td>
 									<!--td style="padding-left:10px"><img src="themes/Aqua/images/picklist_hint.gif"/></td-->
 								</tr>';
 								break;




From vtigercrm-commits at vtiger.fosslabs.com  Sun Sep  3 23:50:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 03:50:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9237 -
	/vtigercrm/trunk/modules/Settings/PickList.php
Message-ID: <20060904035041.293B175EB25@vtiger.fosslabs.com>

Author: saraj
Date: Sun Sep  3 21:50:37 2006
New Revision: 9237

Log:
changes done to make multiselect combo box/picklist values editable through picklist editor--Minnie

Modified:
    vtigercrm/trunk/modules/Settings/PickList.php

Modified: vtigercrm/trunk/modules/Settings/PickList.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/PickList.php (original)
+++ vtigercrm/trunk/modules/Settings/PickList.php Sun Sep  3 21:50:37 2006
@@ -66,7 +66,7 @@
 	global $adb;
 	$user_fld = Array();
 	$tabid = getTabid($fldmodule);
-	$query = "select fieldlabel,generatedtype,columnname,fieldname,uitype from vtiger_field where displaytype = 1 and (tabid = ".getTabid($fld_module)." AND uitype IN (15,16, 111)) OR (tabid = ".getTabid($fld_module)." AND fieldname='salutationtype')";
+	$query = "select fieldlabel,generatedtype,columnname,fieldname,uitype from vtiger_field where displaytype = 1 and (tabid = ".getTabid($fld_module)." AND uitype IN (15,16, 111,33)) OR (tabid = ".getTabid($fld_module)." AND fieldname='salutationtype')";
 	$result = $adb->query($query);
 	$noofrows = $adb->num_rows($result);
     if($noofrows > 0)
@@ -129,7 +129,7 @@
 function getPickListModules()
 {
 	global $adb;
-	$query = 'select distinct vtiger_field.fieldname,vtiger_field.tabid,tablabel,uitype from vtiger_field inner join vtiger_tab on vtiger_tab.tabid=vtiger_field.tabid where uitype IN (15,16, 111) and vtiger_field.tabid != 29';
+	$query = 'select distinct vtiger_field.fieldname,vtiger_field.tabid,tablabel,uitype from vtiger_field inner join vtiger_tab on vtiger_tab.tabid=vtiger_field.tabid where uitype IN (15,16, 111,33) and vtiger_field.tabid != 29';
 	$result = $adb->query($query);
 	while($row = $adb->fetch_array($result))
 	{




From vtigercrm-commits at vtiger.fosslabs.com  Sun Sep  3 23:56:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 03:56:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9238 -
 /vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php
Message-ID: <20060904035638.6CA8E761501@vtiger.fosslabs.com>

Author: saraj
Date: Sun Sep  3 21:56:34 2006
New Revision: 9238

Log:
changes done to make multiselect combo box/picklist values editable --Minnie

Modified:
    vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php

Modified: vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php (original)
+++ vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php Sun Sep  3 21:56:34 2006
@@ -286,15 +286,24 @@
 		if($fldType == 'Picklist' || $fldType == 'MultiSelectCombo')
 		{
 			// Creating the PickList Table and Populating Values
-			$qur = "CREATE TABLE vtiger_".$columnName." (
+			if($_REQUEST['fieldid'] == '')
+			{
+				$qur = "CREATE TABLE vtiger_".$columnName." (
 					".$columnName."id int(19) NOT NULL auto_increment,
 					".$columnName." varchar(200) NOT NULL,
 					sortorderid int(19) NOT NULL default '0',
 					presence int(1) NOT NULL default '1',
 				        PRIMARY KEY  (".$columnName."id)
 				)";
-			$adb->query($qur);
-
+				$adb->query($qur);
+			}
+
+			if($_REQUEST['fieldid'] != '' && $mode == 'edit')
+			{
+				$delquery = "DELETE from vtiger_".$columnName;
+				$adb->query($delquery);
+			}
+			$pickArray = Array();
 			$fldPickList =  $_REQUEST['fldPickList'];
 			$pickArray = explode("\n",$fldPickList);
 			$count = count($pickArray);
@@ -309,7 +318,7 @@
 				}
 			}
 		}
-		//Inserting into LeadMapping vtiger_table - Jaguar
+		//Inserting into LeadMapping table - Jaguar
 		if($fldmodule == 'Leads' && $_REQUEST['fieldid'] == '')
 		{
 




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep  4 00:00:44 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 04:00:44 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9239 -
	/vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
Message-ID: <20060904040044.0F33D71B397@vtiger.fosslabs.com>

Author: saraj
Date: Sun Sep  3 22:00:41 2006
New Revision: 9239

Log:
display for multiselect combo box in EditView has been changed --Minnie

Modified:
    vtigercrm/trunk/Smarty/templates/DisplayFields.tpl

Modified: vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DisplayFields.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DisplayFields.tpl Sun Sep  3 22:00:41 2006
@@ -100,7 +100,7 @@
 				{$fldlabel}
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
-			   <select MULTIPLE name="{$fldname}[]" size="2" tabindex="{$vt_tab}" >
+			   <select MULTIPLE name="{$fldname}[]" size="5" tabindex="{$vt_tab}" >
 				{foreach item=arr from=$fldvalue}
 					{foreach key=sel_value item=value from=$arr}
 						<option value="{$sel_value}" {$value}>{$sel_value}</option>




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep  4 02:46:14 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 06:46:14 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9240 -
 /vtigercrm/trunk/modules/Import/language/en_us.lang.php
Message-ID: <20060904064615.157B676CD5E@vtiger.fosslabs.com>

Author: saraj
Date: Mon Sep  4 00:46:11 2006
New Revision: 9240

Log:
* Added pobox in import files

Modified:
    vtigercrm/trunk/modules/Import/language/en_us.lang.php

Modified: vtigercrm/trunk/modules/Import/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Import/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Import/language/en_us.lang.php Mon Sep  4 00:46:11 2006
@@ -242,11 +242,13 @@
 	,"assistant"=>"Assistant"
 	,"assistantphone"=>"Assistant Phone"
 	,"mailingstreet"=>"Mailing Address Street"
+	,"mailingpobox"=>"Mailing Address Po Box"
 	,"mailingcity"=>"Mailing Address City"
 	,"mailingstate"=>"Mailing Address State"
 	,"mailingzip"=>"Mailing Address Postalcode"
 	,"mailingcountry"=>"Mailing Address Country"
 	,"otherstreet"=>"Other Address Street"
+	,"otherpobox"=>"Other Address Po Box"
 	,"othercity"=>"Other Address City"
 	,"otherstate"=>"Other Address State"
 	,"otherzip"=>"Other Address Postalcode"
@@ -277,6 +279,7 @@
 	//"billing_address_street_2"=>"Billing Address Street 2",
 	//"billing_address_street_3"=>"Billing Address Street 3",
 	//"billing_address_street_4"=>"Billing Address Street 4",
+	"bill_pobox"=>"Billing Address Po Box",
 	"bill_city"=>"Billing Address City",
 	"bill_state"=>"Billing Address State",
 	"bill_code"=>"Billing Address Postalcode",
@@ -285,6 +288,7 @@
 	//"shipping_address_street_2"=>"Shipping Address Street 2",
 	//"shipping_address_street_3"=>"Shipping Address Street 3",
 	//"shipping_address_street_4"=>"Shipping Address Street 4",
+	"ship_pobox"=>"Shipping Address Po Box",
 	"ship_city"=>"Shipping Address City",
 	"ship_state"=>"Shipping Address State",
 	"ship_code"=>"Shipping Address Postalcode",
@@ -330,6 +334,7 @@
 		"assigned_user_id"=>"Assigned To",
 		"yahooid"=>"Yahoo Id",		
 		"lane"=>"Street",
+		"pobox"=>"Po Box",
 		"code"=>"Postal Code",
 		"city"=>"City",
 		"country"=>"Country",




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep  4 03:07:11 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 07:07:11 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9241 -
	/vtigercrm/trunk/soap/vtigerolservice.php
Message-ID: <20060904070711.DED0376CD85@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep  4 01:06:56 2006
New Revision: 9241

Log:
Issue in Calendar duetime has been fixed --Jeri

Modified:
    vtigercrm/trunk/soap/vtigerolservice.php

Modified: vtigercrm/trunk/soap/vtigerolservice.php
==============================================================================
--- vtigercrm/trunk/soap/vtigerolservice.php (original)
+++ vtigercrm/trunk/soap/vtigerolservice.php Mon Sep  4 01:06:56 2006
@@ -1062,13 +1062,14 @@
 		$expldstartdate = explode("-", $clndr["date_start"]);
 		$expldtimestart = explode(":", $clndr["time_start"]);	
 
-		$expldduedate = explode("-", $clndr["due_date"]);
-
 		//this makes a timestamp out of the exploded date this number is in seconds
 		$startdtm = mktime($expldtimestart[0], $expldtimestart[1], 0, $expldstartdate[1], $expldstartdate[2], $expldstartdate[0]);
 
-		$duedtm = mktime($expldtimestart[0]+$clndr["duration_hours"], $expldtimestart[1]+$clndr["duration_minutes"], 0, $expldduedate[1], $expldduedate[2], $expldduedate[0]);
-
+    $expldduedate = explode("-", $clndr["due_date"]);
+    $expldtimeend = explode(":", $clndr["time_end"]);
+    //this makes a timestamp out of the exploded date this number is in seconds
+		$duedtm = mktime($expldtimeend[0], $expldtimeend[1], 0, $expldduedate[1], $expldduedate[2], $expldduedate[0]);
+		
 		$clndr["date_start"] = date("Y-m-d H:i:s", $startdtm);
 		$clndr["due_date"] = date("Y-m-d H:i:s", $duedtm);
 




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep  4 03:22:20 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 07:22:20 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9242 -
	/vtigercrm/trunk/soap/vtigerolservice.php
Message-ID: <20060904072220.022C875FDBE@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep  4 01:22:07 2006
New Revision: 9242

Log:
Issue in Calendar end time has been fixed --Jeri

Modified:
    vtigercrm/trunk/soap/vtigerolservice.php

Modified: vtigercrm/trunk/soap/vtigerolservice.php
==============================================================================
--- vtigercrm/trunk/soap/vtigerolservice.php (original)
+++ vtigercrm/trunk/soap/vtigerolservice.php Mon Sep  4 01:22:07 2006
@@ -1131,18 +1131,20 @@
 			$stimestart = $atimestart[0].":".$atimestart[1];
 			$stimeend = $atimedue[0].":".$atimedue[1];
 		
-			if( $diff=@get_time_difference($stimestart, $stimeend) )
+			/*if( $diff=@get_time_difference($stimestart, $stimeend) )
 			{
 				$stimeduehr = sprintf('%02d',$diff['hours']);
 				$stimeduemin = sprintf('%02d',$diff['minutes']);
-			}
+			}*/
 
 			$clndr->column_fields[subject] = in_array('subject',$permitted_lists) ? $clndrow["subject"] : "";
 			$clndr->column_fields[date_start]= in_array('date_start',$permitted_lists) ? getDisplayDate(trim($astartdtm[0])) : "";
 			$clndr->column_fields[due_date]= in_array('due_date',$permitted_lists) ? getDisplayDate(trim($aduedtm[0])) : ""; 
 			$clndr->column_fields[time_start]= in_array('time_start',$permitted_lists) ? $stimestart : "";
-			$clndr->column_fields[duration_hours]= in_array('duration_hours',$permitted_lists) ? $stimeduehr : "";        
-			$clndr->column_fields[duration_minutes]= in_array('duration_minutes',$permitted_lists) ? $stimeduemin : "";          
+			$clndr->column_fields[time_end]= in_array('time_end',$permitted_lists) ? $stimeend : "";
+			//$clndr->column_fields[duration_hours]= in_array('duration_hours',$permitted_lists) ? $stimeduehr : "";        
+			//$clndr->column_fields[duration_minutes]= in_array('duration_minutes',$permitted_lists) ? $stimeduemin : "";
+                
 			$clndr->column_fields[location]= in_array('location',$permitted_lists) ? $clndrow["location"] : "";
 			$clndr->column_fields[description]= in_array('description',$permitted_lists) ? $clndrow["description"] : "";
 			$clndr->column_fields[activitytype]="Meeting";




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep  4 03:26:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 07:26:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9243 -
 /vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php
Message-ID: <20060904072655.C27CB760FD4@vtiger.fosslabs.com>

Author: saraj
Date: Mon Sep  4 01:26:51 2006
New Revision: 9243

Log:
changes made to fix the convertlead related issue  --Minnie

Modified:
    vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php

Modified: vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php (original)
+++ vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php Mon Sep  4 01:26:51 2006
@@ -25,9 +25,15 @@
 $potential_amount = $_REQUEST['potential_amount'];
 $potential_sales_stage = $_REQUEST['potential_sales_stage'];
 
-global $log;
+global $log,$current_user;
+require('user_privileges/user_privileges_'.$current_user->id.'.php');
 $log->debug("id = $id \n assigned_user_id = $assigned_user_id \n createpotential = $createpotential \n close date = $close_date \n current user id = $current_user_id \n accountname = $accountname \n module = $module");
 
+$rate_symbol=getCurrencySymbolandCRate($user_info['currency_id']);
+$rate = $rate_symbol['rate'];
+if($potential_amount != '')
+        $potential_amount = convertToDollar($potential_amount,$rate);
+	
 $check_unit = explode("-",$potential_name);
 if($check_unit[1] == "")
         $potential_name = $check_unit[0];




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep  4 04:12:24 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 08:12:24 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9244 -
	/vtigercrm/trunk/soap/vtigerolservice.php
Message-ID: <20060904081224.9319B76CD0A@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep  4 02:11:52 2006
New Revision: 9244

Log:
Issue in Calendar end time has been fixed --Jeri

Modified:
    vtigercrm/trunk/soap/vtigerolservice.php

Modified: vtigercrm/trunk/soap/vtigerolservice.php
==============================================================================
--- vtigercrm/trunk/soap/vtigerolservice.php (original)
+++ vtigercrm/trunk/soap/vtigerolservice.php Mon Sep  4 02:11:52 2006
@@ -1144,7 +1144,7 @@
 			$clndr->column_fields[time_end]= in_array('time_end',$permitted_lists) ? $stimeend : "";
 			//$clndr->column_fields[duration_hours]= in_array('duration_hours',$permitted_lists) ? $stimeduehr : "";        
 			//$clndr->column_fields[duration_minutes]= in_array('duration_minutes',$permitted_lists) ? $stimeduemin : "";
-                
+        
 			$clndr->column_fields[location]= in_array('location',$permitted_lists) ? $clndrow["location"] : "";
 			$clndr->column_fields[description]= in_array('description',$permitted_lists) ? $clndrow["description"] : "";
 			$clndr->column_fields[activitytype]="Meeting";
@@ -1199,19 +1199,20 @@
 			$stimestart = $atimestart[0].":".$atimestart[1];
 			$stimeend = $atimedue[0].":".$atimedue[1];
 		
-			if( $diff=@get_time_difference($stimestart, $stimeend) )
+			/*if( $diff=@get_time_difference($stimestart, $stimeend) )
 			{
 				$stimeduehr = sprintf('%02d',$diff['hours']);
 				$stimeduemin = sprintf('%02d',$diff['minutes']);
-			}
+			}*/
 
 			$clndr->retrieve_entity_info($clndrow["id"],"Calendar");
 			$clndr->column_fields[subject] = in_array('subject',$permitted_lists) ? $clndrow["subject"] : "";
 			$clndr->column_fields[date_start]= in_array('date_start',$permitted_lists) ? getDisplayDate(trim($astartdtm[0])) : "";
 			$clndr->column_fields[due_date]= in_array('due_date',$permitted_lists) ? getDisplayDate(trim($aduedtm[0])) : ""; 
 			$clndr->column_fields[time_start]= in_array('time_start',$permitted_lists) ? $stimestart : "";
-			$clndr->column_fields[duration_hours]= in_array('duration_hours',$permitted_lists) ? $stimeduehr : "";       
-			$clndr->column_fields[duration_minutes]= in_array('duration_minutes',$permitted_lists) ? $stimeduemin : "";              
+			$clndr->column_fields[time_end]= in_array('time_end',$permitted_lists) ? $stimeend : "";
+			//$clndr->column_fields[duration_hours]= in_array('duration_hours',$permitted_lists) ? $stimeduehr : "";       
+			//$clndr->column_fields[duration_minutes]= in_array('duration_minutes',$permitted_lists) ? $stimeduemin : "";              
 			$clndr->column_fields[location]= in_array('location',$permitted_lists) ? $clndrow["location"] : "";
 			$clndr->column_fields[description]= in_array('description',$permitted_lists) ? $clndrow["description"] : "";
 			$clndr->column_fields[activitytype]="Meeting";




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep  4 04:39:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 08:39:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9245 -
	/vtigercrm/trunk/schema/DatabaseSchema.xml
Message-ID: <20060904083957.CC7E676CD77@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep  4 02:39:23 2006
New Revision: 9245

Log:
Spelling mistake in organisationnname has been fixed --Jeri

Modified:
    vtigercrm/trunk/schema/DatabaseSchema.xml

Modified: vtigercrm/trunk/schema/DatabaseSchema.xml
==============================================================================
--- vtigercrm/trunk/schema/DatabaseSchema.xml (original)
+++ vtigercrm/trunk/schema/DatabaseSchema.xml Mon Sep  4 02:39:23 2006
@@ -4683,7 +4683,7 @@
 	</table>
 
 	<table name="vtiger_organizationdetails">
-		<field name="organizationame" type="C" size="60">
+		<field name="organizationname" type="C" size="60">
 			<key />
 		</field>
 		<field name="address" type="C" size="150" />




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep  4 04:45:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 08:45:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9246 - in
 /vtigercrm/trunk/modules: Invoice/CreatePDF.php PurchaseOrder/CreatePDF.php
 Quotes/CreatePDF.php SalesOrder/CreateSOPDF.php
Message-ID: <20060904084502.5B75A76CDCF@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep  4 02:42:47 2006
New Revision: 9246

Log:
organitationame changed to organitationname

Modified:
    vtigercrm/trunk/modules/Invoice/CreatePDF.php
    vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php
    vtigercrm/trunk/modules/Quotes/CreatePDF.php
    vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php

Modified: vtigercrm/trunk/modules/Invoice/CreatePDF.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/CreatePDF.php (original)
+++ vtigercrm/trunk/modules/Invoice/CreatePDF.php Mon Sep  4 02:42:47 2006
@@ -66,7 +66,7 @@
 
 if($num_rows == 1)
 {
-		$org_name = $adb->query_result($result,0,"organizationame");
+		$org_name = $adb->query_result($result,0,"organizationname");
 		$org_address = $adb->query_result($result,0,"address");
 		$org_city = $adb->query_result($result,0,"city");
 		$org_state = $adb->query_result($result,0,"state");

Modified: vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php Mon Sep  4 02:42:47 2006
@@ -65,7 +65,7 @@
 
 if($num_rows == 1)
 {
-		$org_name = $adb->query_result($result,0,"organizationame");
+		$org_name = $adb->query_result($result,0,"organizationname");
 		$org_address = $adb->query_result($result,0,"address");
 		$org_city = $adb->query_result($result,0,"city");
 		$org_state = $adb->query_result($result,0,"state");

Modified: vtigercrm/trunk/modules/Quotes/CreatePDF.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/CreatePDF.php (original)
+++ vtigercrm/trunk/modules/Quotes/CreatePDF.php Mon Sep  4 02:42:47 2006
@@ -65,7 +65,7 @@
 
 if($num_rows == 1)
 {
-		$org_name = $adb->query_result($result,0,"organizationame");
+		$org_name = $adb->query_result($result,0,"organizationname");
 		$org_address = $adb->query_result($result,0,"address");
 		$org_city = $adb->query_result($result,0,"city");
 		$org_state = $adb->query_result($result,0,"state");

Modified: vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php Mon Sep  4 02:42:47 2006
@@ -64,7 +64,7 @@
 
 if($num_rows == 1)
 {
-		$org_name = $adb->query_result($result,0,"organizationame");
+		$org_name = $adb->query_result($result,0,"organizationname");
 		$org_address = $adb->query_result($result,0,"address");
 		$org_city = $adb->query_result($result,0,"city");
 		$org_state = $adb->query_result($result,0,"state");




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep  4 04:45:12 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 08:45:12 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9247 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060904084512.3BD1776CDCF@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep  4 02:44:35 2006
New Revision: 9247

Log:
Spelling mistake in organisationnname has been fixed --Jeri

Modified:
    vtigercrm/trunk/modules/Users/DefaultDataPopulator.php

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Mon Sep  4 02:44:35 2006
@@ -2067,7 +2067,7 @@
 
 		
 	       //Insert into vtiger_organizationdetails vtiger_table 
-	       $this->db->query("insert into vtiger_organizationdetails(organizationame,address,city,state,country,code,phone,fax,website,logoname) values ('vtiger',' 40-41-42, Sivasundar Apartments, Flat D-II, Shastri Street, Velachery','Chennai','Tamil Nadu','India','600 042','+91-44-5202-1990','+91-44-5202-1990','www.vtiger.com','vtiger-crm-logo.jpg')");
+	       $this->db->query("insert into vtiger_organizationdetails(organizationname,address,city,state,country,code,phone,fax,website,logoname) values ('vtiger',' 40-41-42, Sivasundar Apartments, Flat D-II, Shastri Street, Velachery','Chennai','Tamil Nadu','India','600 042','+91-44-5202-1990','+91-44-5202-1990','www.vtiger.com','vtiger-crm-logo.jpg')");
 
   //Insert into vtiger_inventory_tandc vtiger_table
                $this->db->query("insert into vtiger_inventory_tandc values('".$this->db->getUniqueID('vtiger_inventory_tandc')."','Inventory','')");




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep  4 04:46:01 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 08:46:01 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9248 - in
 /vtigercrm/trunk/modules/Settings: EditCompanyDetails.php
 OrganizationConfig.php SaveCompany.php add2db.php
Message-ID: <20060904084601.40A1776CD77@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep  4 02:43:55 2006
New Revision: 9248

Log:
Spelling mistake in organisationnname has been fixed --Jeri

Modified:
    vtigercrm/trunk/modules/Settings/EditCompanyDetails.php
    vtigercrm/trunk/modules/Settings/OrganizationConfig.php
    vtigercrm/trunk/modules/Settings/SaveCompany.php
    vtigercrm/trunk/modules/Settings/add2db.php

Modified: vtigercrm/trunk/modules/Settings/EditCompanyDetails.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/EditCompanyDetails.php (original)
+++ vtigercrm/trunk/modules/Settings/EditCompanyDetails.php Mon Sep  4 02:43:55 2006
@@ -46,7 +46,7 @@
 
 $sql="select * from vtiger_organizationdetails";
 $result = $adb->query($sql);
-$organization_name = $adb->query_result($result,0,'organizationame');
+$organization_name = $adb->query_result($result,0,'organizationname');
 $organization_address= $adb->query_result($result,0,'address');
 $organization_city = $adb->query_result($result,0,'city');
 $organization_state = $adb->query_result($result,0,'state');

Modified: vtigercrm/trunk/modules/Settings/OrganizationConfig.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/OrganizationConfig.php (original)
+++ vtigercrm/trunk/modules/Settings/OrganizationConfig.php Mon Sep  4 02:43:55 2006
@@ -37,7 +37,7 @@
 
 $sql="select * from vtiger_organizationdetails";
 $result = $adb->query($sql);
-$organization_name = $adb->query_result($result,0,'organizationame');
+$organization_name = $adb->query_result($result,0,'organizationname');
 $organization_address= $adb->query_result($result,0,'address');
 $organization_city = $adb->query_result($result,0,'city');
 $organization_state = $adb->query_result($result,0,'state');

Modified: vtigercrm/trunk/modules/Settings/SaveCompany.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/SaveCompany.php (original)
+++ vtigercrm/trunk/modules/Settings/SaveCompany.php Mon Sep  4 02:43:55 2006
@@ -22,9 +22,9 @@
 $organization_fax=$_REQUEST['organization_fax'];
 $organization_website=$_REQUEST['organization_website'];
 
-$sql="select * from vtiger_organizationdetails where organizationame = '".$org_name."'";
+$sql="select * from vtiger_organizationdetails where organizationname = '".$org_name."'";
 $result = $adb->query($sql);
-$org_name = $adb->query_result($result,0,'organizationame');
+$org_name = $adb->query_result($result,0,'organizationname');
 
 if($org_name=='')
 {
@@ -32,7 +32,7 @@
 }
 else
 {
-	$sql="update vtiger_organizationdetails set organizationame = '".$organization_name."', address = '".$organization_address."', city = '".$organization_city."', state = '".$organization_state."',  code = '".$organization_code."', country = '".$organization_country."' ,  phone = '".$organization_phone."' ,  fax = '".$organization_fax."',  website = '".$organization_website."' where organizationame = '".$org_name."'";
+	$sql="update vtiger_organizationdetails set organizationname = '".$organization_name."', address = '".$organization_address."', city = '".$organization_city."', state = '".$organization_state."',  code = '".$organization_code."', country = '".$organization_country."' ,  phone = '".$organization_phone."' ,  fax = '".$organization_fax."',  website = '".$organization_website."' where organizationname = '".$org_name."'";
 }	
 
 

Modified: vtigercrm/trunk/modules/Settings/add2db.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/add2db.php (original)
+++ vtigercrm/trunk/modules/Settings/add2db.php Mon Sep  4 02:43:55 2006
@@ -99,16 +99,16 @@
 		if(!isset($organization_logoname))
 			$organization_logoname="";
 
-		$sql="SELECT * FROM vtiger_organizationdetails WHERE organizationame = ".$adb->quote($org_name);
+		$sql="SELECT * FROM vtiger_organizationdetails WHERE organizationname = ".$adb->quote($org_name);
 		$result = $adb->query($sql);
-		$org_name = from_html($adb->query_result($result,0,'organizationame'));
+		$org_name = from_html($adb->query_result($result,0,'organizationname'));
 		$org_logo = $adb->query_result($result,0,'logoname'); 
 
 
 		if($org_name=='')
 		{
 			$sql="INSERT INTO vtiger_organizationdetails
-				(organizationame, address, city, state, code, country, phone, fax, website, logoname)
+				(organizationname, address, city, state, code, country, phone, fax, website, logoname)
 				VALUES (".$adb->quote($organization_name).
 					",".$adb->quote($organization_address).
 					",".$adb->quote($organization_city).
@@ -143,7 +143,7 @@
 			}
 
 			$sql = "UPDATE vtiger_organizationdetails
-				SET organizationame = ".$adb->quote($organization_name).",
+				SET organizationname = ".$adb->quote($organization_name).",
 					address = ".$adb->quote($organization_address).",
 					city = ".$adb->quote($organization_city).",
 					state = ".$adb->quote($organization_state).",
@@ -153,7 +153,7 @@
 					fax = ".$adb->quote($organization_fax).",
 					website = ".$adb->quote($organization_website).",
 					logoname = ".$adb->quote($organization_logoname)."
-				WHERE organizationame = ".$adb->quote($org_name);
+				WHERE organizationname = ".$adb->quote($org_name);
 		}
 		$adb->query($sql);
 




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep  4 05:21:58 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 09:21:58 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9249 -
 /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php
Message-ID: <20060904092158.1513976CE0B@vtiger.fosslabs.com>

Author: saraj
Date: Mon Sep  4 03:21:53 2006
New Revision: 9249

Log:
* Modified the column organizationame to organizationname

Modified:
    vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php

Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php
==============================================================================
--- vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php (original)
+++ vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php Mon Sep  4 03:21:53 2006
@@ -69,7 +69,7 @@
 		"alter table vtiger_def_org_field ADD PRIMARY KEY (fieldid)",
 		"alter table vtiger_leadgrouprelation ADD PRIMARY KEY (leadid)",
 		"alter table vtiger_leadgrouprelation drop key leadgrouprelation_IDX0",
-		"alter table vtiger_organizationdetails ADD PRIMARY KEY (organizationame)",
+		"alter table vtiger_organizationdetails ADD PRIMARY KEY (organizationname)",
 		"alter table vtiger_profile2field ADD PRIMARY KEY (profileid,fieldid)",
 		"alter table vtiger_profile2standardpermissions ADD PRIMARY KEY (profileid,tabid,Operation)",
 		"alter table vtiger_profile2standardpermissions drop index idx_prof2stad",
@@ -3624,6 +3624,7 @@
 	Execute($alterquery);
 }
 
+Execute("alter table vtiger_organizationdetails change column organizationame  organizationname varchar(60) NOT NULL");
 
 
 




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep  4 05:22:58 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 09:22:58 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9250 -
	/vtigercrm/trunk/soap/thunderbirdplugin.php
Message-ID: <20060904092258.5A3AC76CE0C@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep  4 03:22:23 2006
New Revision: 9250

Log:
Related to multiple when added from thunderbird extn has been fixed --Jeri

Modified:
    vtigercrm/trunk/soap/thunderbirdplugin.php

Modified: vtigercrm/trunk/soap/thunderbirdplugin.php
==============================================================================
--- vtigercrm/trunk/soap/thunderbirdplugin.php (original)
+++ vtigercrm/trunk/soap/thunderbirdplugin.php Mon Sep  4 03:22:23 2006
@@ -184,6 +184,7 @@
 	$email->column_fields[date_start] = $datesent;
 	$email->column_fields[description]  = htmlentities($emailbody);
 	$email->column_fields[activitytype] = 'Emails'; 
+	$email->plugin_save = true;
 	$email->save("Emails");
 
 	$email->set_emails_contact_invitee_relationship($email->id,$contact_ids);
@@ -195,7 +196,7 @@
 	if(isset($camodulerow))
 	{
 		$emailid = $camodulerow["email"];
-		$query = 'insert into vtiger_emaildetails values ('.$email->id.',"","'.$emailid.'","","","","'.$contact_ids."@77|".'","OUTLOOK")';
+		$query = 'insert into vtiger_emaildetails values ('.$email->id.',"","'.$emailid.'","","","","'.$contact_ids."@77|".'","THUNDERBIRD")';
 		$adb->query($query);
 	}
 	return $email->id;




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep  4 05:53:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 09:53:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9251 -
	/vtigercrm/trunk/modules/Emails/Email.php
Message-ID: <20060904095359.55F9376CE10@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep  4 03:53:14 2006
New Revision: 9251

Log:
Email ListView made to order by date_sent asc --Jeri

Modified:
    vtigercrm/trunk/modules/Emails/Email.php

Modified: vtigercrm/trunk/modules/Emails/Email.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/Email.php (original)
+++ vtigercrm/trunk/modules/Emails/Email.php Mon Sep  4 03:53:14 2006
@@ -72,7 +72,7 @@
 	var $sortby_fields = Array('subject','date_start','smownerid');
 
 	//Added these variables which are used as default order by and sortorder in ListView
-	var $default_order_by = 'subject';
+	var $default_order_by = 'date_start';
 	var $default_sort_order = 'ASC';
 
 	/** This function will set the columnfields for Email module 




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep  4 07:31:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 11:31:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9252 - in
 /vtigercrm/trunk/include/utils: DetailViewUtils.php EditViewUtils.php
Message-ID: <20060904113137.BD98F76CE0F@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep  4 05:31:16 2006
New Revision: 9252

Log:
Ajax edit provided for multi selection combo box --Jeri

Modified:
    vtigercrm/trunk/include/utils/DetailViewUtils.php
    vtigercrm/trunk/include/utils/EditViewUtils.php

Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/DetailViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/DetailViewUtils.php Mon Sep  4 05:31:16 2006
@@ -120,6 +120,34 @@
 				$chk_val = '';
 			}
 			$options[] = array($pickListValue=>$chk_val );	
+		}
+		$label_fld ["options"] = $options;
+	}
+	elseif($uitype == 33) //uitype 33 added for multiselector picklist - Jeri
+	{
+	     $label_fld[] = $mod_strings[$fieldlabel];
+	     $label_fld[] = str_ireplace(' |##| ',' , ',$col_fields[$fieldname]);
+	     
+		$pick_query="select * from vtiger_".$fieldname;
+		$pickListResult = $adb->query($pick_query);
+		$noofpickrows = $adb->num_rows($pickListResult);
+
+		$options = array();
+		$selected_entries = Array();
+		$selected_entries = explode(' |##| ',$col_fields[$fieldname]);
+		for($j = 0; $j < $noofpickrows; $j++)
+		{
+			$pickListValue = $adb->query_result($pickListResult,$j,strtolower($fieldname));
+      $chk_val = '';
+      foreach($selected_entries as $selected_entries_value)
+      {
+        if(trim($selected_entries_value) == trim($pickListValue))
+        {
+          $chk_val = 'selected';
+          break;
+        }
+      }
+			$options[] = array($pickListValue=>$chk_val);	
 		}
 		$label_fld ["options"] = $options;
 	}

Modified: vtigercrm/trunk/include/utils/EditViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/EditViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/EditViewUtils.php Mon Sep  4 05:31:16 2006
@@ -159,7 +159,7 @@
 		$noofoptions = $adb->num_rows($multiselect_result);
 		$options = array();
 		$found = false;
-		$valur_arr = explode(' , ',$value);
+		$valur_arr = explode(' |##| ',$value);
 		for($j = 0; $j < $noofoptions; $j++)
 		{
 			$multiselect_combo = $adb->query_result($multiselect_result,$j,strtolower($fieldname));




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep  4 07:33:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 11:33:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9253 -
	/vtigercrm/trunk/data/CRMEntity.php
Message-ID: <20060904113341.5E78276CE16@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep  4 05:33:14 2006
New Revision: 9253

Log:
Ajax edit provided for multi selection combo box --Jeri

Modified:
    vtigercrm/trunk/data/CRMEntity.php

Modified: vtigercrm/trunk/data/CRMEntity.php
==============================================================================
--- vtigercrm/trunk/data/CRMEntity.php (original)
+++ vtigercrm/trunk/data/CRMEntity.php Mon Sep  4 05:33:14 2006
@@ -583,21 +583,14 @@
 			  }
 			  elseif($uitype == 33)
 			  {
-				$j = 0;
-				$field_list = '';
-				if(is_array($this->column_fields[$fieldname]) && count($this->column_fields[$fieldname]) > 0)
-				{
-					foreach($this->column_fields[$fieldname] as $key=>$multivalue)
-					{
-						if($j != 0)
-						{
-							$field_list .= ' , ';
-						}
-						$field_list .= $multivalue;
-						$j++;
-					}
-				}
-				$fldvalue = $field_list;
+  				if(is_array($this->column_fields[$fieldname]))
+  				{
+  				  $field_list = implode(' |##| ',$this->column_fields[$fieldname]);
+  				}else
+  				{
+  				  $field_list = $this->column_fields[$fieldname];
+          		}
+  				$fldvalue = $field_list;
 			  }
 			  elseif($uitype == 5 || $uitype == 6 || $uitype ==23)
 			  {




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep  4 07:36:20 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 11:36:20 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9254 -
	/vtigercrm/trunk/include/js/dtlviewajax.js
Message-ID: <20060904113620.5860C76CE19@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep  4 05:36:06 2006
New Revision: 9254

Log:
Ajax edit provided for multi selection combo box --Jeri

Modified:
    vtigercrm/trunk/include/js/dtlviewajax.js

Modified: vtigercrm/trunk/include/js/dtlviewajax.js
==============================================================================
--- vtigercrm/trunk/include/js/dtlviewajax.js (original)
+++ vtigercrm/trunk/include/js/dtlviewajax.js Mon Sep  4 05:36:06 2006
@@ -113,6 +113,7 @@
 	var dtlView = "dtlview_"+ fieldLabel;
 	var editArea = "editarea_"+ fieldLabel;
 	var groupurl = "";
+	
 	if(globaluitype == 53)
 	{
 		if(typeof(document.DetailView.assigntype[0]) != 'undefined')
@@ -134,10 +135,22 @@
 			var groupurl = "&assigned_group_name="+group_name+"&assigntype=T"
 		}
 
-	}else
+	}if(globaluitype == 33)
+	{
+	  var txtBox= "txtbox_"+ fieldLabel;
+	  var oMulSelect = $(txtBox);
+	  var r = new Array();
+	  for (iter=0;iter < oMulSelect.options.length ; iter++)
+	  {
+      if (oMulSelect.options[iter].selected)
+        r[r.length] = oMulSelect.options[iter].value;
+      }
+	}
+  else
 	{
 		var txtBox= "txtbox_"+ fieldLabel;
 	}
+	
 	var popupTxt= "popuptxt_"+ fieldLabel;      
 	var hdTxt = "hdtxt_"+ fieldLabel;
 
@@ -162,8 +175,7 @@
 		{
 			tagValue = "0";
 		}
-	}
-	if(uitype == '156')
+	}else	if(uitype == '156')
 	{
 		if(document.getElementById(txtBox).checked == true)
 		{
@@ -172,7 +184,10 @@
 		{
 			tagValue = "off";
 		}
-	}
+	}else if(uitype == '33')
+	{
+			tagValue = r.join(" |##| ");
+  	}
 
 
 	var data = "file=DetailViewAjax&module=" + module + "&action=" + module + "Ajax&record=" + crmId+"&recordid=" + crmId ;
@@ -183,17 +198,17 @@
                         method: 'post',
                         postBody: data,
                         onComplete: function(response) {
-				if(response.responseText.indexOf(":#:FAILURE")>-1)
-				{
-					alert("Error while Editing");
-				}
-				else if(response.responseText.indexOf(":#:SUCCESS")>-1)
-     				{
-					$("vtbusy_info").style.display="none";
-     				}
-                       	}
+                  				if(response.responseText.indexOf(":#:FAILURE")>-1)
+                  				{
+                  					alert("Error while Editing");
+                  				}
+                  				else if(response.responseText.indexOf(":#:SUCCESS")>-1)
+                       		{
+                  					$("vtbusy_info").style.display="none";
+                       		}
+                        }
                 }
-        );
+            );
 	if(uitype == '13' || uitype == '104')
 	{
 		getObj(dtlView).innerHTML = "<a href=\"mailto:"+ tagValue+"\" target=\"_blank\">"+tagValue+"&nbsp;</a>";
@@ -296,7 +311,10 @@
 		{
 			getObj(dtlView).innerHTML = popObj.value;
 		}
-	}else
+	}else if(uitype == '33')
+  {
+       getObj(dtlView).innerHTML = r.join(" , ");
+  }else
 	{
 		getObj(dtlView).innerHTML = tagValue;
 	}




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep  4 07:38:20 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 11:38:20 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9255 - in
 /vtigercrm/trunk/Smarty/templates: DetailViewUI.tpl DisplayFields.tpl
Message-ID: <20060904113820.4490476CE0F@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep  4 05:38:03 2006
New Revision: 9255

Log:
Ajax edit provided for multi selection combo box --Jeri

Modified:
    vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
    vtigercrm/trunk/Smarty/templates/DisplayFields.tpl

Modified: vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl Mon Sep  4 05:38:03 2006
@@ -47,6 +47,20 @@
                     								{/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-->
+                                          <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 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>

Modified: vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DisplayFields.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DisplayFields.tpl Mon Sep  4 05:38:03 2006
@@ -100,7 +100,7 @@
 				{$fldlabel}
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
-			   <select MULTIPLE name="{$fldname}[]" size="5" tabindex="{$vt_tab}" >
+			   <select MULTIPLE name="{$fldname}[]" size="4" style="width:160px;" tabindex="{$vt_tab}" >
 				{foreach item=arr from=$fldvalue}
 					{foreach key=sel_value item=value from=$arr}
 						<option value="{$sel_value}" {$value}>{$sel_value}</option>




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep  4 09:37:18 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 13:37:18 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9256 -
	/vtigercrm/trunk/include/database/PearDatabase.php
Message-ID: <20060904133718.2801D76CE0F@vtiger.fosslabs.com>

Author: saraj
Date: Mon Sep  4 07:37:10 2006
New Revision: 9256

Log:
Fixes made for HTML tag vulnerabilities

Modified:
    vtigercrm/trunk/include/database/PearDatabase.php

Modified: vtigercrm/trunk/include/database/PearDatabase.php
==============================================================================
--- vtigercrm/trunk/include/database/PearDatabase.php (original)
+++ vtigercrm/trunk/include/database/PearDatabase.php Mon Sep  4 07:37:10 2006
@@ -441,7 +441,9 @@
 	$result->Move($row);
 	$rowdata = $this->change_key_case($result->FetchRow());
 	//$this->println($rowdata);
-	$coldata = strip_selected_tags($rowdata[$col],'script');
+	//Commented strip_selected_tags and added to_html function for HTML tags vulnerability
+	//$coldata = strip_selected_tags($rowdata[$col],'script');
+	$coldata = to_html($rowdata[$col]);
 	//$this->println("ADODB query_result ". $coldata);
 	return $coldata;
     }




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep  4 10:58:24 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 14:58:24 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9257 - in /vtigercrm/trunk:
 Smarty/templates/Inventory/ modules/Products/ themes/woodspice/
Message-ID: <20060904145824.8362D76CE36@vtiger.fosslabs.com>

Author: saraj
Date: Mon Sep  4 08:58:15 2006
New Revision: 9257

Log:
* Modified to display the discount, tax divs in the mouse click area

Modified:
    vtigercrm/trunk/Smarty/templates/Inventory/InventoryCreateView.tpl
    vtigercrm/trunk/Smarty/templates/Inventory/InventoryEditView.tpl
    vtigercrm/trunk/Smarty/templates/Inventory/ProductDetails.tpl
    vtigercrm/trunk/Smarty/templates/Inventory/ProductDetailsEditView.tpl
    vtigercrm/trunk/modules/Products/InventoryTaxAjax.php
    vtigercrm/trunk/themes/woodspice/style.css

Modified: vtigercrm/trunk/Smarty/templates/Inventory/InventoryCreateView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Inventory/InventoryCreateView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Inventory/InventoryCreateView.tpl Mon Sep  4 08:58:15 2006
@@ -188,6 +188,9 @@
 </table>
 </form>
 
+<!-- This div is added to get the left and top values to show the tax details-->
+<div id="tax_container" style="display:none; position:absolute; z-index:1px;"></div>
+
 <script>
 
 

Modified: vtigercrm/trunk/Smarty/templates/Inventory/InventoryEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Inventory/InventoryEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Inventory/InventoryEditView.tpl Mon Sep  4 08:58:15 2006
@@ -171,6 +171,9 @@
 </table>
 </form>
 
+<!-- This div is added to get the left and top values to show the tax details-->
+<div id="tax_container" style="display:none; position:absolute; z-index:1px;"></div>
+
 <script>	
         var fieldname = new Array({$VALIDATION_DATA_FIELDNAME})
 

Modified: vtigercrm/trunk/Smarty/templates/Inventory/ProductDetails.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Inventory/ProductDetails.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Inventory/ProductDetails.tpl Mon Sep  4 08:58:15 2006
@@ -21,7 +21,7 @@
 //  window.onmousemove= displayCoords;
 //  window.onclick = fnRevert;
   
-function displayCoords(event,obj,mode,curr_row) 
+function displayCoords(currObj,obj,mode,curr_row) 
 {ldelim}
 	if(mode != 'discount_final' && mode != 'sh_tax_div_title' && mode != 'group_tax_div_title')
 	{ldelim}
@@ -38,6 +38,10 @@
 	{ldelim}
 		document.getElementById("discount_div_title"+curr_row).innerHTML = '<b>Set Discount for : '+document.getElementById("productTotal"+curr_row).innerHTML+'</b>';
 	{rdelim}
+	else if(mode == 'tax')
+	{ldelim}
+		document.getElementById("tax_div_title"+curr_row).innerHTML = "<b>Set Tax for "+document.getElementById("totalAfterDiscount"+curr_row).innerHTML+'</b>';
+	{rdelim}
 	else if(mode == 'discount_final')
 	{ldelim}
 		document.getElementById("discount_div_title_final").innerHTML = '<b>Set Discount for : '+document.getElementById("netTotal").innerHTML+'</b>';
@@ -52,19 +56,23 @@
 		document.getElementById("group_tax_div_title").innerHTML = '<b>Set Group Tax for : '+net_total_after_discount+'</b>';
 	{rdelim}
 
-	var move_Element = document.getElementById(obj).style;
-	if(!event)
-	{ldelim}
-		move_Element.left = e.pageX +'px' ;
-		move_Element.top = e.pageY + 'px';	
-	{rdelim}
-	else
-	{ldelim}
-		move_Element.left = event.clientX +'px' ;
-		move_Element.top = event.clientY + 'px';	
-	{rdelim}
-
-	move_Element.display = 'block';
+	fnvshobj(currObj,'tax_container');
+	if(document.all)
+	{ldelim}
+		var divleft = document.getElementById("tax_container").style.left;
+		var divabsleft = divleft.substring(0,divleft.length-2);
+		document.getElementById(obj).style.left = eval(divabsleft) - 120;
+
+		var divtop = document.getElementById("tax_container").style.top;
+		var divabstop =  divtop.substring(0,divtop.length-2);
+		document.getElementById(obj).style.top = eval(divabstop) - 200;
+	{rdelim}else
+	{ldelim}
+		document.getElementById(obj).style.left =  document.getElementById("tax_container").left;
+		document.getElementById(obj).style.top = document.getElementById("tax_container").top;
+	{rdelim}
+	document.getElementById(obj).style.display = "block";
+
 {rdelim}
   
 	function doNothing(){ldelim}
@@ -177,7 +185,7 @@
 		   </tr>
 		   <tr>
 			<td align="right" style="padding:5px;" nowrap>
-				(-)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(event,'discount_div1','discount','1')" >{$APP.LBL_DISCOUNT}</a> : </b>
+				(-)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(this,'discount_div1','discount','1')" >{$APP.LBL_DISCOUNT}</a> : </b>
 				<div class="discountUI" id="discount_div1">
 					<input type="hidden" id="discount_type1" name="discount_type1" value="">
 					<table width="100%" border="0" cellpadding="5" cellspacing="0" class="small">
@@ -208,7 +216,7 @@
 		   </tr>
 		   <tr id="individual_tax_row1" class="TaxShow">
 			<td align="right" style="padding:5px;" nowrap>
-				(+)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(event,'tax_div1','tax','1')" >{$APP.LBL_TAX} </a> : </b>
+				(+)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(this,'tax_div1','tax','1')" >{$APP.LBL_TAX} </a> : </b>
 				<div class="discountUI" id="tax_div1">
 				</div>
 			</td>
@@ -269,13 +277,14 @@
 
    <!-- Product Details Final Total Discount, Tax and Shipping&Hanling  - Starts -->
    <tr valign="top">
-	<td width="88%" class="crmTableRow small lineOnTop" align="right"><b>{$APP.LBL_NET_TOTAL}</b></td>
+	<td width="88%" colspan="2" class="crmTableRow small lineOnTop" align="right"><b>{$APP.LBL_NET_TOTAL}</b></td>
 	<td width="12%" id="netTotal" class="crmTableRow small lineOnTop" align="right">0.00</td>
    </tr>
 
    <tr valign="top">
+	<td class="crmTableRow small lineOnTop" width="60%" style="border-right:1px #dadada;">&nbsp;</td>
 	<td class="crmTableRow small lineOnTop" align="right">
-		(-)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(event,'discount_div_final','discount_final','1')">{$APP.LBL_DISCOUNT}</a>
+		(-)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(this,'discount_div_final','discount_final','1')">{$APP.LBL_DISCOUNT}</a>
 		<!-- Popup Discount DIV -->
 		<div class="discountUI" id="discount_div_final">
 			<input type="hidden" id="discount_type_final" name="discount_type_final" value="">
@@ -306,8 +315,9 @@
 
    <!-- Group Tax - starts -->
    <tr id="group_tax_row" valign="top" class="TaxHide">
+	<td class="crmTableRow small lineOnTop" style="border-right:1px #dadada;">&nbsp;</td>
 	<td class="crmTableRow small lineOnTop" align="right">
-		(+)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(event,'group_tax_div','group_tax_div_title',''); calcGroupTax();" >{$APP.LBL_TAX}</a></b>
+		(+)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(this,'group_tax_div','group_tax_div_title',''); calcGroupTax();" >{$APP.LBL_TAX}</a></b>
 				<!-- Pop Div For Group TAX -->
 				<div class="discountUI" id="group_tax_div">
 					<table width="100%" border="0" cellpadding="5" cellspacing="0" class="small">
@@ -322,7 +332,7 @@
 						<td align="left" class="lineOnTop">
 							<input type="text" class="small" size="5" name="{$tax_detail.taxname}_group_percentage" id="group_tax_percentage{$smarty.foreach.group_tax_loop.iteration}" value="{$tax_detail.percentage}" onBlur="calcGroupTax()">&nbsp;%
 						</td>
-						<td align="center" class="lineOnTop">{$tax_detail.taxname}</td>
+						<td align="center" class="lineOnTop">{$tax_detail.taxlabel}</td>
 						<td align="right" class="lineOnTop">
 							<input type="text" class="small" size="6" name="{$tax_detail.taxname}_group_amount" id="group_tax_amount{$smarty.foreach.group_tax_loop.iteration}" style="cursor:pointer;" value="0.00" readonly>
 						</td>
@@ -343,6 +353,7 @@
 
 
    <tr valign="top">
+	<td class="crmTableRow small" style="border-right:1px #dadada;">&nbsp;</td>
 	<td class="crmTableRow small" align="right">
 		(+)&nbsp;<b>{$APP.LBL_SHIPPING_AND_HANDLING_CHARGES} </b>
 	</td>
@@ -352,8 +363,9 @@
    </tr>
 
    <tr valign="top">
+	<td class="crmTableRow small" style="border-right:1px #dadada;">&nbsp;</td>
 	<td class="crmTableRow small" align="right">
-		(+)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(event,'shipping_handling_div','sh_tax_div_title',''); calcSHTax();" >{$APP.LBL_TAX_FOR_SHIPPING_AND_HANDLING} </a></b>
+		(+)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(this,'shipping_handling_div','sh_tax_div_title',''); calcSHTax();" >{$APP.LBL_TAX_FOR_SHIPPING_AND_HANDLING} </a></b>
 
 				<!-- Pop Div For Shipping and Handlin TAX -->
 				<div class="discountUI" id="shipping_handling_div">
@@ -386,6 +398,7 @@
 	<td id="shipping_handling_tax" class="crmTableRow small" align="right">0.00</td>
    </tr>
    <tr valign="top">
+	<td class="crmTableRow small" style="border-right:1px #dadada;">&nbsp;</td>
 	<td class="crmTableRow small" align="right">
 		{$APP.LBL_ADJUSTMENT}
 		<select id="adjustmentType" name="adjustmentType" class=small onchange="calcTotal();">
@@ -398,6 +411,7 @@
 	</td>
    </tr>
    <tr valign="top">
+	<td class="crmTableRow big lineOnTop" style="border-right:1px #dadada;">&nbsp;</td>
 	<td class="crmTableRow big lineOnTop" align="right"><b>{$APP.LBL_GRAND_TOTAL}</b></td>
 	<td id="grandTotal" name="grandTotal" class="crmTableRow big lineOnTop" align="right">&nbsp;</td>
    </tr>

Modified: vtigercrm/trunk/Smarty/templates/Inventory/ProductDetailsEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Inventory/ProductDetailsEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Inventory/ProductDetailsEditView.tpl Mon Sep  4 08:58:15 2006
@@ -22,7 +22,7 @@
 //  window.onmousemove= displayCoords;
 //  window.onclick = fnRevert;
   
-function displayCoords(event,obj,mode,curr_row) 
+function displayCoords(currObj,obj,mode,curr_row) 
 {ldelim}
 	if(mode != 'discount_final' && mode != 'sh_tax_div_title' && mode != 'group_tax_div_title')
 	{ldelim}
@@ -39,6 +39,10 @@
 	{ldelim}
 		document.getElementById("discount_div_title"+curr_row).innerHTML = '<b>Set Discount for : '+document.getElementById("productTotal"+curr_row).innerHTML+'</b>';
 	{rdelim}
+	else if(mode == 'tax')
+	{ldelim}
+		document.getElementById("tax_div_title"+curr_row).innerHTML = "<b>Set Tax for "+document.getElementById("totalAfterDiscount"+curr_row).innerHTML+'</b>';
+	{rdelim}
 	else if(mode == 'discount_final')
 	{ldelim}
 		document.getElementById("discount_div_title_final").innerHTML = '<b>Set Discount for : '+document.getElementById("netTotal").innerHTML+'</b>';
@@ -53,19 +57,23 @@
 		document.getElementById("group_tax_div_title").innerHTML = '<b>Set Group Tax for : '+net_total_after_discount+'</b>';
 	{rdelim}
 
-	var move_Element = document.getElementById(obj).style;
-	if(!event)
-	{ldelim}
-		move_Element.left = e.pageX +'px' ;
-		move_Element.top = e.pageY + 'px';	
-	{rdelim}
-	else
-	{ldelim}
-		move_Element.left = event.clientX +'px' ;
-		move_Element.top = event.clientY + 'px';	
-	{rdelim}
-
-	move_Element.display = 'block';
+	fnvshobj(currObj,'tax_container');
+	if(document.all)
+	{ldelim}
+		var divleft = document.getElementById("tax_container").style.left;
+		var divabsleft = divleft.substring(0,divleft.length-2);
+		document.getElementById(obj).style.left = eval(divabsleft) - 120;
+
+		var divtop = document.getElementById("tax_container").style.top;
+		var divabstop =  divtop.substring(0,divtop.length-2);
+		document.getElementById(obj).style.top = eval(divabstop);
+	{rdelim}else
+	{ldelim}
+		document.getElementById(obj).style.left =  document.getElementById("tax_container").left;
+		document.getElementById(obj).style.top = document.getElementById("tax_container").top;
+	{rdelim}
+	document.getElementById(obj).style.display = "block";
+
 {rdelim}
   
 	function doNothing(){ldelim}
@@ -198,7 +206,7 @@
 		   </tr>
 		   <tr>
 			<td align="right" style="padding:5px;" nowrap>
-				(-)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(event,'discount_div{$row_no}','discount','{$row_no}')" >{$APP.LBL_DISCOUNT}</a> : </b>
+				(-)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(this,'discount_div{$row_no}','discount','{$row_no}')" >{$APP.LBL_DISCOUNT}</a> : </b>
 				<div class="discountUI" id="discount_div{$row_no}">
 					<input type="hidden" id="discount_type{$row_no}" name="discount_type{$row_no}" value="{$data.$discount_type}">
 					<table width="100%" border="0" cellpadding="5" cellspacing="0" class="small">
@@ -229,12 +237,12 @@
 		   </tr>
 		   <tr id="individual_tax_row{$row_no}" class="TaxShow">
 			<td align="right" style="padding:5px;" nowrap>
-				(+)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(event,'tax_div{$row_no}','tax','{$row_no}')" >{$APP.LBL_TAX} </a> : </b>
+				(+)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(this,'tax_div{$row_no}','tax','{$row_no}')" >{$APP.LBL_TAX} </a> : </b>
 				<div class="discountUI" id="tax_div{$row_no}">
 					<!-- we will form the table with all taxes -->
 					<table width="100%" border="0" cellpadding="5" cellspacing="0" class="small">
 					   <tr>
-						<td nowrap align="left" >Set Tax for : {$data.$totalAfterDiscount}</td>
+						<td id="tax_div_title{$row_no}" nowrap align="left" ><b>Set Tax for : {$data.$totalAfterDiscount}</b></td>
 						<td>&nbsp;</td>
 						<td align="right"><img src="{$IMAGE_PATH}close.gif" border="0" onClick="fnHidePopDiv('tax_div{$row_no}')" style="cursor:pointer;"></td>
 					   </tr>
@@ -317,13 +325,14 @@
 
    <!-- Product Details Final Total Discount, Tax and Shipping&Hanling  - Starts -->
    <tr valign="top">
-	<td width="88%" class="crmTableRow small lineOnTop" align="right"><b>{$APP.LBL_NET_TOTAL}</b></td>
+	<td width="88%" colspan="2" class="crmTableRow small lineOnTop" align="right"><b>{$APP.LBL_NET_TOTAL}</b></td>
 	<td width="12%" id="netTotal" class="crmTableRow small lineOnTop" align="right">0.00</td>
    </tr>
 
    <tr valign="top">
+	<td class="crmTableRow small lineOnTop" width="60%" style="border-right:1px #dadada;">&nbsp;</td>
 	<td class="crmTableRow small lineOnTop" align="right">
-		(-)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(event,'discount_div_final','discount_final','1')">{$APP.LBL_DISCOUNT}</a>
+		(-)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(this,'discount_div_final','discount_final','1')">{$APP.LBL_DISCOUNT}</a>
 
 		<!-- Popup Discount DIV -->
 		<div class="discountUI" id="discount_div_final">
@@ -356,8 +365,9 @@
 
    <!-- Group Tax - starts -->
    <tr id="group_tax_row" valign="top" class="TaxHide">
+	<td class="crmTableRow small lineOnTop" style="border-right:1px #dadada;">&nbsp;</td>
 	<td class="crmTableRow small lineOnTop" align="right">
-		(+)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(event,'group_tax_div','group_tax_div_title',''); calcGroupTax();" >{$APP.LBL_TAX}</a></b>
+		(+)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(this,'group_tax_div','group_tax_div_title',''); calcGroupTax();" >{$APP.LBL_TAX}</a></b>
 
 				<!-- Pop Div For Group TAX -->
 				<div class="discountUI" id="group_tax_div">
@@ -396,6 +406,7 @@
 
 
    <tr valign="top">
+	<td class="crmTableRow small" style="border-right:1px #dadada;">&nbsp;</td>
 	<td class="crmTableRow small" align="right">
 		(+)&nbsp;<b>{$APP.LBL_SHIPPING_AND_HANDLING_CHARGES} </b>
 	</td>
@@ -406,8 +417,9 @@
 
 
    <tr valign="top">
+	<td class="crmTableRow small" style="border-right:1px #dadada;">&nbsp;</td>
 	<td class="crmTableRow small" align="right">
-		(+)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(event,'shipping_handling_div','sh_tax_div_title',''); calcSHTax();" >{$APP.LBL_TAX_FOR_SHIPPING_AND_HANDLING} </a></b>
+		(+)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(this,'shipping_handling_div','sh_tax_div_title',''); calcSHTax();" >{$APP.LBL_TAX_FOR_SHIPPING_AND_HANDLING} </a></b>
 
 				<!-- Pop Div For Shipping and Handlin TAX -->
 				<div class="discountUI" id="shipping_handling_div">
@@ -442,6 +454,7 @@
 
 
    <tr valign="top">
+	<td class="crmTableRow small" style="border-right:1px #dadada;">&nbsp;</td>
 	<td class="crmTableRow small" align="right">
 		{$APP.LBL_ADJUSTMENT}
 		<select id="adjustmentType" name="adjustmentType" class=small onchange="calcTotal();">
@@ -456,6 +469,7 @@
 
 
    <tr valign="top">
+	<td class="crmTableRow big lineOnTop" style="border-right:1px #dadada;">&nbsp;</td>
 	<td class="crmTableRow big lineOnTop" align="right"><b>{$APP.LBL_GRAND_TOTAL}</b></td>
 	<td id="grandTotal" name="grandTotal" class="crmTableRow big lineOnTop" align="right">{$FINAL.grandTotal}</td>
    </tr>

Modified: vtigercrm/trunk/modules/Products/InventoryTaxAjax.php
==============================================================================
--- vtigercrm/trunk/modules/Products/InventoryTaxAjax.php (original)
+++ vtigercrm/trunk/modules/Products/InventoryTaxAjax.php Mon Sep  4 08:58:15 2006
@@ -24,7 +24,7 @@
 $tax_div = '
 		<table width="100%" border="0" cellpadding="5" cellspacing="0" class="small">
 		   <tr>
-			<td nowrap align="left" >Set Tax for : '.$product_total.'</td>
+			<td id="tax_div_title'.$rowid.'" nowrap align="left" ><b>Set Tax for : '.$product_total.'</b></td>
 			<td>&nbsp;</td>
 			<td align="right"><img src="'.$image_path.'close.gif" border="0" onClick="fnHidePopDiv(\'tax_div'.$rowid.'\')" style="cursor:pointer;"></td>
 		   </tr>

Modified: vtigercrm/trunk/themes/woodspice/style.css
==============================================================================
--- vtigercrm/trunk/themes/woodspice/style.css (original)
+++ vtigercrm/trunk/themes/woodspice/style.css Mon Sep  4 08:58:15 2006
@@ -3135,7 +3135,7 @@
 
 .discountUI{
 	border:3px solid #CCCCCC;
-	width:200px;
+	width:250px;
 	padding:5px;
 	position:absolute;
 	background-color:#FFFFFF;




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep  4 11:08:36 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 15:08:36 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9258 -
 /vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl
Message-ID: <20060904150836.395A7707DB4@vtiger.fosslabs.com>

Author: saraj
Date: Mon Sep  4 09:08:32 2006
New Revision: 9258

Log:
changes made to fix the calendar related issue  --Minnie

Modified:
    vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl

Modified: vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl Mon Sep  4 09:08:32 2006
@@ -90,7 +90,7 @@
                                                                 <input title="{$APP.LBL_DUPLICATE_BUTTON_TITLE}" accessKey="{$APP.LBL_DUPLICATE_BUTTON_KEY}" class="crmbutton small create" onclick="this.form.return_module.value='{$MODULE}'; this.form.return_action.value='DetailView'; this.form.isDuplicate.value='true';this.form.module.value='{$MODULE}'; this.form.action.value='EditView'" type="submit" name="Duplicate" value="{$APP.LBL_DUPLICATE_BUTTON_LABEL}">&nbsp;
                                                                 {/if}
 								{if $DELETE eq 'permitted'}
-                                                                <input title="{$APP.LBL_DELETE_BUTTON_TITLE}" accessKey="{$APP.LBL_DELETE_BUTTON_KEY}" class="crmbutton small delete" onclick="this.form.return_module.value='{$MODULE}'; this.form.return_action.value='index'; this.form.action.value='Delete'; return confirm('{$APP.NTC_DELETE_CONFIRMATION}')" type="submit" name="Delete" value="{$APP.LBL_DELETE_BUTTON_LABEL}">&nbsp;
+                                                                <input title="{$APP.LBL_DELETE_BUTTON_TITLE}" accessKey="{$APP.LBL_DELETE_BUTTON_KEY}" class="crmbutton small delete" onclick="this.form.return_module.value='{$MODULE}'; {if $VIEWTYPE eq 'calendar'} this.form.return_action.value='index'; {else} this.form.return_action.value='ListView'; {/if}  this.form.action.value='Delete'; return confirm('{$APP.NTC_DELETE_CONFIRMATION}')" type="submit" name="Delete" value="{$APP.LBL_DELETE_BUTTON_LABEL}">&nbsp;
                                                                 {/if}
 
 							</td>




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep  4 11:19:25 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 15:19:25 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9259 -
	/vtigercrm/trunk/modules/Calendar/DetailView.php
Message-ID: <20060904151925.6F455707DB4@vtiger.fosslabs.com>

Author: saraj
Date: Mon Sep  4 09:19:21 2006
New Revision: 9259

Log:
changes made to fix the calendar related issue  --Minnie

Modified:
    vtigercrm/trunk/modules/Calendar/DetailView.php

Modified: vtigercrm/trunk/modules/Calendar/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/DetailView.php (original)
+++ vtigercrm/trunk/modules/Calendar/DetailView.php Mon Sep  4 09:19:21 2006
@@ -259,7 +259,7 @@
 $smarty->assign("NAME", $focus->name);
 $smarty->assign("BLOCKS", $act_data);
 $smarty->assign("LABEL", $fldlabel);
-
+$smarty->assign("VIEWTYPE", $_REQUEST['viewtype']);
 $smarty->assign("CUSTOMFIELD", $cust_fld);
 $smarty->assign("ACTIVITYDATA", $data);
 $smarty->assign("ID", $_REQUEST['record']);




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep  4 12:51:12 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 16:51:12 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9260 -
 /vtigercrm/trunk/log4php/appenders/LoggerAppenderFile.php
Message-ID: <20060904165112.0756F76CE42@vtiger.fosslabs.com>

Author: saraj
Date: Mon Sep  4 10:51:09 2006
New Revision: 9260

Log:
removed read permission for log files

Modified:
    vtigercrm/trunk/log4php/appenders/LoggerAppenderFile.php

Modified: vtigercrm/trunk/log4php/appenders/LoggerAppenderFile.php
==============================================================================
--- vtigercrm/trunk/log4php/appenders/LoggerAppenderFile.php (original)
+++ vtigercrm/trunk/log4php/appenders/LoggerAppenderFile.php Mon Sep  4 10:51:09 2006
@@ -75,6 +75,10 @@
         $fileName = $this->getFile();
         LoggerLog::debug("LoggerAppenderFile::activateOptions() opening file '{$fileName}'");
         $this->fp = @fopen($fileName, ($this->getAppend()? 'a':'w'));
+
+	// Denying read option for log file. Added for Vulnerability fix
+	if (is_readable($fileName)) chmod ($fileName,0222);
+
         if ($this->fp) {
             if ($this->getAppend())
                 fseek($this->fp, 0, SEEK_END);
@@ -177,4 +181,4 @@
         } 
     }
 }
-?>
+?>




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep  4 13:58:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 04 Sep 2006 17:58:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9261 -
	/vtigercrm/trunk/include/utils/DetailViewUtils.php
Message-ID: <20060904175850.EA10F76CDE0@vtiger.fosslabs.com>

Author: saraj
Date: Mon Sep  4 11:58:46 2006
New Revision: 9261

Log:
line break issue fixed

Modified:
    vtigercrm/trunk/include/utils/DetailViewUtils.php

Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/DetailViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/DetailViewUtils.php Mon Sep  4 11:58:46 2006
@@ -159,7 +159,7 @@
 	}
 	elseif($uitype == 19)
 	{
-		$col_fields[$fieldname]= make_clickable(nl2br($col_fields[$fieldname]));
+		$col_fields[$fieldname]= make_clickable(str_replace("&lt;br /&gt;","<br>",$col_fields[$fieldname]));
 		$label_fld[] = $mod_strings[$fieldlabel];
 		$label_fld[] = $col_fields[$fieldname];
 	}




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 03:53:15 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 07:53:15 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9262 -
 /vtigercrm/trunk/themes/woodspice/images/set-IcoTwoTabConfig.gif
Message-ID: <20060905075315.C9BD676521E@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 01:53:10 2006
New Revision: 9262

Log:
Image added for single pane view -- ahmed

Added:
    vtigercrm/trunk/themes/woodspice/images/set-IcoTwoTabConfig.gif   (with props)




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 03:56:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 07:56:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9263 - in
 /vtigercrm/trunk/Smarty/templates: DefModuleView.tpl Settings.tpl
Message-ID: <20060905075638.AEDE376521D@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 01:56:34 2006
New Revision: 9263

Log:
Icon added for single pane view -- ahmed

Modified:
    vtigercrm/trunk/Smarty/templates/DefModuleView.tpl
    vtigercrm/trunk/Smarty/templates/Settings.tpl

Modified: vtigercrm/trunk/Smarty/templates/DefModuleView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DefModuleView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DefModuleView.tpl Tue Sep  5 01:56:34 2006
@@ -31,7 +31,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}" alt="{$MOD.LBL_DEFAULT_MODULE_VIEW}" width="48" height="48" border=0 title="{$MOD.LBL_DEFAULT_MODULE_VIEW}"></td>
+					<td width=50 rowspan=2 valign=top><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}"></td>
 					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > {$MOD.LBL_DEFAULT_MODULE_VIEW}</b></td>
 				</tr>
 				<tr>

Modified: vtigercrm/trunk/Smarty/templates/Settings.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings.tpl Tue Sep  5 01:56:34 2006
@@ -162,7 +162,7 @@
 					<!-- 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}" alt="{$MOD.LBL_DEFAULT_MODULE_VIEW}" width="48" height="48" border=0 title="{$MOD.LBL_DEFAULT_MODULE_VIEW}"></a></td>
+						<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>
 					</tr>
 					<tr>




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 05:18:36 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 09:18:36 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9264 -
	/vtigercrm/trunk/modules/Calendar/calendarLayout.php
Message-ID: <20060905091836.EC3AC765A43@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 03:18:32 2006
New Revision: 9264

Log:
changes made to fix the calendar related issue  --Minnie

Modified:
    vtigercrm/trunk/modules/Calendar/calendarLayout.php

Modified: vtigercrm/trunk/modules/Calendar/calendarLayout.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/calendarLayout.php (original)
+++ vtigercrm/trunk/modules/Calendar/calendarLayout.php Tue Sep  5 03:18:32 2006
@@ -909,10 +909,15 @@
 				$endtemp_date = (($date_format == 'dd-mm-yyyy')?(date('d-m-Y',$endtemp_ts)):(($date_format== 'mm-dd-yyyy')?(date('m-d-Y',$endtemp_ts)):(($date_format == 'yyyy-mm-dd')?(date('Y-m-d', $endtemp_ts)):(''))));
 			}
 			$cal['slice'] = $cal['calendar']->month_array[$cal['calendar']->slices[$count]];
+			$monthclass = dateCheck($cal['slice']->start_time->get_formatted_date());
+			if($monthclass != '')
+				$monthclass = 'calSel';
+			else
+				$monthclass = 'dvtCellLabel';
 			//to display dates in month
 			if ($cal['slice']->start_time->getMonth() == $cal['calendar']->date_time->getMonth())
 			{
-				$monthview_layout .= '<td class="dvtCellLabel" width="14%" onMouseOver="cal_show(\'create_'.$temp_date.''.$time_arr['starthour'].'\')" onMouseOut="fnHide_Event(\'create_'.$temp_date.''.$time_arr['starthour'].'\')">';
+				$monthview_layout .= '<td class="'.$monthclass.'" width="14%" onMouseOver="cal_show(\'create_'.$temp_date.''.$time_arr['starthour'].'\')" onMouseOut="fnHide_Event(\'create_'.$temp_date.''.$time_arr['starthour'].'\')">';
 				$monthview_layout .= '<a href="index.php?module=Calendar&action=index&view='.$cal['slice']->getView().''.$cal['slice']->start_time->get_date_str().'&parenttab='.$category.'">';
 				$monthview_layout .= $cal['slice']->start_time->get_Date();
 				$monthview_layout .= '</a>';
@@ -1125,7 +1130,7 @@
 				</tr>';
 			$eventlayer .= '<tr><td>';
 			$eventlayer .= '</td>
-				<td><a href="index.php?action=DetailView&module=Calendar&record='.$id.'&activity_mode=Events&parenttab='.$category.'"><span class="orgTab">'.$subject.'</span></a></td>
+				<td><a href="index.php?action=DetailView&module=Calendar&record='.$id.'&activity_mode=Events&viewtype=calendar&parenttab='.$category.'"><span class="orgTab">'.$subject.'</span></a></td>
 				</tr>
 				<tr><td>'.$action_str.'</td><td>('.$user.' | '.$eventstatus.' | '.$priority.')</td>
 			</table>
@@ -1196,7 +1201,7 @@
 				</tr>
 				<tr>
 					<td>&nbsp;</td>
-					<td><a href="index.php?action=DetailView&module=Calendar&record='.$id.'&activity_mode=Events&parenttab='.$category.'"><span class="orgTab">'.$subject.'</span></a></td>
+					<td><a href="index.php?action=DetailView&module=Calendar&record='.$id.'&activity_mode=Events&viewtype=calendar&parenttab='.$category.'"><span class="orgTab">'.$subject.'</span></a></td>
 				</tr>
 				<tr><td>'.$action_str.'</td><td>('.$user.' | '.$eventstatus.' | '.$priority.')</td>
 			</table>
@@ -1260,7 +1265,7 @@
 					<table border="0" cellpadding="1" cellspacing="0" width="100%">
 						<tr>
 							<td><img src="'.$image.'" align="middle" border="0"></td>
-							<td width="100%"><a href="index.php?action=DetailView&module=Calendar&record='.$id.'&activity_mode=Events&parenttab='.$category.'"><span class="orgTab"><small>'.$start_hour.' - '.$end_hour.'</small></span></td>
+							<td width="100%"><a href="index.php?action=DetailView&module=Calendar&record='.$id.'&activity_mode=Events&viewtype=calendar&parenttab='.$category.'"><span class="orgTab"><small>'.$start_hour.' - '.$end_hour.'</small></span></td>
 						</tr>
 					</table>
                                 </div><br>';
@@ -1372,7 +1377,7 @@
 			$contactname = getContactName($contact_id);
 			$contact_data = "<b>".$contactname."</b>,";
 		}
-		$more_link = "<a href='index.php?action=DetailView&module=Calendar&record=".$id."&activity_mode=Events&parenttab=".$category."' class='webMnu'>[".$mod_strings['LBL_MORE']."...]</a>";
+		$more_link = "<a href='index.php?action=DetailView&module=Calendar&record=".$id."&activity_mode=Events&viewtype=calendar&parenttab=".$category."' class='webMnu'>[".$mod_strings['LBL_MORE']."...]</a>";
 		$type = $adb->query_result($result,$i,"activitytype");
 		if($type == 'Call')
 			$image_tag = "<img src='".$calendar['IMAGE_PATH']."Calls.gif' align='middle'>&nbsp;".$type;
@@ -1472,7 +1477,7 @@
                 $id = $adb->query_result($result,$i,"activityid");
                 $subject = $adb->query_result($result,$i,"subject");
 		$status = $adb->query_result($result,$i,"status");
-		$more_link = "<a href='index.php?action=DetailView&module=Calendar&record=".$id."&activity_mode=Task&parenttab=".$category."' class='webMnu'>".$subject."</a>";
+		$more_link = "<a href='index.php?action=DetailView&module=Calendar&record=".$id."&activity_mode=Task&viewtype=calendar&parenttab=".$category."' class='webMnu'>".$subject."</a>";
 		$element['tododetail'] = $more_link;
 		$element['status'] = $adb->query_result($result,$i,"status");
 		if(isPermitted("Calendar","EditView") == "yes")
@@ -1656,13 +1661,14 @@
 	//labels of listview header
 	if($cal['view'] == 'day')
 	{
+		$colspan = 7;
 		$header = Array('0'=>'#','1'=>$mod_strings['LBL_TIME'],'2'=>$mod_strings['LBL_LIST_DUE_DATE'],
 				'3'=>$mod_strings['LBL_TODO'],'4'=>$mod_strings['LBL_STATUS'],'5'=>$mod_strings['LBL_ACTION'],'6'=>$mod_strings['LBL_ASSINGEDTO'],);
 		$header_width = Array('0'=>'5%','1'=>'10%','2'=>'10%','3'=>'38%','4'=>'10%','5'=>'10%', '6'=>'15%', );
 	}
 	else
 	{
-		
+		$colspan = 8;
 	        $header = Array('0'=>'#',
                         '1'=>$mod_strings['LBL_TIME'],
 			'2'=>$mod_strings['LBL_APP_START_DATE'],
@@ -1724,7 +1730,7 @@
         }
         else
         {
-		$list_view .="<tr><td style='background-color:#efefef;height:340px' align='center' colspan='6'>";
+		$list_view .="<tr><td style='background-color:#efefef;height:340px' align='center' colspan='".$colspan."'>";
 		$list_view .="<div style='border: 3px solid rgb(153, 153, 153); background-color: rgb(255, 255, 255); width: 45%; position: relative; z-index: 5000;'>
 			<table border='0' cellpadding='5' cellspacing='0' width='98%'>
 			<tr>




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 05:38:07 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 09:38:07 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9265 -
	/vtigercrm/trunk/modules/HelpDesk/Popup.php
Message-ID: <20060905093807.21C867660AA@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 03:38:02 2006
New Revision: 9265

Log:
Popup added for Trouble tickets  --Minnie

Added:
    vtigercrm/trunk/modules/HelpDesk/Popup.php




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 05:43:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 09:43:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9266 - in
 /vtigercrm/trunk/include: js/dtlviewajax.js utils/DetailViewUtils.php
Message-ID: <20060905094350.681FF76CDC2@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep  5 03:42:17 2006
New Revision: 9266

Log:
fieldvalues of multiselect combo box are seperated by comma and space

Modified:
    vtigercrm/trunk/include/js/dtlviewajax.js
    vtigercrm/trunk/include/utils/DetailViewUtils.php

Modified: vtigercrm/trunk/include/js/dtlviewajax.js
==============================================================================
--- vtigercrm/trunk/include/js/dtlviewajax.js (original)
+++ vtigercrm/trunk/include/js/dtlviewajax.js Tue Sep  5 03:42:17 2006
@@ -312,9 +312,9 @@
 			getObj(dtlView).innerHTML = popObj.value;
 		}
 	}else if(uitype == '33')
-  {
-       getObj(dtlView).innerHTML = r.join(" , ");
-  }else
+  	{
+       		getObj(dtlView).innerHTML = r.join(", ");
+	}else
 	{
 		getObj(dtlView).innerHTML = tagValue;
 	}

Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/DetailViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/DetailViewUtils.php Tue Sep  5 03:42:17 2006
@@ -126,7 +126,7 @@
 	elseif($uitype == 33) //uitype 33 added for multiselector picklist - Jeri
 	{
 	     $label_fld[] = $mod_strings[$fieldlabel];
-	     $label_fld[] = str_ireplace(' |##| ',' , ',$col_fields[$fieldname]);
+	     $label_fld[] = str_ireplace(' |##| ',', ',$col_fields[$fieldname]);
 	     
 		$pick_query="select * from vtiger_".$fieldname;
 		$pickListResult = $adb->query($pick_query);




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 05:50:54 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 09:50:54 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9267 -
	/vtigercrm/trunk/modules/HelpDesk/HelpDesk.php
Message-ID: <20060905095054.A419676CD73@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 03:50:50 2006
New Revision: 9267

Log:
changes made to add Popup for Trouble tickets  --Minnie

Modified:
    vtigercrm/trunk/modules/HelpDesk/HelpDesk.php

Modified: vtigercrm/trunk/modules/HelpDesk/HelpDesk.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/HelpDesk.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/HelpDesk.php Tue Sep  5 03:50:50 2006
@@ -40,7 +40,7 @@
 				);
 
 	var $list_fields_name = Array(
-					'Ticket ID'=>'',
+					'Ticket ID'=>'crmid',
 					'Subject'=>'ticket_title',	  			
 					'Related to'=>'parent_id',	  			
 					'Status'=>'ticketstatus',
@@ -67,6 +67,14 @@
 					'modifiedtime',
 					'createdtime'
 				);
+	var $search_fields = Array(
+		'Ticket ID' => Array('crmentity'=>'crmid'),
+		'Subject' => Array('troubletickets'=>'title')
+		);
+	var $search_fields_name = Array(
+		'Ticket ID' => '',
+		'Subject'=>'ticket_title',
+		);
 
 	//Added these variables which are used as default order by and sortorder in ListView
 	var $default_order_by = 'crmid';




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 05:53:10 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 09:53:10 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9268 -
	/vtigercrm/trunk/modules/HelpDesk/HelpDesk.js
Message-ID: <20060905095310.BFBD276CD73@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 03:53:07 2006
New Revision: 9268

Log:
Popup related js added --Minnie

Modified:
    vtigercrm/trunk/modules/HelpDesk/HelpDesk.js

Modified: vtigercrm/trunk/modules/HelpDesk/HelpDesk.js
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/HelpDesk.js (original)
+++ vtigercrm/trunk/modules/HelpDesk/HelpDesk.js Tue Sep  5 03:53:07 2006
@@ -58,3 +58,13 @@
                 getObj("assign_team").style.display="block"
         }
 }
+
+function set_return(product_id, product_name) {
+        window.opener.document.EditView.parent_name.value = product_name;
+        window.opener.document.EditView.parent_id.value = product_id;
+}
+
+function set_return_todo(product_id, product_name) {
+        window.opener.document.createTodo.task_parent_name.value = product_name;
+        window.opener.document.createTodo.task_parent_id.value = product_id;
+}




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 06:09:31 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 10:09:31 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9269 -
	/vtigercrm/trunk/include/utils/DetailViewUtils.php
Message-ID: <20060905100931.07D3E76CD72@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 04:09:27 2006
New Revision: 9269

Log:
added nl2br for uitype 19 in detailview

Modified:
    vtigercrm/trunk/include/utils/DetailViewUtils.php

Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/DetailViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/DetailViewUtils.php Tue Sep  5 04:09:27 2006
@@ -159,7 +159,7 @@
 	}
 	elseif($uitype == 19)
 	{
-		$col_fields[$fieldname]= make_clickable(str_replace("&lt;br /&gt;","<br>",$col_fields[$fieldname]));
+		$col_fields[$fieldname]= make_clickable(str_replace("&lt;br /&gt;","<br>",nl2br($col_fields[$fieldname])));
 		$label_fld[] = $mod_strings[$fieldlabel];
 		$label_fld[] = $col_fields[$fieldname];
 	}




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 06:10:51 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 10:10:51 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9270 -
 /vtigercrmoutlook/trunk/resources/images/vtiger-crm.gif
Message-ID: <20060905101051.A73B876CD33@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep  5 04:10:18 2006
New Revision: 9270

Log:
Image modified for Outlook Plugin --Jeri

Modified:
    vtigercrmoutlook/trunk/resources/images/vtiger-crm.gif

Modified: vtigercrmoutlook/trunk/resources/images/vtiger-crm.gif
==============================================================================
Binary files - no diff available.




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 06:24:04 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 10:24:04 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9271 -
	/vtigercrmoutlook/trunk/vtigercrmoladdin/source/
Message-ID: <20060905102404.D8BB676CE56@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep  5 04:22:35 2006
New Revision: 9271

Log:
Files modified to ignore Contacts without lastname,Logout option added, --Jeri

Modified:
    vtigercrmoutlook/trunk/vtigercrmoladdin/source/clsOlkAddIn.cls
    vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmAbout.frm
    vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmAbout.frx
    vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmAddMsg.frm
    vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmAddMsg.frx
    vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmConflict.frx
    vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmLogin.frx
    vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmOlForum.frx
    vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmPref.frx
    vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmSync.frm
    vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmSync.frx
    vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmSyncDetails.frm
    vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmSyncDetails.frx
    vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmSyncStatus.frx
    vtigercrmoutlook/trunk/vtigercrmoladdin/source/modDoSync.bas
    vtigercrmoutlook/trunk/vtigercrmoladdin/source/modTasks.bas
    vtigercrmoutlook/trunk/vtigercrmoladdin/source/service.DCA
    vtigercrmoutlook/trunk/vtigercrmoladdin/source/vtigeroladdin.vbw

Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/clsOlkAddIn.cls
==============================================================================
--- vtigercrmoutlook/trunk/vtigercrmoladdin/source/clsOlkAddIn.cls (original)
+++ vtigercrmoutlook/trunk/vtigercrmoladdin/source/clsOlkAddIn.cls Tue Sep  5 04:22:35 2006
@@ -45,6 +45,8 @@
 Attribute oVtForums.VB_VarHelpID = -1
 Private WithEvents oPref As Office.CommandBarButton
 Attribute oPref.VB_VarHelpID = -1
+Private WithEvents oLogout As Office.CommandBarButton
+Attribute oLogout.VB_VarHelpID = -1
 Private WithEvents oAddEmailsButton As Office.CommandBarButton
 Attribute oAddEmailsButton.VB_VarHelpID = -1
 
@@ -91,6 +93,7 @@
     Set oVtHelp = Nothing
     Set oVtForums = Nothing
     Set oPref = Nothing
+    Set oLogout = Nothing
     Set oAddEmailsButton = Nothing
     Set oSContactsMenu = Nothing
     Set oSyncContacts = Nothing
@@ -175,6 +178,11 @@
         "&Preferences", "Pref", "Preferences for vtigerCRM Add-In", 0, True, msoButtonCaption)
         oPref.Enabled = False
                     
+        Set oLogout = CreateAddInPopupButton(gstrProgID, cmbControl, _
+        "&Logout", "Logout", "Logout", 0, True, msoButtonCaption)
+        oLogout.Enabled = True
+        
+        
         If oHelpCmdBar Is Nothing Then
             Set oHelpCmdBar = cmbControl.Controls.Add(Type:=msoControlPopup, Parameter:=7)
             With oHelpCmdBar
@@ -249,6 +257,19 @@
     frmLogin.Show vbModal
 End Sub
 
+Private Sub oLogout_Click(ByVal Ctrl As Office.CommandBarButton, CancelDefault As Boolean)
+    oLogin.Enabled = True
+    oPref.Enabled = False
+    oSCalendarMenu.Enabled = False
+    oSTaskMenu.Enabled = False
+    oSContactsMenu.Enabled = False
+    oSyncCalendar.Enabled = False
+    oSyncContacts.Enabled = False
+    oSyncTask.Enabled = False
+    oAddEmailsButton.Enabled = False
+    oAddEmailsMenu.Enabled = False
+End Sub
+
 Private Sub oPref_Click(ByVal Ctrl As Office.CommandBarButton, CancelDefault As Boolean)
     frmPref.Show vbModal
 End Sub

Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmAbout.frm
==============================================================================
Binary files - no diff available.

Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmAbout.frx
==============================================================================
Binary files - no diff available.

Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmAddMsg.frm
==============================================================================
Binary files - no diff available.

Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmAddMsg.frx
==============================================================================
Binary files - no diff available.

Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmConflict.frx
==============================================================================
Binary files - no diff available.

Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmLogin.frx
==============================================================================
Binary files - no diff available.

Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmOlForum.frx
==============================================================================
Binary files - no diff available.

Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmPref.frx
==============================================================================
Binary files - no diff available.

Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmSync.frm
==============================================================================
Binary files - no diff available.

Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmSync.frx
==============================================================================
Binary files - no diff available.

Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmSyncDetails.frm
==============================================================================
Binary files - no diff available.

Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmSyncDetails.frx
==============================================================================
Binary files - no diff available.

Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmSyncStatus.frx
==============================================================================
Binary files - no diff available.

Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/modDoSync.bas
==============================================================================
Binary files - no diff available.

Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/modTasks.bas
==============================================================================
Binary files - no diff available.

Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/service.DCA
==============================================================================
Binary files - no diff available.

Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/vtigeroladdin.vbw
==============================================================================
Binary files - no diff available.




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 07:21:52 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 11:21:52 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9272 -
	/vtigercrm/trunk/include/utils/SearchUtils.php
Message-ID: <20060905112152.E43E176CE92@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 05:21:48 2006
New Revision: 9272

Log:
changes made search string with quotes. Fixes #2063

Modified:
    vtigercrm/trunk/include/utils/SearchUtils.php

Modified: vtigercrm/trunk/include/utils/SearchUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/SearchUtils.php (original)
+++ vtigercrm/trunk/include/utils/SearchUtils.php Tue Sep  5 05:21:48 2006
@@ -205,7 +205,7 @@
         }
         if(isset($_REQUEST['search_text']) && $_REQUEST['search_text']!="")
         {
-                $search_string=ltrim(rtrim($_REQUEST['search_text']));
+                $search_string=addslashes(ltrim(rtrim($_REQUEST['search_text'])));
         }
         if(isset($_REQUEST['searchtype']) && $_REQUEST['searchtype']!="")
         {




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 07:54:32 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 11:54:32 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9273 -
	/vtigercrm/trunk/modules/HelpDesk/HelpDesk.php
Message-ID: <20060905115432.D5D0276CEAD@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 05:54:28 2006
New Revision: 9273

Log:
table name has been changed in search_fields array --Minnie

Modified:
    vtigercrm/trunk/modules/HelpDesk/HelpDesk.php

Modified: vtigercrm/trunk/modules/HelpDesk/HelpDesk.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/HelpDesk.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/HelpDesk.php Tue Sep  5 05:54:28 2006
@@ -40,7 +40,7 @@
 				);
 
 	var $list_fields_name = Array(
-					'Ticket ID'=>'crmid',
+					'Ticket ID'=>'',
 					'Subject'=>'ticket_title',	  			
 					'Related to'=>'parent_id',	  			
 					'Status'=>'ticketstatus',
@@ -68,8 +68,8 @@
 					'createdtime'
 				);
 	var $search_fields = Array(
-		'Ticket ID' => Array('crmentity'=>'crmid'),
-		'Subject' => Array('troubletickets'=>'title')
+		'Ticket ID' => Array('vtiger_crmentity'=>'crmid'),
+		'Subject' => Array('vtiger_troubletickets'=>'title')
 		);
 	var $search_fields_name = Array(
 		'Ticket ID' => '',




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 08:08:48 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 12:08:48 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9274 -
	/vtigercrm/trunk/Popup.php
Message-ID: <20060905120848.8930076CEBE@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 06:08:44 2006
New Revision: 9274

Log:
changes made to add popup for trouble tickets --Minnie

Modified:
    vtigercrm/trunk/Popup.php

Modified: vtigercrm/trunk/Popup.php
==============================================================================
--- vtigercrm/trunk/Popup.php (original)
+++ vtigercrm/trunk/Popup.php Tue Sep  5 06:08:44 2006
@@ -183,6 +183,15 @@
                 $alphabetical = AlphabeticalSearch($currentModule,'Popup','user_name','true','basic',$popuptype,"","","");
 		if (isset($_REQUEST['select'])) $smarty->assign("SELECT",'enable');
                 break;	
+	case 'HelpDesk':
+		require_once("modules/$currentModule/HelpDesk.php");
+		$focus = new HelpDesk();
+		$smarty->assign("SINGLE_MOD",'HelpDesk');
+		if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] !='')
+		$smarty->assign("RETURN_MODULE",$_REQUEST['return_module']);
+		$alphabetical = AlphabeticalSearch($currentModule,'Popup','ticket_title','true','basic',$popuptype,"","","");
+		if (isset($_REQUEST['select'])) $smarty->assign("SELECT",'enable');
+		break;
 
 
 }




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 08:10:58 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 12:10:58 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9275 -
	/vtigercrm/trunk/Smarty/templates/EditViewHidden.tpl
Message-ID: <20060905121058.3DCE076CEBD@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 06:10:54 2006
New Revision: 9275

Log:
ticket_id field has been removed from hidden fields of Calendar --Minnie

Modified:
    vtigercrm/trunk/Smarty/templates/EditViewHidden.tpl

Modified: vtigercrm/trunk/Smarty/templates/EditViewHidden.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/EditViewHidden.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/EditViewHidden.tpl Tue Sep  5 06:10:54 2006
@@ -40,7 +40,6 @@
 
 {elseif $MODULE eq 'Calendar'}
 	<input type="hidden" name="activity_mode" value="{$ACTIVITY_MODE}">
-	<input type="hidden" name="ticket_id" value="{$TICKETID}">
 	<input type="hidden" name="product_id" value="{$PRODUCTID}">
 
 {elseif $MODULE eq 'PurchaseOrder' || $MODULE eq 'SalesOrder' || $MODULE eq 'Invoice' || $MODULE eq 'Quotes'}




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 08:15:35 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 12:15:35 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9276 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060905121535.B1D9676CEBF@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 06:15:31 2006
New Revision: 9276

Log:
Demo Data populated for Groups & Profile Desc added -- Ahmed

Modified:
    vtigercrm/trunk/modules/Users/DefaultDataPopulator.php

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Tue Sep  5 06:15:31 2006
@@ -44,6 +44,10 @@
 		$profile2_id = $this->db->getUniqueID("vtiger_profile");
 		$profile3_id = $this->db->getUniqueID("vtiger_profile");
 		$profile4_id = $this->db->getUniqueID("vtiger_profile");
+
+		$group1_id = $this->db->getUniqueID("vtiger_groups");
+		$group2_id = $this->db->getUniqueID("vtiger_groups");
+		$group3_id = $this->db->getUniqueID("vtiger_groups");
 
                 $this->db->query("insert into vtiger_role values('H".$role1_id."','Organisation','H".$role1_id."',0)");
                 $this->db->query("insert into vtiger_role values('H".$role2_id."','CEO','H".$role1_id."::H".$role2_id."',1)");
@@ -915,14 +919,30 @@
 
 
                 // Insert End
-                
+		
+		//Inserting into vtiger_groups table
+		$this->db->query("insert into vtiger_groups values ('".$group1_id."','Team Selling','Group Related to Sales')");	
+		$this->db->query("insert into vtiger_group2role values ('".$group1_id."','H".$role4_id."')");	
+		$this->db->query("insert into vtiger_group2rs values ('".$group1_id."','H".$role5_id."')");	
+		$this->db->query("insert into vtiger_users2group values ('".$group1_id."',2)");	
+
+		$this->db->query("insert into vtiger_groups values ('".$group2_id."','Marketing Group','Group Related to Marketing Activities')");	
+		$this->db->query("insert into vtiger_group2role values ('".$group2_id."','H".$role2_id."')");	
+		$this->db->query("insert into vtiger_group2rs values ('".$group2_id."','H".$role3_id."')");	
+		$this->db->query("insert into vtiger_users2group values ('".$group2_id."',1)");	
+		$this->db->query("insert into vtiger_users2group values ('".$group2_id."',2)");	
+
+		$this->db->query("insert into vtiger_groups values ('".$group3_id."','Support Group','Group Related to providing Support to Customers')");
+		$this->db->query("insert into vtiger_group2role values ('".$group3_id."','H".$role3_id."')");
+		$this->db->query("insert into vtiger_group2rs values ('".$group3_id."','H".$role3_id."')");
+		$this->db->query("insert into vtiger_users2group values ('".$group3_id."',2)");	
 
 		//New Security Start
 		//Inserting into vtiger_profile vtiger_table
-		$this->db->query("insert into vtiger_profile values ('".$profile1_id."','Administrator',null)");	
-		$this->db->query("insert into vtiger_profile values ('".$profile2_id."','Sales Profile',null)");
-		$this->db->query("insert into vtiger_profile values ('".$profile3_id."','Support Profile',null)");
-		$this->db->query("insert into vtiger_profile values ('".$profile4_id."','Guest Profile',null)");
+		$this->db->query("insert into vtiger_profile values ('".$profile1_id."','Administrator','Admin Profile')");	
+		$this->db->query("insert into vtiger_profile values ('".$profile2_id."','Sales Profile','Profile Related to Sales')");
+		$this->db->query("insert into vtiger_profile values ('".$profile3_id."','Support Profile','Profile Related to Support')");
+		$this->db->query("insert into vtiger_profile values ('".$profile4_id."','Guest Profile','Guest Profile for Test Users')");
 		
 		//Inserting into vtiger_profile2gloabal permissions
 		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile1_id."',1,0)");




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 08:15:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 12:15:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9277 -
	/vtigercrm/trunk/modules/Calendar/addEventUI.php
Message-ID: <20060905121555.97BC176CEBF@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 06:15:51 2006
New Revision: 9277

Log:
changes made to relate trouble tickets --Minnie

Modified:
    vtigercrm/trunk/modules/Calendar/addEventUI.php

Modified: vtigercrm/trunk/modules/Calendar/addEventUI.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/addEventUI.php (original)
+++ vtigercrm/trunk/modules/Calendar/addEventUI.php Tue Sep  5 06:15:51 2006
@@ -537,24 +537,25 @@
 				<div id="addEventRelatedtoUI" style="display:none;width:100%">
 					<table width="100%" cellpadding="5" cellspacing="0" border="0" bgcolor="#FFFFFF">
 						<tr>
-							<td><b><?php echo $mod_strings['LBL_RELATEDTO']?> :</b></td>
+							<td><b><?php echo $mod_strings['LBL_RELATEDTO']?></b></td>
 							<td>
 								<input name="parent_id" value="" type="hidden">
 								<select name="parent_type" class="small" id="parent_type" onChange="document.EditView.parent_name.value='';">
 									<option value="Leads"><?php echo $app_strings['Leads']?></option>
 									<option value="Accounts"><?php echo $app_strings['Accounts']?></option>
 									<option value="Potentials"><?php echo $app_strings['Potentials']?></option>
+									<option value="HelpDesk"><?php echo $app_strings['HelpDesk']?></option>
 								</select>
 							</td>
 							<td>
 								<div id="eventrelatedto" align="left">
 								<input type="text" readonly="readonly" class="calTxt small" value="" name="parent_name">&nbsp;
-								<input type="button" name="selectparent" class="crmButton small edit" value="Change..." onclick="return window.open('index.php?module='+document.EditView.parent_type.value+'&action=Popup','test','width=640,height=602,resizable=0,scrollbars=0,top=150,left=200');">
+							<input type="button" name="selectparent" class="crmButton small edit" value="<?php echo $mod_strings['LBL_SELECT']; ?>" onclick="return window.open('index.php?module='+document.EditView.parent_type.value+'&action=Popup','test','width=640,height=602,resizable=0,scrollbars=0,top=150,left=200');">
 								</div>
 							</td>
 						</tr>
 						<tr>
-						<td><b><?php echo $app_strings['Contacts'] ?>:</b></td>
+						<td><b><?php echo $app_strings['Contacts'] ?></b></td>
 							<td colspan="2">
 								<input name="contactidlist" id="contactidlist" value="" type="hidden">
 								<textarea rows="5" name="contactlist" readonly="readonly" class="calTxt"></textarea>&nbsp;
@@ -726,7 +727,7 @@
 		<div id="addTaskRelatedtoUI" style="display:none;width:100%">
 			<table width="100%" cellpadding="5" cellspacing="0" border="0">
 			<tr>
-				<td><b><?php echo $mod_strings['LBL_RELATEDTO']?> :</b></td>
+				<td><b><?php echo $mod_strings['LBL_RELATEDTO']?></b></td>
 				<td>
 					<input name="task_parent_id" type="hidden" value="">
 						<select name="task_parent_type" class="small" id="task_parent_type" onChange="document.createTodo.task_parent_name.value='';document.createTodo.task_parent_id.value=''">
@@ -737,7 +738,8 @@
 						<option value="PurchaseOrder"><?php echo $app_strings['PurchaseOrder']?></option>
 						<option value="SalesOrder"><?php echo $app_strings['SalesOrder']?></option>
 						<option value="Invoice"><?php echo $app_strings['Invoice']?></option>
-						<option value="Campaigns"><?php echo $app_strings['Campaigns']?></option></select>
+						<option value="Campaigns"><?php echo $app_strings['Campaigns']?></option>
+						<option value="HelpDesk"><?php echo $app_strings['HelpDesk']?></option></select>
 						</select>
 				</td>
 				<td>
@@ -748,7 +750,7 @@
 				</td>
 			</tr>
 			<tr>
-			<td><b><?php echo $mod_strings['LBL_CONTACT'] ?> :</b></td>
+			<td><b><?php echo $mod_strings['LBL_CONTACT_NAME'] ?></b></td>
 			<td colspan="2">
 				<input name="task_contact_name" id="contact_name" readonly type="text" class="calTxt" value=""><input name="task_contact_id" id="contact_id" type="hidden" value="">&nbsp;
 				<input type="button" onclick="return window.open('index.php?module=Contacts&action=Popup&html=Popup_picker&popuptype=specific&form=EditView','test','width=640,height=602,resizable=0,scrollbars=0');" class="crmButton small edit" name="selectcnt" value="<?php echo $mod_strings['LBL_SELECT_CONTACT'] ; ?>">




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 08:20:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 12:20:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9278 -
	/vtigercrm/trunk/modules/Calendar/Save.php
Message-ID: <20060905122045.E1BAB76CEC5@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 06:20:40 2006
New Revision: 9278

Log:
changes made to relate trouble tickets --Minnie

Modified:
    vtigercrm/trunk/modules/Calendar/Save.php

Modified: vtigercrm/trunk/modules/Calendar/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/Save.php (original)
+++ vtigercrm/trunk/modules/Calendar/Save.php Tue Sep  5 06:20:40 2006
@@ -100,10 +100,8 @@
 else $return_action = "DetailView";
 if(isset($_REQUEST['return_id']) && $_REQUEST['return_id'] != "") $return_id = $_REQUEST['return_id'];
 
-if($_REQUEST['mode'] != 'edit' && (($_REQUEST['return_module'] == 'HelpDesk') || ($_REQUEST['return_module']== 'Products')  ))
-{
-	if($_REQUEST['ticket_id'] != '')
-		$crmid = $_REQUEST['ticket_id'];
+if($_REQUEST['mode'] != 'edit' && $_REQUEST['return_module'] == 'Products')
+{
 	if($_REQUEST['product_id'] != '')
 		$crmid = $_REQUEST['product_id'];
 	if($crmid != $_REQUEST['parent_id'])




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 08:24:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 12:24:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9279 -
	/vtigercrm/trunk/include/language/en_us.lang.php
Message-ID: <20060905122457.9999F76CEBF@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 06:24:53 2006
New Revision: 9279

Log:
label added --Minnie

Modified:
    vtigercrm/trunk/include/language/en_us.lang.php

Modified: vtigercrm/trunk/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/include/language/en_us.lang.php (original)
+++ vtigercrm/trunk/include/language/en_us.lang.php Tue Sep  5 06:24:53 2006
@@ -877,6 +877,8 @@
  // Added Invoice in activity parent type selection / Related list
 'COMBO_INVOICES'=>'Invoice',
 'LBL_INVOICE_NAME'=>'Invoice',
+'LBL_HELPDESK_NAME'=>'Trouble Ticket',
+'LBL_CAMPAIGN_NAME'=>'Campaign Name',
 
 'LBL_NEW_INVOICE_BUTTON_TITLE'=>'New Invoice [Alt+I]',
 'LBL_NEW_INVOICE_BUTTON_KEY'=>'I',




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 08:41:48 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 12:41:48 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9280 -
	/vtigercrm/trunk/include/utils/ListViewUtils.php
Message-ID: <20060905124148.03E3276CE92@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 06:41:44 2006
New Revision: 9280

Log:
code added to include HelpDesk as one of the parent modules for Activities  --Minnie

Modified:
    vtigercrm/trunk/include/utils/ListViewUtils.php

Modified: vtigercrm/trunk/include/utils/ListViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/ListViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/ListViewUtils.php Tue Sep  5 06:41:44 2006
@@ -2520,6 +2520,17 @@
                 $parent_result = $adb->query($parent_query);
                 $parent_name = $adb->query_result($parent_result,0,"lastname")." ".$adb->query_result($parent_result,0,"firstname");
         }
+	if($parent_module == 'HelpDesk')
+	{
+		$parent_query = "SELECT title FROM vtiger_troubletickets WHERE ticketid=".$parent_id;
+		$parent_result = $adb->query($parent_query);
+		$parent_name = $adb->query_result($parent_result,0,"title");
+		if(strlen($parent_name) > 25)
+		{
+			$parent_name = substr($parent_name,0,25).'...';
+		}
+	}
+
 	//added by rdhital for better emails - Raju
 	if ($parent_module == 'Multiple')
 	{




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 08:45:47 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 12:45:47 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9281 -
	/vtigercrm/trunk/include/utils/SearchUtils.php
Message-ID: <20060905124547.862F476CE29@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 06:45:43 2006
New Revision: 9281

Log:
changes made to fix popup search related issue  --Minnie

Modified:
    vtigercrm/trunk/include/utils/SearchUtils.php

Modified: vtigercrm/trunk/include/utils/SearchUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/SearchUtils.php (original)
+++ vtigercrm/trunk/include/utils/SearchUtils.php Tue Sep  5 06:45:43 2006
@@ -118,7 +118,10 @@
                 }
 		else
                 {
-                        $fieldname = $focus->list_fields_name[$name];
+			if( $focus->list_fields_name[$name] == '')
+				$fieldname = 'crmid';
+			else
+				$fieldname = $focus->list_fields_name[$name];
                 }
 
                 if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] ==0 || in_array($fieldname,$field))




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 08:55:07 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 12:55:07 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9282 -
	/vtigercrm/trunk/include/utils/DetailViewUtils.php
Message-ID: <20060905125507.E827176CEBF@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 06:55:02 2006
New Revision: 9282

Log:
changes made to display Campaign and Trouble tickets in activities detailview --Minnie

Modified:
    vtigercrm/trunk/include/utils/DetailViewUtils.php

Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/DetailViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/DetailViewUtils.php Tue Sep  5 06:55:02 2006
@@ -639,6 +639,26 @@
 
 				$label_fld[] = '<a href="index.php?module='.$parent_module.'&action=DetailView&record='.$value.'">'.$invoicename.'</a>';
                         }
+			elseif($parent_module == "Campaigns")
+			{
+				$label_fld[] = $app_strings['LBL_CAMPAIGN_NAME'];
+				$sql = "select * from  vtiger_campaign where campaignid=".$value;
+				$result = $adb->query($sql);
+				$campaignname = $adb->query_result($result,0,"campaignname");
+				$label_fld[] = '<a href="index.php?module='.$parent_module.'&action=DetailView&record='.$value.'">'.$campaignname.'</a>';
+			}
+			elseif($parent_module == "HelpDesk")
+			{
+				$label_fld[] = $app_strings['LBL_HELPDESK_NAME'];
+				$sql = "select * from  vtiger_troubletickets where ticketid=".$value;
+				$result = $adb->query($sql);
+				$tickettitle = $adb->query_result($result,0,"title");
+				if(strlen($tickettitle) > 25)
+				{
+					$tickettitle = substr($tickettitle,0,25).'...';
+				}
+				$label_fld[] = '<a href="index.php?module='.$parent_module.'&action=DetailView&record='.$value.'">'.$tickettitle.'</a>';
+			}
 
 		}
 		else




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 09:07:21 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 13:07:21 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9283 -
	/vtigercrm/trunk/include/utils/EditViewUtils.php
Message-ID: <20060905130721.A403A76CEDA@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 07:07:17 2006
New Revision: 9283

Log:
changes made to display Trouble tickets in activities edit/creteview --Minnie

Modified:
    vtigercrm/trunk/include/utils/EditViewUtils.php

Modified: vtigercrm/trunk/include/utils/EditViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/EditViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/EditViewUtils.php Tue Sep  5 07:07:17 2006
@@ -758,6 +758,23 @@
 					$parent_name = $adb->query_result($result,0,"campaignname");
 					$campaign_selected = "selected";
 				}
+				if($parent_module == "HelpDesk")
+				{
+					$sql = "select title from vtiger_troubletickets where ticketid=".$value;
+					$result = $adb->query($sql);
+					$parent_name = $adb->query_result($result,0,"title");
+					$ticket_selected = "selected";
+				}
+			}
+			elseif($act_mode == "Events")
+			{
+				if($parent_module == "HelpDesk")
+				{
+					$sql = "select title from vtiger_troubletickets where ticketid=".$value;
+					$result = $adb->query($sql);
+					$parent_name = $adb->query_result($result,0,"title");
+					$ticket_selected = "selected";
+				}
 			}
 
 		}
@@ -770,7 +787,8 @@
                                 $app_strings['COMBO_PORDER'],
                                 $app_strings['COMBO_SORDER'],
                                 $app_strings['COMBO_INVOICES'],
-				$app_strings['COMBO_CAMPAIGNS']
+				$app_strings['COMBO_CAMPAIGNS'],
+				$app_strings['COMBO_HELPDESK']
                                         );
 			$editview_label[] = array($lead_selected,
                                 $account_selected,
@@ -779,10 +797,25 @@
                                 $purchase_selected,
                                 $sales_selected,
                                 $invoice_selected,
-				$campaign_selected
+				$campaign_selected,
+				$ticket_selected
                                         );
-                        $editview_label[] = array("Leads&action=Popup","Accounts&action=Popup","Potentials&action=Popup","Quotes&action=Popup","PurchaseOrder&action=Popup","SalesOrder&action=Popup","Invoice&action=Popup","Campaigns&action=Popup");
+                        $editview_label[] = array("Leads&action=Popup","Accounts&action=Popup","Potentials&action=Popup","Quotes&action=Popup","PurchaseOrder&action=Popup","SalesOrder&action=Popup","Invoice&action=Popup","Campaigns&action=Popup","HelpDesk&action=Popup");
                 }
+		elseif($act_mode == "Events")
+		{
+			$editview_label[] = array($app_strings['COMBO_LEADS'],
+				$app_strings['COMBO_ACCOUNTS'],
+				$app_strings['COMBO_POTENTIALS'],
+				$app_strings['COMBO_HELPDESK']
+			);
+			$editview_label[] = array($lead_selected,
+				$account_selected,
+				$potential_selected,
+				$ticket_selected
+			);
+			$editview_label[] = array("Leads&action=Popup","Accounts&action=Popup","Potentials&action=Popup","HelpDesk&action=Popup");
+		}
                 else
                 {
                         $editview_label[] = array($app_strings['COMBO_LEADS'],




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 09:13:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 13:13:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9284 -
 /vtigercrm/trunk/modules/Settings/LeadCustomFieldMapping.php
Message-ID: <20060905131330.1A44576CED8@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 07:13:27 2006
New Revision: 9284

Log:
changes made to put validation for custom field mapping --Minnie

Modified:
    vtigercrm/trunk/modules/Settings/LeadCustomFieldMapping.php

Modified: vtigercrm/trunk/modules/Settings/LeadCustomFieldMapping.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/LeadCustomFieldMapping.php (original)
+++ vtigercrm/trunk/modules/Settings/LeadCustomFieldMapping.php Tue Sep  5 07:13:27 2006
@@ -31,7 +31,7 @@
 {
 	global $adb;
 	$accountcf=Array();
-	$sql="select fieldid,fieldlabel from vtiger_field,vtiger_tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Accounts'";
+	$sql="select fieldid,fieldlabel,uitype,typeofdata from vtiger_field,vtiger_tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Accounts'";
 	$result = $adb->query($sql);
 	$noofrows = $adb->num_rows($result);
 	
@@ -39,7 +39,8 @@
 	{
         	$account_field['fieldid']=$adb->query_result($result,$i,"fieldid");
 	        $account_field['fieldlabel']=$adb->query_result($result,$i,"fieldlabel");
-
+		$account_field['typeofdata']=$adb->query_result($result,$i,"typeofdata");
+		$account_field['fieldtype']=getCustomFieldTypeName($adb->query_result($result,$i,"uitype"));
 		if($account_field['fieldid']==$accountid)
 			$account_field['selected'] = "selected";
 		else
@@ -60,13 +61,15 @@
 {	
 	global $adb;	
 	$contactcf=Array();
-	$sql="select fieldid,fieldlabel from vtiger_field,vtiger_tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Contacts'";
+	$sql="select fieldid,fieldlabel,uitype,typeofdata from vtiger_field,vtiger_tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Contacts'";
 	$result = $adb->query($sql);
 	$noofrows = $adb->num_rows($result);
 	for($i=0; $i<$noofrows; $i++)
 	{
 		$contact_field['fieldid']=$adb->query_result($result,$i,"fieldid");
 		$contact_field['fieldlabel']=$adb->query_result($result,$i,"fieldlabel");
+		$contact_field['typeofdata']=$adb->query_result($result,$i,"typeofdata");
+		$contact_field['fieldtype']=getCustomFieldTypeName($adb->query_result($result,$i,"uitype"));
 	
                 if($contact_field['fieldid']==$contactid)
                         $contact_field['selected']="selected";
@@ -88,13 +91,15 @@
 {
 	global $adb;	
 	$potentialcf=Array();
-	$sql="select fieldid,fieldlabel from vtiger_field,vtiger_tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Potentials'";
+	$sql="select fieldid,fieldlabel,uitype,typeofdata from vtiger_field,vtiger_tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Potentials'";
 	$result = $adb->query($sql);
 	$noofrows = $adb->num_rows($result);
 	for($i=0; $i<$noofrows; $i++)
 	{
 		$potential_field['fieldid']=$adb->query_result($result,$i,"fieldid");
 		$potential_field['fieldlabel']=$adb->query_result($result,$i,"fieldlabel");
+		$potential_field['typeofdata']=$adb->query_result($result,$i,"typeofdata");
+		$potential_field['fieldtype']=getCustomFieldTypeName($adb->query_result($result,$i,"uitype"));
 
 		if($potential_field['fieldid']==$potentialid)
 			 $potential_field['selected']="selected";
@@ -115,7 +120,7 @@
 {
 	global $adb;
 
-	$convert_sql="select vtiger_convertleadmapping.*,uitype,fieldlabel from vtiger_convertleadmapping left join vtiger_field on vtiger_field.fieldid = vtiger_convertleadmapping.leadfid";
+	$convert_sql="select vtiger_convertleadmapping.*,uitype,fieldlabel,typeofdata from vtiger_convertleadmapping left join vtiger_field on vtiger_field.fieldid = vtiger_convertleadmapping.leadfid";
 	$convert_result = $adb->query($convert_sql);
 
 	$no_rows = $adb->num_rows($convert_result);
@@ -127,13 +132,13 @@
 		$potentialid=$adb->query_result($convert_result,$j,"potentialfid");
 		$lead_field['sno'] = $j+1;
 		$lead_field['leadid'] = $adb->query_result($convert_result,$j,"fieldlabel"); 
+		$lead_field['typeofdata']=$adb->query_result($convert_result,$j,"typeofdata");
 		$lead_field['fieldtype'] = getCustomFieldTypeName($adb->query_result($convert_result,$j,"uitype"));; 
 		$lead_field['account'] = getAccountCustomValues($leadid,$accountid);
 		$lead_field['contact'] = getContactCustomValues($leadid,$contactid);
 		$lead_field['potential'] = getPotentialCustomValues($leadid,$potentialid);
 		$leadcf[]= $lead_field;
 	}
-
 	return $leadcf;
 }
 




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 09:15:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 13:15:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9285 -
 /vtigercrm/trunk/Smarty/templates/CustomFieldMapping.tpl
Message-ID: <20060905131541.7EB0176CED8@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 07:15:37 2006
New Revision: 9285

Log:
changes made to put validation for custom field mapping --Minnie

Modified:
    vtigercrm/trunk/Smarty/templates/CustomFieldMapping.tpl

Modified: vtigercrm/trunk/Smarty/templates/CustomFieldMapping.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/CustomFieldMapping.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/CustomFieldMapping.tpl Tue Sep  5 07:15:37 2006
@@ -60,39 +60,57 @@
 					<td class="colHeader small" valign="top" width="23%">{$APP.Contacts}</td>
 					<td class="colHeader small" valign="top" width="24%">{$APP.Potentials}</td>
 				</tr>
-				{foreach key=leadcf item=cfarray from=$CUSTOMFIELDMAPPING}
+				{foreach key=leadcf item=cfarray name=cfarray from=$CUSTOMFIELDMAPPING}
 				<tr>
 					<td class="listTableRow small">{$cfarray.sno}</td>
 					<td class="listTableRow small">{$cfarray.leadid}</td>
 					<td class="listTableRow small">{$cfarray.fieldtype}</td>
 					{foreach item=acc_cf key=fldnameacc from=$cfarray.account}
 					<td class="listTableRow small">
-						<select name='{$fldnameacc}'>
+						<select name='{$fldnameacc}' id='{$fldnameacc}' onChange='return validateTypeforCFMapping("{$cfarray.fieldtype}","{$cfarray.typeofdata}","{$fldnameacc}",this);' >
 						<option value='None'>{$APP.LBL_NONE}</option>
 						{foreach item=element from=$acc_cf}
 							<option value="{$element.fieldid}" {$element.selected}>{$element.fieldlabel}</option>
 						{/foreach}
 						</select>
+						{if $smarty.foreach.cfarray.index eq 0}
+							{foreach item=element from=$acc_cf}
+								<input type='hidden' name='{$element.fieldid}_type' id='{$element.fieldid}_type' value='{$element.fieldtype}'>
+								<input type='hidden' name='{$element.fieldid}_typeofdata' id='{$element.fieldid}_typeofdata' value='{$element.typeofdata}'>
+							{/foreach}
+						{/if}
 					</td>
 					{/foreach}
 					{foreach item=con_cf key=fldnamecon from=$cfarray.contact}
                     <td class="listTableRow small">
-                        <select name='{$fldnamecon}'>
+                        <select name='{$fldnamecon}' id='{$fldnamecon}' onChange='return validateTypeforCFMapping("{$cfarray.fieldtype}","{$cfarray.typeofdata}","{$fldnamecon}",this);'>
 						<option value='None'>{$APP.LBL_NONE}</option>
 						{foreach item=element from=$con_cf}
 							<option value="{$element.fieldid}" {$element.selected}>{$element.fieldlabel}</option>
 						{/foreach}
                         </select>
+					{if $smarty.foreach.cfarray.index eq 0}
+						{foreach item=element from=$con_cf}
+                                                	<input type='hidden' name='{$element.fieldid}_type' id='{$element.fieldid}_type' value='{$element.fieldtype}' >
+                                                	<input type='hidden' name='{$element.fieldid}_typeofdata' id='{$element.fieldid}_typeofdata' value='{$element.typeofdata}'>
+						{/foreach}
+                                        {/if}
 					</td>
 				  	{/foreach}
 					{foreach item=pot_cf key=fldnamepot from=$cfarray.potential}
 					<td class="listTableRow small">
-						<select name='{$fldnamepot}'>
+						<select name='{$fldnamepot}' id='{$fldnamepot}' onChange='return validateTypeforCFMapping("{$cfarray.fieldtype}","{$cfarray.typeofdata}","{$fldnamepot}",this);'>
 						<option value='None'>{$APP.LBL_NONE}</option>
 						{foreach item=element from=$pot_cf}
 							<option value="{$element.fieldid}" {$element.selected}>{$element.fieldlabel}</option>
 						{/foreach}
                         </select>
+					{if $smarty.foreach.cfarray.index eq 0}
+						{foreach item=element from=$pot_cf}
+	                                        	<input type='hidden' name='{$element.fieldid}_type' id='{$element.fieldid}_type' value='{$element.fieldtype}'>
+        	                                        <input type='hidden' name='{$element.fieldid}_typeofdata' id='{$element.fieldid}_typeofdata' value='{$element.typeofdata}'>
+						{/foreach}
+                                        {/if}
 					</td>
 				    {/foreach}
 				</tr>




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 10:39:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 14:39:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9286 -
 /vtigercrm/trunk/modules/Settings/language/en_us.lang.php
Message-ID: <20060905143941.6BD3676CEAA@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 08:39:37 2006
New Revision: 9286

Log:
label added --Minnie

Modified:
    vtigercrm/trunk/modules/Settings/language/en_us.lang.php

Modified: vtigercrm/trunk/modules/Settings/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Settings/language/en_us.lang.php Tue Sep  5 08:39:37 2006
@@ -714,6 +714,11 @@
 'LBL_ENABLE_SINGLEPANE_VIEW'=>'Enable Singlepane View',
 
 'LBL_CLEAR_DATA'=>'Clear Data',
+'LBL_LENGTHALERT'=>'Sorry, you can cannot map fields with different character size. Kindly map the data with same or more character size.',
+'LBL_DECIMALALERT'=>'Sorry, you can cannot map fields with different decimal places. Kindly map the data with same or more decimal places.',
+'LBL_TYPEALERT_1'=>'Sorry, you cannot map the',
+'LBL_WITH'=>'with',
+'LBL_TYPEALERT_2'=>'data type. Kindly map the same data types.',
 );
 
 




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 10:41:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 14:41:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9287 -
	/vtigercrm/trunk/include/js/customview.js
Message-ID: <20060905144151.1C50F76CED0@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 08:41:47 2006
New Revision: 9287

Log:
mapping validation script added --Minnie

Modified:
    vtigercrm/trunk/include/js/customview.js

Modified: vtigercrm/trunk/include/js/customview.js
==============================================================================
--- vtigercrm/trunk/include/js/customview.js (original)
+++ vtigercrm/trunk/include/js/customview.js Tue Sep  5 08:41:47 2006
@@ -321,3 +321,72 @@
                 document.location.href=url;
 }
 
+function validateTypeforCFMapping(leadtype,leadtypeofdata,field_name,cf_form)
+{
+	var combo_val = cf_form.options[cf_form.selectedIndex].value;
+	if(combo_val != 'None')
+	{
+		var type = document.getElementById(combo_val+"_type").value;
+		var typeofdata = document.getElementById(combo_val+"_typeofdata").value;
+		if(leadtype == type)
+		{
+			if(leadtypeofdata == typeofdata)
+			{
+				return true;
+			}
+			else
+			{
+				var lead_tod = leadtypeofdata.split("~");
+				var tod = typeofdata.split("~");
+				switch (lead_tod[0]) {
+                	                case "V"  :
+						if(lead_tod[3] <= tod[3])
+							return true;
+						else
+						{
+							alert(alertmessage[3]);
+							document.getElementById(field_name).value = 'None';
+							return false;
+						}
+						break;
+					case "N"  :
+						if(lead_tod[2].indexOf(",")>0)
+						{
+							var lead_dec = lead_tod[2].split(",");
+							var dec = tod[2].split(",");
+						
+						}
+						else
+						{
+							var lead_dec = lead_tod[2].split("~");
+                	                                var dec = tod[2].split("~");
+						}
+						if(lead_dec[0] <= dec[0])
+						{
+							if(lead_dec[1] <= dec[1])
+								return true;
+							else
+							{
+								alert(alertmessage[4]);
+								document.getElementById(field_name).value = 'None';
+								return false;
+							}
+						}
+						else
+						{
+							alert(alertmessage[3]);
+							document.getElementById(field_name).value = 'None';
+							return false;
+						}
+						break;
+				}	
+			}
+		}
+		else
+		{
+			alert(alertmessage[0]+" "+leadtype+" "+alertmessage[1]+" "+type+" "+alertmessage[2]);
+			document.getElementById(field_name).value = 'None';
+			return false;
+		}
+	}
+}




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 10:43:22 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 14:43:22 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9288 -
 /vtigercrm/trunk/Smarty/templates/CustomFieldMapping.tpl
Message-ID: <20060905144322.40A9076CED0@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 08:43:18 2006
New Revision: 9288

Log:
alertmessage array added --Minnie

Modified:
    vtigercrm/trunk/Smarty/templates/CustomFieldMapping.tpl

Modified: vtigercrm/trunk/Smarty/templates/CustomFieldMapping.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/CustomFieldMapping.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/CustomFieldMapping.tpl Tue Sep  5 08:43:18 2006
@@ -143,3 +143,6 @@
         </tr>
 </tbody>
 </table>
+<script>
+	var alertmessage = new Array("{$MOD.LBL_TYPEALERT_1}","{$MOD.LBL_WITH}","{$MOD.LBL_TYPEALERT_2}","{$MOD.LBL_LENGTHALERT}","{$MOD.LBL_DECIMALALERT}");
+</script>




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 11:46:29 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 15:46:29 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9289 - in /vtigercrm/trunk:
 include/fpdf/pdf.php include/fpdf/templates/body.php
 modules/Invoice/CreatePDF.php
Message-ID: <20060905154630.11B1A76CEED@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 09:46:21 2006
New Revision: 9289

Log:
* Modified to display the Product and Tax details for Invoice

Modified:
    vtigercrm/trunk/include/fpdf/pdf.php
    vtigercrm/trunk/include/fpdf/templates/body.php
    vtigercrm/trunk/modules/Invoice/CreatePDF.php

Modified: vtigercrm/trunk/include/fpdf/pdf.php
==============================================================================
--- vtigercrm/trunk/include/fpdf/pdf.php (original)
+++ vtigercrm/trunk/include/fpdf/pdf.php Tue Sep  5 09:46:21 2006
@@ -305,14 +305,16 @@
 			break;
 	  		case 'Qty':
 	  		case 'Price':
-	  		case 'Tax':
 				if($taxtype == "individual")
 					$this->Line( $colX, $y1, $colX, (($y1+$y2)-37));
 				else
 					$this->Line( $colX, $y1, $colX, (($y1+$y2)-43));
 			break;
 	  		default:
-				$this->Line( $colX, $y1, $colX, ($y1+$y2));
+				if($taxtype == "individual" && $lib == 'Discount')
+					$this->Line( $colX, $y1, $colX, (($y1+$y2)-37));
+				else
+					$this->Line( $colX, $y1, $colX, ($y1+$y2));
 	  		break;
 		}
 	}

Modified: vtigercrm/trunk/include/fpdf/templates/body.php
==============================================================================
--- vtigercrm/trunk/include/fpdf/templates/body.php (original)
+++ vtigercrm/trunk/include/fpdf/templates/body.php Tue Sep  5 09:46:21 2006
@@ -24,13 +24,15 @@
 	$colsAlign["Description"] = "L";
 	$colsAlign["Qty"] = "R";
 	$colsAlign["Price"] = "R";
+	$colsAlign["Discount"] = "R";
 	$colsAlign["Tax"] = "R";
 	$colsAlign["Total"] = "R";
 
 	$cols["Product Name"] = "25";
-	$cols["Description"] = "80";
-	$cols["Qty"] = "15";
+	$cols["Description"] = "70";
+	$cols["Qty"] = "10";
 	$cols["Price"] = "25";
+	$cols["Discount"] = "15";
 	$cols["Tax"] = "20";
 	$cols["Total"] = "25";
 } else {
@@ -38,12 +40,14 @@
 	$colsAlign["Description"] = "L";
 	$colsAlign["Qty"] = "R";
 	$colsAlign["Price"] = "R";
+	$colsAlign["Discount"] = "R";
 	$colsAlign["Total"] = "R";
 
 	$cols["Product Name"] = "25";
-	$cols["Description"] = "80";
-	$cols["Qty"] = "20";
+	$cols["Description"] = "70";
+	$cols["Qty"] = "15";
 	$cols["Price"] = "30";
+	$cols["Discount"] = "20";
 	$cols["Total"] = "30";
 }
 
@@ -76,77 +80,77 @@
 
 
 if($focus->column_fields["hdnTaxType"] != "individual") {
-	$lineData=array("115",$bottom+37,"84");
+	$lineData=array("105",$bottom+37,"94");
 	$pdf->drawLine($lineData);
-	$data= $app_strings['LBL_NET_TOTAL'].":                                                ".$price_subtotal."";
-	$pdf->SetXY( 119 , 168 );
+	$data= $app_strings['LBL_NET_TOTAL'].":                                                                   ".$price_subtotal."";
+	$pdf->SetXY( 105 , 168 );
 	$pdf->SetFont( "Helvetica", "", 10);
-	$pdf->MultiCell(119, 4, $data);
+	$pdf->MultiCell(110, 4, $data);
 
-	$lineData=array("115",$bottom+43,"84");
+	$lineData=array("105",$bottom+43,"94");
 	$pdf->drawLine($lineData);
-	$data= $app_strings['LBL_DISCOUNT'].":                                                ".$price_discount."";
-	$pdf->SetXY( 119 , 174 );
+	$data= $app_strings['LBL_DISCOUNT'].":                                                                      ".$price_discount."";
+	$pdf->SetXY( 105 , 174 );
 	$pdf->SetFont( "Helvetica", "", 10);
-	$pdf->MultiCell(119, 4, $data);
+	$pdf->MultiCell(110, 4, $data);
 
-	$lineData=array("115",$bottom+49,"84");
+	$lineData=array("105",$bottom+49,"94");
 	$pdf->drawLine($lineData);
-	$data= $app_strings['LBL_TAX'].":                                                         ".$price_salestax."";
-	$pdf->SetXY( 119 , 180 );
+	$data= $app_strings['LBL_TAX'].":  ($group_total_tax_percent %)                                                               ".$price_salestax."";
+	$pdf->SetXY( 105 , 180 );
 	$pdf->SetFont( "Helvetica", "", 10);
-	$pdf->MultiCell(119, 4, $data);
+	$pdf->MultiCell(110, 4, $data);
 
-	$lineData=array("115",$bottom+55,"84");
+	$lineData=array("105",$bottom+55,"94");
 	$pdf->drawLine($lineData);
-	$data = $app_strings['LBL_SHIPPING_AND_HANDLING_CHARGES'].":               ".$price_shipping;
-	$pdf->SetXY( 119 , 186 );
+	$data = $app_strings['LBL_SHIPPING_AND_HANDLING_CHARGES'].":                                     ".$price_shipping;
+	$pdf->SetXY( 105 , 186 );
 	$pdf->SetFont( "Helvetica", "", 10);
-	$pdf->MultiCell(119, 4, $data);
+	$pdf->MultiCell(110, 4, $data);
 
 } else {
-	$lineData=array("115",$bottom+43,"84");
+	$lineData=array("105",$bottom+43,"94");
 	$pdf->drawLine($lineData);
-	$data= $app_strings['LBL_NET_TOTAL'].":                                                ".$price_subtotal."";
-	$pdf->SetXY( 119 , 174 );
+	$data= $app_strings['LBL_NET_TOTAL'].":                                                                   ".$price_subtotal."";
+	$pdf->SetXY( 105 , 174 );
 	$pdf->SetFont( "Helvetica", "", 10);
-	$pdf->MultiCell(119, 4, $data);
+	$pdf->MultiCell(110, 4, $data);
 
-	$lineData=array("115",$bottom+49,"84");
+	$lineData=array("105",$bottom+49,"94");
 	$pdf->drawLine($lineData);
-	$data= $app_strings['LBL_DISCOUNT'].":                                                ".$price_discount."";
-	$pdf->SetXY( 119 , 180 );
+	$data= $app_strings['LBL_DISCOUNT'].":                                                                      ".$price_discount."";
+	$pdf->SetXY( 105 , 180 );
 	$pdf->SetFont( "Helvetica", "", 10);
-	$pdf->MultiCell(119, 4, $data);
+	$pdf->MultiCell(110, 4, $data);
 
-	$lineData=array("115",$bottom+55,"84");
+	$lineData=array("105",$bottom+55,"94");
 	$pdf->drawLine($lineData);
-	$data = $app_strings['LBL_SHIPPING_AND_HANDLING_CHARGES'].":               ".$price_shipping;
-	$pdf->SetXY( 119 , 186 );
+	$data = $app_strings['LBL_SHIPPING_AND_HANDLING_CHARGES'].":                                   ".$price_shipping;
+	$pdf->SetXY( 105 , 186 );
 	$pdf->SetFont( "Helvetica", "", 10);
-	$pdf->MultiCell(119, 4, $data);
+	$pdf->MultiCell(110, 4, $data);
 }
 
-$lineData=array("115",$bottom+61,"84");
+$lineData=array("105",$bottom+61,"94");
 $pdf->drawLine($lineData);
-$data = $app_strings['LBL_TAX_FOR_SHIPPING_AND_HANDLING'].":         ".$price_shipping_tax;
-$pdf->SetXY( 119 , 192 );
+$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(119, 4, $data);
+$pdf->MultiCell(110, 4, $data);
 
-$lineData=array("115",$bottom+67,"84");
+$lineData=array("105",$bottom+67,"94");
 $pdf->drawLine($lineData);
-$data = $app_strings['LBL_ADJUSTMENT'].":                                            ".$price_adjustment;
-$pdf->SetXY( 119 , 198 );
+$data = $app_strings['LBL_ADJUSTMENT'].":                                                                    ".$price_adjustment;
+$pdf->SetXY( 105 , 198 );
 $pdf->SetFont( "Helvetica", "", 10);
-$pdf->MultiCell(119, 4, $data);
+$pdf->MultiCell(110, 4, $data);
 
-$lineData=array("115",$bottom+73,"84");
+$lineData=array("105",$bottom+73,"94");
 $pdf->drawLine($lineData);
-$data = $app_strings['LBL_GRAND_TOTAL'].":                                           ".$price_total;
-$pdf->SetXY( 119 , 204 );
+$data = $app_strings['LBL_GRAND_TOTAL'].":(in $currency_symbol)                                                  ".$price_total;
+$pdf->SetXY( 105 , 204 );
 $pdf->SetFont( "Helvetica", "", 10);
-$pdf->MultiCell(119, 4, $data);
+$pdf->MultiCell(110, 4, $data);
 
 /* ************** End Totals *********************** */
 

Modified: vtigercrm/trunk/modules/Invoice/CreatePDF.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/CreatePDF.php (original)
+++ vtigercrm/trunk/modules/Invoice/CreatePDF.php Tue Sep  5 09:46:21 2006
@@ -78,90 +78,113 @@
 		$logo_name = $adb->query_result($result,0,"logoname");
 }
 
-//getting the Total Array
-$price_subtotal = $currency_symbol.number_format($focus->column_fields["hdnSubTotal"],2,'.',',');
-$price_salestax = $focus->column_fields["txtTax"]."%";
-if($price_salestax != "")
-	$price_salestax = $currency_symbol."0.00";
-
+
+
+
+
+//NOTE : Removed currency symbols and added with Grand Total text. it is enough to show the currency symbol in one place
+
+//we can also get the NetTotal, Final Discount Amount/Percent, Adjustment and GrandTotal from the array $associated_products[1]['final_details']
+
+//getting the Net Total
+$price_subtotal = number_format($focus->column_fields["hdnSubTotal"],2,'.',',');
+
+//Final discount amount/percentage
 $discount_amount = $focus->column_fields["hdnDiscountAmount"];
 $discount_percent = $focus->column_fields["hdnDiscountPercent"];
 
-$price_shipping = $currency_symbol.number_format($focus->column_fields["hdnS_H_Amount"],2,'.',',');
-if($price_shipping > 0 || price_shipping == "")
-	$price_shipping = $currency_symbol."0.00";
-
-$q = "SELECT * FROM vtiger_inventoryshippingrel WHERE id='".$focus->column_fields["record_id"]."'";
-$shrs = $adb->query($q);
-$shtax1 = $adb->query_result($shrs,'0','shtax1'); 
-$shtax2 = $adb->query_result($shrs,'0','shtax2'); 
-$shtax3 = $adb->query_result($shrs,'0','shtax3'); 
-if($shtax1 != "")
-	$price_shipping_tax = number_format($shtax1,2,'.',',')."%";
-if($shtax2 != "")
-	$price_shipping_tax = number_format($shtax2,2,'.',',')."%";
-if($shtax3 != "")
-	$price_shipping_tax = number_format($shtax3,2,'.',',')."%";
-
-
 if($discount_amount != "")
-	$price_discount = $currency_symbol.number_format($discount_amount,2,'.',',');
+	$price_discount = number_format($discount_amount,2,'.',',');
 else if($discount_percent != "")
 	$price_discount = $discount_percent."%";
 else
-	$price_discount = $currency_symbol."0.00";
-
-
-$price_adjustment = $currency_symbol.number_format($focus->column_fields["txtAdjustment"],2,'.',',');
-$price_total = $currency_symbol.number_format($focus->column_fields["hdnGrandTotal"],2,'.',',');
-
-//getting the Product Data
-$query="select vtiger_products.productname, vtiger_products.productid, vtiger_products.unit_price, vtiger_products.product_description, vtiger_inventoryproductrel.* from vtiger_inventoryproductrel inner join vtiger_products on vtiger_products.productid=vtiger_inventoryproductrel.productid where id=".$id;
-
-global $result;
-$result = $adb->query($query);
-$num_products=$adb->num_rows($result);
-for($i=0;$i<$num_products;$i++) {
-	$product_name[$i]=$adb->query_result($result,$i,'productname');
-	$prod_description[$i]=$adb->query_result($result,$i,'product_description');
-	$product_id[$i]=$adb->query_result($result,$i,'productid');
-	$qty[$i]=$adb->query_result($result,$i,'quantity');
-
-	$unit_price[$i]= $currency_symbol.number_format($adb->query_result($result,$i,'unit_price'),2,'.',',');
-	$list_price[$i]= $currency_symbol.number_format(StripLastZero($adb->query_result($result,$i,'listprice')),2,'.',',');
-	$list_pricet[$i]= $adb->query_result($result,$i,'listprice');
-	$prod_total[$i]= $qty[$i]*$list_pricet[$i];
-
+	$price_discount = "0.00";
+
+//Adjustment
+$price_adjustment = number_format($focus->column_fields["txtAdjustment"],2,'.',',');
+//Grand Total
+$price_total = number_format($focus->column_fields["hdnGrandTotal"],2,'.',',');
+
+
+//get the Associated Products for this Invoice
+$focus->id = $focus->column_fields["record_id"];
+$associated_products = getAssociatedProducts("Invoice",$focus);
+$num_products = count($associated_products);
+
+//This $final_details array will contain the final total, discount, Group Tax, S&H charge, S&H taxes and adjustment
+$final_details = $associated_products[1]['final_details'];
+
+//To calculate the group tax amount
+if($final_details['taxtype'] == 'group')
+{
+	$group_tax_total = $final_details['tax_totalamount'];
+	$price_salestax = number_format($group_tax_total,2,'.',',');
+
+	$group_total_tax_percent = '0.00';
+	$group_tax_details = $final_details['taxes'];
+	for($i=0;$i<count($group_tax_details);$i++)
+	{
+		$group_total_tax_percent = $group_total_tax_percent+$group_tax_details[$i]['percentage'];
+	}
+}
+
+//S&H amount
+$sh_amount = $final_details['shipping_handling_charge'];
+$price_shipping = number_format($sh_amount,2,'.',',');
+
+//S&H taxes
+$sh_tax_details = $final_details['sh_taxes'];
+$sh_tax_percent = '0.00';
+for($i=0;$i<count($sh_tax_details);$i++)
+{
+	$sh_tax_percent = $sh_tax_percent + $sh_tax_details[$i]['percentage'];
+}
+$sh_tax_amount = $final_details['shtax_totalamount'];
+$price_shipping_tax = number_format($sh_tax_amount,2,'.',',');
+
+
+//This is to get all prodcut details as row basis
+for($i=1,$j=$i-1;$i<=$num_products;$i++,$j++)
+{
+	$product_name[$i] = $associated_products[$i]['productName'.$i];
+	$prod_description[$i] = $associated_products[$i]['productDescription'.$i];
+	$product_id[$i] = $associated_products[$i]['hdnProductId'.$i];
+	$qty[$i] = $associated_products[$i]['qty'.$i];
+	$unit_price[$i] = number_format($associated_products[$i]['unitPrice'.$i],2,'.',',');
+	$list_price[$i] = number_format($associated_products[$i]['listPrice'.$i],2,'.',',');
+	$list_pricet[$i] = $associated_products[$i]['listPrice'.$i];
+	$discount_total[$i] = $associated_products[$i]['discountTotal'.$i];
+	
+	$taxable_total = $qty[$i]*$list_pricet[$i]-$discount_total[$i];
+
+	$producttotal = $taxable_total;
 	$total_taxes = '0.00';
-	if($focus->column_fields["hdnTaxType"] == "individual") {
-		$q = "SELECT * FROM vtiger_inventoryproductrel WHERE id='".$focus->column_fields["record_id"]."' AND productid='".$product_id[$i]."'";
-		$trs = $adb->query($q);
-		$tax1 = $adb->query_result($trs,'0','tax1'); 
-		$tax2 = $adb->query_result($trs,'0','tax2'); 
-		$tax3 = $adb->query_result($trs,'0','tax3'); 
-		$taxable_total = ($adb->query_result($trs,'0','listprice') * $adb->query_result($trs,'0','quantity')); 
-
-		if($tax1 != "" && $tax1 > 0) {
-			$total_taxes = (($taxable_total*$tax1)/100);
-			$prod_total[$i] = ($prod_total[$i]+$total_taxes);
+	if($focus->column_fields["hdnTaxType"] == "individual")
+	{
+		$total_tax_percent = '0.00';
+		//This loop is to get all tax percentage and then calculate the total of all taxes
+		for($tax_count=0;$tax_count<count($associated_products[$i]['taxes']);$tax_count++)
+		{
+			$tax_percent = $associated_products[$i]['taxes'][$tax_count]['percentage'];
+			$total_tax_percent = $total_tax_percent+$tax_percent;
+			$tax_amount = (($taxable_total*$tax_percent)/100);
+			$total_taxes = $total_taxes+$tax_amount;
 		}
-		if($tax2 != "" && $tax2 > 0) {
-			$total_taxes = (($taxable_total*$tax2)/100);
-			$prod_total[$i] = ($prod_total[$i]+$total_taxes);
-		}
-		if($tax3 != "" && $tax3 > 0) {
-			$total_taxes = (($taxable_total*$tax3)/100);
-			$prod_total[$i] = ($prod_total[$i]+$total_taxes);
-		}
-		$product_line[$i]["Tax"] = $total_taxes."%";
-	}
-	$product_line[$i]["Product Name"] = $product_name[$i];
-	$product_line[$i]["Description"] = $prod_description[$i];
-	$product_line[$i]["Qty"] = $qty[$i];
-	$product_line[$i]["Price"] = $list_price[$i];
-	$product_line[$i]["Total"] = $currency_symbol.number_format($prod_total[$i],"2",".",",");
-}
-
+		$producttotal = $taxable_total+$total_taxes;
+		$product_line[$j]["Tax"] = number_format($total_taxes,2,'.',',')."\n ($total_tax_percent %) ";
+	}
+	$prod_total[$i] = number_format($producttotal,2,'.',',');
+
+	$product_line[$j]["Product Name"] = $product_name[$i];
+	$product_line[$j]["Description"] = $prod_description[$i];
+	$product_line[$j]["Qty"] = $qty[$i];
+	$product_line[$j]["Price"] = $list_price[$i];
+	$product_line[$j]["Discount"] = $discount_total[$i];
+	$product_line[$j]["Total"] = $prod_total[$i];
+}
+
+//echo '<pre>Product Details ==>';print_r($product_line);echo '</pre>';
+//echo '<pre>';print_r($associated_products);echo '</pre>';
 
 // ************************ END POPULATE DATA ***************************8
 




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 11:49:34 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 15:49:34 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9290 -
	/vtigercrm/trunk/include/utils/EditViewUtils.php
Message-ID: <20060905154935.1621176CEEE@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 09:49:30 2006
New Revision: 9290

Log:
* Added product_description and unitprice in the getAssociatedProducts function as these fields are needed for Export to PDF functionality

Modified:
    vtigercrm/trunk/include/utils/EditViewUtils.php

Modified: vtigercrm/trunk/include/utils/EditViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/EditViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/EditViewUtils.php Tue Sep  5 09:49:30 2006
@@ -1384,27 +1384,27 @@
 	
 	if($module == 'Quotes')
 	{
-		$query="select vtiger_products.productname, vtiger_products.unit_price, vtiger_products.qtyinstock, vtiger_inventoryproductrel.* from vtiger_inventoryproductrel inner join vtiger_products on vtiger_products.productid=vtiger_inventoryproductrel.productid where id=".$focus->id." ORDER BY sequence_no";
+		$query="select vtiger_products.productname, vtiger_products.product_description, vtiger_products.unit_price, vtiger_products.qtyinstock, vtiger_inventoryproductrel.* from vtiger_inventoryproductrel inner join vtiger_products on vtiger_products.productid=vtiger_inventoryproductrel.productid where id=".$focus->id." ORDER BY sequence_no";
 	}
 	elseif($module == 'PurchaseOrder')
 	{
-		$query="select vtiger_products.productname, vtiger_products.unit_price, vtiger_products.qtyinstock, vtiger_inventoryproductrel.* from vtiger_inventoryproductrel inner join vtiger_products on vtiger_products.productid=vtiger_inventoryproductrel.productid where id=".$focus->id." ORDER BY sequence_no";
+		$query="select vtiger_products.productname, vtiger_products.product_description, vtiger_products.unit_price, vtiger_products.qtyinstock, vtiger_inventoryproductrel.* from vtiger_inventoryproductrel inner join vtiger_products on vtiger_products.productid=vtiger_inventoryproductrel.productid where id=".$focus->id." ORDER BY sequence_no";
 	}
 	elseif($module == 'SalesOrder')
 	{
-		$query="select vtiger_products.productname, vtiger_products.unit_price, vtiger_products.qtyinstock, vtiger_inventoryproductrel.* from vtiger_inventoryproductrel inner join vtiger_products on vtiger_products.productid=vtiger_inventoryproductrel.productid where id=".$focus->id." ORDER BY sequence_no";
+		$query="select vtiger_products.productname, vtiger_products.product_description, vtiger_products.unit_price, vtiger_products.qtyinstock, vtiger_inventoryproductrel.* from vtiger_inventoryproductrel inner join vtiger_products on vtiger_products.productid=vtiger_inventoryproductrel.productid where id=".$focus->id." ORDER BY sequence_no";
 	}
 	elseif($module == 'Invoice')
 	{
-		$query="select vtiger_products.productname, vtiger_products.unit_price, vtiger_products.qtyinstock, vtiger_inventoryproductrel.* from vtiger_inventoryproductrel inner join vtiger_products on vtiger_products.productid=vtiger_inventoryproductrel.productid where id=".$focus->id." ORDER BY sequence_no";
+		$query="select vtiger_products.productname, vtiger_products.product_description, vtiger_products.unit_price, vtiger_products.qtyinstock, vtiger_inventoryproductrel.* from vtiger_inventoryproductrel inner join vtiger_products on vtiger_products.productid=vtiger_inventoryproductrel.productid where id=".$focus->id." ORDER BY sequence_no";
 	}
 	elseif($module == 'Potentials')
 	{
-		$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_products.qtyinstock,vtiger_seproductsrel.* from vtiger_products inner join vtiger_seproductsrel on vtiger_seproductsrel.productid=vtiger_products.productid where crmid=".$seid;
+		$query="select vtiger_products.productname, vtiger_products.product_description, vtiger_products.unit_price,vtiger_products.qtyinstock,vtiger_seproductsrel.* from vtiger_products inner join vtiger_seproductsrel on vtiger_seproductsrel.productid=vtiger_products.productid where crmid=".$seid;
 	}
 	elseif($module == 'Products')
 	{
-		$query="select vtiger_products.productid,vtiger_products.productname,vtiger_products.unit_price,vtiger_products.qtyinstock,vtiger_crmentity.* from vtiger_products inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_products.productid where vtiger_crmentity.deleted=0 and productid=".$seid;
+		$query="select vtiger_products.productid, vtiger_products.productname, vtiger_products.product_description, vtiger_products.unit_price,vtiger_products.qtyinstock,vtiger_crmentity.* from vtiger_products inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_products.productid where vtiger_crmentity.deleted=0 and productid=".$seid;
 	}
 
 	$result = $adb->query($query);
@@ -1413,6 +1413,7 @@
 	{
 		$hdnProductId = $adb->query_result($result,$i-1,'productid');
 		$productname=$adb->query_result($result,$i-1,'productname');
+		$productdescription=$adb->query_result($result,$i-1,'product_description');
 		$comment=$adb->query_result($result,$i-1,'comment');
 		$qtyinstock=$adb->query_result($result,$i-1,'qtyinstock');
 		$qty=$adb->query_result($result,$i-1,'quantity');
@@ -1435,6 +1436,7 @@
 
 		$product_Detail[$i]['hdnProductId'.$i] = $hdnProductId;
 		$product_Detail[$i]['productName'.$i]= $productname;
+		$product_Detail[$i]['productDescription'.$i]= $productdescription;
 		$product_Detail[$i]['comment'.$i]= $comment;
 
 		if($module != 'PurchaseOrder' && $focus->object_name != 'Order')
@@ -1445,6 +1447,7 @@
 		$productTotal = getConvertedPriceFromDollar($productTotal);
 		$product_Detail[$i]['qty'.$i]=$qty;
 		$product_Detail[$i]['listPrice'.$i]=$listprice;
+		$product_Detail[$i]['unitPrice'.$i]=$unitprice;
 		$product_Detail[$i]['productTotal'.$i]=$productTotal;
 
 		$discount_percent=$adb->query_result($result,$i-1,'discount_percent');




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 12:57:15 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 16:57:15 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9291 -
	/vtigercrm/trunk/themes/woodspice/style.css
Message-ID: <20060905165716.2DED376CE29@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 10:57:12 2006
New Revision: 9291

Log:
CSS added for disabling window during recalculate -- ahmed

Modified:
    vtigercrm/trunk/themes/woodspice/style.css

Modified: vtigercrm/trunk/themes/woodspice/style.css
==============================================================================
--- vtigercrm/trunk/themes/woodspice/style.css (original)
+++ vtigercrm/trunk/themes/woodspice/style.css Tue Sep  5 10:57:12 2006
@@ -3135,7 +3135,7 @@
 
 .discountUI{
 	border:3px solid #CCCCCC;
-	width:250px;
+	width:200px;
 	padding:5px;
 	position:absolute;
 	background-color:#FFFFFF;
@@ -3347,3 +3347,67 @@
 .bgwhite{
 	background-color:white;
 }
+
+/* Recalculate Disabling Window */
+
+.veil{
+   background: url(images/searchUIBg.gif) ;
+    height: 100%;
+    width: 100%;
+    top: 0px;
+    left: 0px;
+    overflow: hidden;
+    z-index: 10000;
+    Filter: Alpha(opacity = 70);
+    -moz-opacity: 0.7;
+    text-align: center;
+    vertical-align: middle;
+    position: absolute;
+}
+
+.veil_new{
+   background: url(images/searchUIBg.gif) ;
+    height: 100%;
+    width: 100%;
+    top: 0px;
+    left: 0px;
+    overflow: hidden;
+    z-index: 50000;
+    Filter: Alpha(opacity = 70);
+    -moz-opacity: 0.7;
+    text-align: center;
+    vertical-align: middle;
+    position: absolute;
+}
+
+.optioncontainer{
+    vertical-align: middle;   
+    height: 100%;
+    width: 100%;   
+    position: absolute;
+    z-index: 90000;   
+}
+
+
+.options{
+    	vertical-align: middle;   
+	margin-left: 25%;
+	margin-top: 16%;
+	color: #FFFFFF;
+	width:650px;
+	background-color: Black;
+	border: 2px solid #222;	
+    	position: relative;
+	text-align: left;
+    	z-index: 80000;   
+}
+
+.options h2{
+	color: White;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	border-bottom: 1px solid #373D4C;
+	margin: 0;
+	font-weight: normal;
+}
+
+/* Recalculate Disable Ends */




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 12:59:06 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 16:59:06 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9293 -
 /vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl
Message-ID: <20060905165906.78E3E76CEFA@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 10:59:02 2006
New Revision: 9293

Log:
Disabled window during recalculate -- ahmed

Modified:
    vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl

Modified: vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl Tue Sep  5 10:59:02 2006
@@ -58,14 +58,14 @@
 			  	<!-- GLOBAL ACCESS MODULE -->
 		  		<div id="globaldiv">
 				<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
-				<form action="index.php" method="post" name="new" id="form">
+				<form action="index.php" method="post" name="new" id="orgSharingform">
 				<input type="hidden" name="module" value="Users">
 				<input type="hidden" name="action" value="OrgSharingEditView">
 				<input type="hidden" name="parenttab" value="Settings">
 				<tr>
 					<td class="big"><strong>1. {$CMOD.LBL_GLOBAL_ACCESS_PRIVILEGES}</strong></td>
 					<td class="small" align=right>
-						<input class="crmButton small cancel" title="{$CMOD.LBL_RECALCULATE_BUTTON}"  type="submit" name="recalculate" value="{$CMOD.LBL_RECALCULATE_BUTTON}" onclick="this.form.action.value='RecalculateSharingRules'; return confirm('Recalculate Sharing Rules will calculate the sharing rules for the whole organization. This Operation will take some time. Do you want to contunue? ')">	
+						<input class="crmButton small cancel" title="{$CMOD.LBL_RECALCULATE_BUTTON}"  type="button" name="recalculate" value="{$CMOD.LBL_RECALCULATE_BUTTON}" onclick="return freezeBackground();">	
 	&nbsp;<input class="crmButton small edit" type="submit" name="Edit" value="{$CMOD.LBL_CHANGE} {$CMOD.LBL_PRIVILEGES}" ></td>
 					</td>
 				</tr>
@@ -192,6 +192,34 @@
 </tbody>
 </table>
 <div id="tempdiv" style="display:block;position:absolute;width:400px;"></div>
+
+<!-- For Disabling Window -->
+<div id="confId"  class='veil_new' style="display:none;">
+<table class="options" border="0" cellpadding="18" cellspacing="0">
+<tr>
+	<td class="big" align="center">
+		<h2>{$CMOD.LBL_RECALC_MSG}</h2>
+	</td>
+	<br>
+	<tr>
+		<td align="center"><input type="button" value="{$CMOD.LBL_YES}" onclick="return disableStyle('confId');">&nbsp;&nbsp;<input type="button" value="&nbsp;{$CMOD.LBL_NO}&nbsp;" onclick="$('freeze').style.display='none';$('confId').style.display='none'; "></td>
+	</tr>
+</tr>
+</table>
+</div>
+
+<div id="divId" class="veil_new" style="display:none;top:0px;left:0px;">
+<table class="optioncontainer" border="0" cellpadding="18" cellspacing="0">
+<tbody><tr>
+		<td class="big" align="center">
+		    <img src="{$IMAGE_PATH}plsWaitAnimated.gif">
+		</td>
+	</tr>
+</tbody>
+</table>
+</div>
+
+
 <script>
 function callEditDiv(obj,modulename,mode,id)
 {ldelim}
@@ -258,5 +286,26 @@
 			{rdelim}
 		{rdelim}
 	
+	function disableStyle(id)
+	{ldelim}
+			$('orgSharingform').action.value = 'RecalculateSharingRules';
+			$('orgSharingform').submit();
+ 			$(id).style.display = 'none';
+			$('divId').style.display = 'block';
+	{rdelim}
+
+	function freezeBackground()
+	{ldelim}
+	    var oFreezeLayer = document.createElement("DIV");
+	    oFreezeLayer.id = "freeze";
+	    oFreezeLayer.className = "veil";
+
+	     if (browser_ie) oFreezeLayer.style.height = (document.body.offsetHeight + (document.body.scrollHeight - document.body.offsetHeight)) + "px";
+	     else if (browser_nn4 || browser_nn6) oFreezeLayer.style.height = document.body.offsetHeight + "px";
+
+	    oFreezeLayer.style.width = "100%";
+	    document.body.appendChild(oFreezeLayer);
+	    document.getElementById('confId').style.display = 'block';
+	{rdelim}
 
 </script>




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 13:01:32 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 17:01:32 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9294 -
	/vtigercrm/trunk/themes/woodspice/style.css
Message-ID: <20060905170132.ECE8976CEF1@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 11:01:29 2006
New Revision: 9294

Log:
style.css file updated -- ahmed

Modified:
    vtigercrm/trunk/themes/woodspice/style.css

Modified: vtigercrm/trunk/themes/woodspice/style.css
==============================================================================
--- vtigercrm/trunk/themes/woodspice/style.css (original)
+++ vtigercrm/trunk/themes/woodspice/style.css Tue Sep  5 11:01:29 2006
@@ -3135,7 +3135,7 @@
 
 .discountUI{
 	border:3px solid #CCCCCC;
-	width:200px;
+	width:250px;
 	padding:5px;
 	position:absolute;
 	background-color:#FFFFFF;




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 12:57:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 16:57:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9292 -
 /vtigercrm/trunk/modules/Users/language/en_us.lang.php
Message-ID: <20060905165750.2A9D176CE29@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 10:57:46 2006
New Revision: 9292

Log:
Lang strings updated -- ahmed

Modified:
    vtigercrm/trunk/modules/Users/language/en_us.lang.php

Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Users/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Users/language/en_us.lang.php Tue Sep  5 10:57:46 2006
@@ -589,6 +589,14 @@
 'LBL_DELETE_PROFILE'=>'Delete Profile',
 'LBL_TRANSFER_ROLES_TO_PROFILE'=>'Transfer Roles to Profile',
 'LBL_PROFILE_TO_BE_DELETED'=>'Profile to be Deteted',
+
+//Added for disabling window Recalculate
+
+'LBL_RECALC_MSG'=>'Are you sure, you wish to Recalculate Sharing Access?',
+'LBL_YES'=>'Yes',
+'LBL_NO'=>'No',
+
+
 );
 
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 13:52:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 17:52:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9295 - in
 /vtigercrm/trunk/modules: PurchaseOrder/CreatePDF.php Quotes/CreatePDF.php
 SalesOrder/CreateSOPDF.php
Message-ID: <20060905175238.A5FC476CEEA@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 11:52:32 2006
New Revision: 9295

Log:
* Modified to display the product and tax details

Modified:
    vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php
    vtigercrm/trunk/modules/Quotes/CreatePDF.php
    vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php

Modified: vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php Tue Sep  5 11:52:32 2006
@@ -78,62 +78,114 @@
 		$logo_name = $adb->query_result($result,0,"logoname");
 }
 
-//getting the Total Array
-$price_subtotal = $currency_symbol.number_format(StripLastZero($focus->column_fields["hdnSubTotal"]),2,'.',',');
-$price_tax = $currency_symbol.number_format(StripLastZero($focus->column_fields["txtTax"]),2,'.',',');
-$price_adjustment = $currency_symbol.number_format(StripLastZero($focus->column_fields["txtAdjustment"]),2,'.',',');
-$price_total = $currency_symbol.number_format(StripLastZero($focus->column_fields["hdnGrandTotal"]),2,'.',',');
-
-//getting the Product Data
-$query="select vtiger_products.productname, vtiger_products.unit_price, vtiger_products.product_description, vtiger_inventoryproductrel.* from vtiger_inventoryproductrel inner join vtiger_products on vtiger_products.productid=vtiger_inventoryproductrel.productid where id=".$id;
-
-global $result;
-$result = $adb->query($query);
-$num_products=$adb->num_rows($result);
-for($i=0;$i<$num_products;$i++) {
-	$product_name[$i]=$adb->query_result($result,$i,'productname');
-	$prod_description[$i]=$adb->query_result($result,$i,'product_description');
-	$product_id[$i]=$adb->query_result($result,$i,'productid');
-	$qty[$i]=$adb->query_result($result,$i,'quantity');
-
-	$unit_price[$i]= $currency_symbol.number_format($adb->query_result($result,$i,'unit_price'),2,'.',',');
-	$list_price[$i]= $currency_symbol.number_format(StripLastZero($adb->query_result($result,$i,'listprice')),2,'.',',');
-	$list_pricet[$i]= $adb->query_result($result,$i,'listprice');
-	$prod_total[$i]= $qty[$i]*$list_pricet[$i];
-
-        $total_taxes = '0.00';
-        if($product_taxes == "true") {
-                $q = "SELECT * FROM vtiger_inventoryproductrel WHERE id='".$focus->column_fields["record_id"]."' AND productid='".$product_id[$i]."' AND tax2 IS NOT NULL";
-                $trs = $adb->query($q);
-                $tax = $adb->query_result($trs,'0','tax2');
-                $taxable_total = ($adb->query_result($trs,'0','listprice') * $adb->query_result($trs,'0','quantity'));
-                if($tax != "") {
-                        $total_taxes = ($taxable_total/$tax);
-                        $prod_total[$i] = ($prod_total[$i]+$total_taxes);
-                }
-        }
-
-        $product_line[] = array( "Product Name"    => $product_name[$i],
-                "Description"  => $prod_description[$i],
-                "Qty"     => $qty[$i],
-                "List Price"      => $list_price[$i],
-                "Unit Price" => $unit_price[$i],
-                "Tax" => $currency_symbol.$total_taxes,
-                "Total" => $currency_symbol.$prod_total[$i]
-        );
-}
-
-	$total[]=array("Unit Price" => $app_strings['LBL_SUB_TOTAL'],
-		"Total" => $price_subtotal);
-
-	$total[]=array("Unit Price" => $app_strings['LBL_ADJUSTMENT'],
-		"Total" => $price_adjustment);
-
-	$total[]=array("Unit Price" => $app_strings['LBL_TAX'],
-		"Total" => $price_tax);
-
-	$total[]=array("Unit Price" => $app_strings['LBL_GRAND_TOTAL'],
-		"Total" => $price_total);
+//Population of Product Details - Starts
+
+//we can cut and paste the following lines in a file and include that file here is enough. For that we have to put a new common file. we will do this later
+//NOTE : Removed currency symbols and added with Grand Total text. it is enough to show the currency symbol in one place
+
+//we can also get the NetTotal, Final Discount Amount/Percent, Adjustment and GrandTotal from the array $associated_products[1]['final_details']
+
+//getting the Net Total
+$price_subtotal = number_format($focus->column_fields["hdnSubTotal"],2,'.',',');
+
+//Final discount amount/percentage
+$discount_amount = $focus->column_fields["hdnDiscountAmount"];
+$discount_percent = $focus->column_fields["hdnDiscountPercent"];
+
+if($discount_amount != "")
+	$price_discount = number_format($discount_amount,2,'.',',');
+else if($discount_percent != "")
+	$price_discount = $discount_percent."%";
+else
+	$price_discount = "0.00";
+
+//Adjustment
+$price_adjustment = number_format($focus->column_fields["txtAdjustment"],2,'.',',');
+//Grand Total
+$price_total = number_format($focus->column_fields["hdnGrandTotal"],2,'.',',');
+
+
+//get the Associated Products for this Invoice
+$focus->id = $focus->column_fields["record_id"];
+$associated_products = getAssociatedProducts("PurchaseOrder",$focus);
+$num_products = count($associated_products);
+
+//This $final_details array will contain the final total, discount, Group Tax, S&H charge, S&H taxes and adjustment
+$final_details = $associated_products[1]['final_details'];
+
+//To calculate the group tax amount
+if($final_details['taxtype'] == 'group')
+{
+	$group_tax_total = $final_details['tax_totalamount'];
+	$price_salestax = number_format($group_tax_total,2,'.',',');
+
+	$group_total_tax_percent = '0.00';
+	$group_tax_details = $final_details['taxes'];
+	for($i=0;$i<count($group_tax_details);$i++)
+	{
+		$group_total_tax_percent = $group_total_tax_percent+$group_tax_details[$i]['percentage'];
+	}
+}
+
+//S&H amount
+$sh_amount = $final_details['shipping_handling_charge'];
+$price_shipping = number_format($sh_amount,2,'.',',');
+
+//S&H taxes
+$sh_tax_details = $final_details['sh_taxes'];
+$sh_tax_percent = '0.00';
+for($i=0;$i<count($sh_tax_details);$i++)
+{
+	$sh_tax_percent = $sh_tax_percent + $sh_tax_details[$i]['percentage'];
+}
+$sh_tax_amount = $final_details['shtax_totalamount'];
+$price_shipping_tax = number_format($sh_tax_amount,2,'.',',');
+
+
+//This is to get all prodcut details as row basis
+for($i=1,$j=$i-1;$i<=$num_products;$i++,$j++)
+{
+	$product_name[$i] = $associated_products[$i]['productName'.$i];
+	$prod_description[$i] = $associated_products[$i]['productDescription'.$i];
+	$product_id[$i] = $associated_products[$i]['hdnProductId'.$i];
+	$qty[$i] = $associated_products[$i]['qty'.$i];
+	$unit_price[$i] = number_format($associated_products[$i]['unitPrice'.$i],2,'.',',');
+	$list_price[$i] = number_format($associated_products[$i]['listPrice'.$i],2,'.',',');
+	$list_pricet[$i] = $associated_products[$i]['listPrice'.$i];
+	$discount_total[$i] = $associated_products[$i]['discountTotal'.$i];
+	
+	$taxable_total = $qty[$i]*$list_pricet[$i]-$discount_total[$i];
+
+	$producttotal = $taxable_total;
+	$total_taxes = '0.00';
+	if($focus->column_fields["hdnTaxType"] == "individual")
+	{
+		$total_tax_percent = '0.00';
+		//This loop is to get all tax percentage and then calculate the total of all taxes
+		for($tax_count=0;$tax_count<count($associated_products[$i]['taxes']);$tax_count++)
+		{
+			$tax_percent = $associated_products[$i]['taxes'][$tax_count]['percentage'];
+			$total_tax_percent = $total_tax_percent+$tax_percent;
+			$tax_amount = (($taxable_total*$tax_percent)/100);
+			$total_taxes = $total_taxes+$tax_amount;
+		}
+		$producttotal = $taxable_total+$total_taxes;
+		$product_line[$j]["Tax"] = number_format($total_taxes,2,'.',',')."\n ($total_tax_percent %) ";
+	}
+	$prod_total[$i] = number_format($producttotal,2,'.',',');
+
+	$product_line[$j]["Product Name"] = $product_name[$i];
+	$product_line[$j]["Description"] = $prod_description[$i];
+	$product_line[$j]["Qty"] = $qty[$i];
+	$product_line[$j]["Price"] = $list_price[$i];
+	$product_line[$j]["Discount"] = $discount_total[$i];
+	$product_line[$j]["Total"] = $prod_total[$i];
+}
+//echo '<pre>Product Details ==>';print_r($product_line);echo '</pre>';
+//echo '<pre>';print_r($associated_products);echo '</pre>';
+
+
+//Population of Product Details - Ends
 
 
 // ************************ END POPULATE DATA ***************************8

Modified: vtigercrm/trunk/modules/Quotes/CreatePDF.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/CreatePDF.php (original)
+++ vtigercrm/trunk/modules/Quotes/CreatePDF.php Tue Sep  5 11:52:32 2006
@@ -78,67 +78,115 @@
 		$logo_name = $adb->query_result($result,0,"logoname");
 }
 
-//getting the Total Array
-$price_subtotal = $currency_symbol.number_format(StripLastZero($focus->column_fields["hdnSubTotal"]),2,'.',',');
-$price_tax = $currency_symbol.number_format(StripLastZero($focus->column_fields["txtTax"]),2,'.',',');
-$price_adjustment = $currency_symbol.number_format(StripLastZero($focus->column_fields["txtAdjustment"]),2,'.',',');
-$price_total = $currency_symbol.number_format(StripLastZero($focus->column_fields["hdnGrandTotal"]),2,'.',',');
-
-//getting the Product Data
-// DG 15 Aug 2006
-// Add "ORDER BY sequence_no to preserve add order in printed version
-// Seems not to be strictly necessary as the upstream ORDER BY in EditView appears to produce this behaviour by default
-// Having this here makes sure though. 
-$query="select vtiger_products.productname, vtiger_products.unit_price, vtiger_products.product_description, vtiger_inventoryproductrel.* from vtiger_inventoryproductrel inner join vtiger_products on vtiger_products.productid=vtiger_inventoryproductrel.productid where id=".$quote_id." ORDER BY sequence_no";
-//$query="select vtiger_products.productname, vtiger_products.unit_price, vtiger_products.product_description, vtiger_inventoryproductrel.* from vtiger_inventoryproductrel inner join vtiger_products on vtiger_products.productid=vtiger_inventoryproductrel.productid where id=".$quote_id;
-
-global $result;
-$result = $adb->query($query);
-$num_products=$adb->num_rows($result);
-for($i=0;$i<$num_products;$i++) {
-	$product_name[$i]=$adb->query_result($result,$i,'productname');
-	$prod_description[$i]=$adb->query_result($result,$i,'product_description');
-	$product_id[$i]=$adb->query_result($result,$i,'productid');
-	$qty[$i]=$adb->query_result($result,$i,'quantity');
-
-	$unit_price[$i]= $currency_symbol.number_format($adb->query_result($result,$i,'unit_price'),2,'.',',');
-	$list_price[$i]= $currency_symbol.number_format(StripLastZero($adb->query_result($result,$i,'listprice')),2,'.',',');
-	$list_pricet[$i]= $adb->query_result($result,$i,'listprice');
-	$prod_total[$i]= $qty[$i]*$list_pricet[$i];
-
-        $total_taxes = '0.00';
-        if($product_taxes == "true") {
-                $q = "SELECT * FROM vtiger_inventoryproductrel WHERE id='".$focus->column_fields["record_id"]."' AND productid='".$product_id[$i]."' AND tax2 IS NOT NULL";
-                $trs = $adb->query($q);
-                $tax = $adb->query_result($trs,'0','tax2');
-                $taxable_total = ($adb->query_result($trs,'0','listprice') * $adb->query_result($trs,'0','quantity'));
-                if($tax != "") {
-                        $total_taxes = ($taxable_total/$tax);
-                        $prod_total[$i] = ($prod_total[$i]+$total_taxes);
-                }
-        }
-
-        $product_line[] = array( "Product Name"    => $product_name[$i],
-                "Description"  => $prod_description[$i],
-                "Qty"     => $qty[$i],
-                "List Price"      => $list_price[$i],
-                "Unit Price" => $unit_price[$i],
-                "Tax" => $currency_symbol.$total_taxes,
-                "Total" => $currency_symbol.$prod_total[$i]
-        );
-}
-
-	$total[]=array("Unit Price" => $app_strings['LBL_SUB_TOTAL'],
-		"Total" => $price_subtotal);
-
-	$total[]=array("Unit Price" => $app_strings['LBL_ADJUSTMENT'],
-		"Total" => $price_adjustment);
-
-	$total[]=array("Unit Price" => $app_strings['LBL_TAX'],
-		"Total" => $price_tax);
-
-	$total[]=array("Unit Price" => $app_strings['LBL_GRAND_TOTAL'],
-		"Total" => $price_total);
+
+//Population of Product Details - Starts
+
+//we can cut and paste the following lines in a file and include that file here is enough. For that we have to put a new common file. we will do this later
+//NOTE : Removed currency symbols and added with Grand Total text. it is enough to show the currency symbol in one place
+
+//we can also get the NetTotal, Final Discount Amount/Percent, Adjustment and GrandTotal from the array $associated_products[1]['final_details']
+
+//getting the Net Total
+$price_subtotal = number_format($focus->column_fields["hdnSubTotal"],2,'.',',');
+
+//Final discount amount/percentage
+$discount_amount = $focus->column_fields["hdnDiscountAmount"];
+$discount_percent = $focus->column_fields["hdnDiscountPercent"];
+
+if($discount_amount != "")
+	$price_discount = number_format($discount_amount,2,'.',',');
+else if($discount_percent != "")
+	$price_discount = $discount_percent."%";
+else
+	$price_discount = "0.00";
+
+//Adjustment
+$price_adjustment = number_format($focus->column_fields["txtAdjustment"],2,'.',',');
+//Grand Total
+$price_total = number_format($focus->column_fields["hdnGrandTotal"],2,'.',',');
+
+
+//get the Associated Products for this Invoice
+$focus->id = $focus->column_fields["record_id"];
+$associated_products = getAssociatedProducts("Quotes",$focus);
+$num_products = count($associated_products);
+
+//This $final_details array will contain the final total, discount, Group Tax, S&H charge, S&H taxes and adjustment
+$final_details = $associated_products[1]['final_details'];
+
+//To calculate the group tax amount
+if($final_details['taxtype'] == 'group')
+{
+	$group_tax_total = $final_details['tax_totalamount'];
+	$price_salestax = number_format($group_tax_total,2,'.',',');
+
+	$group_total_tax_percent = '0.00';
+	$group_tax_details = $final_details['taxes'];
+	for($i=0;$i<count($group_tax_details);$i++)
+	{
+		$group_total_tax_percent = $group_total_tax_percent+$group_tax_details[$i]['percentage'];
+	}
+}
+
+//S&H amount
+$sh_amount = $final_details['shipping_handling_charge'];
+$price_shipping = number_format($sh_amount,2,'.',',');
+
+//S&H taxes
+$sh_tax_details = $final_details['sh_taxes'];
+$sh_tax_percent = '0.00';
+for($i=0;$i<count($sh_tax_details);$i++)
+{
+	$sh_tax_percent = $sh_tax_percent + $sh_tax_details[$i]['percentage'];
+}
+$sh_tax_amount = $final_details['shtax_totalamount'];
+$price_shipping_tax = number_format($sh_tax_amount,2,'.',',');
+
+
+//This is to get all prodcut details as row basis
+for($i=1,$j=$i-1;$i<=$num_products;$i++,$j++)
+{
+	$product_name[$i] = $associated_products[$i]['productName'.$i];
+	$prod_description[$i] = $associated_products[$i]['productDescription'.$i];
+	$product_id[$i] = $associated_products[$i]['hdnProductId'.$i];
+	$qty[$i] = $associated_products[$i]['qty'.$i];
+	$unit_price[$i] = number_format($associated_products[$i]['unitPrice'.$i],2,'.',',');
+	$list_price[$i] = number_format($associated_products[$i]['listPrice'.$i],2,'.',',');
+	$list_pricet[$i] = $associated_products[$i]['listPrice'.$i];
+	$discount_total[$i] = $associated_products[$i]['discountTotal'.$i];
+	
+	$taxable_total = $qty[$i]*$list_pricet[$i]-$discount_total[$i];
+
+	$producttotal = $taxable_total;
+	$total_taxes = '0.00';
+	if($focus->column_fields["hdnTaxType"] == "individual")
+	{
+		$total_tax_percent = '0.00';
+		//This loop is to get all tax percentage and then calculate the total of all taxes
+		for($tax_count=0;$tax_count<count($associated_products[$i]['taxes']);$tax_count++)
+		{
+			$tax_percent = $associated_products[$i]['taxes'][$tax_count]['percentage'];
+			$total_tax_percent = $total_tax_percent+$tax_percent;
+			$tax_amount = (($taxable_total*$tax_percent)/100);
+			$total_taxes = $total_taxes+$tax_amount;
+		}
+		$producttotal = $taxable_total+$total_taxes;
+		$product_line[$j]["Tax"] = number_format($total_taxes,2,'.',',')."\n ($total_tax_percent %) ";
+	}
+	$prod_total[$i] = number_format($producttotal,2,'.',',');
+
+	$product_line[$j]["Product Name"] = $product_name[$i];
+	$product_line[$j]["Description"] = $prod_description[$i];
+	$product_line[$j]["Qty"] = $qty[$i];
+	$product_line[$j]["Price"] = $list_price[$i];
+	$product_line[$j]["Discount"] = $discount_total[$i];
+	$product_line[$j]["Total"] = $prod_total[$i];
+}
+//echo '<pre>Product Details ==>';print_r($product_line);echo '</pre>';
+//echo '<pre>';print_r($associated_products);echo '</pre>';
+
+
+//Population of Product Details - Ends
 
 
 // ************************ END POPULATE DATA ***************************8

Modified: vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php Tue Sep  5 11:52:32 2006
@@ -77,90 +77,115 @@
 		$logo_name = $adb->query_result($result,0,"logoname");
 }
 
-//getting the Total Array
-$price_subtotal = $currency_symbol.number_format($focus->column_fields["hdnSubTotal"],2,'.',',');
-$price_salestax = $focus->column_fields["txtTax"]."%";
-if($price_salestax != "")
-        $price_salestax = $currency_symbol."0.00";
-
+//Population of Product Details - Starts
+
+//we can cut and paste the following lines in a file and include that file here is enough. For that we have to put a new common file. we will do this later
+//NOTE : Removed currency symbols and added with Grand Total text. it is enough to show the currency symbol in one place
+
+//we can also get the NetTotal, Final Discount Amount/Percent, Adjustment and GrandTotal from the array $associated_products[1]['final_details']
+
+//getting the Net Total
+$price_subtotal = number_format($focus->column_fields["hdnSubTotal"],2,'.',',');
+
+//Final discount amount/percentage
 $discount_amount = $focus->column_fields["hdnDiscountAmount"];
 $discount_percent = $focus->column_fields["hdnDiscountPercent"];
 
-$price_shipping = $currency_symbol.number_format($focus->column_fields["hdnS_H_Amount"],2,'.',',');
-if($price_shipping > 0 || price_shipping == "")
-        $price_shipping = $currency_symbol."0.00";
-
-$q = "SELECT * FROM vtiger_inventoryshippingrel WHERE id='".$focus->column_fields["record_id"]."'";
-$shrs = $adb->query($q);
-$shtax1 = $adb->query_result($shrs,'0','shtax1');
-$shtax2 = $adb->query_result($shrs,'0','shtax2');
-$shtax3 = $adb->query_result($shrs,'0','shtax3');
-if($shtax1 != "" && $shtax1 != "0.00")
-        $price_shipping_tax = number_format($shtax1,2,'.',',')."%";
-if($shtax2 != "" && $shtax2 != "0.00")
-        $price_shipping_tax = number_format($shtax2,2,'.',',')."%";
-if($shtax3 != "" && $shtax3 != "0.00")
-        $price_shipping_tax = number_format($shtax3,2,'.',',')."%";
-
-
 if($discount_amount != "")
-        $price_discount = $currency_symbol.number_format($discount_amount,2,'.',',');
+	$price_discount = number_format($discount_amount,2,'.',',');
 else if($discount_percent != "")
-        $price_discount = $discount_percent."%";
+	$price_discount = $discount_percent."%";
 else
-        $price_discount = $currency_symbol."0.00";
-
-
-$price_adjustment = $currency_symbol.number_format($focus->column_fields["txtAdjustment"],2,'.',',');
-$price_total = $currency_symbol.number_format($focus->column_fields["hdnGrandTotal"],2,'.',',');
-
-//getting the Product Data
-$query="select vtiger_products.productname, vtiger_products.unit_price, vtiger_products.product_description, vtiger_inventoryproductrel.* from vtiger_inventoryproductrel inner join vtiger_products on vtiger_products.productid=vtiger_inventoryproductrel.productid where id=".$id;
-
-global $result;
-$result = $adb->query($query);
-$num_products=$adb->num_rows($result);
-for($i=0;$i<$num_products;$i++) {
-	$product_name[$i]=$adb->query_result($result,$i,'productname');
-	$prod_description[$i]=$adb->query_result($result,$i,'product_description');
-	$product_id[$i]=$adb->query_result($result,$i,'productid');
-	$qty[$i]=$adb->query_result($result,$i,'quantity');
-
-	$unit_price[$i]= $currency_symbol.number_format($adb->query_result($result,$i,'unit_price'),2,'.',',');
-	$list_price[$i]= $currency_symbol.number_format(StripLastZero($adb->query_result($result,$i,'listprice')),2,'.',',');
-	$list_pricet[$i]= $adb->query_result($result,$i,'listprice');
-	$prod_total[$i]= $qty[$i]*$list_pricet[$i];
-
-        $total_taxes = '0.00';
-        if($focus->column_fields["hdnTaxType"] == "individual") {
-                $q = "SELECT * FROM vtiger_inventoryproductrel WHERE id='".$focus->column_fields["record_id"]."' AND productid='".$product_id[$i]."'";
-                $trs = $adb->query($q);
-                $tax1 = $adb->query_result($trs,'0','tax1');
-                $tax2 = $adb->query_result($trs,'0','tax2');
-                $tax3 = $adb->query_result($trs,'0','tax3');
-                $taxable_total = ($adb->query_result($trs,'0','listprice') * $adb->query_result($trs,'0','quantity'));
-
-                if($tax1 != "" && $tax1 > 0) {
-                        $total_taxes = (($taxable_total*$tax1)/100);
-                        $prod_total[$i] = ($prod_total[$i]+$total_taxes);
-                }
-                if($tax2 != "" && $tax2 > 0) {
-                        $total_taxes = (($taxable_total*$tax2)/100);
-                        $prod_total[$i] = ($prod_total[$i]+$total_taxes);
-                }
-                if($tax3 != "" && $tax3 > 0) {
-                        $total_taxes = (($taxable_total*$tax3)/100);
-                        $prod_total[$i] = ($prod_total[$i]+$total_taxes);
-                }
-                $product_line[$i]["Tax"] = $total_taxes."%";
-        }
-        $product_line[$i]["Product Name"] = $product_name[$i];
-        $product_line[$i]["Description"] = $prod_description[$i];
-        $product_line[$i]["Qty"] = $qty[$i];
-        $product_line[$i]["Price"] = $list_price[$i];
-        $product_line[$i]["Total"] = $currency_symbol.number_format($prod_total[$i],"2",".",",");
-
-}
+	$price_discount = "0.00";
+
+//Adjustment
+$price_adjustment = number_format($focus->column_fields["txtAdjustment"],2,'.',',');
+//Grand Total
+$price_total = number_format($focus->column_fields["hdnGrandTotal"],2,'.',',');
+
+
+//get the Associated Products for this Invoice
+$focus->id = $focus->column_fields["record_id"];
+$associated_products = getAssociatedProducts("SalesOrder",$focus);
+$num_products = count($associated_products);
+
+//This $final_details array will contain the final total, discount, Group Tax, S&H charge, S&H taxes and adjustment
+$final_details = $associated_products[1]['final_details'];
+
+//To calculate the group tax amount
+if($final_details['taxtype'] == 'group')
+{
+	$group_tax_total = $final_details['tax_totalamount'];
+	$price_salestax = number_format($group_tax_total,2,'.',',');
+
+	$group_total_tax_percent = '0.00';
+	$group_tax_details = $final_details['taxes'];
+	for($i=0;$i<count($group_tax_details);$i++)
+	{
+		$group_total_tax_percent = $group_total_tax_percent+$group_tax_details[$i]['percentage'];
+	}
+}
+
+//S&H amount
+$sh_amount = $final_details['shipping_handling_charge'];
+$price_shipping = number_format($sh_amount,2,'.',',');
+
+//S&H taxes
+$sh_tax_details = $final_details['sh_taxes'];
+$sh_tax_percent = '0.00';
+for($i=0;$i<count($sh_tax_details);$i++)
+{
+	$sh_tax_percent = $sh_tax_percent + $sh_tax_details[$i]['percentage'];
+}
+$sh_tax_amount = $final_details['shtax_totalamount'];
+$price_shipping_tax = number_format($sh_tax_amount,2,'.',',');
+
+
+//This is to get all prodcut details as row basis
+for($i=1,$j=$i-1;$i<=$num_products;$i++,$j++)
+{
+	$product_name[$i] = $associated_products[$i]['productName'.$i];
+	$prod_description[$i] = $associated_products[$i]['productDescription'.$i];
+	$product_id[$i] = $associated_products[$i]['hdnProductId'.$i];
+	$qty[$i] = $associated_products[$i]['qty'.$i];
+	$unit_price[$i] = number_format($associated_products[$i]['unitPrice'.$i],2,'.',',');
+	$list_price[$i] = number_format($associated_products[$i]['listPrice'.$i],2,'.',',');
+	$list_pricet[$i] = $associated_products[$i]['listPrice'.$i];
+	$discount_total[$i] = $associated_products[$i]['discountTotal'.$i];
+	
+	$taxable_total = $qty[$i]*$list_pricet[$i]-$discount_total[$i];
+
+	$producttotal = $taxable_total;
+	$total_taxes = '0.00';
+	if($focus->column_fields["hdnTaxType"] == "individual")
+	{
+		$total_tax_percent = '0.00';
+		//This loop is to get all tax percentage and then calculate the total of all taxes
+		for($tax_count=0;$tax_count<count($associated_products[$i]['taxes']);$tax_count++)
+		{
+			$tax_percent = $associated_products[$i]['taxes'][$tax_count]['percentage'];
+			$total_tax_percent = $total_tax_percent+$tax_percent;
+			$tax_amount = (($taxable_total*$tax_percent)/100);
+			$total_taxes = $total_taxes+$tax_amount;
+		}
+		$producttotal = $taxable_total+$total_taxes;
+		$product_line[$j]["Tax"] = number_format($total_taxes,2,'.',',')."\n ($total_tax_percent %) ";
+	}
+	$prod_total[$i] = number_format($producttotal,2,'.',',');
+
+	$product_line[$j]["Product Name"] = $product_name[$i];
+	$product_line[$j]["Description"] = $prod_description[$i];
+	$product_line[$j]["Qty"] = $qty[$i];
+	$product_line[$j]["Price"] = $list_price[$i];
+	$product_line[$j]["Discount"] = $discount_total[$i];
+	$product_line[$j]["Total"] = $prod_total[$i];
+}
+//echo '<pre>Product Details ==>';print_r($product_line);echo '</pre>';
+//echo '<pre>';print_r($associated_products);echo '</pre>';
+
+
+//Population of Product Details - Ends
+
 
 // ************************ END POPULATE DATA ***************************8
 




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 13:54:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 17:54:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9296 - in
 /vtigercrmoutlook/trunk/vtigercrmoladdin/source: frmAbout.frm
 frmSyncDetails.frm modDoSync.bas service.DCA vtigeroladdin.vbp
 vtigeroladdin.vbw
Message-ID: <20060905175437.CCFD876CEAA@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep  5 11:54:21 2006
New Revision: 9296

Log:
Contacts without lastname and calendar with out subject are not synchronised --Jeri

Modified:
    vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmAbout.frm
    vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmSyncDetails.frm
    vtigercrmoutlook/trunk/vtigercrmoladdin/source/modDoSync.bas
    vtigercrmoutlook/trunk/vtigercrmoladdin/source/service.DCA
    vtigercrmoutlook/trunk/vtigercrmoladdin/source/vtigeroladdin.vbp
    vtigercrmoutlook/trunk/vtigercrmoladdin/source/vtigeroladdin.vbw

Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmAbout.frm
==============================================================================
Binary files - no diff available.

Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmSyncDetails.frm
==============================================================================
Binary files - no diff available.

Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/modDoSync.bas
==============================================================================
Binary files - no diff available.

Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/service.DCA
==============================================================================
Binary files - no diff available.

Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/vtigeroladdin.vbp
==============================================================================
Binary files - no diff available.

Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/vtigeroladdin.vbw
==============================================================================
Binary files - no diff available.




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 14:22:52 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 18:22:52 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9297 -
	/vtigercrm/trunk/jscalendar/lang/calendar-de.js
Message-ID: <20060905182252.EF26676CEFE@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 12:22:49 2006
New Revision: 9297

Log:
i18n issue for jscalendar fix given by frank integrated -- ahmed

Modified:
    vtigercrm/trunk/jscalendar/lang/calendar-de.js

Modified: vtigercrm/trunk/jscalendar/lang/calendar-de.js
==============================================================================
--- vtigercrm/trunk/jscalendar/lang/calendar-de.js (original)
+++ vtigercrm/trunk/jscalendar/lang/calendar-de.js Tue Sep  5 12:22:49 2006
@@ -3,16 +3,7 @@
 // Feel free to use / redistribute under the GNU LGPL.
 // ** I18N
 
-// short day names
-Calendar._SDN = new Array
-("So",
- "Mo",
- "Di",
- "Mi",
- "Do",
- "Fr",
- "Sa",
- "So");
+
 
 // full day names
 Calendar._DN = new Array
@@ -24,6 +15,17 @@
  "Freitag",
  "Samstag",
  "Sonntag");
+ 
+// short day names
+Calendar._SDN = new Array
+("So",
+ "Mo",
+ "Di",
+ "Mi",
+ "Do",
+ "Fr",
+ "Sa",
+ "So"); 
 
 // short day names only use 2 letters instead of 3
 Calendar._SDN_len = 2;
@@ -32,7 +34,8 @@
 Calendar._MN = new Array
 ("Januar",
  "Februar",
- "M\u00e4rz",
+ "M?rz",
+// "M\u00e4rz",
  "April",
  "Mai",
  "Juni",
@@ -47,7 +50,8 @@
 Calendar._SMN = new Array
 ("Jan",
  "Feb",
- "M\u00e4r",
+ "M?r",
+// "M\u00e4r",
  "Apr",
  "Mai",
  "Jun",
@@ -60,42 +64,50 @@
 
 // tooltips
 Calendar._TT = {};
+Calendar._TT["INFO"] = "?ber den Kalender";
 
 Calendar._TT["ABOUT"] =
-"DHTML Datum/Zeit Selector\n" +
+"DHTML Date/Time Selector\n" +
 "(c) dynarch.com 2002-2003\n" + // don't translate this this ;-)
-"Donwload neueste Version: http://dynarch.com/mishoo/calendar.epl\n" +
+"For latest version visit: http://dynarch.com/mishoo/calendar.epl\n" +
 "Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
 "\n\n" +
 "Datumsauswahl:\n" +
-"- Jahr ausw\u00e4hlen mit \xab und \xbb\n" +
-"- Monat ausw\u00e4hlen mit " + String.fromCharCode(0x2039) + " und " + String.fromCharCode(0x203a) + "\n" +
-"- Fr Auswahl aus Liste Maustaste gedr\u00fcckt halten.";
+"- Benutze die \xab, \xbb Buttons um das Jahr auszuw?hlen\n" +
+"- Benutze die " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " Buttons um einen Monat auszuw?hlen\n" +
+"- F?r eine schnellere Auswahl, halte die Maus ?ber einen dieser Buttons gedr?ckt.";
 
 Calendar._TT["ABOUT_TIME"] = "\n\n" +
-"Zeit w\u00e4hlen:\n" +
-"- Stunde/Minute weiter mit Mausklick\n" +
-"- Stunde/Minute zurck mit Shift-Mausklick\n" +
-"- oder f\u00fcr schnellere Auswahl nach links oder rechts ziehen.";
+"Time selection:\n" +
+"- Click on any of the time parts to increase it\n" +
+"- or Shift-click to decrease it\n" +
+"- or click and drag for faster selection.";
 
+Calendar._TT["PREV_YEAR"] = "Vorheriges Jahr (halte f?r Men?)";
+Calendar._TT["PREV_MONTH"] = "Vorheriger Monat (halte f?r Men?)";
+Calendar._TT["GO_TODAY"] = "Heute";
+Calendar._TT["NEXT_MONTH"] = "N?chster Monat (halte f?r Men?)";
+Calendar._TT["NEXT_YEAR"] = "N?chstes Jahr (halte f?r Men?)";
+Calendar._TT["SEL_DATE"] = "Datum ausw?hlen";
+Calendar._TT["DRAG_TO_MOVE"] = "Zum Verschieben festhalten";
+Calendar._TT["PART_TODAY"] = " (heute)";
 
-Calendar._TT["TOGGLE"] = "Ersten Tag der Woche w\u00e4hlen";
-Calendar._TT["PREV_YEAR"] = "Jahr zur\u00fcck (halten -> Auswahlmen\u00fc)";
-Calendar._TT["PREV_MONTH"] = "Monat zur\u00fcck (halten -> Auswahlmen\u00fc)";
-Calendar._TT["GO_TODAY"] = "Gehe zum heutigen Datum";
-Calendar._TT["NEXT_MONTH"] = "Monat vor (halten -> Auswahlmen\u00fc)";
-Calendar._TT["NEXT_YEAR"] = "Jahr vor (halten -> Auswahlmen\u00fc)";
-Calendar._TT["SEL_DATE"] = "Datum ausw\u00e4hlen";
-Calendar._TT["DRAG_TO_MOVE"] = "Klicken und halten um zu verschieben";
-Calendar._TT["PART_TODAY"] = " (heute)";
-Calendar._TT["MON_FIRST"] = "Wochenanzeige mit Montag beginnen";
-Calendar._TT["SUN_FIRST"] = "Wochenanzeige mit Sonntag beginnen";
-Calendar._TT["CLOSE"] = "Schlie\u00dfen";
-Calendar._TT["TODAY"] = "Heute";
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "%s zuerst anzeigen";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
 Calendar._TT["WEEKEND"] = "0,6";
 
+Calendar._TT["CLOSE"] = "Schliessen";
+Calendar._TT["TODAY"] = "Heute";
+Calendar._TT["TIME_PART"] = "(Shift-)Klick oder festhalten um Wert zu ?ndern";
+
 // date formats
-Calendar._TT["DEF_DATE_FORMAT"] = "dd-mm-y";
-Calendar._TT["TT_DATE_FORMAT"] = "Datum ausw\u00e4hlen";
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
 
-Calendar._TT["WK"] = "KW";
+Calendar._TT["WK"] = "wk";
+Calendar._TT["TIME"] = "Zeit:";




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 16:17:35 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 20:17:35 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9298 -
	/vtigercrm/trunk/modules/Users/Authenticate.php
Message-ID: <20060905201735.CBE4D76CF0E@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep  5 14:17:27 2006
New Revision: 9298

Log:
Removed the writing of security info in session

Modified:
    vtigercrm/trunk/modules/Users/Authenticate.php

Modified: vtigercrm/trunk/modules/Users/Authenticate.php
==============================================================================
--- vtigercrm/trunk/modules/Users/Authenticate.php (original)
+++ vtigercrm/trunk/modules/Users/Authenticate.php Tue Sep  5 14:17:27 2006
@@ -69,20 +69,10 @@
         $loghistory=new LoginHistory();
         $Signin = $loghistory->user_login($focus->column_fields["user_name"],$usip,$intime);
 
-	// save the user information into the session
-	// go to the home screen
 	//Security related entries start
 	require_once('include/utils/UserInfoUtil.php');
-	$profileid = fetchUserProfileId($focus->id);	
 
 	createUserPrivilegesfile($focus->id);
-		
-	$_SESSION['authenticated_user_profileid'] = $profileid;
-	setGlobalProfilePermission2Session($profileid);
-        setPermittedTabs2Session($profileid);
-	setPermittedActions2Session($profileid);
-	setPermittedDefaultSharingAction2Session($profileid);
-	
 	
 	//Security related entries end
 	header("Location: index.php?action=index&module=Home");




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 16:20:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 20:20:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9299 -
	/vtigercrm/trunk/modules/Users/User.php
Message-ID: <20060905202002.996EF76CF48@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep  5 14:19:54 2006
New Revision: 9299

Log:
Removed unwanted variables

Modified:
    vtigercrm/trunk/modules/Users/User.php

Modified: vtigercrm/trunk/modules/Users/User.php
==============================================================================
--- vtigercrm/trunk/modules/Users/User.php (original)
+++ vtigercrm/trunk/modules/Users/User.php Tue Sep  5 14:19:54 2006
@@ -45,51 +45,13 @@
 	var $db;
 	// Stored fields
 	var $id;
-	var $user_name;
-	var $user_password;
-	var $cal_color;
-	var $hour_format;
-	var $start_hour;
-	var $end_hour;
-	var $first_name;
-	var $last_name;
-	var $date_entered;
-	var $date_modified;
-	var $modified_user_id;
-	var $description;
-	var $phone_home;
-	var $phone_mobile;
-	var $phone_work;
-	var $currency_id;
-	var $phone_other;
-	var $phone_fax;
-	var $email1;
-	var $email2;
-	var $yahoo_id;
-	var $address_street;
-	var $address_city;
-	var $address_state;
-	var $address_postalcode;
-	var $address_country;
-	var $tz;
-	var $holidays;
-	var $namedays;
-	var $workdays;
-	var $weekstart;
-	var $status;
-	var $title;
-	var $department;
 	var $authenticated = false;
 	var $error_string;
 	var $is_admin;
-	var $date_format;
 	var $deleted;
 	var $homeorder;
 
-	var $reports_to_name;
-	var $reports_to_id;
-
-	var $module_id='id';
+
 	var $tab_name = Array('vtiger_users','vtiger_attachments','vtiger_user2role');	
 	var $tab_name_index = Array('vtiger_users'=>'id','vtiger_attachments'=>'attachmentsid','vtiger_user2role'=>'userid');
 	var $column_fields = Array('user_name'=>'','is_admin' =>'','user_password'=>'','confirm_password'=>'',
@@ -146,10 +108,6 @@
 
 	var $object_name = "User";
 	var $user_preferences;
-	var $activity_view;
-	var $lead_view;
-	var $tagcloud;
-	var $imagename;
 	var $defhomeview;
 	var $homeorder_array = array('ALVT','HDB','PLVT','QLTQ','CVLVT','HLT','OLV','GRT','OLTSO','ILTI','MNL','OLTPO','LTFAQ');
 




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep  5 19:02:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 05 Sep 2006 23:02:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9300 -
	/vtigercrm/trunk/soap/wordplugin.php
Message-ID: <20060905230250.0187E76D02E@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep  5 17:02:43 2006
New Revision: 9300

Log:
Issue in WordPlugin has been fixed --Jeri

Modified:
    vtigercrm/trunk/soap/wordplugin.php

Modified: vtigercrm/trunk/soap/wordplugin.php
==============================================================================
--- vtigercrm/trunk/soap/wordplugin.php (original)
+++ vtigercrm/trunk/soap/wordplugin.php Tue Sep  5 17:02:43 2006
@@ -16,6 +16,7 @@
 
 $log = &LoggerManager::getLogger('wordplugin');
 
+error_reporting(0);
 $NAMESPACE = 'http://www.vtiger.com/vtigercrm/';
 $server = new soap_server;
 $accessDenied = "You are not permitted to perform this action";
@@ -321,24 +322,31 @@
 
 function create_session($user_name, $password)
 { 
-  	global $adb;
+  	global $adb,$log;
 	require_once('modules/Users/User.php');
 	$objuser = new User();
 	if($password != "" && $user_name != '')
 	{
 		$objuser->column_fields['user_name'] = $user_name;
-		$objuser->load_user($password);
-		if($objuser->is_authenticated())
+		$encrypted_password = $objuser->encrypt_password($password);
+		$query = "select id from vtiger_users where user_name='$user_name' and user_password='$encrypted_password'";
+		$result = $adb->query($query);
+		if($adb->num_rows($result) > 0)
 		{
-		  return "TempSessionID";
+			$return_access = "TempSessionID";
+			$log->debug("Logged in sucessfully from wordplugin");
 		}else
 		{
-			return "false";
+			$return_access = "false";
+			$log->debug("Logged in failure from wordplugin");
 		}
 	}else
 	{
-			return "false";
-	}
+		$return_access = "false";
+		$log->debug("Logged in failure from wordplugin");
+     }
+   return $return_access;
+		
 }
 
 function end_session($user_name)
@@ -349,6 +357,6 @@
 
 
 
-$server->service($HTTP_RAW_POST_DATA); 
+$server->service(utf8_encode($HTTP_RAW_POST_DATA)); 
 exit(); 
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep  6 01:18:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 06 Sep 2006 05:18:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9301 -
 /vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php
Message-ID: <20060906051857.A9BCA76D064@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 23:18:54 2006
New Revision: 9301

Log:
V~0 and C~0 changed to V~O and C~O  --Minnie

Modified:
    vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php

Modified: vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php (original)
+++ vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php Tue Sep  5 23:18:54 2006
@@ -212,19 +212,19 @@
         {	 
                  $uitype = 56;	 
                  $type = "C(3) default 0"; //adodb type	 
-                 $uichekdata='C~0';	 
+                 $uichekdata='C~O';	 
         }
 	elseif($fldType == 'TextArea')	 
         {	 
                  $uitype = 21;	 
                  $type = "X"; //adodb type	 
-                 $uichekdata='V~0';	 
+                 $uichekdata='V~O';	 
         }
 	elseif($fldType == 'MultiSelectCombo')
 	{
 		 $uitype = 33;
 		 $type = "X"; //adodb type
-		 $uichekdata='V~0';
+		 $uichekdata='V~O';
 	}
 	// No Decimal Pleaces Handling
 




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep  6 01:31:19 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 06 Sep 2006 05:31:19 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9302 -
	/vtigercrm/trunk/modules/Calendar/addEventUI.php
Message-ID: <20060906053120.11BED76D06B@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 23:31:15 2006
New Revision: 9302

Log:
location field has been added --Minnie

Modified:
    vtigercrm/trunk/modules/Calendar/addEventUI.php

Modified: vtigercrm/trunk/modules/Calendar/addEventUI.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/addEventUI.php (original)
+++ vtigercrm/trunk/modules/Calendar/addEventUI.php Tue Sep  5 23:31:15 2006
@@ -228,6 +228,10 @@
 			<tr>
 				<td valign="top" align="right"><b><?php echo $mod_strings['Description']?></b></td>
 				<td align="left"><textarea style = "width:100%; height : 60px;" name="description"></textarea></td>
+			</tr>
+			<tr>
+				<td nowrap align="right"><b><?php echo $mod_strings['Location']?></b></td>
+				<td align="left"><input name="location" type="text" class="textbox" value="" style="width:50%"></td>
 			</tr>
 			<tr>
 				<td colspan=2 width=80% align="center">




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep  6 01:35:18 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 06 Sep 2006 05:35:18 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9303 - in
 /vtigercrm/trunk/Smarty/templates: ActivityDetailView.tpl
 ActivityEditView.tpl
Message-ID: <20060906053518.99CAB76D074@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 23:35:14 2006
New Revision: 9303

Log:
location field has been added --Minnie

Modified:
    vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl
    vtigercrm/trunk/Smarty/templates/ActivityEditView.tpl

Modified: vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl Tue Sep  5 23:35:14 2006
@@ -123,6 +123,10 @@
 								<td align="right" width="20%" nowrap valign="top"><b>{$LABEL.description}</b></td>
 								<td valign="top" align="left" colspan="3" height="60px">{$ACTIVITYDATA.description}</td>
 							 </tr>
+							 <tr>
+                                                                <td width="20%" align="right"><b>{$LABEL.location}</b></td>
+                                                                <td valign="top" align="left" colspan="3">{$ACTIVITYDATA.location}</td>
+                                                         </tr>
 							 <tr>
 								<td colspan=2 width=80% align="center">
 								<table border=0 cellspacing=0 cellpadding=3 width=80%>

Modified: vtigercrm/trunk/Smarty/templates/ActivityEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ActivityEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ActivityEditView.tpl Tue Sep  5 23:35:14 2006
@@ -129,6 +129,10 @@
                         					<td valign="top" nowrap align="right"><b>{$LABEL.description}</b></td>
 								<td align="left"><textarea style="width:100%; height : 60px;" name="description">{$ACTIVITYDATA.description}</textarea></td>
                 					</tr>
+							<tr>
+								<td valign="top" nowrap align="right"><b>{$LABEL.location}</b></td>
+								 <td align="left"><input type="text" class="textbox" name="location" id ="location" value="{$ACTIVITYDATA.location}" style="width:50%"></td>
+							</tr>
 							<tr>
 								<td colspan=2 width=80% align="center">
                                 				<table border=0 cellspacing=0 cellpadding=3 width=80%>
@@ -392,7 +396,7 @@
 											</tr>
 											<tr>
 												<td nowrap align=right>
-													{$MOD.LBL_SDRMD} :
+													{$MOD.LBL_SDRMD}
 												</td>
 												<td >
 													<input type=text name="toemail" class=textbox style="width:90%" value="{$USEREMAILID}">
@@ -407,7 +411,7 @@
 									<table border=0 cellspacing=0 cellpadding=2  width=100%>
 										<tr>
 											<td nowrap align=right width=20% valign=top>
-												<strong>{$MOD.LBL_REPEAT} :</strong>
+												<strong>{$MOD.LBL_REPEAT}</strong>
 											</td>
 											<td nowrap width=80% valign=top>
 												<table border=0 cellspacing=0 cellpadding=0>
@@ -515,7 +519,7 @@
 						<div id="addEventRelatedtoUI" style="display:none;width:100%">
 						<table width="100%" cellpadding="5" cellspacing="0" border="0">
 							<tr>
-								<td><b>{$MOD.LBL_RELATEDTO} :</b></td>
+								<td><b>{$MOD.LBL_RELATEDTO}</b></td>
 								<td>
 									<input name="parent_id" type="hidden" value="{$secondvalue.parent_id}">
 									<select name="parent_type" class="small" id="parent_type" onChange="document.EditView.parent_name.value='';document.EditView.parent_id.value=''">
@@ -532,7 +536,7 @@
 								</td>
 							</tr>
 							<tr>
-								<td><b>{$APP.Contacts} :</b></td>
+								<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">
@@ -730,7 +734,7 @@
 			<div id="addTaskRelatedtoUI" style="display:none;width:100%">
            		     <table width="100%" cellpadding="5" cellspacing="0" border="0">
                 	     <tr>
-                        	     <td><b>{$MOD.LBL_RELATEDTO} :</b></td>
+                        	     <td><b>{$MOD.LBL_RELATEDTO}</b></td>
                                      <td>
 					<input name="parent_id" type="hidden" value="{$secondvalue.parent_id}">
                                              <select name="parent_type" class="small" id="parent_type" onChange="document.EditView.parent_name.value='';document.EditView.parent_id.value=''">
@@ -747,7 +751,7 @@
                                      </td>
 			     </tr>
 			     <tr>
-                                     <td><b>{$LABEL.contact_id} :</b></td>
+                                     <td><b>{$LABEL.contact_id}</b></td>
 				     <td colspan="2">
 						<input name="contact_name" readonly type="text" class="calTxt" value="{$ACTIVITYDATA.contact_id}"><input name="contact_id" type="hidden" value="{$secondvalue.contact_id}">&nbsp;
 						<input type="button" onclick="return window.open('index.php?module=Contacts&action=Popup&html=Popup_picker&popuptype=specific&form=EditView','test','width=640,height=602,resizable=0,scrollbars=0');" class="crmButton small edit" name="selectcnt" value="Select Contact">




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep  6 01:38:07 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 06 Sep 2006 05:38:07 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9304 -
	/vtigercrm/trunk/modules/Calendar/DetailView.php
Message-ID: <20060906053807.59D2A76D074@vtiger.fosslabs.com>

Author: saraj
Date: Tue Sep  5 23:38:03 2006
New Revision: 9304

Log:
location field has been added --Minnie

Modified:
    vtigercrm/trunk/modules/Calendar/DetailView.php

Modified: vtigercrm/trunk/modules/Calendar/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/DetailView.php (original)
+++ vtigercrm/trunk/modules/Calendar/DetailView.php Tue Sep  5 23:38:03 2006
@@ -152,6 +152,7 @@
 	$data['visibility'] = $finaldata['visibility'];
 	$data['eventstatus'] = $finaldata['eventstatus'];
 	$data['activitytype'] = $finaldata['activitytype'];
+	$data['location'] = $finaldata['location'];
 	//Calculating reminder time
 	$rem_days = 0;
 	$rem_hrs = 0;




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep  6 02:06:53 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 06 Sep 2006 06:06:53 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9305 -
 /vtigercrm/tags/vtigercrm-4.2.4/modules/Leads/LeadConvertToEntities.php
Message-ID: <20060906060653.B4D9976D085@vtiger.fosslabs.com>

Author: allanbush
Date: Wed Sep  6 00:06:51 2006
New Revision: 9305

Log:
Reverted changeset:9127 as that change was not part of the 4.2.4 release.

Modified:
    vtigercrm/tags/vtigercrm-4.2.4/modules/Leads/LeadConvertToEntities.php

Modified: vtigercrm/tags/vtigercrm-4.2.4/modules/Leads/LeadConvertToEntities.php
==============================================================================
--- vtigercrm/tags/vtigercrm-4.2.4/modules/Leads/LeadConvertToEntities.php (original)
+++ vtigercrm/tags/vtigercrm-4.2.4/modules/Leads/LeadConvertToEntities.php Wed Sep  6 00:06:51 2006
@@ -279,7 +279,7 @@
 $adb->query($sql_insert_contact);
 
 
-$sql_insert_contactsubdetails = "INSERT INTO contactsubdetails (contactsubscriptionid,homephone,otherphone,leadsource) VALUES (".$contact_id.",'','',".$adb->quote($row['leadsource']).")";
+$sql_insert_contactsubdetails = "INSERT INTO contactsubdetails (contactsubscriptionid,homephone,otherphone,leadsource) VALUES (".$contact_id.",'','','".$adb->quote($row['leadsource'])."')";
 
 $adb->query($sql_insert_contactsubdetails);
 




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep  6 02:41:46 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 06 Sep 2006 06:41:46 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9306 -
 /vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php
Message-ID: <20060906064146.AD2F976D05D@vtiger.fosslabs.com>

Author: saraj
Date: Wed Sep  6 00:41:42 2006
New Revision: 9306

Log:
T added

Modified:
    vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php

Modified: vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php (original)
+++ vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php Wed Sep  6 00:41:42 2006
@@ -946,6 +946,7 @@
                                 , 'Q'
                                 , 'R'
                                 , 'S'
+                                , 'T'
                                 , 'U'
                                 , 'V'
                                 , 'W'




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep  6 02:43:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 06 Sep 2006 06:43:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9307 -
 /vtigercrm/branches/4.2/modules/Reports/ReportColumns.php
Message-ID: <20060906064357.422A776D05D@vtiger.fosslabs.com>

Author: allanbush
Date: Wed Sep  6 00:43:54 2006
New Revision: 9307

Log:
Fixed typo in $fieldlabel variable name.  Refs #1989.

Modified:
    vtigercrm/branches/4.2/modules/Reports/ReportColumns.php

Modified: vtigercrm/branches/4.2/modules/Reports/ReportColumns.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Reports/ReportColumns.php (original)
+++ vtigercrm/branches/4.2/modules/Reports/ReportColumns.php Wed Sep  6 00:43:54 2006
@@ -99,7 +99,7 @@
 			{
 				foreach($ogReport->sec_module_columnslist[$secmodule[$i]][$key] as $field=>$fieldlabel)
 				{
-					if(isset($mod_strings[$fieldlable]))
+					if(isset($mod_strings[$fieldlabel]))
 					{
 					$shtml .= "<option value=\"".$field."\">".$mod_strings[$fieldlabel]."</option>";
 					}else




From allan.bush+vtiger_dev at gmail.com  Wed Sep  6 02:49:44 2006
From: allan.bush+vtiger_dev at gmail.com (Allan Bush)
Date: Tue, 5 Sep 2006 23:49:44 -0700
Subject: [Vtigercrm-commits] [vtiger-commits] r9306 -
	/vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php
In-Reply-To: <20060906064146.AD2F976D05D@vtiger.fosslabs.com>
References: <20060906064146.AD2F976D05D@vtiger.fosslabs.com>
Message-ID: <3bec26390609052349x22d5cfaex6edb8583b046417c@mail.gmail.com>

Umm yeah,

so exactly 35 minutes after I fixed your last fuck up  you do the same
damn thing again.

I understand that english isn't your first language, but please try
and make an effort to understand what's going on.

Does anyone have saraj's personally email address? so I can try and
resolve this problem directly.

Mike, can we just revoke commit privileges to everyone in the tags
directory?  I'm not sure how we'd create tags then though...

On 9/5/06, vtigercrm-commits at vtiger.fosslabs.com
<vtigercrm-commits at vtiger.fosslabs.com> wrote:
> Author: saraj
> Date: Wed Sep  6 00:41:42 2006
> New Revision: 9306
>
> Log:
> T added
>
> Modified:
>     vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php
>
> Modified: vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php
> ==============================================================================
> --- vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php (original)
> +++ vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php Wed Sep  6 00:41:42 2006
> @@ -946,6 +946,7 @@
>                                  , 'Q'
>                                  , 'R'
>                                  , 'S'
> +                                , 'T'
>                                  , 'U'
>                                  , 'V'
>                                  , 'W'
>
>
> _______________________________________________
> vtigercrm-commits mailing list
> vtigercrm-commits at lists.vtigercrm.com
> http://lists.vtigercrm.com/mailman/listinfo/vtigercrm-commits
>


From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep  6 02:51:42 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 06 Sep 2006 06:51:42 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9308 -
 /vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php
Message-ID: <20060906065142.B35A276D05D@vtiger.fosslabs.com>

Author: allanbush
Date: Wed Sep  6 00:51:40 2006
New Revision: 9308

Log:
Reverted changeset:9306 as that change was not part of the 4.2.4 release.

Modified:
    vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php

Modified: vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php (original)
+++ vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php Wed Sep  6 00:51:40 2006
@@ -946,7 +946,6 @@
                                 , 'Q'
                                 , 'R'
                                 , 'S'
-                                , 'T'
                                 , 'U'
                                 , 'V'
                                 , 'W'




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep  6 03:16:33 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 06 Sep 2006 07:16:33 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9309 - in
 /vtigercrm/branches/4.2/include/php_writeexcel:
 class.writeexcel_format.inc.php class.writeexcel_formula.inc.php
Message-ID: <20060906071633.DDEAE76D0AD@vtiger.fosslabs.com>

Author: allanbush
Date: Wed Sep  6 01:16:30 2006
New Revision: 9309

Log:
Fixed php errors using php5 with excel exports.  Closes #2040.  This patch is a little more refined then r8681 which was used on the trunk.

Modified:
    vtigercrm/branches/4.2/include/php_writeexcel/class.writeexcel_format.inc.php
    vtigercrm/branches/4.2/include/php_writeexcel/class.writeexcel_formula.inc.php

Modified: vtigercrm/branches/4.2/include/php_writeexcel/class.writeexcel_format.inc.php
==============================================================================
--- vtigercrm/branches/4.2/include/php_writeexcel/class.writeexcel_format.inc.php (original)
+++ vtigercrm/branches/4.2/include/php_writeexcel/class.writeexcel_format.inc.php Wed Sep  6 01:16:30 2006
@@ -119,7 +119,7 @@
      */
     function copy($other) {
         $xf = $this->_xf_index;   // Backup XF index
-        $this = $other;           // Copy properties
+        $this[] = clone($other);  // Copy properties
         $this->_xf_index = $xf;   // Restore XF index
     }
 

Modified: vtigercrm/branches/4.2/include/php_writeexcel/class.writeexcel_formula.inc.php
==============================================================================
--- vtigercrm/branches/4.2/include/php_writeexcel/class.writeexcel_formula.inc.php (original)
+++ vtigercrm/branches/4.2/include/php_writeexcel/class.writeexcel_formula.inc.php Wed Sep  6 01:16:30 2006
@@ -150,7 +150,7 @@
 
 function set_ext_sheet($key, $value) {
 
-    $this->_ext_sheets->$key = $value;
+    $this->_ext_sheets[$key] = $value;
 }
 
 function isError($data) {




From richie at vtiger.com  Wed Sep  6 03:26:37 2006
From: richie at vtiger.com (Richie)
Date: Wed, 06 Sep 2006 00:26:37 -0700
Subject: [Vtigercrm-commits] [Vtigercrm-developers]
	[vtiger-commits]	r9306
	-	/vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php
In-Reply-To: <3bec26390609052349x22d5cfaex6edb8583b046417c@mail.gmail.com>
References: <20060906064146.AD2F976D05D@vtiger.fosslabs.com>
	<3bec26390609052349x22d5cfaex6edb8583b046417c@mail.gmail.com>
Message-ID: <10d8205736e.-2386127368813020782.8080687821603972621@@vtiger.com>

Allan, 
 
Be warned that you are using abusive language and causing disrespect to 
a member of the community. 
 
We always try and make an effort to understand what is going on regardless of English being our first or last language. 
 
Whatever be the issue, I think, we can deal it like mature and mannered people. 
 
You have done a good job on vtiger-4.2.x but that does not give you the liberty 
to treat people like dirt. 
 
I expect everyone on the list to be couth enough to treat others with respect. Do you not think it would have been better to for saraj's email address so that you could resolve the problem personally instead of what you have done now? 
 
You are good technically, but you need to be a good human being too, which incidentally is most important in life. 
 
Please apologise to saraj on this mailing list and let us get on with it. 
 
If you want to talk to me in person, call me at 18777884437 
or 
Give me your number. I will call you now. 
 
Richie




---- Allan Bush&lt;allan.bush+vtiger_dev at gmail.com&gt; wrote ---- 

  Umm yeah,

so exactly 35 minutes after I fixed your last fuck up you do the same
damn thing again.

I understand that english isn't your first language, but please try
and make an effort to understand what's going on.

Does anyone have saraj's personally email address? so I can try and
resolve this problem directly.

Mike, can we just revoke commit privileges to everyone in the tags
directory? I'm not sure how we'd create tags then though...

On 9/5/06, vtigercrm-commits at vtiger.fosslabs.com
&lt;vtigercrm-commits at vtiger.fosslabs.com&gt; wrote:
&gt; Author: saraj
&gt; Date: Wed Sep 6 00:41:42 2006
&gt; New Revision: 9306
&gt;
&gt; Log:
&gt; T added
&gt;
&gt; Modified:
&gt; vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php
&gt;
&gt; Modified: vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php
&gt; ==============================================================================
&gt; --- vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php (original)
&gt; +++ vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php Wed Sep 6 00:41:42 2006
&gt; @@ -946,6 +946,7 @@
&gt; , 'Q'
&gt; , 'R'
&gt; , 'S'
&gt; + , 'T'
&gt; , 'U'
&gt; , 'V'
&gt; , 'W'
&gt;
&gt;
&gt; _______________________________________________
&gt; vtigercrm-commits mailing list
&gt; vtigercrm-commits at lists.vtigercrm.com
&gt; http://lists.vtigercrm.com/mailman/listinfo/vtigercrm-commits
&gt;
_______________________________________________
Get started with creating presentations online - http://zohoshow.com?vt
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20060906/a0c46610/attachment-0002.html 

From richie at vtiger.com  Wed Sep  6 03:27:54 2006
From: richie at vtiger.com (Richie)
Date: Wed, 06 Sep 2006 00:27:54 -0700
Subject: [Vtigercrm-commits] [Vtigercrm-developers]
	[vtiger-commits]	r9306
	-	/vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php
In-Reply-To: <3bec26390609052349x22d5cfaex6edb8583b046417c@mail.gmail.com>
References: <20060906064146.AD2F976D05D@vtiger.fosslabs.com>
	<3bec26390609052349x22d5cfaex6edb8583b046417c@mail.gmail.com>
Message-ID: <10d82069f66.5974971160233137988.-5465377170316991356@@vtiger.com>

Mike, 
Please put Allan's request on hold. Kindly maintain status quo till further notice please. 
 
I expect this fire to die down fast. 
 
Richie




---- Allan Bush&lt;allan.bush+vtiger_dev at gmail.com&gt; wrote ---- 

  Umm yeah,

so exactly 35 minutes after I fixed your last fuck up you do the same
damn thing again.

I understand that english isn't your first language, but please try
and make an effort to understand what's going on.

Does anyone have saraj's personally email address? so I can try and
resolve this problem directly.

Mike, can we just revoke commit privileges to everyone in the tags
directory? I'm not sure how we'd create tags then though...

On 9/5/06, vtigercrm-commits at vtiger.fosslabs.com
&lt;vtigercrm-commits at vtiger.fosslabs.com&gt; wrote:
&gt; Author: saraj
&gt; Date: Wed Sep 6 00:41:42 2006
&gt; New Revision: 9306
&gt;
&gt; Log:
&gt; T added
&gt;
&gt; Modified:
&gt; vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php
&gt;
&gt; Modified: vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php
&gt; ==============================================================================
&gt; --- vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php (original)
&gt; +++ vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php Wed Sep 6 00:41:42 2006
&gt; @@ -946,6 +946,7 @@
&gt; , 'Q'
&gt; , 'R'
&gt; , 'S'
&gt; + , 'T'
&gt; , 'U'
&gt; , 'V'
&gt; , 'W'
&gt;
&gt;
&gt; _______________________________________________
&gt; vtigercrm-commits mailing list
&gt; vtigercrm-commits at lists.vtigercrm.com
&gt; http://lists.vtigercrm.com/mailman/listinfo/vtigercrm-commits
&gt;
_______________________________________________
Get started with creating presentations online - http://zohoshow.com?vt
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20060906/066e5e13/attachment-0001.html 

From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep  6 03:29:35 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 06 Sep 2006 07:29:35 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9310 -
 /vtigercrm/branches/4.2/modules/Orders/PopupSalesOrder.php
Message-ID: <20060906072935.47CD776D0AD@vtiger.fosslabs.com>

Author: allanbush
Date: Wed Sep  6 01:29:32 2006
New Revision: 9310

Log:
Fixed query error in sales order popup.  Closes #2027.

Modified:
    vtigercrm/branches/4.2/modules/Orders/PopupSalesOrder.php

Modified: vtigercrm/branches/4.2/modules/Orders/PopupSalesOrder.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Orders/PopupSalesOrder.php (original)
+++ vtigercrm/branches/4.2/modules/Orders/PopupSalesOrder.php Wed Sep  6 01:29:32 2006
@@ -238,10 +238,10 @@
 $focus->list_mode="search";
 $focus->popup_type=$popuptype;
 
-$listview_header = getSearchListViewHeader($focus,"SalesOrder",$url_string,$sorder,$order_by);
+$listview_header = getSearchListViewHeader($focus,"Orders",$url_string,$sorder,$order_by);
 $xtpl->assign("LISTHEADER", $listview_header);
 
-$listview_entries = getSearchListViewEntries($focus,"SalesOrder",$list_result,$navigation_array);
+$listview_entries = getSearchListViewEntries($focus,"Orders",$list_result,$navigation_array);
 $xtpl->assign("LISTENTITY", $listview_entries);
 
 if($order_by !='')




From allan.bush+vtiger_dev at gmail.com  Wed Sep  6 03:34:59 2006
From: allan.bush+vtiger_dev at gmail.com (Allan Bush)
Date: Wed, 6 Sep 2006 00:34:59 -0700
Subject: [Vtigercrm-commits] [Vtigercrm-developers] [vtiger-commits]
	r9306 -
	/vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php
In-Reply-To: <6850184341801969779@unknownmsgid>
References: <20060906064146.AD2F976D05D@vtiger.fosslabs.com>
	<3bec26390609052349x22d5cfaex6edb8583b046417c@mail.gmail.com>
	<6850184341801969779@unknownmsgid>
Message-ID: <3bec26390609060034y6f147f7ehe1d129ecb4fdbf4f@mail.gmail.com>

Sorry I may have been a little out of line, I just get frustrated
sometimes having to redo work because of people not paying attentions
to my requests for changes.

Regardless of the tone of my request, there is no reason to every make
changes (other then adding new tags) to anything in the tags folder
and as such making it readonly is probably a good idea.

On 9/6/06, Richie <richie at vtiger.com> wrote:
>
> Mike,
> Please put Allan's request on hold. Kindly maintain status quo till further
> notice please.
>
> I expect this fire to die down fast.
>
> Richie
>
>
>
>
> ---- Allan Bush<allan.bush+vtiger_dev at gmail.com> wrote ----
>
>
>  Umm yeah,
>
> so exactly 35 minutes after I fixed your last fuck up you do the same
> damn thing again.
>
> I understand that english isn't your first language, but please try
> and make an effort to understand what's going on.
>
> Does anyone have saraj's personally email address? so I can try and
> resolve this problem directly.
>
> Mike, can we just revoke commit privileges to everyone in the tags
> directory? I'm not sure how we'd create tags then though...
>
> On 9/5/06, vtigercrm-commits at vtiger.fosslabs.com
> <vtigercrm-commits at vtiger.fosslabs.com> wrote:
> > Author: saraj
> > Date: Wed Sep 6 00:41:42 2006
> > New Revision: 9306
> >
> > Log:
> > T added
> >
> > Modified:
> >
> vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php
> >
> > Modified:
> vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php
> >
> ==============================================================================
> > ---
> vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php
> (original)
> > +++
> vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php
> Wed Sep 6 00:41:42 2006
> > @@ -946,6 +946,7 @@
> > , 'Q'
> > , 'R'
> > , 'S'
> > + , 'T'
> > , 'U'
> > , 'V'
> > , 'W'
> >
> >
> > _______________________________________________
> > vtigercrm-commits mailing list
> > vtigercrm-commits at lists.vtigercrm.com
> >
> http://lists.vtigercrm.com/mailman/listinfo/vtigercrm-commits
> >
> _______________________________________________
> Get started with creating presentations online - http://zohoshow.com?vt
>
>
> _______________________________________________
> Get started with creating presentations online - http://zohoshow.com?vt
>
>


From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep  6 03:57:03 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 06 Sep 2006 07:57:03 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9311 - in
 /vtigercrm/branches/4.2/modules/Reports: ReportRun.php Reports.php
Message-ID: <20060906075703.8403776D0B2@vtiger.fosslabs.com>

Author: allanbush
Date: Wed Sep  6 01:57:00 2006
New Revision: 9311

Log:
Adds Sales Orders to the list of modules reports can be created for.  Closes #94.

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

Modified: vtigercrm/branches/4.2/modules/Reports/ReportRun.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Reports/ReportRun.php (original)
+++ vtigercrm/branches/4.2/modules/Reports/ReportRun.php Wed Sep  6 01:57:00 2006
@@ -1072,6 +1072,7 @@
 				inner join crmentity crmentityQuotes on crmentityQuotes.crmid=quotes.quoteid 
 				inner join quotesbillads on quotes.quoteid=quotesbillads.quotebilladdressid 
 				inner join quotesshipads on quotes.quoteid=quotesshipads.quoteshipaddressid 
+				inner join quotescf on quotes.quoteid=quotescf.quoteid 
 				left join users usersQuotes on usersQuotes.id = crmentityQuotes.smownerid
 				left join users usersRel1 on usersRel1.id = quotes.inventorymanager
 				left join potential potentialRel on potentialRel.potentialid = quotes.potentialid
@@ -1087,6 +1088,7 @@
 				inner join crmentity crmentityOrders on crmentityOrders.crmid=purchaseorder.purchaseorderid 
 				inner join pobillads on purchaseorder.purchaseorderid=pobillads.pobilladdressid 
 				inner join poshipads on purchaseorder.purchaseorderid=poshipads.poshipaddressid 
+				inner join purchaseordercf on purchaseorder.purchaseorderid=purchaseordercf.purchaseorderid 
 				left join users usersOrders on usersOrders.id = crmentityOrders.smownerid 
 				left join vendor vendorRel on vendorRel.vendorid = purchaseorder.vendorid 
 				left join contactdetails contactdetailsOrders on contactdetailsOrders.contactid = purchaseorder.contactid 
@@ -1100,11 +1102,29 @@
 				inner join crmentity crmentityInvoice on crmentityInvoice.crmid=invoice.invoiceid 
 				inner join invoicebillads on invoice.invoiceid=invoicebillads.invoicebilladdressid 
 				inner join invoiceshipads on invoice.invoiceid=invoiceshipads.invoiceshipaddressid 
+				inner join invoicecf on invoice.invoiceid=invoicecf.invoiceid 
 				left join users usersInvoice on usersInvoice.id = crmentityInvoice.smownerid
 				left join account accountInvoice on accountInvoice.accountid = invoice.accountid
 				".$this->getRelatedModulesQuery($module,$this->secondarymodule)."
 				where crmentityInvoice.deleted=0";
 		}
+
+		if($module == "SalesOrder")
+		{
+			$query = "from salesorder 
+				inner join crmentity as crmentitySalesOrder on crmentitySalesOrder.crmid=salesorder.salesorderid 
+				inner join sobillads on salesorder.salesorderid=sobillads.sobilladdressid 
+				inner join soshipads on salesorder.salesorderid=soshipads.soshipaddressid 
+				left join salesordercf on salesorder.salesorderid = salesordercf.salesorderid  
+				left join contactdetails as contactdetailsSalesOrder on contactdetailsSalesOrder.contactid = salesorder.contactid 
+				left join quotes as quotesSalesOrder on quotesSalesOrder.quoteid = salesorder.quoteid                           
+				left join account as accountSalesOrder on accountSalesOrder.accountid = salesorder.accountid
+				left join potential as potentialRel on potentialRel.potentialid = salesorder.potentialid 
+				left join users as usersSalesOrder on usersSalesOrder.id = crmentitySalesOrder.smownerid 
+				where crmentitySalesOrder.deleted=0";
+
+		}       
+
 
 		$vtlog->logthis("ReportRun :: Successfully returned getReportsQuery".$module,"info");
 		return $query;

Modified: vtigercrm/branches/4.2/modules/Reports/Reports.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Reports/Reports.php (original)
+++ vtigercrm/branches/4.2/modules/Reports/Reports.php Wed Sep  6 01:57:00 2006
@@ -33,7 +33,7 @@
 			    "m"=>"less or equal",
 			    "h"=>"greater or equal");
 
-$report_modules = Array('Leads','Accounts','Contacts','Potentials','Products','HelpDesk','Quotes','Orders','Invoice','Activities');
+$report_modules = Array('Leads','Accounts','Contacts','Potentials','Products','HelpDesk','Quotes','Orders','Invoice','Activities','SalesOrder');
 
 $related_modules = Array('Leads'=>Array(''),
 			 'Accounts'=>Array('Potentials','Contacts','Products','Quotes','Invoice'),
@@ -44,6 +44,7 @@
 			 'HelpDesk'=>Array('Products'),
 			 'Quotes'=>Array('Accounts','Contacts','Potentials'),
 			 'Orders'=>Array('Contacts'),
+			 'SalesOrder'=>Array(),
 			 'Invoice'=>Array('Accounts')
 			);
 
@@ -102,6 +103,7 @@
 				 "HelpDesk"=>Array("Information"=>'1,2',"Custom Information"=>5,"Description"=>3,"Solution"=>4),//patch2
 				 "Quotes"=>Array("Information"=>1,"Address"=>2,"Description"=>3,"Custom Information"=>5),
 				 "Orders"=>Array("Information"=>1,"Address"=>2,"Description"=>3,"Custom Information"=>5),
+				 "SalesOrder"=>Array("Information"=>1,"Address"=>2,"Description"=>3,"Custom Information"=>5),
 				 "Invoice"=>Array("Information"=>1,"Address"=>2,"Description"=>3,"Custom Information"=>5)
 				);
 




From philip at vtiger.com  Wed Sep  6 04:03:26 2006
From: philip at vtiger.com (Philip)
Date: Wed, 06 Sep 2006 01:03:26 -0700
Subject: [Vtigercrm-commits] [Vtigercrm-developers]
	[vtiger-commits]	r9306
	-	/vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php
In-Reply-To: <3bec26390609060034y6f147f7ehe1d129ecb4fdbf4f@mail.gmail.com>
References: <20060906064146.AD2F976D05D@vtiger.fosslabs.com>	<3bec26390609052349x22d5cfaex6edb8583b046417c@mail.gmail.com>	<6850184341801969779@unknownmsgid>
	<3bec26390609060034y6f147f7ehe1d129ecb4fdbf4f@mail.gmail.com>
Message-ID: <10d822725ef.-2963427893705069027.-4819865131191860493@@vtiger.com>

I apologize, for not checking in the file in the right branch.  Henceforth i'll make sure that the 4.2.4 fixes are 
checked into the 4.2.4.1 branch, if the fix has not been done. 

So,  shall i revert the changes that has been done in the r9306 version?

Philip 


---- On Wed, 06 Sep 2006 Allan Bush <allan.bush+vtiger_dev at gmail.com> wrote ---- 

Sorry I may have been a little out of line, I just get frustrated
sometimes having to redo work because of people not paying attentions
to my requests for changes.

Regardless of the tone of my request, there is no reason to every make
changes (other then adding new tags) to anything in the tags folder
and as such making it readonly is probably a good idea.

On 9/6/06, Richie <richie at vtiger.com> wrote:
>
> Mike,
> Please put Allan's request on hold. Kindly maintain status quo till further
> notice please.
>
> I expect this fire to die down fast.
>
> Richie
>
>
>
>
> ---- Allan Bush<allan.bush+vtiger_dev at gmail.com> wrote ----
>
>
>  Umm yeah,
>
> so exactly 35 minutes after I fixed your last fuck up you do the same
> damn thing again.
>
> I understand that english isn't your first language, but please try
> and make an effort to understand what's going on.
>
> Does anyone have saraj's personally email address? so I can try and
> resolve this problem directly.
>
> Mike, can we just revoke commit privileges to everyone in the tags
> directory? I'm not sure how we'd create tags then though...
>
> On 9/5/06, vtigercrm-commits at vtiger.fosslabs.com
> <vtigercrm-commits at vtiger.fosslabs.com> wrote:
> > Author: saraj
> > Date: Wed Sep 6 00:41:42 2006
> > New Revision: 9306
> >
> > Log:
> > T added
> >
> > Modified:
> >
> vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php
> >
> > Modified:
> vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php
> >
> ==============================================================================
> > ---
> vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php
> (original)
> > +++
> vtigercrm/tags/vtigercrm-4.2.4/include/language/en_us.lang.php
> Wed Sep 6 00:41:42 2006
> > @@ -946,6 +946,7 @@
> > , 'Q'
> > , 'R'
> > , 'S'
> > + , 'T'
> > , 'U'
> > , 'V'
> > , 'W'
> >
> >
> > _______________________________________________
> > vtigercrm-commits mailing list
> > vtigercrm-commits at lists.vtigercrm.com
> >
> http://lists.vtigercrm.com/mailman/listinfo/vtigercrm-commits
> >
> _______________________________________________
> Get started with creating presentations online - http://zohoshow.com?vt
>
>
> _______________________________________________
> Get started with creating presentations online - http://zohoshow.com?vt
>
>
_______________________________________________
Get started with creating presentations online - http://zohoshow.com?vt 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20060906/272fbccf/attachment-0002.html 

From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep  6 05:44:07 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 06 Sep 2006 09:44:07 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9312 - in
 /vtigercrm/trunk/themes/woodspice/images: cal12x12Shared.gif
 cal16x16Shared.jpg
Message-ID: <20060906094407.6EF8676D068@vtiger.fosslabs.com>

Author: saraj
Date: Wed Sep  6 03:44:02 2006
New Revision: 9312

Log:
images added  --Minnie

Added:
    vtigercrm/trunk/themes/woodspice/images/cal12x12Shared.gif   (with props)
    vtigercrm/trunk/themes/woodspice/images/cal16x16Shared.jpg   (with props)




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep  6 05:50:47 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 06 Sep 2006 09:50:47 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9313 -
 /vtigercrm/trunk/themes/woodspice/images/plsWaitAnimated.gif
Message-ID: <20060906095047.D6C3176D0AA@vtiger.fosslabs.com>

Author: saraj
Date: Wed Sep  6 03:50:43 2006
New Revision: 9313

Log:
Image added for background freeze in recalculate sharing access -- ahmed

Added:
    vtigercrm/trunk/themes/woodspice/images/plsWaitAnimated.gif   (with props)




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep  6 05:50:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 06 Sep 2006 09:50:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9314 -
	/vtigercrm/trunk/modules/Calendar/calendarLayout.php
Message-ID: <20060906095050.12A9876D0B8@vtiger.fosslabs.com>

Author: saraj
Date: Wed Sep  6 03:50:46 2006
New Revision: 9314

Log:
changes made to differentiate shared events form others --Minnie

Modified:
    vtigercrm/trunk/modules/Calendar/calendarLayout.php

Modified: vtigercrm/trunk/modules/Calendar/calendarLayout.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/calendarLayout.php (original)
+++ vtigercrm/trunk/modules/Calendar/calendarLayout.php Wed Sep  6 03:50:46 2006
@@ -1106,6 +1106,7 @@
 			$end_hour = $value['endhour'] .':'.$value['endmin'].''.$value['endfmt'];
 			$account_name = $act[$i]->accountname;
 			$eventstatus = $act[$i]->eventstatus;
+			$shared = $act[$i]->shared;
 			$color = $act[$i]->color;
 			$image = $cal['IMAGE_PATH'].''.$act[$i]->image_name;
 			$height = $rowspan * 75;
@@ -1129,6 +1130,10 @@
 					<td width="100%"><b>'.$start_hour.' - '.$end_hour.'</b></td>
 				</tr>';
 			$eventlayer .= '<tr><td>';
+			if($shared)
+				$eventlayer .= '<img src="'.$cal['IMAGE_PATH'].'cal12x12Shared.gif" align="middle" border="0">';
+			else
+				$eventlayer .= '&nbsp;';
 			$eventlayer .= '</td>
 				<td><a href="index.php?action=DetailView&module=Calendar&record='.$id.'&activity_mode=Events&viewtype=calendar&parenttab='.$category.'"><span class="orgTab">'.$subject.'</span></a></td>
 				</tr>
@@ -1185,6 +1190,7 @@
 			$end_hour = $value['endhour'] .':'.$value['endmin'].''.$value['endfmt'];
                         $account_name = $act[$i]->accountname;
 			$eventstatus = $act[$i]->eventstatus;
+			$shared = $act[$i]->shared;
 			$user = $act[$i]->owner;
 			$priority = $act[$i]->priority;
                         $image = $cal['IMAGE_PATH'].''.$act[$i]->image_name;
@@ -1200,7 +1206,13 @@
 					<td width="100%"><b>'.$start_hour.' - '.$end_hour.'</b></td>
 				</tr>
 				<tr>
-					<td>&nbsp;</td>
+					<td>';
+			if($shared)
+				$eventlayer .= '<img src="'.$cal['IMAGE_PATH'].'cal12x12Shared.gif" align="middle" border="0">';
+			else
+				$eventlayer .= '&nbsp;';
+			$eventlayer .= '	
+				</td>
 					<td><a href="index.php?action=DetailView&module=Calendar&record='.$id.'&activity_mode=Events&viewtype=calendar&parenttab='.$category.'"><span class="orgTab">'.$subject.'</span></a></td>
 				</tr>
 				<tr><td>'.$action_str.'</td><td>('.$user.' | '.$eventstatus.' | '.$priority.')</td>




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep  6 05:51:16 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 06 Sep 2006 09:51:16 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9315 -
	/vtigercrm/trunk/modules/Calendar/Appointment.php
Message-ID: <20060906095116.56E7076D0AA@vtiger.fosslabs.com>

Author: saraj
Date: Wed Sep  6 03:51:12 2006
New Revision: 9315

Log:
changes made to differentiate shared events form others --Minnie

Modified:
    vtigercrm/trunk/modules/Calendar/Appointment.php

Modified: vtigercrm/trunk/modules/Calendar/Appointment.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/Appointment.php (original)
+++ vtigercrm/trunk/modules/Calendar/Appointment.php Wed Sep  6 03:51:12 2006
@@ -36,6 +36,7 @@
 	var $formatted_datetime;
 	var $duration_min;
 	var $duration_hour;
+	var $shared = false;
 
 	function Appointment()
 	{
@@ -127,7 +128,7 @@
          */
 	function readResult($act_array, $view)
 	{
-		global $adb;
+		global $adb,$current_user;
 		$format_sthour='';
                 $format_stmin='';
 		$this->description       = $act_array["description"];
@@ -150,6 +151,11 @@
 		{
 			$this->assignedto ="user";
 			$this->ownerid = $act_array["smownerid"];
+			if(!is_admin($current_user))
+			{
+				if($act_array["smownerid"] != $current_user->id)
+					$this->shared = true;
+			}
 			$this->owner   = getUserName($act_array["smownerid"]);
 			$query="SELECT cal_color FROM vtiger_users where id = ".$this->ownerid;
 			$result=$adb->query($query);




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep  6 06:40:18 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 06 Sep 2006 10:40:18 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9316 - in
 /vtigercrm/trunk/Smarty/templates: Header.tpl QuickCreate.tpl
 QuickCreateHidden.tpl
Message-ID: <20060906104018.DA1CF76D0B8@vtiger.fosslabs.com>

Author: saraj
Date: Wed Sep  6 04:40:13 2006
New Revision: 9316

Log:
changes made to integrate enddate and time in event quickcreate form --Minnie

Modified:
    vtigercrm/trunk/Smarty/templates/Header.tpl
    vtigercrm/trunk/Smarty/templates/QuickCreate.tpl
    vtigercrm/trunk/Smarty/templates/QuickCreateHidden.tpl

Modified: vtigercrm/trunk/Smarty/templates/Header.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Header.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Header.tpl Wed Sep  6 04:40:13 2006
@@ -210,6 +210,7 @@
 						$("qcform").style.display="inline";
 					        $("qcform").innerHTML = response.responseText;
 						eval($("date_calpopup").innerHTML);
+						eval($("date_calpopup23").innerHTML);
 						eval($("qcform"));
                                         {rdelim}
                 {rdelim}

Modified: vtigercrm/trunk/Smarty/templates/QuickCreate.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/QuickCreate.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/QuickCreate.tpl Wed Sep  6 04:40:13 2006
@@ -217,7 +217,13 @@
                                                                 {/if}
                                                         {/if}
 							{elseif $uitype eq 23 || $uitype eq 5 || $uitype eq 6}
-							<td width="20%" class="cellLabel" align=right>{$fldlabel}</td>
+							<td width="20%" class="cellLabel" align=right>
+							{if $uitype eq 23 && $QCMODULE eq 'Event'}
+                                                                {$APP.LBL_EVENT_ENDDATE}
+                                                        {else}
+                                                                {$fldlabel}
+                                                        {/if}
+                                                        </td>
 							<td width="30%" align=left class="cellText">
 							   {foreach key=date_value item=time_value from=$fldvalue}
 								{assign var=date_val value="$date_value"}
@@ -228,6 +234,12 @@
 							{if $uitype eq 6}
 							   <input name="time_start" style="border:1px solid #bababa;" size="5" maxlength="5" type="text" value="{$time_val}">
 							{/if}
+							{if $uitype eq 23 && $QCMODULE eq 'Event'}
+                                                           <input name="time_end" style="border:1px solid #bababa;" size="5" maxlength="5" type="text" value="{$time_val}">
+                                                            <script id="date_calpopup23">
+                                                                getCalendarPopup('jscal_trigger_{$fldname}','jscal_field_{$fldname}','{$dateFormat}');
+                                                             </script>
+                                                        {/if}
 							{foreach key=date_format item=date_str from=$secondvalue}
                                                                 {assign var=dateFormat value="$date_format"}
 							        {assign var=dateStr value="$date_str"}
@@ -378,10 +390,18 @@
 </td>
 </tr>
 </table>
+{if $QCMODULE eq 'Event'}
+<SCRIPT id="qcvalidate">
+        var qcfieldname = new Array('subject','date_start','eventstatus','activitytype','due_date','time_end');
+        var qcfieldlabel = new Array('Subject','Start Date & Time','Status','Activity Type','End Date & Time','End Date & Time');
+        var qcfielddatatype = new Array('V~M','DT~M~time_start','V~O','V~O','D~M~OTH~GE~date_start~Start Date & Time','T~M');
+</SCRIPT>
+{else}
 <SCRIPT id="qcvalidate">
         var qcfieldname = new Array({$VALIDATION_DATA_FIELDNAME});
         var qcfieldlabel = new Array({$VALIDATION_DATA_FIELDLABEL});
         var qcfielddatatype = new Array({$VALIDATION_DATA_FIELDDATATYPE});
 </SCRIPT>
+{/if}
 </form>
 </body>

Modified: vtigercrm/trunk/Smarty/templates/QuickCreateHidden.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/QuickCreateHidden.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/QuickCreateHidden.tpl Wed Sep  6 04:40:13 2006
@@ -42,14 +42,12 @@
 	<input type="hidden" name="activity_mode" value="{$ACTIVITY_MODE}">
 	<input type="hidden" name="assigned_user_id" value="{$USERID}">
 	<input type="hidden" name="action" value="Save">
-	<input type="hidden" name="due_date" value="">
 {elseif $MODULE eq 'Events'}
         <input type="hidden" name="module" value="Calendar">
         <input type="hidden" name="record" value="">
         <input type="hidden" name="activity_mode" value="{$ACTIVITY_MODE}">
         <input type="hidden" name="assigned_user_id" value="{$USERID}">
         <input type="hidden" name="action" value="Save">
-        <input type="hidden" name="due_date" value="">
 {elseif $MODULE eq 'HelpDesk'}
 	<input type="hidden" name="module" value="{$MODULE}">
         <input type="hidden" name="return_module" value="HelpDesk">




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep  6 06:43:23 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 06 Sep 2006 10:43:23 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9317 -
	/vtigercrm/trunk/include/language/en_us.lang.php
Message-ID: <20060906104323.2B33E76D0B8@vtiger.fosslabs.com>

Author: saraj
Date: Wed Sep  6 04:43:19 2006
New Revision: 9317

Log:
label added  --Minnie

Modified:
    vtigercrm/trunk/include/language/en_us.lang.php

Modified: vtigercrm/trunk/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/include/language/en_us.lang.php (original)
+++ vtigercrm/trunk/include/language/en_us.lang.php Wed Sep  6 04:43:19 2006
@@ -731,6 +731,7 @@
 'Category'=>'Category',
 
 'Price Book Name'=>'Price Book Name',
+'LBL_EVENT_ENDDATE'=>'End Date & Time',
 
 //Added after 4 GA
 'LBL_CUSTOM_INFORMATION'=>'Custom Information',




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep  6 06:51:56 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 06 Sep 2006 10:51:56 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9318 -
	/vtigercrm/trunk/include/utils/EditViewUtils.php
Message-ID: <20060906105156.7C4D476D0B8@vtiger.fosslabs.com>

Author: saraj
Date: Wed Sep  6 04:51:52 2006
New Revision: 9318

Log:
changes made for event enddate and time --Minnie

Modified:
    vtigercrm/trunk/include/utils/EditViewUtils.php

Modified: vtigercrm/trunk/include/utils/EditViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/EditViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/EditViewUtils.php Wed Sep  6 04:51:52 2006
@@ -112,7 +112,12 @@
 		$fieldvalue[] = array($disp_value => $curr_time) ;
 		if($uitype == 5 || $uitype == 23)
 		{
-			$fieldvalue[] = array($date_format=>$current_user->date_format);
+			if($module_name == 'Events' && $uitype == 23)
+			{
+				$fieldvalue[] = array($date_format=>$current_user->date_format.' '.$app_strings['YEAR_MONTH_DATE']);
+			}
+			else
+				$fieldvalue[] = array($date_format=>$current_user->date_format);
 		}
 		else
 		{




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep  6 06:55:44 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 06 Sep 2006 10:55:44 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9319 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060906105544.0334D76D067@vtiger.fosslabs.com>

Author: saraj
Date: Wed Sep  6 04:55:41 2006
New Revision: 9319

Log:
changes made to integrate enddate and time in event quickcreate form --Minnie

Modified:
    vtigercrm/trunk/modules/Users/DefaultDataPopulator.php

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Wed Sep  6 04:55:41 2006
@@ -553,11 +553,11 @@
  $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'date_start','vtiger_activity',1,'6','date_start','Start Date & Time',1,0,0,100,3,41,1,'DT~M~time_start',0,2,'BAS')");
  $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'time_start','vtiger_activity',1,'2','time_start','Time Start',1,0,0,100,4,41,3,'T~M',1,null,'BAS')");
 
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'due_date','vtiger_activity',1,'23','due_date','End Date',1,0,0,100,5,41,1,'D~M~OTH~GE~date_start~Start Date & Time',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'due_date','vtiger_activity',1,'23','due_date','End Date',1,0,0,100,5,41,1,'D~M~OTH~GE~date_start~Start Date & Time',0,5,'BAS')");
  $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'time_end','vtiger_activity',1,'2','time_end','End Time',1,0,0,100,5,41,3,'T~M',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'recurringtype','vtiger_recurringevents',1,'15','recurringtype','Recurrence',1,0,0,100,6,41,1,'O~O',1,null,'BAS')");
   
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'duration_hours','vtiger_activity',1,'63','duration_hours','Duration',1,0,0,100,7,41,1,'I~M',0,5,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'duration_hours','vtiger_activity',1,'63','duration_hours','Duration',1,0,0,100,7,41,1,'I~M',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'duration_minutes','vtiger_activity',1,'15','duration_minutes','Duration Minutes',1,0,0,100,8,41,3,'O~O',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'crmid','vtiger_seactivityrel',1,'66','parent_id','Related To',1,0,0,100,9,41,1,'I~O',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'eventstatus','vtiger_activity',1,'111','eventstatus','Status',1,0,0,100,10,41,1,'V~O',0,3,'BAS')");




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep  6 07:10:08 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 06 Sep 2006 11:10:08 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9320 - in /vtigercrm/trunk:
 Smarty/templates/Inventory/ProductDetails.tpl
 Smarty/templates/Inventory/ProductDetailsEditView.tpl
 include/js/Inventory.js modules/Products/InventoryTaxAjax.php
Message-ID: <20060906111008.792DD76D0B8@vtiger.fosslabs.com>

Author: saraj
Date: Wed Sep  6 05:09:59 2006
New Revision: 9320

Log:
* Modified to calculate the taxes when we change discount and listprice

Modified:
    vtigercrm/trunk/Smarty/templates/Inventory/ProductDetails.tpl
    vtigercrm/trunk/Smarty/templates/Inventory/ProductDetailsEditView.tpl
    vtigercrm/trunk/include/js/Inventory.js
    vtigercrm/trunk/modules/Products/InventoryTaxAjax.php

Modified: vtigercrm/trunk/Smarty/templates/Inventory/ProductDetails.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Inventory/ProductDetails.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Inventory/ProductDetails.tpl Wed Sep  6 05:09:59 2006
@@ -180,7 +180,7 @@
 		<table width="100%" cellpadding="0" cellspacing="0">
 		   <tr>
 			<td align="right">
-				<input id="listPrice1" name="listPrice1" value="{$UNIT_PRICE}" type="text" class="small " style="width:70px" onBlur="calcTotal()"/>&nbsp;<img src="{$IMAGE_PATH}pricebook.gif" onclick="priceBookPickList(this,1)">
+				<input id="listPrice1" name="listPrice1" value="{$UNIT_PRICE}" type="text" class="small " style="width:70px" onBlur="calcTotal(); callTaxCalc(1);"/>&nbsp;<img src="{$IMAGE_PATH}pricebook.gif" onclick="priceBookPickList(this,1)">
 			</td>
 		   </tr>
 		   <tr>
@@ -194,16 +194,16 @@
 						<td align="right"><img src="{$IMAGE_PATH}close.gif" border="0" onClick="fnHidePopDiv('discount_div1')" style="cursor:pointer;"></td>
 					   </tr>
 					   <tr>
-						<td align="left" class="lineOnTop"><input type="radio" name="discount1" checked onclick="setDiscount(this,1)">&nbsp; {$APP.LBL_ZERO_DISCOUNT}</td>
+						<td align="left" class="lineOnTop"><input type="radio" name="discount1" checked onclick="setDiscount(this,1); callTaxCalc(1);">&nbsp; {$APP.LBL_ZERO_DISCOUNT}</td>
 						<td class="lineOnTop">&nbsp;</td>
 					   </tr>
 					   <tr>
-						<td align="left"><input type="radio" name="discount1" onclick="setDiscount(this,1)">&nbsp; % {$APP.LBL_OF_PRICE}</td>
-						<td align="right"><input type="text" class="small" size="2" id="discount_percentage1" name="discount_percentage1" value="0" style="visibility:hidden" onBlur="setDiscount(this,1)">&nbsp;%</td>
-					   </tr>
-					   <tr>
-						<td align="left" nowrap><input type="radio" name="discount1" onclick="setDiscount(this,1)">&nbsp;{$APP.LBL_DIRECT_PRICE_REDUCTION}</td>
-						<td align="right"><input type="text" id="discount_amount1" name="discount_amount1" size="5" value="0" style="visibility:hidden" onBlur="setDiscount(this,1)"></td>
+						<td align="left"><input type="radio" name="discount1" onclick="setDiscount(this,1); callTaxCalc(1);">&nbsp; % {$APP.LBL_OF_PRICE}</td>
+						<td align="right"><input type="text" class="small" size="2" id="discount_percentage1" name="discount_percentage1" value="0" style="visibility:hidden" onBlur="setDiscount(this,1); callTaxCalc(1);">&nbsp;%</td>
+					   </tr>
+					   <tr>
+						<td align="left" nowrap><input type="radio" name="discount1" onclick="setDiscount(this,1); callTaxCalc(1);">&nbsp;{$APP.LBL_DIRECT_PRICE_REDUCTION}</td>
+						<td align="right"><input type="text" id="discount_amount1" name="discount_amount1" size="5" value="0" style="visibility:hidden" onBlur="setDiscount(this,1); callTaxCalc(1);"></td>
 					   </tr>
 					</table>
 				</div>

Modified: vtigercrm/trunk/Smarty/templates/Inventory/ProductDetailsEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Inventory/ProductDetailsEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Inventory/ProductDetailsEditView.tpl Wed Sep  6 05:09:59 2006
@@ -201,7 +201,7 @@
 		<table width="100%" cellpadding="0" cellspacing="0">
 		   <tr>
 			<td align="right">
-				<input id="{$listPrice}" name="{$listPrice}" value="{$data.$listPrice}" type="text" class="small " style="width:70px" onBlur="calcTotal()"/>&nbsp;<img src="{$IMAGE_PATH}pricebook.gif" onclick="priceBookPickList(this,'{$row_no}')">
+				<input id="{$listPrice}" name="{$listPrice}" value="{$data.$listPrice}" type="text" class="small " style="width:70px" onBlur="calcTotal(); callTaxCalc('{$row_no}');"/>&nbsp;<img src="{$IMAGE_PATH}pricebook.gif" onclick="priceBookPickList(this,'{$row_no}')">
 			</td>
 		   </tr>
 		   <tr>
@@ -215,16 +215,16 @@
 						<td align="right"><img src="{$IMAGE_PATH}close.gif" border="0" onClick="fnHidePopDiv('discount_div{$row_no}')" style="cursor:pointer;"></td>
 					   </tr>
 					   <tr>
-						<td align="left" class="lineOnTop"><input type="radio" name="discount{$row_no}" {$data.$checked_discount_zero} onclick="setDiscount(this,'{$row_no}')">&nbsp; {$APP.LBL_ZERO_DISCOUNT}</td>
+						<td align="left" class="lineOnTop"><input type="radio" name="discount{$row_no}" {$data.$checked_discount_zero} onclick="setDiscount(this,'{$row_no}'); callTaxCalc('{$row_no}');">&nbsp; {$APP.LBL_ZERO_DISCOUNT}</td>
 						<td class="lineOnTop">&nbsp;</td>
 					   </tr>
 					   <tr>
-						<td align="left"><input type="radio" name="discount{$row_no}" onclick="setDiscount(this,'{$row_no}')" {$data.$checked_discount_percent}>&nbsp; % {$APP.LBL_OF_PRICE}</td>
-						<td align="right"><input type="text" class="small" size="2" id="discount_percentage{$row_no}" name="discount_percentage{$row_no}" value="{$data.$discount_percent}" {$data.$style_discount_percent} onBlur="setDiscount(this,'{$row_no}')">&nbsp;%</td>
-					   </tr>
-					   <tr>
-						<td align="left" nowrap><input type="radio" name="discount{$row_no}" onclick="setDiscount(this,'{$row_no}')" {$data.$checked_discount_amount}>&nbsp;{$APP.LBL_DIRECT_PRICE_REDUCTION}</td>
-						<td align="right"><input type="text" id="discount_amount{$row_no}" name="discount_amount{$row_no}" size="5" value="{$data.$discount_amount}" {$data.$style_discount_amount} onBlur="setDiscount(this,{$row_no})"></td>
+						<td align="left"><input type="radio" name="discount{$row_no}" onclick="setDiscount(this,'{$row_no}'); callTaxCalc('{$row_no}');" {$data.$checked_discount_percent}>&nbsp; % {$APP.LBL_OF_PRICE}</td>
+						<td align="right"><input type="text" class="small" size="2" id="discount_percentage{$row_no}" name="discount_percentage{$row_no}" value="{$data.$discount_percent}" {$data.$style_discount_percent} onBlur="setDiscount(this,'{$row_no}'); callTaxCalc('{$row_no}');">&nbsp;%</td>
+					   </tr>
+					   <tr>
+						<td align="left" nowrap><input type="radio" name="discount{$row_no}" onclick="setDiscount(this,'{$row_no}'); callTaxCalc('{$row_no}');" {$data.$checked_discount_amount}>&nbsp;{$APP.LBL_DIRECT_PRICE_REDUCTION}</td>
+						<td align="right"><input type="text" id="discount_amount{$row_no}" name="discount_amount{$row_no}" size="5" value="{$data.$discount_amount}" {$data.$style_discount_amount} onBlur="setDiscount(this,{$row_no}); callTaxCalc('{$row_no}');"></td>
 					   </tr>
 					</table>
 				</div>
@@ -240,7 +240,7 @@
 				(+)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(this,'tax_div{$row_no}','tax','{$row_no}')" >{$APP.LBL_TAX} </a> : </b>
 				<div class="discountUI" id="tax_div{$row_no}">
 					<!-- we will form the table with all taxes -->
-					<table width="100%" border="0" cellpadding="5" cellspacing="0" class="small">
+					<table width="100%" border="0" cellpadding="5" cellspacing="0" class="small" id="tax_table{$row_no}">
 					   <tr>
 						<td id="tax_div_title{$row_no}" nowrap align="left" ><b>Set Tax for : {$data.$totalAfterDiscount}</b></td>
 						<td>&nbsp;</td>
@@ -249,11 +249,13 @@
 
 					{foreach key=tax_row_no item=tax_data from=$data.taxes}
 					   {assign var="taxname" value=$tax_data.taxname|cat:"_percentage"|cat:$row_no}
+					   {assign var="tax_id_name" value="hidden_tax"|cat:$tax_row_no+1|cat:"_percentage"|cat:$row_no}
 					   {assign var="taxlabel" value=$tax_data.taxlabel|cat:"_percentage"|cat:$row_no}
 					   {assign var="popup_tax_rowname" value="popup_tax_row"|cat:$row_no}
 					   <tr>
 						<td align="left" class="lineOnTop">
 							<input type="text" class="small" size="5" name="{$taxname}" id="{$taxname}" value="{$tax_data.percentage}" onBlur="calcCurrentTax('{$taxname}',{$row_no},{$tax_row_no})">&nbsp;%
+							<input type="hidden" id="{$tax_id_name}" value="{$taxname}">
 						</td>
 						<td align="center" class="lineOnTop">{$tax_data.taxlabel}</td>
 						<td align="right" class="lineOnTop">

Modified: vtigercrm/trunk/include/js/Inventory.js
==============================================================================
--- vtigercrm/trunk/include/js/Inventory.js (original)
+++ vtigercrm/trunk/include/js/Inventory.js Wed Sep  6 05:09:59 2006
@@ -480,7 +480,7 @@
 	
 	//List Price with Discount, Total after Discount and Tax labels
 	colfive.className = "crmTableRow small"
-	colfive.innerHTML='<table width="100%" cellpadding="0" cellspacing="0"><tr><td align="right"><input id="listPrice'+count+'" name="listPrice'+count+'" value="0.00" type="text" class="small " style="width:70px" onBlur="calcTotal()"/>&nbsp;<img src="'+image_path+'pricebook.gif" onclick="priceBookPickList(this,'+count+')"></td></tr><tr><td align="right" style="padding:5px;" nowrap>		(-)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(event,\'discount_div'+count+'\',\'discount\','+count+')" >Discount</a> : </b><div class=\"discountUI\" id=\"discount_div'+count+'"><input type="hidden" id="discount_type'+count+'" name="discount_type'+count+'" value=""><table width="100%" border="0" cellpadding="5" cellspacing="0" class="small"><tr><td id="discount_div_title'+count+'" nowrap align="left" ></td><td align="right"><img src="'+image_path+'close.gif" border="0" onClick="fnHidePopDiv(\'discount_div'+count+'\')" style="cursor:pointer;"></td></tr><tr><td align="left" class="lineOnTop"><input type="radio" name="discount'+count+'" checked onclick="setDiscount(this,'+count+')">&nbsp; Zero Discount</td><td class="lineOnTop">&nbsp;</td></tr><tr><td align="left"><input type="radio" name="discount'+count+'" onclick="setDiscount(this,'+count+')">&nbsp; % of Price </td><td align="right"><input type="text" class="small" size="2" id="discount_percentage'+count+'" name="discount_percentage'+count+'" value="0" style="visibility:hidden" onBlur="setDiscount(this,'+count+')">&nbsp;%</td></tr><tr><td align="left" nowrap><input type="radio" name="discount'+count+'" onclick="setDiscount(this,'+count+')">&nbsp; Direct Price Redunction</td><td align="right"><input type="text" id="discount_amount'+count+'" name="discount_amount'+count+'" size="5" value="0" style="visibility:hidden" onBlur="setDiscount(this,'+count+')"></td></tr></table></div></td></tr><tr> <td align="right" style="padding:5px;" nowrap><b>Total After Discount :</b></td></tr><tr id="individual_tax_row'+count+'" class="TaxShow"><td align="right" style="padding:5px;" nowrap>(+)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(event,\'tax_div'+count+'\',\'tax\','+count+')" >Tax </a> : </b><div class="discountUI" id="tax_div'+count+'"></div></td></tr></table> ';
+	colfive.innerHTML='<table width="100%" cellpadding="0" cellspacing="0"><tr><td align="right"><input id="listPrice'+count+'" name="listPrice'+count+'" value="0.00" type="text" class="small " style="width:70px" onBlur="calcTotal(); callTaxCalc('+count+');"/>&nbsp;<img src="'+image_path+'pricebook.gif" onclick="priceBookPickList(this,'+count+')"></td></tr><tr><td align="right" style="padding:5px;" nowrap>		(-)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(event,\'discount_div'+count+'\',\'discount\','+count+')" >Discount</a> : </b><div class=\"discountUI\" id=\"discount_div'+count+'"><input type="hidden" id="discount_type'+count+'" name="discount_type'+count+'" value=""><table width="100%" border="0" cellpadding="5" cellspacing="0" class="small"><tr><td id="discount_div_title'+count+'" nowrap align="left" ></td><td align="right"><img src="'+image_path+'close.gif" border="0" onClick="fnHidePopDiv(\'discount_div'+count+'\')" style="cursor:pointer;"></td></tr><tr><td align="left" class="lineOnTop"><input type="radio" name="discount'+count+'" checked onclick="setDiscount(this,'+count+'); callTaxCalc('+count+');">&nbsp; Zero Discount</td><td class="lineOnTop">&nbsp;</td></tr><tr><td align="left"><input type="radio" name="discount'+count+'" onclick="setDiscount(this,'+count+'); callTaxCalc('+count+');">&nbsp; % of Price </td><td align="right"><input type="text" class="small" size="2" id="discount_percentage'+count+'" name="discount_percentage'+count+'" value="0" style="visibility:hidden" onBlur="setDiscount(this,'+count+'); callTaxCalc('+count+');">&nbsp;%</td></tr><tr><td align="left" nowrap><input type="radio" name="discount'+count+'" onclick="setDiscount(this,'+count+'); callTaxCalc('+count+');">&nbsp; Direct Price Redunction</td><td align="right"><input type="text" id="discount_amount'+count+'" name="discount_amount'+count+'" size="5" value="0" style="visibility:hidden" onBlur="setDiscount(this,'+count+'); callTaxCalc('+count+');"></td></tr></table></div></td></tr><tr> <td align="right" style="padding:5px;" nowrap><b>Total After Discount :</b></td></tr><tr id="individual_tax_row'+count+'" class="TaxShow"><td align="right" style="padding:5px;" nowrap>(+)&nbsp;<b><a href="javascript:doNothing();" onClick="displayCoords(event,\'tax_div'+count+'\',\'tax\','+count+')" >Tax </a> : </b><div class="discountUI" id="tax_div'+count+'"></div></td></tr></table> ';
 
 	//Total and Discount, Total after Discount and Tax details
 	colsix.className = "crmTableRow small"
@@ -578,6 +578,20 @@
 	calcTotal();
 }
 
+//This function is added to call the tax calculation function
+function callTaxCalc(curr_row)
+{
+	//when we change discount or list price, we have to calculate the taxes again before calculate the total
+	tax_count = eval(document.getElementById('tax_table'+curr_row).rows.length-1);//subtract the title tr length
+
+	for(var i=0, j=i+1;i<tax_count;i++,j++)
+	{
+		var tax_hidden_name = "hidden_tax"+j+"_percentage"+curr_row;
+		var tax_name = document.getElementById(tax_hidden_name).value;
+		calcCurrentTax(tax_name,curr_row,i);
+	}
+}
+
 function calcCurrentTax(tax_name, curr_row, tax_row)
 {
 	//we should calculate the tax amount only for the total After Discount

Modified: vtigercrm/trunk/modules/Products/InventoryTaxAjax.php
==============================================================================
--- vtigercrm/trunk/modules/Products/InventoryTaxAjax.php (original)
+++ vtigercrm/trunk/modules/Products/InventoryTaxAjax.php Wed Sep  6 05:09:59 2006
@@ -22,7 +22,7 @@
 
 
 $tax_div = '
-		<table width="100%" border="0" cellpadding="5" cellspacing="0" class="small">
+		<table width="100%" border="0" cellpadding="5" cellspacing="0" class="small" id="tax_table'.$rowid.'">
 		   <tr>
 			<td id="tax_div_title'.$rowid.'" nowrap align="left" ><b>Set Tax for : '.$product_total.'</b></td>
 			<td>&nbsp;</td>
@@ -31,12 +31,13 @@
 	   ';
 
 $net_tax_total = 0.00;
-for($i=0;$i<count($tax_details);$i++)
+for($i=0,$j=$i+1;$i<count($tax_details);$i++,$j++)
 {
 	$tax_name = $tax_details[$i]['taxname'];
 	$tax_label = $tax_details[$i]['taxlabel'];
 	$tax_percentage = $tax_details[$i]['percentage'];
 	$tax_name_percentage = $tax_name."_percentage".$rowid;
+	$tax_id_name = "hidden_tax".$j."_percentage".$rowid;//used to store the tax name, used in function callTaxCalc
 	$tax_name_total = "popup_tax_row".$rowid;//$tax_name."_total".$rowid;
 	$tax_total = $product_total*$tax_percentage/100.00;
 
@@ -45,6 +46,7 @@
 		   <tr>
 			<td align="left" class="lineOnTop">
 				<input type="text" class="small" size="5" name="'.$tax_name_percentage.'" id="'.$tax_name_percentage.'" value="'.$tax_percentage.'" onBlur="calcCurrentTax(\''.$tax_name_percentage.'\','.$rowid.','.$i.')">&nbsp;%
+				<input type="hidden" id="'.$tax_id_name.'" value="'.$tax_name_percentage.'">
 			</td>
 			<td align="center" class="lineOnTop">'.$tax_label.'</td>
 			<td align="right" class="lineOnTop">
@@ -54,12 +56,13 @@
 	    ';
 }
 
+$tax_div .= '</table>';
+
 if($associated_tax_count == 0)
 {
-	$tax_div .= '<tr><td colspan="3" align="left" class="lineOnTop">No taxes associated with this product.</td></tr>';
+	$tax_div .= '<div align="left" class="lineOnTop" width="100%">No taxes associated with this product.</div>';
 }
 
-$tax_div .= '</table>';
 $tax_div .= '<input type="hidden" id="hdnTaxTotal'.$rowid.'" name="hdnTaxTotal'.$rowid.'" value="'.$net_tax_total.'">';
 
 echo $tax_div;




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep  6 07:52:10 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 06 Sep 2006 11:52:10 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9321 - in
 /vtigercrm/trunk/Smarty/templates/Inventory: ProductDetails.tpl
 ProductDetailsEditView.tpl
Message-ID: <20060906115211.1783776D067@vtiger.fosslabs.com>

Author: saraj
Date: Wed Sep  6 05:52:04 2006
New Revision: 9321

Log:
* Modified to calculate the group taxes when we change the discount 

Modified:
    vtigercrm/trunk/Smarty/templates/Inventory/ProductDetails.tpl
    vtigercrm/trunk/Smarty/templates/Inventory/ProductDetailsEditView.tpl

Modified: vtigercrm/trunk/Smarty/templates/Inventory/ProductDetails.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Inventory/ProductDetails.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Inventory/ProductDetails.tpl Wed Sep  6 05:52:04 2006
@@ -294,16 +294,16 @@
 				<td align="right"><img src="{$IMAGE_PATH}close.gif" border="0" onClick="fnHidePopDiv('discount_div_final')" style="cursor:pointer;"></td>
 			   </tr>
 			   <tr>
-				<td align="left" class="lineOnTop"><input type="radio" name="discount_final" checked onclick="setDiscount(this,'_final')">&nbsp; {$APP.LBL_ZERO_DISCOUNT}</td>
+				<td align="left" class="lineOnTop"><input type="radio" name="discount_final" checked onclick="setDiscount(this,'_final'); calcGroupTax();">&nbsp; {$APP.LBL_ZERO_DISCOUNT}</td>
 				<td class="lineOnTop">&nbsp;</td>
 			   </tr>
 			   <tr>
-				<td align="left"><input type="radio" name="discount_final" onclick="setDiscount(this,'_final')">&nbsp; % {$APP.LBL_OF_PRICE}</td>
-				<td align="right"><input type="text" class="small" size="2" id="discount_percentage_final" name="discount_percentage_final" value="0" style="visibility:hidden" onBlur="setDiscount(this,'_final')">&nbsp;%</td>
+				<td align="left"><input type="radio" name="discount_final" onclick="setDiscount(this,'_final'); calcGroupTax();">&nbsp; % {$APP.LBL_OF_PRICE}</td>
+				<td align="right"><input type="text" class="small" size="2" id="discount_percentage_final" name="discount_percentage_final" value="0" style="visibility:hidden" onBlur="setDiscount(this,'_final'); calcGroupTax();">&nbsp;%</td>
 			   </tr>
 			   <tr>
-				<td align="left" nowrap><input type="radio" name="discount_final" onclick="setDiscount(this,'_final')">&nbsp;{$APP.LBL_DIRECT_PRICE_REDUCTION}</td>
-				<td align="right"><input type="text" id="discount_amount_final" name="discount_amount_final" size="5" value="0" style="visibility:hidden" onBlur="setDiscount(this,'_final')"></td>
+				<td align="left" nowrap><input type="radio" name="discount_final" onclick="setDiscount(this,'_final'); calcGroupTax();">&nbsp;{$APP.LBL_DIRECT_PRICE_REDUCTION}</td>
+				<td align="right"><input type="text" id="discount_amount_final" name="discount_amount_final" size="5" value="0" style="visibility:hidden" onBlur="setDiscount(this,'_final'); calcGroupTax();"></td>
 			   </tr>
 			</table>
 		</div>

Modified: vtigercrm/trunk/Smarty/templates/Inventory/ProductDetailsEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Inventory/ProductDetailsEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Inventory/ProductDetailsEditView.tpl Wed Sep  6 05:52:04 2006
@@ -345,16 +345,16 @@
 				<td align="right"><img src="{$IMAGE_PATH}close.gif" border="0" onClick="fnHidePopDiv('discount_div_final')" style="cursor:pointer;"></td>
 			   </tr>
 			   <tr>
-				<td align="left" class="lineOnTop"><input type="radio" name="discount_final" checked onclick="setDiscount(this,'_final')">&nbsp; {$APP.LBL_ZERO_DISCOUNT}</td>
+				<td align="left" class="lineOnTop"><input type="radio" name="discount_final" checked onclick="setDiscount(this,'_final'); calcGroupTax();">&nbsp; {$APP.LBL_ZERO_DISCOUNT}</td>
 				<td class="lineOnTop">&nbsp;</td>
 			   </tr>
 			   <tr>
-				<td align="left"><input type="radio" name="discount_final" onclick="setDiscount(this,'_final')" {$FINAL.checked_discount_percentage_final}>&nbsp; % {$APP.LBL_OF_PRICE}</td>
-				<td align="right"><input type="text" class="small" size="2" id="discount_percentage_final" name="discount_percentage_final" value="{$FINAL.discount_percentage_final}" {$FINAL.style_discount_percentage_final} onBlur="setDiscount(this,'_final')">&nbsp;%</td>
+				<td align="left"><input type="radio" name="discount_final" onclick="setDiscount(this,'_final'); calcGroupTax();" {$FINAL.checked_discount_percentage_final}>&nbsp; % {$APP.LBL_OF_PRICE}</td>
+				<td align="right"><input type="text" class="small" size="2" id="discount_percentage_final" name="discount_percentage_final" value="{$FINAL.discount_percentage_final}" {$FINAL.style_discount_percentage_final} onBlur="setDiscount(this,'_final'); calcGroupTax();">&nbsp;%</td>
 			   </tr>
 			   <tr>
-				<td align="left" nowrap><input type="radio" name="discount_final" onclick="setDiscount(this,'_final')" {$FINAL.checked_discount_amount_final}>&nbsp;{$APP.LBL_DIRECT_PRICE_REDUCTION}</td>
-				<td align="right"><input type="text" id="discount_amount_final" name="discount_amount_final" size="5" value="{$FINAL.discount_amount_final}" {$FINAL.style_discount_amount_final} onBlur="setDiscount(this,'_final')"></td>
+				<td align="left" nowrap><input type="radio" name="discount_final" onclick="setDiscount(this,'_final'); calcGroupTax();" {$FINAL.checked_discount_amount_final}>&nbsp;{$APP.LBL_DIRECT_PRICE_REDUCTION}</td>
+				<td align="right"><input type="text" id="discount_amount_final" name="discount_amount_final" size="5" value="{$FINAL.discount_amount_final}" {$FINAL.style_discount_amount_final} onBlur="setDiscount(this,'_final'); calcGroupTax();"></td>
 			   </tr>
 			</table>
 		</div>




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep  6 11:57:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 06 Sep 2006 15:57:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9323 -
 /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php
Message-ID: <20060906155738.324DF74815B@vtiger.fosslabs.com>

Author: saraj
Date: Wed Sep  6 09:57:34 2006
New Revision: 9323

Log:
* Added query to change the tablename in customview from activity to crmentity for the description fields

Modified:
    vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php

Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php
==============================================================================
--- vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php (original)
+++ vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php Wed Sep  6 09:57:34 2006
@@ -3606,6 +3606,10 @@
 		}
 	}
 }
+//we have to change the table name from activity to crmentity for customview activity description 
+Execute('update vtiger_cvcolumnlist set columnname="vtiger_crmentity:description:description:Calendar_Description:V" where columnname="vtiger_activity:description:description:Calendar_Description:V"');
+//we have to change the table name (alias) from activity to crmentiryCalendar for reports activity description
+Execute('update vtiger_selectcolumn set columnname="vtiger_crmentityCalendar:description:Calendar_Description:description:V" where columnname="vtiger_activity:description:Calendar_Description:description:V"');
 //changes made for CustomView and Reports - Activities changed to Calendar -- Ends
 
 Execute("update vtiger_field set uitype = 16 where tabid=2 and uitype=111 and columnname='sales_stage'");




From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 02:22:06 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 06:22:06 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9324 -
	/vtigercrm/trunk/Smarty/templates/DetailView.tpl
Message-ID: <20060907062207.20F3A76D0DF@vtiger.fosslabs.com>

Author: richie
Date: Thu Sep  7 00:21:49 2006
New Revision: 9324

Log:
Issue in DetailView Template Merge has been fixed --Jeri

Modified:
    vtigercrm/trunk/Smarty/templates/DetailView.tpl

Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailView.tpl Thu Sep  7 00:21:49 2006
@@ -401,6 +401,11 @@
 			<!-- Mail Merge-->
 				<br>
 				{if $MERGEBUTTON eq 'permitted'}
+				<form action="index.php" method="post" name="TemplateMerge" id="form">
+				<input type="hidden" name="module" value="{$MODULE}">
+				<input type="hidden" name="parenttab" value="{$CATEGORY}">
+				<input type="hidden" name="record" value="{$ID}">
+				<input type="hidden" name="action">
   				<table border=0 cellspacing=0 cellpadding=0 width=100% class="rightMailMerge">
       				<tr>
       					   <td class="rightMailMergeHeader"><b>{$WORDTEMPLATEOPTIONS}</b></td>
@@ -412,6 +417,7 @@
       					  </td>
       				</tr>
   				</table>
+				</form>
 				{/if}
 			</td>
 		</tr>




From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 02:23:36 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 06:23:36 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9325 -
 /vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl
Message-ID: <20060907062336.4F9DB76D0DE@vtiger.fosslabs.com>

Author: richie
Date: Thu Sep  7 00:23:10 2006
New Revision: 9325

Log:
Issue in in Listwordtemplates has been fixed --jeri

Modified:
    vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl

Modified: vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl Thu Sep  7 00:23:10 2006
@@ -13,6 +13,8 @@
 <script>
 function massDelete()
 {ldelim}
+	if(typeof(document.massdelete.selected_id) == 'undefined')
+		return false;
         x = document.massdelete.selected_id.length;
         idstring = "";
 
@@ -53,7 +55,7 @@
        {rdelim}
 		if(confirm("Are you sure you want to delete the selected "+xx+" records ?"))
 		{ldelim}
-	        document.massdelete.action="index.php?module=Users&action=deletewordtemplate&return_module=Users&return_action=listwordtemplates";
+	        	document.massdelete.action.value= "deletewordtemplate";
 		{rdelim}
 		else
 		{ldelim}
@@ -78,7 +80,7 @@
 	    			<input name="idlist" type="hidden">
     				<input name="module" type="hidden" value="Users">
     				<input name="parenttab" type="hidden" value="Settings">
-    				<input name="action" type="hidden" value="deletewordtemplate">
+    				<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 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>
@@ -120,7 +122,7 @@
 					{foreach item=template name=mailmerge from=$WORDTEMPLATES}
 					<tr>
 						<td class="listTableRow small" valign=top>{$smarty.foreach.mailmerge.iteration}</td>
-						<td class="listTableRow small" valign=top><input type="checkbox" class=small name="selected_id" value="{$template.templateid}" onClick=toggleSelectAll(this.name,"selectall")></td>
+						<td class="listTableRow small" valign=top><input type="checkbox" class=small name="selected_id" value="{$template.templateid}"></td>
 						<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>




From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 02:35:08 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 06:35:08 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9326 -
 /vtigercrm/trunk/modules/Users/deletewordtemplate.php
Message-ID: <20060907063508.096E076D0DF@vtiger.fosslabs.com>

Author: richie
Date: Thu Sep  7 00:34:50 2006
New Revision: 9326

Log:
Parenttab added after deleting wordtemplates--Jeri

Modified:
    vtigercrm/trunk/modules/Users/deletewordtemplate.php

Modified: vtigercrm/trunk/modules/Users/deletewordtemplate.php
==============================================================================
--- vtigercrm/trunk/modules/Users/deletewordtemplate.php (original)
+++ vtigercrm/trunk/modules/Users/deletewordtemplate.php Thu Sep  7 00:34:50 2006
@@ -1,27 +1,26 @@
-<?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.
-*
- ********************************************************************************/
-
- $idlist = $_REQUEST['idlist'];
- $id_array=explode(';', $idlist);
-
- for($i=0; $i < count($id_array)-1; $i++)
- {
-
-	         $sql = "delete from vtiger_wordtemplates where templateid=".$id_array[$i];
-	         $adb->query($sql);
-
- }
- header("Location:index.php?module=Users&action=listwordtemplates");
- 			 
-
-?>
-
-
+<?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.
+*
+ ********************************************************************************/
+ $idlist = $_REQUEST['idlist'];
+ $id_array=explode(';', $idlist);
+
+ for($i=0; $i < count($id_array)-1; $i++)
+ {
+
+	         $sql = "delete from vtiger_wordtemplates where templateid=".$id_array[$i];
+	         $adb->query($sql);
+
+ }
+ header("Location:index.php?module=Users&action=listwordtemplates&parenttab=Settings");
+ 			 
+
+?>
+
+




From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 03:12:31 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 07:12:31 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9327 -
 /vtigercrm/trunk/modules/Settings/BackupServerConfig.php
Message-ID: <20060907071232.146FD76D0E6@vtiger.fosslabs.com>

Author: richie
Date: Thu Sep  7 01:12:20 2006
New Revision: 9327

Log:
Enable disable added for backup config--Jeri

Modified:
    vtigercrm/trunk/modules/Settings/BackupServerConfig.php

Modified: vtigercrm/trunk/modules/Settings/BackupServerConfig.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/BackupServerConfig.php (original)
+++ vtigercrm/trunk/modules/Settings/BackupServerConfig.php Thu Sep  7 01:12:20 2006
@@ -9,10 +9,11 @@
 *
  ********************************************************************************/
 
+require_once('user_privileges/enable_backup.php');
 require_once('Smarty_setup.php');
 
 global $mod_strings;
-global $app_strings;
+global $app_strings, $enable_backup;
 global $app_list_strings;
 global $adb;
 global $theme;
@@ -55,6 +56,13 @@
 $smarty->assign("APP", $app_strings);
 $smarty->assign("CMOD", $mod_strings);
 
+if($enable_backup == 'true')	
+	$backup_status = 'enabled';
+else
+	$backup_status = 'disabled';
+
+$smarty->assign("BACKUP_STATUS", $backup_status);
+
 if($_REQUEST['ajax'] == 'true')
 	$smarty->display("Settings/BackupServerContents.tpl");
 else




From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 03:23:27 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 07:23:27 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9328 -
 /vtigercrm/trunk/modules/Settings/language/en_us.lang.php
Message-ID: <20060907072327.1D70B76D0E9@vtiger.fosslabs.com>

Author: richie
Date: Thu Sep  7 01:23:10 2006
New Revision: 9328

Log:
Language string updated --Jeri

Modified:
    vtigercrm/trunk/modules/Settings/language/en_us.lang.php

Modified: vtigercrm/trunk/modules/Settings/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Settings/language/en_us.lang.php Thu Sep  7 01:23:10 2006
@@ -719,6 +719,8 @@
 'LBL_TYPEALERT_1'=>'Sorry, you cannot map the',
 'LBL_WITH'=>'with',
 'LBL_TYPEALERT_2'=>'data type. Kindly map the same data types.',
+'LBL_ENABLE'=>'Enable',
+
 );
 
 




From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 03:24:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 07:24:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9329 -
 /vtigercrm/trunk/modules/Settings/SaveEnableBackup.php
Message-ID: <20060907072440.0433F76D0E9@vtiger.fosslabs.com>

Author: richie
Date: Thu Sep  7 01:24:29 2006
New Revision: 9329

Log:
File added to enable back up server config --Jeri

Added:
    vtigercrm/trunk/modules/Settings/SaveEnableBackup.php




From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 03:26:20 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 07:26:20 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9330 -
	/vtigercrm/trunk/modules/Users/Logout.php
Message-ID: <20060907072620.8A0B776D0DC@vtiger.fosslabs.com>

Author: richie
Date: Thu Sep  7 01:26:13 2006
New Revision: 9330

Log:
Backup config checked from flat file --Jeri

Modified:
    vtigercrm/trunk/modules/Users/Logout.php

Modified: vtigercrm/trunk/modules/Users/Logout.php
==============================================================================
--- vtigercrm/trunk/modules/Users/Logout.php (original)
+++ vtigercrm/trunk/modules/Users/Logout.php Thu Sep  7 01:26:13 2006
@@ -1,106 +1,109 @@
-<?php
-/*********************************************************************************
- * The contents of this file are subject to the SugarCRM Public License Version 1.1.2
- * ("License"); You may not use this file except in compliance with the 
- * License. You may obtain a copy of the License at http://www.sugarcrm.com/SPL
- * Software distributed under the License is distributed on an  "AS IS"  basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
- * the specific language governing rights and limitations under the License.
- * The Original Code is:  SugarCRM Open Source
- * The Initial Developer of the Original Code is SugarCRM, Inc.
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.;
- * All Rights Reserved.
- * Contributor(s): ______________________________________.
- ********************************************************************************/
-/*********************************************************************************
- * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Users/Logout.php,v 1.8 2005/03/21 04:51:21 ray Exp $
- * Description:  TODO: To be written.
- ********************************************************************************/
-
-require_once('include/logging.php');
-require_once('database/DatabaseConnection.php');
-require_once('modules/Users/LoginHistory.php');
-require_once('modules/Users/User.php');
-require_once('config.php');
-require_once('include/db_backup/backup.php');
-require_once('include/db_backup/ftp.php');
-require_once('include/database/PearDatabase.php');
-
-$ftpserver = '';
-$ftpuser = '';
-$ftppassword = '';
-global $adb;
-$query = "select * from vtiger_systems where server_type='backup'";
-$result = $adb->query($query);
-$num_rows = $adb->num_rows($result);
-if($num_rows > 0)
-{
-	$ftpserver = $adb->query_result($result,0,'server');
-	$ftpuser = $adb->query_result($result,0,'server_username');
-	$ftppassword = $adb->query_result($result,0,'server_password');
-}
-
-
-//Taking the Backup of DB
-	$currenttime=date("Ymd_His");
-	if($ftpserver != '' && $ftpuser != '' && $ftppassword != '')
-	{	$backupFileName="backup_".$currenttime.".sql";
-		save_structure($backupFileName, $root_directory);
-		$source_file=$backupFileName;	
-		ftpBackupFile($source_file, $ftpserver, $ftpuser, $ftppassword);
-		if(file_exists($source_file)) unlink($source_file);	
-		
-	}
-
-// Recording Logout Info
-	$usip=$_SERVER['REMOTE_ADDR'];
-        $outtime=date("Y/m/d H:i:s");
-        $loghistory=new LoginHistory();
-        $loghistory->user_logout($current_user->user_name,$usip,$outtime);
-
-
-$local_log =& LoggerManager::getLogger('Logout');
-
-//Calendar Logout
-//include('modules/Calendar/logout.php');
-
-// clear out the autthenticating flag
-session_destroy();
-
-define("IN_LOGIN", true);
-	
-// define('IN_PHPBB', true);
-// include($phpbb_root_path . 'extension.inc');
-// include($phpbb_root_path . 'common.'.$phpEx);
-
-//
-// Set page ID for session management
-//
-//$userdata = session_pagestart($user_ip, PAGE_LOGIN);
-//init_userprefs($userdata);
-//
-// End session management
-//
-
-// session id check
-/*
-if (!empty($HTTP_POST_VARS['sid']) || !empty($HTTP_GET_VARS['sid']))
-{
-        $sid = (!empty($HTTP_POST_VARS['sid'])) ? $HTTP_POST_VARS['sid'] : $HTTP_GET_VARS['sid'];
-}
-else
-{
-        $sid = '';
-}
-if( $userdata['session_logged_in'] )
-	{
-		if( $userdata['session_logged_in'] )
-		{
-			session_end($userdata['session_id'], $userdata['user_id']);
-		}
-
-	}
-*/
-// go to the login screen.
-header("Location: index.php?action=Login&module=Users");
-?>
+<?php
+/*********************************************************************************
+ * The contents of this file are subject to the SugarCRM Public License Version 1.1.2
+ * ("License"); You may not use this file except in compliance with the 
+ * License. You may obtain a copy of the License at http://www.sugarcrm.com/SPL
+ * Software distributed under the License is distributed on an  "AS IS"  basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
+ * the specific language governing rights and limitations under the License.
+ * The Original Code is:  SugarCRM Open Source
+ * The Initial Developer of the Original Code is SugarCRM, Inc.
+ * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.;
+ * All Rights Reserved.
+ * Contributor(s): ______________________________________.
+ ********************************************************************************/
+/*********************************************************************************
+ * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Users/Logout.php,v 1.8 2005/03/21 04:51:21 ray Exp $
+ * Description:  TODO: To be written.
+ ********************************************************************************/
+
+require_once('include/logging.php');
+require_once('database/DatabaseConnection.php');
+require_once('modules/Users/LoginHistory.php');
+require_once('modules/Users/User.php');
+require_once('config.php');
+require_once('include/db_backup/backup.php');
+require_once('include/db_backup/ftp.php');
+require_once('include/database/PearDatabase.php');
+require_once('user_privileges/enable_backup.php');
+
+global $adb, $enable_backup;
+
+if($enable_backup == 'true')
+{
+	$ftpserver = '';
+	$ftpuser = '';
+	$ftppassword = '';
+	$query = "select * from vtiger_systems where server_type='backup'";
+	$result = $adb->query($query);
+	$num_rows = $adb->num_rows($result);
+	if($num_rows > 0)
+	{
+		$ftpserver = $adb->query_result($result,0,'server');
+		$ftpuser = $adb->query_result($result,0,'server_username');
+		$ftppassword = $adb->query_result($result,0,'server_password');
+	}
+
+	//Taking the Backup of DB
+	$currenttime=date("Ymd_His");
+	if($ftpserver != '' && $ftpuser != '' && $ftppassword != '')
+	{	$backupFileName="backup_".$currenttime.".sql";
+	save_structure($backupFileName, $root_directory);
+	$source_file=$backupFileName;	
+	ftpBackupFile($source_file, $ftpserver, $ftpuser, $ftppassword);
+	if(file_exists($source_file)) unlink($source_file);	
+
+	}
+}
+// Recording Logout Info
+	$usip=$_SERVER['REMOTE_ADDR'];
+        $outtime=date("Y/m/d H:i:s");
+        $loghistory=new LoginHistory();
+        $loghistory->user_logout($current_user->user_name,$usip,$outtime);
+
+
+$local_log =& LoggerManager::getLogger('Logout');
+
+//Calendar Logout
+//include('modules/Calendar/logout.php');
+
+// clear out the autthenticating flag
+session_destroy();
+
+define("IN_LOGIN", true);
+	
+// define('IN_PHPBB', true);
+// include($phpbb_root_path . 'extension.inc');
+// include($phpbb_root_path . 'common.'.$phpEx);
+
+//
+// Set page ID for session management
+//
+//$userdata = session_pagestart($user_ip, PAGE_LOGIN);
+//init_userprefs($userdata);
+//
+// End session management
+//
+
+// session id check
+/*
+if (!empty($HTTP_POST_VARS['sid']) || !empty($HTTP_GET_VARS['sid']))
+{
+        $sid = (!empty($HTTP_POST_VARS['sid'])) ? $HTTP_POST_VARS['sid'] : $HTTP_GET_VARS['sid'];
+}
+else
+{
+        $sid = '';
+}
+if( $userdata['session_logged_in'] )
+	{
+		if( $userdata['session_logged_in'] )
+		{
+			session_end($userdata['session_id'], $userdata['user_id']);
+		}
+
+	}
+*/
+// go to the login screen.
+header("Location: index.php?action=Login&module=Users");
+?>




From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 03:43:58 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 07:43:58 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9331 -
	/vtigercrm/trunk/user_privileges/enable_backup.php
Message-ID: <20060907074358.16EFD76D0E4@vtiger.fosslabs.com>

Author: richie
Date: Thu Sep  7 01:43:46 2006
New Revision: 9331

Log:
File added for backup config--Jeri

Added:
    vtigercrm/trunk/user_privileges/enable_backup.php




From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 03:54:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 07:54:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9332 -
	/vtigercrm/trunk/modules/Users/profilePrivileges.php
Message-ID: <20060907075402.F210676D0F0@vtiger.fosslabs.com>

Author: richie
Date: Thu Sep  7 01:53:54 2006
New Revision: 9332

Log:
Fields disabled if it is not enabled in global privileges --Jeri

Modified:
    vtigercrm/trunk/modules/Users/profilePrivileges.php

Modified: vtigercrm/trunk/modules/Users/profilePrivileges.php
==============================================================================
--- vtigercrm/trunk/modules/Users/profilePrivileges.php (original)
+++ vtigercrm/trunk/modules/Users/profilePrivileges.php Thu Sep  7 01:53:54 2006
@@ -388,7 +388,7 @@
 //Field privileges		
 $modArr=getFieldModuleAccessArray();
 
- 
+
 $no_of_mod=sizeof($modArr);
 for($i=0;$i<$no_of_mod; $i++)
 {
@@ -399,6 +399,19 @@
 }
 $smarty->assign("PRI_FIELD_LIST",$privilege_fld);	
 $smarty->assign("MODE",$mode);
+
+$disable_field_array = Array();
+$sql_disablefield = "select * from vtiger_def_org_field";
+$result = $adb->query($sql_disablefield);
+$noofrows=$adb->num_rows($result);
+for($i=0; $i<$noofrows; $i++)
+{
+	$FieldId = $adb->query_result($result,$i,'fieldid');
+	$Visible = $adb->query_result($result,$i,'visible');
+
+	$disable_field_array[$FieldId] = $Visible;
+}
+
 if($mode=='view')
 {
 	$fieldListResult = getProfile2AllFieldList($modArr,$profileId);
@@ -446,7 +459,11 @@
 			$mandatory = '';
 			$readonly = '';
 			$field=array();
-
+			if($disable_field_array[$fieldListResult[$module_name][$j][4]] == 1)
+			{
+				$mandatory = '<font color="blue">*</font>';
+				$readonly = 'disabled';
+			}
 			if($uitype == 2 || $uitype == 6 || $uitype == 22 || $uitype == 73 || $uitype == 24 || $uitype == 81 || $uitype == 50 || $uitype == 23 || $uitype == 16)
 			{
 				$mandatory = '<font color="red">*</font>';
@@ -491,6 +508,11 @@
 				$readonly = '';
 				$field=array();
 
+				if($disable_field_array[$fieldListResult[$module_name][$j][4]] == 1)
+				{
+					$mandatory = '<font color="blue">*</font>';
+					$readonly = 'disabled';
+				}
 				if($uitype == 2 || $uitype == 6 || $uitype == 22 || $uitype == 73 || $uitype == 24 || $uitype == 81 || $uitype == 50 || $uitype == 23 || $uitype == 16)
 				{
 					$mandatory = '<font color="red">*</font>';
@@ -532,6 +554,11 @@
 				$readonly = '';
 				$field=array();
 
+				if($disable_field_array[$fieldListResult[$module_name][$j][4]] == 1)
+				{
+					$mandatory = '<font color="blue">*</font>';
+					$readonly = 'disabled';
+				}
 				if($uitype == 2 || $uitype == 6 || $uitype == 22 || $uitype == 73 || $uitype == 24 || $uitype == 81 || $uitype == 50 || $uitype == 23 || $uitype == 16)
 				{
 					$mandatory = '<font color="red">*</font>';




From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 03:54:48 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 07:54:48 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9333 -
 /vtigercrm/trunk/modules/Users/language/en_us.lang.php
Message-ID: <20060907075448.A39B576D0FC@vtiger.fosslabs.com>

Author: richie
Date: Thu Sep  7 01:54:30 2006
New Revision: 9333

Log:
Language string updated --Jeri

Modified:
    vtigercrm/trunk/modules/Users/language/en_us.lang.php

Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Users/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Users/language/en_us.lang.php Thu Sep  7 01:54:30 2006
@@ -596,6 +596,8 @@
 'LBL_YES'=>'Yes',
 'LBL_NO'=>'No',
 
+'LBL_MANDATORY_MSG'=>'Mandatory Fields',
+'LBL_DISABLE_FIELD_MSG'=>'Fields Disabled from Global Field Access Settings',
 
 );
 




From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 03:54:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 07:54:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9334 -
	/vtigercrm/trunk/modules/Calendar/EditView.php
Message-ID: <20060907075455.A542C76D0F0@vtiger.fosslabs.com>

Author: saraj
Date: Thu Sep  7 01:54:48 2006
New Revision: 9334

Log:
changes made for weekly recurring events  --Minnie

Modified:
    vtigercrm/trunk/modules/Calendar/EditView.php

Modified: vtigercrm/trunk/modules/Calendar/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/EditView.php (original)
+++ vtigercrm/trunk/modules/Calendar/EditView.php Thu Sep  7 01:54:48 2006
@@ -95,9 +95,16 @@
 	    $value['repeat_frequency'] = $adb->query_result($res,0,'recurringfreq');
 	    $recurringinfo =  explode("::",$adb->query_result($res,0,'recurringinfo'));
 	    $value['eventrecurringtype'] = $recurringinfo[0];
-	    if($recurringinfo[0] == 'Monthly')
+	    if($recurringinfo[0] == 'Weekly')
 	    {
-		    $monthrpt_str = '';
+		   for($i=0;$i<6;$i++)
+		   {
+			   $label = 'week'.$recurringinfo[$i+1];
+			   $value[$label] = 'checked';
+		   }
+	    }
+	    elseif($recurringinfo[0] == 'Monthly')
+	    {
 		    $value['repeatMonth'] = $recurringinfo[1];
 		    if($recurringinfo[1] == 'date')
 		    {




From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 03:55:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 07:55:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9335 - in
 /vtigercrm/trunk/Smarty/templates: EditProfile.tpl ProfileDetailView.tpl
Message-ID: <20060907075549.72FFD76D0F0@vtiger.fosslabs.com>

Author: richie
Date: Thu Sep  7 01:55:37 2006
New Revision: 9335

Log:
Fields disabled if it is not enabled in global privileges --Jeri

Modified:
    vtigercrm/trunk/Smarty/templates/EditProfile.tpl
    vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl

Modified: vtigercrm/trunk/Smarty/templates/EditProfile.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/EditProfile.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/EditProfile.tpl Thu Sep  7 01:55:37 2006
@@ -246,6 +246,14 @@
 			</table>
 		</td>
                 </tr>
+		<table border="0" cellpadding="2" cellspacing="0">
+			<tr>
+				<td align="left"><font color="red" size=5>*</font>{$CMOD.LBL_MANDATORY_MSG}</td>
+			</tr>
+			<tr>
+				<td align="left"><font color="blue" size=5>*</font>{$CMOD.LBL_DISABLE_FIELD_MSG}</td>
+			</tr>
+		</table>
 		<tr>
 		<td style="border-top: 2px dotted rgb(204, 204, 204);" align="right">
 		<!-- wizard buttons -->

Modified: vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl Thu Sep  7 01:55:37 2006
@@ -235,6 +235,14 @@
 			</table>
 		</td>
                 </tr>
+		<table border="0" cellpadding="2" cellspacing="0">
+			<tr>
+				<td align="left"><font color="red" size=5>*</font>{$CMOD.LBL_MANDATORY_MSG}</td>
+			</tr>
+			<tr>
+				<td align="left"><font color="blue" size=5>*</font>{$CMOD.LBL_DISABLE_FIELD_MSG}</td>
+			</tr>
+		</table>
 		<tr>
 		<td style="border-top: 2px dotted rgb(204, 204, 204);" align="right">
 		<!-- wizard buttons -->
@@ -244,6 +252,7 @@
 				<td><input type="submit" value="{$APP.LBL_EDIT_BUTTON_LABEL}" class="crmButton small edit" name="edit"></td>
 				<td>&nbsp;</td>
 			</tr>
+			
 		</tbody>
 		</table>
 		</td>




From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 03:56:48 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 07:56:48 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9336 -
	/vtigercrm/trunk/modules/Calendar/addEventUI.php
Message-ID: <20060907075648.D177176D0F0@vtiger.fosslabs.com>

Author: saraj
Date: Thu Sep  7 01:56:42 2006
New Revision: 9336

Log:
changes made to fix calendar related issue  --Minnie

Modified:
    vtigercrm/trunk/modules/Calendar/addEventUI.php

Modified: vtigercrm/trunk/modules/Calendar/addEventUI.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/addEventUI.php (original)
+++ vtigercrm/trunk/modules/Calendar/addEventUI.php Thu Sep  7 01:56:42 2006
@@ -177,7 +177,7 @@
 	<script type="text/javascript" src="jscalendar/calendar.js"></script>
 	<script type="text/javascript" src="jscalendar/lang/calendar-<? echo $app_strings['LBL_JSCALENDAR_LANG'] ?>.js"></script>
 	<script type="text/javascript" src="jscalendar/calendar-setup.js"></script>
-	<div class="calAddEvent layerPopup" style="display:none" id="addEvent" align=center>
+	<div class="calAddEvent layerPopup" style="display:none;width:500px;left:200px;" id="addEvent" align=center>
 	<form name="EditView" onSubmit="return check_form();" method="POST" action="index.php">
 	<input type="hidden" name="return_action" value="index">
 	<input type="hidden" name="return_module" value="Calendar">
@@ -604,7 +604,7 @@
 				<a href="" id="pending" onClick="fninvsh('eventcalAction')" class="calMnu">- <?php echo $mod_strings['LBL_NOTHELD']?></a>
 				<span style="border-top:1px dashed #CCCCCC;width:99%;display:block;"></span>
 				<a href="" id="postpone" onClick="fninvsh('eventcalAction')" class="calMnu">- <?php echo $mod_strings['LBL_POSTPONE']?></a>
-				<a href="" id="changeowner" onClick="fninvsh('eventcalAction')" class="calMnu">- <?php echo $mod_strings['LBL_CHANGEOWNER']?></a>
+				<a href="" id="changeowner" onClick="fnvshobj(this,'act_changeowner');fninvsh('eventcalAction')" class="calMnu">- <?php echo $mod_strings['LBL_CHANGEOWNER']?></a>
 				<a href="" id="actdelete" onclick ="fninvsh('eventcalAction');return confirm('Are you sure?');" class="calMnu">- <?php echo $mod_strings['LBL_DEL']?></a>
 			</td>
 		</tr>
@@ -832,7 +832,7 @@
                                 <a href="" id="taskpending" onClick="fninvsh('taskcalAction');" class="calMnu">- <?php echo $mod_strings['LBL_DEFERRED']?></a>
                                 <span style="border-top:1px dashed #CCCCCC;width:99%;display:block;"></span>
                                 <a href="" id="taskpostpone" onClick="fninvsh('taskcalAction');" class="calMnu">- <?php echo $mod_strings['LBL_POSTPONE']?></a>
-                                <a href="" id="taskchangeowner" onClick="fninvsh('taskcalAction');" class="calMnu">- <?php echo $mod_strings['LBL_CHANGEOWNER']?></a>
+                                <a href="" id="taskchangeowner" onClick="fnvshobj(this,'act_changeowner'); fninvsh('taskcalAction');" class="calMnu">- <?php echo $mod_strings['LBL_CHANGEOWNER']?></a>
                                 <a href="" id="taskactdelete" onClick ="fninvsh('taskcalAction');return confirm('Are you sure?');" class="calMnu">- <?php echo $mod_strings['LBL_DEL']?></a>
                         </td>
                 </tr>




From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 03:57:25 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 07:57:25 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9337 -
	/vtigercrm/trunk/modules/Calendar/DetailView.php
Message-ID: <20060907075725.4113176D0F0@vtiger.fosslabs.com>

Author: saraj
Date: Thu Sep  7 01:57:19 2006
New Revision: 9337

Log:
changes made for weekly recurring events  --Minnie

Modified:
    vtigercrm/trunk/modules/Calendar/DetailView.php

Modified: vtigercrm/trunk/modules/Calendar/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/DetailView.php (original)
+++ vtigercrm/trunk/modules/Calendar/DetailView.php Thu Sep  7 01:57:19 2006
@@ -174,7 +174,23 @@
 		$data['repeat_frequency'] = $adb->query_result($res,0,'recurringfreq');
 		$recurringinfo =  explode("::",$adb->query_result($res,0,'recurringinfo'));
 		$data['recurringtype'] = $recurringinfo[0];
-		if($recurringinfo[0] == 'Monthly')
+		if($recurringinfo[0] == 'Weekly')
+		{
+			$weekrpt_str = '';
+			if(count($recurringinfo) > 1)
+			{
+				$weekrpt_str .= 'on ';
+				for($i=1;$i<count($recurringinfo);$i++)
+				{
+					$label = 'LBL_DAY'.$recurringinfo[$i];
+					if($i != 1)
+						$weekrpt_str .= ', ';
+					$weekrpt_str .= $mod_strings[$label];
+				}
+			}
+			$data['repeat_str'] = $weekrpt_str;
+		}
+		elseif($recurringinfo[0] == 'Monthly')
 		{   
 			$monthrpt_str = '';
 			$data['repeatMonth'] = $recurringinfo[1];  
@@ -214,7 +230,7 @@
 
 				$monthrpt_str .= 'on '.$mod_strings[$recurringinfo[2]].' '.$day;
 			}
-			$data['repeat_month_str'] = $monthrpt_str;
+			$data['repeat_str'] = $monthrpt_str;
 		}
 	}
 	else 




From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 04:01:01 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 08:01:01 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9338 -
	/vtigercrm/trunk/modules/Calendar/calendarLayout.php
Message-ID: <20060907080101.0CE8476D0F0@vtiger.fosslabs.com>

Author: saraj
Date: Thu Sep  7 02:00:55 2006
New Revision: 9338

Log:
changes made to fix calendar related issue  --Minnie

Modified:
    vtigercrm/trunk/modules/Calendar/calendarLayout.php

Modified: vtigercrm/trunk/modules/Calendar/calendarLayout.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/calendarLayout.php (original)
+++ vtigercrm/trunk/modules/Calendar/calendarLayout.php Thu Sep  7 02:00:55 2006
@@ -734,9 +734,9 @@
 
 		$js_string = "";
 		if(isPermitted("Calendar","EditView") == "yes")
-		              $js_string = 'onClick="gshow(\'addEvent\',\'call\',\''.$sttemp_date.'\',\''.$endtemp_date.'\',\''.$time_arr['starthour'].'\',\''.$time_arr['startmin'].'\',\''.$time_arr['startfmt'].'\',\''.$time_arr['endhour'].'\',\''.$time_arr['endmin'].'\',\''.$time_arr['endfmt'].'\',\'hourview\',\'event\')"';
+		              $js_string = 'onClick="fnvshobj(this,\'addEvent\'); gshow(\'addEvent\',\'call\',\''.$sttemp_date.'\',\''.$endtemp_date.'\',\''.$time_arr['starthour'].'\',\''.$time_arr['startmin'].'\',\''.$time_arr['startfmt'].'\',\''.$time_arr['endhour'].'\',\''.$time_arr['endmin'].'\',\''.$time_arr['endfmt'].'\',\'hourview\',\'event\')"';
 		$dayview_layout .= '<tr>
-					<td class="lvtCol" valign=top height="75"  width="10%" '.$js_string.'>'.$hour.''.$sub_str.'</td>';
+					<td style="cursor:pointer;" class="lvtCol" valign=top height="75"  width="10%" '.$js_string.'>'.$hour.''.$sub_str.'</td>';
 		//To display events in Dayview
 		$dayview_layout .= getdayEventLayer($cal,$cal['calendar']->slices[$i],$no_of_rows);
 		$dayview_layout .= '</tr>';
@@ -844,7 +844,7 @@
 			$weekview_layout .= '<td class="cellNormal" onMouseOver="cal_show(\'create_'.$sttemp_date.''.$time_arr['starthour'].''.$time_arr['startfmt'].'\')" onMouseOut="fnHide_Event(\'create_'.$sttemp_date.''.$time_arr['starthour'].''.$time_arr['startfmt'].'\')"  style="height: 40px;" bgcolor="white" valign="top" width="12%" align=right vlign=top>';
 			$weekview_layout .= '<div id="create_'.$sttemp_date.''.$time_arr['starthour'].''.$time_arr['startfmt'].'" style="visibility: hidden;">';
 			if(isPermitted("Calendar","EditView") == "yes")
-		                        $weekview_layout .='<img onClick="gshow(\'addEvent\',\'call\',\''.$sttemp_date.'\',\''.$endtemp_date.'\',\''.$time_arr['starthour'].'\',\''.$time_arr['startmin'].'\',\''.$time_arr['startfmt'].'\',\''.$time_arr['endhour'].'\',\''.$time_arr['endmin'].'\',\''.$time_arr['endfmt'].'\',\'hourview\',\'event\')" src="'.$cal['IMAGE_PATH'].'cal_add.gif" border="0">';
+		                        $weekview_layout .='<img onClick="fnvshobj(this,\'addEvent\'); gshow(\'addEvent\',\'call\',\''.$sttemp_date.'\',\''.$endtemp_date.'\',\''.$time_arr['starthour'].'\',\''.$time_arr['startmin'].'\',\''.$time_arr['startfmt'].'\',\''.$time_arr['endhour'].'\',\''.$time_arr['endmin'].'\',\''.$time_arr['endfmt'].'\',\'hourview\',\'event\')" src="'.$cal['IMAGE_PATH'].'cal_add.gif" border="0">';
 					
                         $weekview_layout .='</div>';
 			//To display events in WeekView
@@ -923,7 +923,7 @@
 				$monthview_layout .= '</a>';
 				$monthview_layout .= '<div id="create_'.$temp_date.''.$time_arr['starthour'].'" style="visibility:hidden;">';
 				if(isPermitted("Calendar","EditView") == "yes")
-                                $monthview_layout .='<a onClick="gshow(\'addEvent\',\'call\',\''.$temp_date.'\',\''.$endtemp_date.'\',\''.$time_arr['starthour'].'\',\''.$time_arr['startmin'].'\',\''.$time_arr['startfmt'].'\',\''.$time_arr['endhour'].'\',\''.$time_arr['endmin'].'\',\''.$time_arr['endfmt'].'\',\'hourview\',\'event\')" href="javascript:void(0)"><img src="'.$cal['IMAGE_PATH'].'cal_add.gif" border="0"></a>';
+                                $monthview_layout .='<a onClick="fnvshobj(this,\'addEvent\'); gshow(\'addEvent\',\'call\',\''.$temp_date.'\',\''.$endtemp_date.'\',\''.$time_arr['starthour'].'\',\''.$time_arr['startmin'].'\',\''.$time_arr['startfmt'].'\',\''.$time_arr['endhour'].'\',\''.$time_arr['endmin'].'\',\''.$time_arr['endfmt'].'\',\'hourview\',\'event\')" href="javascript:void(0)"><img src="'.$cal['IMAGE_PATH'].'cal_add.gif" border="0"></a>';
                                 $monthview_layout .= '  </div></td>';
 			}
 			else




From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 04:04:47 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 08:04:47 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9339 -
	/vtigercrm/trunk/modules/Calendar/calendarLayout.php
Message-ID: <20060907080447.D532176D0F0@vtiger.fosslabs.com>

Author: saraj
Date: Thu Sep  7 02:04:42 2006
New Revision: 9339

Log:
changes made to fix calendar related issue  --Minnie

Modified:
    vtigercrm/trunk/modules/Calendar/calendarLayout.php

Modified: vtigercrm/trunk/modules/Calendar/calendarLayout.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/calendarLayout.php (original)
+++ vtigercrm/trunk/modules/Calendar/calendarLayout.php Thu Sep  7 02:04:42 2006
@@ -917,7 +917,7 @@
 			//to display dates in month
 			if ($cal['slice']->start_time->getMonth() == $cal['calendar']->date_time->getMonth())
 			{
-				$monthview_layout .= '<td class="'.$monthclass.'" width="14%" onMouseOver="cal_show(\'create_'.$temp_date.''.$time_arr['starthour'].'\')" onMouseOut="fnHide_Event(\'create_'.$temp_date.''.$time_arr['starthour'].'\')">';
+				$monthview_layout .= '<td style="text-align:left;" class="'.$monthclass.'" width="14%" onMouseOver="cal_show(\'create_'.$temp_date.''.$time_arr['starthour'].'\')" onMouseOut="fnHide_Event(\'create_'.$temp_date.''.$time_arr['starthour'].'\')">';
 				$monthview_layout .= '<a href="index.php?module=Calendar&action=index&view='.$cal['slice']->getView().''.$cal['slice']->start_time->get_date_str().'&parenttab='.$category.'">';
 				$monthview_layout .= $cal['slice']->start_time->get_Date();
 				$monthview_layout .= '</a>';




From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 04:06:53 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 08:06:53 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9340 -
	/vtigercrm/trunk/include/utils/RecurringType.php
Message-ID: <20060907080653.4833F76D103@vtiger.fosslabs.com>

Author: saraj
Date: Thu Sep  7 02:06:47 2006
New Revision: 9340

Log:
changes made for weekly recurring events  --Minnie

Modified:
    vtigercrm/trunk/include/utils/RecurringType.php

Modified: vtigercrm/trunk/include/utils/RecurringType.php
==============================================================================
--- vtigercrm/trunk/include/utils/RecurringType.php (original)
+++ vtigercrm/trunk/include/utils/RecurringType.php Thu Sep  7 02:06:47 2006
@@ -42,12 +42,10 @@
 			'month' => $end_date[1],
 			'year'  => $end_date[0]
 		);
-		//echo '<pre>';print_r($end_date);echo '</pre>';
 		$this->recur_type = $repeat_arr['type'];
 		$this->recur_freq = $repeat_arr['repeat_frequency'];
 		$this->startdate = new DateTime($start_date,true);
 		$this->enddate = new DateTime($end_date,true);
-		//echo '<pre>';print_r($this->startdate);echo '</pre>';die;
 		if($repeat_arr['sun_flag'])
 		{
 			$this->dayofweek_to_rpt[] = 0;
@@ -81,7 +79,6 @@
 			$this->rptmonth_datevalue = $repeat_arr['repeatmonth_date'];
 		$this->rptmonth_daytype = $repeat_arr['repeatmonth_daytype'];
 		$this->recurringdates = $this->getRecurringDates();
-		//echo '<pre>';print_r($this);echo '</pre>';die;
 	}
 
 	/**
@@ -109,20 +106,6 @@
 			}
 			elseif($this->recur_type == 'Weekly')
 			{
-				//echo '<pre>';print_r($this);echo '</pre>';die;
-				$recurringDates[] = $tempdate;
-				$st_date = explode("-",$tempdate);
-				if(isset($this->recur_freq))
-					$index = $this->recur_freq * 7;
-				else
-					$index = 7;
-				$date_arr = Array(
-					'day'   => $st_date[2] + $index,
-					'month' => $st_date[1],
-					'year'  => $st_date[0]
-				);
-				$tempdateObj = new DateTime($date_arr,true);
-				/*$recurringDates[] = $tempdate;
 				$st_date = explode("-",$tempdate);
 				$date_arr = Array(
 					'day'   => $st_date[2],
@@ -130,28 +113,57 @@
 					'year'  => $st_date[0]
 				);
 				$tempdateObj = new DateTime($date_arr,true);
-				$firstdayofweekObj = $tempdateObj->getThisweekDaysbyIndex(0);
-				$date_arr = Array(
-					'day'   => $firstdayofweekObj->day+$this->dayofweek_to_rpt[0],
-					'month' => $st_date[1],
-					'year'  => $st_date[0]
-				);
-				$firstrptObj = new DateTime($date_arr,true);
-				
-				if(isset($this->recur_freq) && $this->recur_freq != null)
-					$index = $st_date[2] + ($this->recur_freq -1) ;
+				if(isset($this->dayofweek_to_rpt) && $this->dayofweek_to_rpt != null)
+				{
+					$weekstartObj = $tempdateObj->getThisweekDaysbyIndex(0);
+					if($weekstartObj->get_formatted_date() >= $this->startdate->get_formatted_date())
+					{
+						for($i=0;$i<count($this->dayofweek_to_rpt);$i++)
+						{
+							$repeatdateObj = $weekstartObj->getThisweekDaysbyIndex($this->dayofweek_to_rpt[$i]);
+							if($repeatdateObj->get_formatted_date() <= $enddate)
+								$recurringDates[] = $repeatdateObj->get_formatted_date();
+						}
+						if(isset($this->recur_freq))
+							$index = $this->recur_freq * 7;
+						else
+						        $index = 7;
+						$date_arr = Array(
+							'day'   => $st_date[2] + $index,
+							'month' => $st_date[1],
+							'year'  => $st_date[0]
+						);
+						$tempdateObj = new DateTime($date_arr,true);
+					}
+					else
+					{
+						if(isset($this->recur_freq))
+							$index = $this->recur_freq * 7;
+						else
+							$index = 7;
+						$date_arr = Array(
+							'day'   => $st_date[2] + $index,
+							'month' => $st_date[1],
+							'year'  => $st_date[0]
+						);
+						$tempdateObj = new DateTime($date_arr,true);
+						
+					}
+				}
 				else
-					$index = $st_date[2] - 1 ;
-				$index = $st_date[2] - 1 ;
-				$tempdateObj = $this->startdate->getThismonthDaysbyIndex($index,'',$st_date[1],$st_date[0]);
-				if(in_array($tempdateObj->dayofweek_inshort,$this->repeatdays))
-				{
-					$tempdate = $tempdateObj->get_formatted_date();
-				}
-				else
-				{
-				}
-				//echo '<pre>';print_r($this);echo '</pre>';die;*/
+				{
+					$recurringDates[] = $tempdateObj->get_formatted_date();
+					if(isset($this->recur_freq))
+						$index = $this->recur_freq * 7;
+					else
+						$index = 7;
+					$date_arr = Array(
+						'day'   => $st_date[2] + $index,
+						'month' => $st_date[1],
+						'year'  => $st_date[0]
+					);
+					$tempdateObj = new DateTime($date_arr,true);
+				}
 				$tempdate = $tempdateObj->get_formatted_date();
 			}
 			elseif($this->recur_type == 'Monthly')




From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 04:10:13 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 08:10:13 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9341 -
	/vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
Message-ID: <20060907081013.BD30572A555@vtiger.fosslabs.com>

Author: saraj
Date: Thu Sep  7 02:10:08 2006
New Revision: 9341

Log:
changes made to do wordwrapping for description and multiselect combobox --Minnie

Modified:
    vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl

Modified: vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl Thu Sep  7 02:10:08 2006
@@ -51,7 +51,13 @@
                     							</div>
                							</td>
                                           {elseif $keyid eq '33'}<!--Multi Select Combo box-->
-                                          <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}</span>
+						<!--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}
@@ -116,7 +122,11 @@
 						{if $label eq $MOD.LBL_ADD_COMMENT}
 							{assign var=keyval value=''}
 						{/if}
-                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}</span>
+							{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}">
+							{$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}




From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 04:12:07 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 08:12:07 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9342 -
 /vtigercrm/trunk/Smarty/templates/ActivityEditView.tpl
Message-ID: <20060907081207.C058F76D0DC@vtiger.fosslabs.com>

Author: saraj
Date: Thu Sep  7 02:12:02 2006
New Revision: 9342

Log:
changes made for weekly recurring events  --Minnie

Modified:
    vtigercrm/trunk/Smarty/templates/ActivityEditView.tpl

Modified: vtigercrm/trunk/Smarty/templates/ActivityEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ActivityEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ActivityEditView.tpl Thu Sep  7 02:12:02 2006
@@ -422,17 +422,22 @@
 														{assign var=rptstyle value='style="display:block"'}
 														{if $ACTIVITYDATA.eventrecurringtype eq 'Daily'}
 															{assign var=rptmonthstyle value='style="display:none"'}
+															{assign var=rptweekstyle value='style="display:none"'}
 														{elseif $ACTIVITYDATA.eventrecurringtype eq 'Weekly'}
 															{assign var=rptmonthstyle value='style="display:none"'}
+															{assign var=rptweekstyle value='style="display:block"'}
 														{elseif $ACTIVITYDATA.eventrecurringtype eq 'Monthly'}
 															{assign var=rptmonthstyle value='style="display:block"'}
+															{assign var=rptweekstyle value='style="display:none"'}
 														{elseif $ACTIVITYDATA.eventrecurringtype eq 'Yearly'}
 															{assign var=rptmonthstyle value='style="display:none"'}
+															{assign var=rptweekstyle value='style="display:none"'}
 														{/if}
 													<input type="checkbox" name="recurringcheck" onClick="showhide('repeatOptions')" checked>
 													{else}
 														{assign var=rptstyle value='style="display:none"'}
 														{assign var=rptmonthstyle value='style="display:none"'}
+														{assign var=rptweekstyle value='style="display:none"'}
 													<input type="checkbox" name="recurringcheck" onClick="showhide('repeatOptions')">
 													{/if}
 													</td>
@@ -454,16 +459,16 @@
 													</td>
 												</tr>
 												</table>
-												<div id="repeatWeekUI" style="display:none;">
+												<div id="repeatWeekUI" {$rptweekstyle}>
 												<table border=0 cellspacing=0 cellpadding=2>
 												<tr>
-													<td><input name="sun_flag" value="sunday" type="checkbox"></td><td>Sun</td>
-													<td><input name="mon_flag" value="monday" type="checkbox"></td><td>Mon</td>
-													<td><input name="tue_flag" value="tuesday" type="checkbox"></td><td>Tue</td>
-													<td><input name="wed_flag" value="wednesday" type="checkbox"></td><td>Wed</td>
-													<td><input name="thu_flag" value="thursday" type="checkbox"></td><td>Thu</td>
-													<td><input name="fri_flag" value="friday" type="checkbox"></td><td>Fri</td>
-													<td><input name="sat_flag" value="saturday" type="checkbox"></td><td>Sat</td>
+													<td><input name="sun_flag" value="sunday" {$ACTIVITYDATA.week0} type="checkbox"></td><td>Sun</td>
+													<td><input name="mon_flag" value="monday" {$ACTIVITYDATA.week1} type="checkbox"></td><td>Mon</td>
+													<td><input name="tue_flag" value="tuesday" {$ACTIVITYDATA.week2} type="checkbox"></td><td>Tue</td>
+													<td><input name="wed_flag" value="wednesday" {$ACTIVITYDATA.week3} type="checkbox"></td><td>Wed</td>
+													<td><input name="thu_flag" value="thursday" {$ACTIVITYDATA.week4} type="checkbox"></td><td>Thu</td>
+													<td><input name="fri_flag" value="friday" {$ACTIVITYDATA.week5} type="checkbox"></td><td>Fri</td>
+													<td><input name="sat_flag" value="saturday" {$ACTIVITYDATA.week6} type="checkbox"></td><td>Sat</td>
 												</tr>
 												</table>
 												</div>




From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 04:12:34 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 08:12:34 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9343 -
 /vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl
Message-ID: <20060907081234.610B376D0DC@vtiger.fosslabs.com>

Author: saraj
Date: Thu Sep  7 02:12:30 2006
New Revision: 9343

Log:
changes made for weekly recurring events  --Minnie

Modified:
    vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl

Modified: vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl Thu Sep  7 02:12:30 2006
@@ -243,7 +243,7 @@
 										</tr>
 										<tr>
                                                                                         <td width="30%" align=right>&nbsp;</td>
-                                                                                        <td>{$ACTIVITYDATA.repeat_month_str}</td>
+                                                                                        <td>{$ACTIVITYDATA.repeat_str}</td>
                                                                                 </tr>
 										{/if}
 									</table>




From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 04:39:25 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 08:39:25 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9344 - in
	/vtigercrm/trunk/themes/blue lagoon: ./ images/
Message-ID: <20060907083926.2096474815B@vtiger.fosslabs.com>

Author: saraj
Date: Thu Sep  7 02:33:30 2006
New Revision: 9344

Log:
* Added new theme files

Added:
    vtigercrm/trunk/themes/blue lagoon/
    vtigercrm/trunk/themes/blue lagoon/footer.php
    vtigercrm/trunk/themes/blue lagoon/header.php
    vtigercrm/trunk/themes/blue lagoon/images/
    vtigercrm/trunk/themes/blue lagoon/images/3hdrTabBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/Accounts.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/Call.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/Calls.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/Contacts.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/HomeBtm.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/Home_15.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/Leads.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/Meeting.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/Meetings.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/Opportunities.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/Potentials.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/Quotes.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/Reports_arrow.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/RolesDelete.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/RolesEdit.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/RolesMove.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/Rolesadd.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/Settings.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/Tasks.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/Thumbs.db   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/Tickets.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/TopOpenQuotes.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/ViewTemplate.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/aboutUS.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/about_btm.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/aboutus.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/addrss.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/advancedSearchLens.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/announ.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/arrow.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/arrow_down.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/arrow_up.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/assign.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/attachment.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/audit.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/backupserver.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/basicSearchLens.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/bl_bar.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/black.png   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/blank.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/bookMark.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/bottom_left.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/bottom_right.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/btnAlexa.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/btnL3Add-Faded.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/btnL3Add.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/btnL3AllMenu-Faded.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/btnL3AllMenu.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/btnL3Calc-Faded.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/btnL3Calc.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/btnL3Calendar-Faded.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/btnL3Calendar.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/btnL3Clock-Faded.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/btnL3Clock.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/btnL3Search-Faded.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/btnL3Search.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/btnL3Tracker-Faded.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/btnL3Tracker.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/busy.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/cal12x12Shared.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/cal16x16Call.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/cal16x16CallAdd.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/cal16x16Linked.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/cal16x16Meeting.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/cal16x16MeetingAdd.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/cal16x16Shared.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/cal16x16ToDo.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/cal16x16ToDoAdd.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calAddButtonBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calBottomBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calBottomLeft.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calBottomRight.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calNavNext.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calNavPrev.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calSep.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calTopLeft.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calTopRight.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/cal_Hdr.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/cal_Others.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/cal_add.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/cal_add.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/cal_clock.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/cal_event.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/cal_hdr.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/cal_nav.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/cal_next_nav.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/cal_prev_nav.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/cal_sel.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/cal_sharing.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/cal_title.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calc_back_btn.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calc_black_btn.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calc_blue_btn.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calc_bottom_center.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calc_bottom_left.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calc_bottom_right.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calc_canc_btn.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calc_grey_btn.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calc_logo.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calc_mem_btn.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calc_middle_right.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calc_red_btn.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calc_res_bc.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calc_res_bl.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calc_res_br.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calc_res_ml.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calc_res_mr.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calc_res_tc.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calc_res_tl.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calc_res_tr.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calc_top_left.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calc_top_right.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/calendar.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/cfcurrency.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/cfpicklist.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/check_mail.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/checkbox.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/clear_field.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/clock_bg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/close.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/collapse.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/company.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/compose.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/composeMail.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/currency.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/currencydelete.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/custom.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/dashBottomBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/dashSelectBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/dashTopBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/dash_btm.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/dash_btm_center.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/dash_btm_left.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/dash_btm_right.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/dash_down_arrow.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/dash_name.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/dash_screw.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/dash_screw.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/dash_scroll_up.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/dash_sel_btm.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/dash_sel_chart.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/dash_sel_left.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/dash_sel_top.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/dash_switch_view.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/dash_top.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/dash_top_shadow.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/dash_unsel_chart.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/date.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/dboardMatrixView.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/dboardNormalView.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/del.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/del_tag.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/delete.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/denied.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/disabled.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/editfield.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/email.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/empty.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/enabled.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/end.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/end_disabled.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/expand.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/free.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/hdrNameBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/hdrTabBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/head_end.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/head_start.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/help.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/help_icon.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/hometop.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/ico-groups.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/ico-profile.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/ico-roles.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/ico-users.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/inventory.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/jump.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/keyMetrics.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/layerPopupBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/left.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/left_arc.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/level2TabBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/loginBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/loginBottomBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/loginBottomURL.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/loginSIBottomLeft.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/loginSIBottomRight.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/loginSITopLeft.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/loginSITopRight.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/loginTopShade.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/logout.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/lvtNavBtnFirst.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/lvtNavBtnLast.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/lvtNavBtnNext.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/lvtNavBtnPrev.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/mailHdr.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/mailSubHeaderBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/mailTitle.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/mailmarge.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/menuDnArrow.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/menu_off_end.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/menu_off_start.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/menu_off_tile.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/menu_on_end.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/menu_on_start.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/menu_on_tile.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/menu_root.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/migrate.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/migration_sucess.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/minus.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/moduleSelectorBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/movecol_del.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/movecol_del_down.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/movecol_del_over.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/movecol_down.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/movecol_down_disabled.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/movecol_down_down.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/movecol_down_over.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/movecol_up.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/movecol_up_disabled.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/movecol_up_down.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/movecol_up_over.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/myGroupAllocation.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/myTickets.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/myTopAccounts.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/myTopInvoices.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/myTopOpenPotentials.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/myTopSalesOrders.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/myUpcoPendAct.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/next.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/nextRecord.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/next_disabled.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/no.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/notification.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/number.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/offstar.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/ogmailserver.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/one.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/onstar.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/orgshar.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/pendingEvents.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/pending_left.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/pending_right.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/percent.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/phone.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/picklist.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/picklistEditor.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/picklist_hint.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/plsWaitAnimated.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/plus.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/pointer.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/popupHdr.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/previous.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/previousRecord.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/previous_disabled.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/pricebook.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/primeTopBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/print.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/private.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/proxy.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/prvPrfBottomLeft.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/prvPrfBottomRight.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/prvPrfHdrArrow.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/prvPrfSelectedTick.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/prvPrfTopLeft.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/prvPrfTopRight.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/public.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/qcBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/qcName.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/reload.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/report_bg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/report_bottom.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/report_btn.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/report_newHdr.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/reportsCreate.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/reportsDelete.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/reportsFolderCreate.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/reportsMove.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/right.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/right_arc.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/rss.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/rssDisplayBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/rssDisplayBottom.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/rssDisplayBottomLeft.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/rssDisplayBottomRight.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/rssDisplayLeft.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/rssDisplayRight.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/rssDisplaySpeaker.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/rssDisplayTop.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/rssDisplayTopLeft.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/rssDisplayTopRight.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/rssHeader.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/rssOnHeader.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/rssdelete.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/rssforward.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/rssframeHdr.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/rssimage.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/rssroot.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/scroll_left.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/scroll_left_down.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/scroll_right.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/scroll_right_down.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/search.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/searchUIBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/searching.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/select.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/set-IcoLoginHistory.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/set-IcoTwoTabConfig.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/settingsActBtnDelete.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/settingsActBtnDuplicate.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/settingsActBtnEdit.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/settingsMTBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/settingsSelUIBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/settings_top.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/shareaccess.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/showDown.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/showPanelTopBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/showPanelTopLeft.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/showPanelTopRight.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/showsubmenu.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/site_hdr.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/site_sel.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/site_unsel.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/small_left.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/small_right.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/spacer.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/start.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/start_disabled.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/status.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/strikeline.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/summarize.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/system.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/tabRht.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/tabSelectedBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/tabSeperatorBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/tabUnSelectedBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/tabular.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/tagCloudBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/tagCloudName.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/tagcloud_03.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/taxConfiguration.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/tbarChat-Faded.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/tbarChat.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/tbarExport-Faded.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/tbarExport.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/tbarImport-Faded.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/tbarImport.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/tbarPrivateChat.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/tbarPublicChat.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/tbarSettings.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/tblPro1BtnHide.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/tblPro1ColBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/terms.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/text.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/titleMailClient.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/titleMySites.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/titleRSSReader.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/todaybg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/topBg.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/topBnr.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/top_left.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/top_right.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/topbar.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/topcut.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/up.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/uparrow.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/upcomingEvents.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/upcoming_left.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/upcoming_right.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/url.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/vtbusy.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/vtiger-crm.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/vtiger.jpg   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/vtigerDevDocs.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/webmail_downarrow.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/webmail_header.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/webmail_root.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/webmail_settings.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/webmail_trash.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/webmail_uparrow.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/images/yes.gif   (with props)
    vtigercrm/trunk/themes/blue lagoon/layout_utils.php
    vtigercrm/trunk/themes/blue lagoon/loginheader.html
    vtigercrm/trunk/themes/blue lagoon/loginheader.php
    vtigercrm/trunk/themes/blue lagoon/style.css




From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 05:30:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 09:30:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9345 -
	/vtigercrm/trunk/include/utils/CommonUtils.php
Message-ID: <20060907093049.8373076D10D@vtiger.fosslabs.com>

Author: richie
Date: Thu Sep  7 03:30:14 2006
New Revision: 9345

Log:
Writing the actionid and actionname array in tabdata.php file

Modified:
    vtigercrm/trunk/include/utils/CommonUtils.php

Modified: vtigercrm/trunk/include/utils/CommonUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/CommonUtils.php (original)
+++ vtigercrm/trunk/include/utils/CommonUtils.php Thu Sep  7 03:30:14 2006
@@ -1593,6 +1593,34 @@
 
         }
 
+	//Constructing the actionname=>actionid array
+	$actionid_array=Array();
+	$sql1="select * from vtiger_actionmapping";
+	$result1=$adb->query($sql1);
+	$num_seq1=$adb->num_rows($result1);
+	for($i=0;$i<$num_seq1;$i++)
+	{
+		$actionname=$adb->query_result($result1,$i,'actionname');
+		$actionid=$adb->query_result($result1,$i,'actionid');
+		$actionid_array[$actionname]=$actionid;
+	}		
+
+	print_r($actionid_array);
+	
+	//Constructing the actionid=>actionname array with securitycheck=0
+	$actionname_array=Array();
+	$sql2="select * from vtiger_actionmapping where securitycheck=0";
+	$result2=$adb->query($sql2);
+	$num_seq2=$adb->num_rows($result2);
+	for($i=0;$i<$num_seq2;$i++)
+	{
+		$actionname=$adb->query_result($result2,$i,'actionname');
+		$actionid=$adb->query_result($result2,$i,'actionid');
+		$actionname_array[$actionid]=$actionname;
+	}
+
+	print_r($actionname_array);	
+	
         $filename = 'tabdata.php';
 	
 	
@@ -1614,6 +1642,10 @@
                 $newbuf .= "\$tab_info_array=".constructArray($result_array).";\n";
                 $newbuf .= "\n";
                 $newbuf .= "\$tab_seq_array=".constructArray($seq_array).";\n";
+		$newbuf .= "\n";
+                $newbuf .= "\$action_id_array=".constructSingleStringKeyAndValueArray($actionid_array).";\n";
+		$newbuf .= "\n";
+                $newbuf .= "\$action_name_array=".constructSingleStringValueArray($actionname_array).";\n";
                 $newbuf .= "?>";
                 fputs($handle, $newbuf);
                 fclose($handle);




From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 05:37:25 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 09:37:25 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9346 -
 /vtigercrm/trunk/Smarty/templates/Settings/BackupServer.tpl
Message-ID: <20060907093725.1E5CB76D10C@vtiger.fosslabs.com>

Author: richie
Date: Thu Sep  7 03:37:11 2006
New Revision: 9346

Log:
Backup config checked from flat file --Jeri

Modified:
    vtigercrm/trunk/Smarty/templates/Settings/BackupServer.tpl

Modified: vtigercrm/trunk/Smarty/templates/Settings/BackupServer.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings/BackupServer.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings/BackupServer.tpl Thu Sep  7 03:37:11 2006
@@ -36,49 +36,84 @@
 				</tr>
 				</table>
 				
-				<br>
-				<table border=0 cellspacing=0 cellpadding=10 width=100% >
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
 				<tr>
-				<td>
+				<td class="big" height="40px;" width="70%"><strong>{$MOD.LBL_BACKUP_SERVER_SETTINGS}</strong></td>
+				<td class="small" align="center" width="30%">&nbsp;
+					<span id="view_info" class="crmButton small cancel" style="display:none;"></span>
+				</td>
+				</tr>
+				</table>
 				
-					<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+				<table border=0 cellspacing=0 cellpadding=0 width=100% class="listRow">
+				<tr>
+				<td class="small" valign=top >
+					<table width="100%"  border="0" cellspacing="0" cellpadding="5">
 					<tr>
-						<td class="big"><strong>{$MOD.LBL_BACKUP_SERVER_SETTINGS} ({$MOD.LBL_FTP})<br>{$ERROR_MSG}</strong></td>
-						{if $BKP_SERVER_MODE neq 'edit'}
-						<td class="small" align=right>
-							<input title="{$APP.LBL_EDIT_BUTTON_TITLE}" accessKey="{$APP.LBL_EDIT_BUTTON_KEY}" class="crmButton small edit" onclick="this.form.action.value='BackupServerConfig';this.form.bkp_server_mode.value='edit'" type="submit" name="Edit" value="{$APP.LBL_EDIT_BUTTON_LABEL}">&nbsp;
-							<input title="{$MOD.LBL_CLEAR_DATA}" accessKey="{$MOD.LBL_CLEAR_DATA}" class="crmButton small cancel" onclick="clearBackupServer();" type="button" name="Clear" value="{$MOD.LBL_CLEAR_DATA}">
-						</td>
-						{else}
-						<td class="small" align=right>
-							<input title="{$APP.LBL_SAVE_BUTTON_LABEL}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="crmButton small save" type="submit" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}" onclick="this.form.action.value='Save'; return validate()">&nbsp;&nbsp;
-						    <input title="{$APP.LBL_CANCEL_BUTTON_LABEL}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="crmButton small cancel" onclick="window.history.back()" type="button" name="button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}">
-						</td>
-						{/if}
+					<td width="20%" nowrap class="small cellLabel"><strong>{$MOD.LBL_ENABLE} {$MOD.LBL_BACKUP_SERVER_SETTINGS}</strong></td>
+					<td width="80%" class="small cellText">
+					{if $BACKUP_STATUS eq 'enabled'}
+						<input type="checkbox" checked name="enable_backup" onclick="backupenabled(this)"></input>
+					{else}
+						<input type="checkbox" name="enable_backup" onclick="backupenabled(this)"></input>
+					{/if}
+					</td>
 					</tr>
 					</table>
+				</td>
+				</tr>
+				<tr>
+				<td class="small" valign=top >
+				<br>
+				{if $BACKUP_STATUS eq 'enabled'}
+					<div id='bckcontents' style="display:block;">
+				{else}
+					<div id='bckcontents' style="display:none;">
+				{/if}
+					<table border=0 cellspacing=0 cellpadding=10 width=100% >
+					<tr>
+					<td>
 				
-					<div id="BackupServerContents">
-						{include file="Settings/BackupServerContents.tpl"}
+						<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+						<tr>
+							<td class="big"><strong>{$MOD.LBL_BACKUP_SERVER_SETTINGS} ({$MOD.LBL_FTP})<br>{$ERROR_MSG}</strong></td>
+							{if $BKP_SERVER_MODE neq 'edit'}
+							<td class="small" align=right>
+								<input title="{$APP.LBL_EDIT_BUTTON_TITLE}" accessKey="{$APP.LBL_EDIT_BUTTON_KEY}" class="crmButton small edit" onclick="this.form.action.value='BackupServerConfig';this.form.bkp_server_mode.value='edit'" type="submit" name="Edit" value="{$APP.LBL_EDIT_BUTTON_LABEL}">&nbsp;
+								<input title="{$MOD.LBL_CLEAR_DATA}" accessKey="{$MOD.LBL_CLEAR_DATA}" class="crmButton small cancel" onclick="clearBackupServer();" type="button" name="Clear" value="{$MOD.LBL_CLEAR_DATA}">
+							</td>
+							{else}
+							<td class="small" align=right>
+								<input title="{$APP.LBL_SAVE_BUTTON_LABEL}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="crmButton small save" type="submit" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}" onclick="this.form.action.value='Save'; return validate()">&nbsp;&nbsp;
+							    <input title="{$APP.LBL_CANCEL_BUTTON_LABEL}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="crmButton small cancel" onclick="window.history.back()" type="button" name="button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}">
+							</td>
+							{/if}
+						</tr>
+						</table>
+					</td>
+					</tr>
+					<tr>
+					<td>
+						<div id="BackupServerContents">
+							{include file="Settings/BackupServerContents.tpl"}
+						</div>
+					</td>
+					</tr>
+					</table>
 					</div>
 				</td>
 				</tr>
 				</table>
-			
-			
-			
-			</td>
-			</tr>
-			</table>
 		</td>
-	</tr>
-	</form>
-	</table>
-		
+		</tr>
+		</form>
+		</table>
+		</td></tr>
+		</table>	
 	</div>
-</td>
+	</td>
         <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
-   </tr>
+</tr>
 </tbody>
 </table>
 {literal}
@@ -103,5 +138,39 @@
                         }
                 );	
 }
+
+function backupenabled(ochkbox)
+{
+	if(ochkbox.checked == true)
+	{
+		$('bckcontents').style.display='block';
+		var status='enabled';
+		$('view_info').innerHTML = 'Backup Enabled';
+		$('view_info').style.display = 'block';		
+		
+			
+	}
+	else
+	{
+		$('bckcontents').style.display='none';
+		var status = 'disabled';	
+	     	$('view_info').innerHTML = 'Backup Disabled';
+	     	$('view_info').style.display = 'block';		
+	}
+             $("status").style.display="block";
+	     new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: 'module=Settings&action=SettingsAjax&file=SaveEnableBackup&ajax=true&enable_backup='+status,
+                        onComplete: function(response) {
+                                $("status").style.display="none";
+                        }
+                }
+        );
+			
+	setTimeout("hide('view_info')",3000);
+}
+
 </script>
 {/literal}




From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 05:40:00 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 09:40:00 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9347 -
	/vtigercrm/trunk/include/utils/utils.php
Message-ID: <20060907094000.8F42A76D05D@vtiger.fosslabs.com>

Author: richie
Date: Thu Sep  7 03:39:52 2006
New Revision: 9347

Log:
retrieve actionid and action name from tabdata file done

Modified:
    vtigercrm/trunk/include/utils/utils.php

Modified: vtigercrm/trunk/include/utils/utils.php
==============================================================================
--- vtigercrm/trunk/include/utils/utils.php (original)
+++ vtigercrm/trunk/include/utils/utils.php Thu Sep  7 03:39:52 2006
@@ -1019,13 +1019,21 @@
 	$log->debug("Entering getActionid(".$action.") method ...");
 	global $adb;
 	$log->info("get Actionid ".$action);
-
 	$actionid = '';
-	$query="select * from vtiger_actionmapping where actionname='".$action."'";
-        $result =$adb->query($query);
-        $actionid=$adb->query_result($result,0,'actionid');
+	if(file_exists('tabdata.php') && (filesize('tabdata.php') != 0)) 
+	{
+		include('tabdata.php');
+		$actionid= $action_id_array[$action];
+	}
+	else
+	{
+		$query="select * from vtiger_actionmapping where actionname='".$action."'";
+        	$result =$adb->query($query);
+        	$actionid=$adb->query_result($result,0,'actionid');
+		
+	}
 	$log->info("action id selected is ".$actionid );
-	$log->debug("Exiting getActionid method ...");
+	$log->debug("Exiting getActionid method ...");	
 	return $actionid;
 }
 
@@ -1042,9 +1050,19 @@
 	global $adb;
 
 	$actionname='';
-	$query="select * from vtiger_actionmapping where actionid=".$actionid ." and securitycheck=0";
-	$result =$adb->query($query);
-	$actionname=$adb->query_result($result,0,"actionname");
+	
+	if (file_exists('tabdata.php') && (filesize('tabdata.php') != 0)) 
+	{
+		include('tabdata.php');
+		$actionname= $action_name_array[$actionid];
+	}
+	else
+	{
+	
+		$query="select * from vtiger_actionmapping where actionid=".$actionid ." and securitycheck=0";
+		$result =$adb->query($query);
+		$actionname=$adb->query_result($result,0,"actionname");
+	}	
 	$log->debug("Exiting getActionname method ...");
 	return $actionname;
 }




From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 05:51:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 09:51:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9348 -
 /vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php
Message-ID: <20060907095110.1925474815B@vtiger.fosslabs.com>

Author: richie
Date: Thu Sep  7 03:50:58 2006
New Revision: 9348

Log:
Added a function to get the array in a single string

Modified:
    vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php

Modified: vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php
==============================================================================
--- vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php (original)
+++ vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php Thu Sep  7 03:50:58 2006
@@ -1317,6 +1317,38 @@
   * @param $var -- input array:: Type array
   * @returns $code -- contains the whole array in a single string:: Type array 
  */
+function constructSingleStringKeyAndValueArray($var)
+{
+
+        $size = sizeof($var);
+        $i=1;
+        if (is_array($var))
+        {
+                $code = 'array(';
+                foreach ($var as $key => $value)
+                {
+                        if($i<$size)
+                        {
+                                $code .= "'".$key."'=>".$value.",";
+                        }
+                        else
+                        {
+                                $code .= "'".$key."'=>".$value;
+                        }
+                        $i++;
+                }
+                $code .= ')';
+                return $code;
+        }
+}
+
+
+
+/** Converts the input array  to a single string to facilitate the writing of the input array in a flat file 
+
+  * @param $var -- input array:: Type array
+  * @returns $code -- contains the whole array in a single string:: Type array 
+ */
 function constructSingleStringKeyValueArray($var)
 {
 




From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 06:47:13 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 10:47:13 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9349 -
 /vtigercrm/trunk/modules/Settings/DeleteCustomField.php
Message-ID: <20060907104713.2520676D0DC@vtiger.fosslabs.com>

Author: saraj
Date: Thu Sep  7 04:47:08 2006
New Revision: 9349

Log:
* Modified to delete the customfield from corresponding module tables and add the missed module tables

Modified:
    vtigercrm/trunk/modules/Settings/DeleteCustomField.php

Modified: vtigercrm/trunk/modules/Settings/DeleteCustomField.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/DeleteCustomField.php (original)
+++ vtigercrm/trunk/modules/Settings/DeleteCustomField.php Thu Sep  7 04:47:08 2006
@@ -11,10 +11,9 @@
 require_once('include/database/PearDatabase.php');
 
 $fld_module = $_REQUEST["fld_module"];
-//echo $fld_module;
+
 $id = $_REQUEST["fld_id"];
-//echo '<BR>';
-//echo $id;
+
 $colName = $_REQUEST["colName"];
 $uitype = $_REQUEST["uitype"];
 
@@ -22,43 +21,37 @@
 $query='delete from vtiger_field where fieldid="'.$id.'"';
 $adb->query($query);
 
-//Deleting from vtiger_profile2field vtiger_table
+//Deleting from vtiger_profile2field table
 $query='delete from vtiger_profile2field where fieldid="'.$id.'"';
 $adb->query($query);
 
-//Deleting from vtiger_def_org_field vtiger_table
+//Deleting from vtiger_def_org_field table
 $query='delete from vtiger_def_org_field where fieldid="'.$id.'"';
 $adb->query($query);
 
-//Dropping the column in the module vtiger_table
-if($fld_module == "Leads")
-{
-	$tableName = "leadscf";
-}
-elseif($fld_module == "Accounts")
-{
-	$tableName = "accountscf";
-}
-elseif($fld_module == "Contacts")
-{
-	$tableName = "contactscf";
-}
-elseif($fld_module == "Potentials")
-{
-	$tableName = "potentialscf";
-}
-elseif($fld_module == "HelpDesk")
-{
-	$tableName = "ticketcf";
-}
-elseif($fld_module == "Products")
-{
-	$tableName = "productcf";
-}
-//echo '<BR>';
-//echo $tableName;
-$dbquery = 'Alter table '.$tableName.' Drop Column '.$colName;
+//Drop the column in the corresponding module table
+$delete_module_tables = Array(
+				"Leads"=>"vtiger_leadscf",
+				"Accounts"=>"vtiger_accountscf",
+				"Contacts"=>"vtiger_contactscf",
+				"Potentials"=>"vtiger_potentialscf",
+				"HelpDesk"=>"vtiger_ticketcf",
+				"Products"=>"vtiger_productcf",
+				"Vendors"=>"vtiger_vendorcf",
+				"PriceBooks"=>"vtiger_pricebookcf",
+				"PurchaseOrder"=>"vtiger_purchaseordercf",
+				"SalesOrder"=>"vtiger_salesordercf",
+				"Quotes"=>"vtiger_quotescf",
+				"Invoice"=>"vtiger_invoicecf",
+				"Campaigns"=>"vtiger_campaignscf",
+			     );
+
+$dbquery = 'alter table '.$delete_module_tables[$fld_module].' drop column '.$colName;
 $adb->query($dbquery);
+
+
+//HANDLE HERE - we have to remove the entries in customview and report related tables which have this field ($colName)
+
 
 //Deleting from convert lead mapping vtiger_table- Jaguar
 if($fld_module=="Leads")
@@ -67,11 +60,12 @@
 	$adb->query($deletequery);
 }
 
-
+//HANDLE HERE - we have to remove the table for other picklist type values which are text area and multiselect combo box 
 if($uitype == 15)
 {
-$deltablequery = 'drop table '.$colName;
-$adb->query($deltablequery);
+	$deltablequery = 'drop table '.$colName;
+	$adb->query($deltablequery);
 }
+
 header("Location:index.php?module=Settings&action=CustomFieldList&fld_module=".$fld_module."&parenttab=Settings");
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 06:52:06 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 10:52:06 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9350 - in /vtigercrm/trunk:
 include/utils/CommonUtils.php modules/Potentials/Charts.php
 modules/Users/User.php
Message-ID: <20060907105206.D598676D0DC@vtiger.fosslabs.com>

Author: saraj
Date: Thu Sep  7 04:51:59 2006
New Revision: 9350

Log:
changes made to show currency in conversion rate and symbol in dashboard

Modified:
    vtigercrm/trunk/include/utils/CommonUtils.php
    vtigercrm/trunk/modules/Potentials/Charts.php
    vtigercrm/trunk/modules/Users/User.php

Modified: vtigercrm/trunk/include/utils/CommonUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/CommonUtils.php (original)
+++ vtigercrm/trunk/include/utils/CommonUtils.php Thu Sep  7 04:51:59 2006
@@ -779,6 +779,17 @@
     * param $crate - conversion rate.
       */
 function convertFromDollar($amount,$crate){
+	global $log;
+	$log->debug("Entering convertFromDollar(".$amount.",".$crate.") method ...");
+	$log->debug("Exiting convertFromDollar method ...");
+        return $amount * $crate;
+}
+
+/** This function returns the amount converted from master currency.
+  * param $amount - amount to be converted.
+    * param $crate - conversion rate.
+      */
+function convertFromMasterCurrency($amount,$crate){
 	global $log;
 	$log->debug("Entering convertFromDollar(".$amount.",".$crate.") method ...");
 	$log->debug("Exiting convertFromDollar method ...");

Modified: vtigercrm/trunk/modules/Potentials/Charts.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/Charts.php (original)
+++ vtigercrm/trunk/modules/Potentials/Charts.php Thu Sep  7 04:51:59 2006
@@ -127,7 +127,7 @@
 					}
 					if (isset($record->column_fields['amount']))	{
 						// Strip all non numbers from this string.
-						$amount = ereg_replace('[^0-9]', '', floor($record->column_fields['amount']));
+						$amount = convertFromMasterCurrency(ereg_replace('[^0-9]', '', floor($record->column_fields['amount'])),$current_user->conv_rate);
 						$sum[$month][$sales_stage] = $sum[$month][$sales_stage] + $amount;
 						if (isset($count[$month][$sales_stage])) {
 							$count[$month][$sales_stage]++;
@@ -261,8 +261,8 @@
 			$gbplot->setBackground(Image_Graph::factory('gradient', array(IMAGE_GRAPH_GRAD_VERTICAL, 'white', '#E5E5E5')));
 
 			// Setup title
-			$titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$curr_symbol.$total.$app_strings['LBL_THOUSANDS_SYMBOL'];
-				//$titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$curr_symbol.$total;
+			$titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$current_user->currency_symbol.$total.$app_strings['LBL_THOUSANDS_SYMBOL'];
+				//$titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$current_user->currency_symbol.$total;
 			
 			$title->setText($titlestr);
 
@@ -298,7 +298,7 @@
 			$yaxis->setAxisIntersection('max');
 
 			// Then fix the tick marks
-			$valueproc =& Image_Graph::factory('Image_Graph_DataPreprocessor_Formatted', $curr_symbol."%d");
+			$valueproc =& Image_Graph::factory('Image_Graph_DataPreprocessor_Formatted', $current_user->currency_symbol."%d");
 			$yaxis->setFontSize(8);
 			$yaxis->setDataPreprocessor($valueproc);
 			// Arrange Y-Axis tick marks inside
@@ -323,7 +323,7 @@
 			$marker->setFontSize(8);
 			$gbplot->setMarker($marker);
 
-			$subtitle .= $current_module_strings['LBL_OPP_SIZE'].$curr_symbol.$current_module_strings['LBL_OPP_SIZE_VALUE'];
+			$subtitle .= $current_module_strings['LBL_OPP_SIZE'].$current_user->currency_symbol.$current_module_strings['LBL_OPP_SIZE_VALUE'];
 			$footer->setText($subtitle);
 			$footer->setAlignment(IMAGE_GRAPH_ALIGN_TOP_RIGHT);
 
@@ -363,7 +363,7 @@
 	 * Contributor(s): ______________________________________..
 	 */
 	function lead_source_by_outcome($datay=array('foo','bar'), $user_id=array('1'), $cache_file_name='a_file', $refresh=false,$width=900,$height=500){
-		global $log;
+		global $log,$current_user;
 		$log->debug("Entering lead_source_by_outcome(".$datay.",".$user_id.",".$cache_file_name.",".$refresh.") method ...");
 		global $app_strings,$lang_crm, $current_module_strings,$charset, $tmp_dir;
 		global $theme;
@@ -471,7 +471,7 @@
 					}
 					if (isset($record->column_fields['amount']))	{
 						// Strip all non numbers from this string.
-						$amount = ereg_replace('[^0-9]', '', floor($record->column_fields['amount']));
+						$amount = convertFromMasterCurrency(ereg_replace('[^0-9]', '', floor($record->column_fields['amount'])),$current_user->conv_rate);
 						$sum[$lead_source][$sales_stage] = $sum[$lead_source][$sales_stage] + $amount;
 						if (isset($count[$lead_source][$sales_stage])) {
 							$count[$lead_source][$sales_stage]++;
@@ -602,8 +602,8 @@
 			$gbplot->setBackground(Image_Graph::factory('gradient', array(IMAGE_GRAPH_GRAD_HORIZONTAL, 'white', '#E5E5E5')));
 
 			// Setup title
-			$titlestr = $current_module_strings['LBL_ALL_OPPORTUNITIES'].$curr_symbol.$total.$app_strings['LBL_THOUSANDS_SYMBOL'];
-			//$titlestr = $current_module_strings['LBL_ALL_OPPORTUNITIES'].$curr_symbol.$total;
+			$titlestr = $current_module_strings['LBL_ALL_OPPORTUNITIES'].$current_user->currency_symbol.$total.$app_strings['LBL_THOUSANDS_SYMBOL'];
+			//$titlestr = $current_module_strings['LBL_ALL_OPPORTUNITIES'].$current_user->currency_symbol.$total;
 			$title->setText($titlestr);
 
 			// Create the xaxis labels
@@ -635,7 +635,7 @@
 			// Then fix the tick marks
 			$yaxis->setFontSize(8);
 			$yaxis->setAxisIntersection('max');
-			$valueproc =& Image_Graph::factory('Image_Graph_DataPreprocessor_Formatted', $curr_symbol."%d");
+			$valueproc =& Image_Graph::factory('Image_Graph_DataPreprocessor_Formatted', $current_user->currency_symbol."%d");
 			$yaxis->setDataPreprocessor($valueproc);
 			$yaxis->setLabelInterval($ticks[0]);
 			$yaxis->setTickOptions(-5,0);
@@ -655,7 +655,7 @@
 			$gbplot->setMarker($marker);
 
 			// Finally setup the title
-			$subtitle = $current_module_strings['LBL_OPP_SIZE'].$curr_symbol.$current_module_strings['LBL_OPP_SIZE_VALUE']; 
+			$subtitle = $current_module_strings['LBL_OPP_SIZE'].$current_user->currency_symbol.$current_module_strings['LBL_OPP_SIZE_VALUE']; 
 			$footer->setText($subtitle);
 			$footer->setAlignment(IMAGE_GRAPH_ALIGN_TOP_RIGHT);
 
@@ -690,7 +690,7 @@
 	 * Contributor(s): ______________________________________..
 	 */
 	function pipeline_by_sales_stage($datax=array('foo','bar'), $date_start='2071-10-15', $date_end='2071-10-15', $user_id=array('1'), $cache_file_name='a_file', $refresh=false,$width=900,$height=500){
-		global $log;
+		global $log,$current_user;
 		$log->debug("Entering pipeline_by_sales_stage(".$datax.",".$date_start.",".$date_end.",".$user_id.",".$cache_file_name.",".$refresh.") method ...");
 		global $app_strings,$lang_crm, $current_module_strings, $charset, $tmp_dir;
 		global $theme;
@@ -793,7 +793,7 @@
 					}
 					if (isset($record->column_fields['amount']))	{
 						// Strip all non numbers from this string.
-						$amount = ereg_replace('[^0-9]', '', floor($record->column_fields['amount']));
+						$amount = convertFromMasterCurrency(ereg_replace('[^0-9]', '', floor($record->column_fields['amount'])),$current_user->conv_rate);
 						$sum[$record->column_fields['sales_stage']][$record->column_fields['assigned_user_id']] = $sum[$record->column_fields['sales_stage']][$record->column_fields['assigned_user_id']] + $amount;
 						if (isset($count[$record->column_fields['sales_stage']][$record->column_fields['assigned_user_id']])) {
 							$count[$record->column_fields['sales_stage']][$record->column_fields['assigned_user_id']]++;
@@ -915,8 +915,8 @@
 			$font->setColor($font_color);
 
 			// Setup title
-			$titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$curr_symbol.$total.$app_strings['LBL_THOUSANDS_SYMBOL'];
-			//$titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$curr_symbol.$total;
+			$titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$current_user->currency_symbol.$total.$app_strings['LBL_THOUSANDS_SYMBOL'];
+			//$titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$current_user->currency_symbol.$total;
 			$title->setText($titlestr);
 
 			// Create the xaxis labels
@@ -951,7 +951,7 @@
 			$gridY->setLineColor('#E5E5E5 at 0.5');
 
 			// First make the labels look right
-			$valueproc =& Image_Graph::factory('Image_Graph_DataPreprocessor_Formatted', $curr_symbol."%d");
+			$valueproc =& Image_Graph::factory('Image_Graph_DataPreprocessor_Formatted', $current_user->currency_symbol."%d");
 			$yaxis->setDataPreprocessor($valueproc);
 			$yaxis->setLabelInterval($ticks[0]);
 			$yaxis->setTickOptions(-5,0);
@@ -972,7 +972,7 @@
 
 			// Finally setup the title
 
-			$subtitle .= $current_module_strings['LBL_OPP_SIZE'].$curr_symbol.$current_module_strings['LBL_OPP_SIZE_VALUE']; 
+			$subtitle .= $current_module_strings['LBL_OPP_SIZE'].$current_user->currency_symbol.$current_module_strings['LBL_OPP_SIZE_VALUE']; 
 			$footer->setText($subtitle);
 			$footer->setAlignment(IMAGE_GRAPH_ALIGN_TOP_RIGHT);
 
@@ -1009,7 +1009,7 @@
 	 * Contributor(s): ______________________________________..
 	 */
 	function pipeline_by_lead_source($legends=array('foo','bar'), $user_id=array('1'), $cache_file_name='a_file', $refresh=true,$width=900,$height=500){
-		global $log;
+		global $log,$current_user;
 		$log->debug("Entering pipeline_by_lead_source(".$legends.") method ...");
 		global $app_strings,$lang_crm, $current_module_strings, $log, $charset, $tmp_dir;
 		global $theme;
@@ -1069,7 +1069,7 @@
 					if (!isset($sum[$record->column_fields['leadsource']])) $sum[$record->column_fields['leadsource']] = 0;
 					if (isset($record->column_fields['amount']) && isset($record->column_fields['leadsource']))	{
 						// Strip all non numbers from this string.
-						$amount = ereg_replace('[^0-9]', '', floor($record->column_fields['amount']));
+						$amount = convertFromMasterCurrency(ereg_replace('[^0-9]', '', floor($record->column_fields['amount'])),$current_user->conv_rate);
 						$sum[$record->column_fields['leadsource']] = $sum[$record->column_fields['leadsource']] + ($amount/1000);
 						if (isset($count[$record->column_fields['leadsource']])) $count[$record->column_fields['leadsource']]++;
 						else $count[$record->column_fields['leadsource']] = 1;
@@ -1174,13 +1174,13 @@
 			$gbplot->setFillStyle($fills);
 
 			// Setup title
-			$titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$curr_symbol.$total.$app_strings['LBL_THOUSANDS_SYMBOL'];
-			//$titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$curr_symbol.$total;
+			$titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$current_user->currency_symbol.$total.$app_strings['LBL_THOUSANDS_SYMBOL'];
+			//$titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$current_user->currency_symbol.$total;
 
 			$title->setText($titlestr);
 
 			// format the data values
-			$valueproc =& Image_Graph::factory('Image_Graph_DataPreprocessor_Formatted', $curr_symbol."%d");
+			$valueproc =& Image_Graph::factory('Image_Graph_DataPreprocessor_Formatted', $current_user->currency_symbol."%d");
 
 			// set markers
 			$marker =& $graph->addNew('value_marker', IMAGE_GRAPH_VALUE_Y);
@@ -1198,7 +1198,7 @@
 			$legend_box->setFillColor('#F5F5F5');
 			$legend_box->showShadow();
 
-			$subtitle = $current_module_strings['LBL_OPP_SIZE'].$curr_symbol.$current_module_strings['LBL_OPP_SIZE_VALUE'];
+			$subtitle = $current_module_strings['LBL_OPP_SIZE'].$current_user->currency_symbol.$current_module_strings['LBL_OPP_SIZE_VALUE'];
 			$footer->setText($subtitle);
 			$footer->setAlignment(IMAGE_GRAPH_ALIGN_TOP_LEFT);
 

Modified: vtigercrm/trunk/modules/Users/User.php
==============================================================================
--- vtigercrm/trunk/modules/Users/User.php (original)
+++ vtigercrm/trunk/modules/Users/User.php Thu Sep  7 04:51:59 2006
@@ -63,6 +63,10 @@
 	'activity_view' =>'',
 	'lead_view' =>'',
 	'currency_id' =>'',
+	'currency_name' =>'',
+	'currency_code' =>'',
+	'currency_symbol' =>'',
+	'conv_rate' =>'',
 	'hour_format' =>'',
 	'end_hour' =>'',
 	'start_hour' =>'',
@@ -839,6 +843,22 @@
 		$this->column_fields["record_id"] = $record;
 		$this->column_fields["record_module"] = $module;
 
+		$currency_query = "select * from vtiger_currency_info where id=".$this->column_fields["currency_id"]." and currency_status='Active'";
+		$currency_result = $adb->query($currency_query);
+		if($adb->num_rows($currency_result) == 0)
+		{
+			$currency_query = "select * from vtiger_currency_info where id =1";
+			$currency_result = $adb->query($currency_query);
+		}
+		$currency_array = array("$"=>"&#36;","&dollar;"=>"&#36;","&euro;"=>"&#8364;","&pound;"=>"&#163;","&yen;"=>"&#165;","Rs"=>"&#8360;");
+			$ui_curr = $currency_array[$adb->query_result($currency_result,0,"currency_symbol")];
+		if($ui_curr == "")
+			$ui_curr = $adb->query_result($currency_result,0,"currency_symbol");
+		$this->column_fields["currency_name"]= $this->currency_name = $adb->query_result($currency_result,0,"currency_name");
+		$this->column_fields["currency_code"]= $this->currency_code = $adb->query_result($currency_result,0,"currency_code");
+		$this->column_fields["currency_symbol"]= $this->currency_symbol = $ui_curr;
+		$this->column_fields["conv_rate"]= $this->conv_rate = $adb->query_result($currency_result,0,"conversion_rate");
+
 		$this->id = $record;
 		$log->debug("Exit from retrieve_entity_info($record, $module) method.");
 




From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 07:02:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 11:02:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9351 -
	/vtigercrm/trunk/include/utils/CommonUtils.php
Message-ID: <20060907110239.77D2576D116@vtiger.fosslabs.com>

Author: richie
Date: Thu Sep  7 05:02:31 2006
New Revision: 9351

Log:
removed junk prints

Modified:
    vtigercrm/trunk/include/utils/CommonUtils.php

Modified: vtigercrm/trunk/include/utils/CommonUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/CommonUtils.php (original)
+++ vtigercrm/trunk/include/utils/CommonUtils.php Thu Sep  7 05:02:31 2006
@@ -1616,8 +1616,6 @@
 		$actionid_array[$actionname]=$actionid;
 	}		
 
-	print_r($actionid_array);
-	
 	//Constructing the actionid=>actionname array with securitycheck=0
 	$actionname_array=Array();
 	$sql2="select * from vtiger_actionmapping where securitycheck=0";
@@ -1630,8 +1628,6 @@
 		$actionname_array[$actionid]=$actionname;
 	}
 
-	print_r($actionname_array);	
-	
         $filename = 'tabdata.php';
 	
 	




From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep  7 07:19:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 07 Sep 2006 11:19:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9353 -
	/vtigercrm/tags/vtigercrm-5.0.0-ga-val1/
Message-ID: <20060907111949.2FFB87618F7@vtiger.fosslabs.com>

Author: richie
Date: Thu Sep  7 05:19:26 2006
New Revision: 9353

Log:
made a copy

Added:
    vtigercrm/tags/vtigercrm-5.0.0-ga-val1/
      - copied from r9352, vtigercrm/trunk/




From vtigercrm-commits at vtiger.fosslabs.com  Fri Sep  8 02:04:47 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 08 Sep 2006 06:04:47 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9354 -
	/vtigercrm/branches/4.2/include/logging.php
Message-ID: <20060908060447.5420366A085@vtiger.fosslabs.com>

Author: allanbush
Date: Fri Sep  8 00:04:44 2006
New Revision: 9354

Log:
Set the umask before initiating log4php so if the log file needs to be created it's created with the permissions specified in the config file.  Closed #1418.

Modified:
    vtigercrm/branches/4.2/include/logging.php

Modified: vtigercrm/branches/4.2/include/logging.php
==============================================================================
--- vtigercrm/branches/4.2/include/logging.php (original)
+++ vtigercrm/branches/4.2/include/logging.php Fri Sep  8 00:04:44 2006
@@ -25,7 +25,13 @@
 require_once(LOG4PHP_DIR.'/LoggerManager.php');
 require_once(LOG4PHP_DIR.'/LoggerPropertyConfigurator.php');
 
+// change the umask so that the log file is created with the proper permissions
+if($log_readable == 1) {
+	$old_umask = umask(0177);
+} else {
+	$old_umask = umask(0577);
+}
 $config = new LoggerPropertyConfigurator();
 $config->configure('log4php.properties');
 
-?>
+?>




From vtigercrm-commits at vtiger.fosslabs.com  Fri Sep  8 02:06:42 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 08 Sep 2006 06:06:42 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9355 -
	/vtigercrm/branches/4.2/include/logging.php
Message-ID: <20060908060642.7C58C66A0B8@vtiger.fosslabs.com>

Author: allanbush
Date: Fri Sep  8 00:06:39 2006
New Revision: 9355

Log:
Revert to the pervious umask after file creation.  Missing from changeset:9354.  Refs #1418.

Modified:
    vtigercrm/branches/4.2/include/logging.php

Modified: vtigercrm/branches/4.2/include/logging.php
==============================================================================
--- vtigercrm/branches/4.2/include/logging.php (original)
+++ vtigercrm/branches/4.2/include/logging.php Fri Sep  8 00:06:39 2006
@@ -33,5 +33,6 @@
 }
 $config = new LoggerPropertyConfigurator();
 $config->configure('log4php.properties');
+umask($old_umask);
 
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Fri Sep  8 22:09:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 02:09:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9356 -
	/vtigercrm/trunk/include/utils/CommonUtils.php
Message-ID: <20060909020903.277D176AF66@vtiger.fosslabs.com>

Author: mmbrich
Date: Fri Sep  8 20:08:57 2006
New Revision: 9356

Log:
fix for table prefix, this should get email personalization working again

Modified:
    vtigercrm/trunk/include/utils/CommonUtils.php

Modified: vtigercrm/trunk/include/utils/CommonUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/CommonUtils.php (original)
+++ vtigercrm/trunk/include/utils/CommonUtils.php Fri Sep  8 20:08:57 2006
@@ -2431,7 +2431,7 @@
 			if(is_array($fields["contacts"]))
 			{
 				$columnfields = implode(',',$fields["contacts"]);
-				$query = 'select '.$columnfields.' from contactdetails where contactid='.$id;
+				$query = 'select '.$columnfields.' from vtiger_contactdetails where contactid='.$id;
 				$result = $adb->query($query);
 				foreach($fields["contacts"] as $columnname)
 				{
@@ -2444,7 +2444,7 @@
 			if(is_array($fields["leads"]))
 			{
 				$columnfields = implode(',',$fields["leads"]);
-				$query = 'select '.$columnfields.' from leaddetails where leadid='.$id;
+				$query = 'select '.$columnfields.' from vtiger_leaddetails where leadid='.$id;
 				$result = $adb->query($query);
 				foreach($fields["leads"] as $columnname)
 				{




From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 03:04:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 07:04:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9357 -
 /thunderbirdextn/trunk/chrome/vtiger/content/vtiger/vtiger.xul
Message-ID: <20060909070449.87C1876B5BA@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 01:04:06 2006
New Revision: 9357

Log:
Issue in thunderbird plugin (add to vtigerCRm window opening twice) has been fixed --Jeri

Modified:
    thunderbirdextn/trunk/chrome/vtiger/content/vtiger/vtiger.xul

Modified: thunderbirdextn/trunk/chrome/vtiger/content/vtiger/vtiger.xul
==============================================================================
Binary files - no diff available.




From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 04:01:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 08:01:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9358 -
	/vtigercrm/trunk/data/CRMEntity.php
Message-ID: <20060909080159.6AEE976BDC3@vtiger.fosslabs.com>

Author: richie
Date: Sat Sep  9 02:00:56 2006
New Revision: 9358

Log:
Postgres fixes by Jens done --By Don

Modified:
    vtigercrm/trunk/data/CRMEntity.php

Modified: vtigercrm/trunk/data/CRMEntity.php
==============================================================================
--- vtigercrm/trunk/data/CRMEntity.php (original)
+++ vtigercrm/trunk/data/CRMEntity.php Sat Sep  9 02:00:56 2006
@@ -935,7 +935,7 @@
         global $adb;
 	global $current_user;
 
-        $current_time = date('Y-m-d H:i:s');
+        $current_time = $adb->formatDate(date('YmdHis'));
 	if($this->column_fields['assigned_user_id'] != '')
 		$ownertype = 'user';
 	else
@@ -949,7 +949,7 @@
 	if($comment != '')
 	{
 		$comment = addslashes($comment);
-		$sql = "insert into vtiger_ticketcomments values('',".$this->id.",'".$comment."','".$current_user->id."','".$ownertype."','".$current_time."')";
+		$sql = "insert into vtiger_ticketcomments values('',".$this->id.",'".$comment."','".$current_user->id."','".$ownertype."',".$current_time.")";	
 	        $adb->query($sql);
 	}
 }
@@ -963,7 +963,7 @@
 	$log->info("in insertIntoFAQCommentTable  ".$table_name."    module is  ".$module);
         global $adb;
 
-        $current_time = date('Y-m-d H:i:s');
+        $current_time = $adb->formatDate(date('YmdHis'));
 
 	if($this->column_fields['comments'] != '')
 		$comment = $this->column_fields['comments'];
@@ -973,7 +973,7 @@
 	if($comment != '')
 	{
 		$comment = addslashes($comment);
-		$sql = "insert into vtiger_faqcomments values('',".$this->id.",'".$comment."','".$current_time."')";
+		$sql = "insert into vtiger_faqcomments values('',".$this->id.",'".$comment."',".$current_time.")";	
 		$adb->query($sql);
 	}
 }




From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 04:10:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 08:10:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9359 -
	/vtigercrm/trunk/data/SugarBean.php
Message-ID: <20060909081049.BE2CA76BE72@vtiger.fosslabs.com>

Author: richie
Date: Sat Sep  9 02:10:11 2006
New Revision: 9359

Log:
Postgres fixes by Jens done --By Don

Modified:
    vtigercrm/trunk/data/SugarBean.php

Modified: vtigercrm/trunk/data/SugarBean.php
==============================================================================
--- vtigercrm/trunk/data/SugarBean.php (original)
+++ vtigercrm/trunk/data/SugarBean.php Sat Sep  9 02:10:11 2006
@@ -1,451 +1,451 @@
-<?php
-/*********************************************************************************
- * The contents of this file are subject to the SugarCRM Public License Version 1.1.2
- * ("License"); You may not use this file except in compliance with the 
- * License. You may obtain a copy of the License at http://www.sugarcrm.com/SPL
- * Software distributed under the License is distributed on an  "AS IS"  basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
- * the specific language governing rights and limitations under the License.
- * The Original Code is:  SugarCRM Open Source
- * The Initial Developer of the Original Code is SugarCRM, Inc.
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.;
- * All Rights Reserved.
- * Contributor(s): ______________________________________.
- ********************************************************************************/
-/*********************************************************************************
- * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/data/SugarBean.php,v 1.70 2005/03/16 10:25:16 shaw Exp $
- * Description:  Defines the base class for all data entities used throughout the 
- * application.  The base class including its methods and variables is designed to 
- * be overloaded with module-specific methods and variables particular to the 
- * module's base entity class. 
- ********************************************************************************/
-
-include_once('config.php');
-require_once('include/logging.php');
-require_once('data/Tracker.php');
-require_once('include/utils/utils.php');
-require_once('include/utils/UserInfoUtil.php');
-require_once('include/database/PearDatabase.php');
-
-class SugarBean
-{
-    /**
-     * This method implements a generic insert and update logic for any SugarBean
-     * This method only works for subclasses that implement the same variable names.
-     * This method uses the presence of an id vtiger_field that is not null to signify and update.
-     * The id vtiger_field should not be set otherwise.
-     * todo - Add support for vtiger_field type validation and encoding of parameters.
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
- * All Rights Reserved.
- * Contributor(s): ______________________________________..
-     */
-	
-
-	function save($module_name= '') 
-	{
-         global $adb; 
-          global $current_user;
-		$isUpdate = true;
-
-		if(!isset($this->id) || $this->id == "")
-		{
-			$isUpdate = false;
-		}
-
-		if ( $this->new_with_id == true )
-		{
-			$isUpdate = false;
-		}
-
-		//$this->date_modified = $this->db->formatDate(date('YmdHis'));
-		$this->date_modified = date('YmdHis');
-		if (isset($current_user)) $this->modified_user_id = $current_user->id;
-		
-		if($isUpdate)
-		{
-    			$query = "Update ".$this->table_name." set ";
-		}
-		else
-		{
-    			//$this->date_entered = $this->db->formatDate(date('YmdHis'));
-			$this->date_entered = date('YmdHis');
-
-			if($this->new_schema && 
-				$this->new_with_id == false)
-			{
-                          $this->id = $adb->getUniqueID("vtiger_users");
-			}
-                        
-			$query = "INSERT into ".$this->table_name;
-		}
-		// todo - add date modified to the list.
-
-		// write out the SQL statement.
-		//$query .= $this->table_name." set ";
-
-		$firstPass = 0;
-		$insKeys = '(';
-		$insValues = '(';
-		$updKeyValues='';
-		foreach($this->column_fields as $field)
-		{
-			// Do not write out the id vtiger_field on the update statement.
-			// We are not allowed to change ids.
-			if($isUpdate && ('id' == $field))
-				continue;
-
-			// Only assign variables that have been set.
-			if(isset($this->$field))
-			{				
-				// Try comparing this element with the head element.
-				if(0 == $firstPass)
-				{
-					$firstPass = 1;
-				}
-				else
-				{
-					if($isUpdate)
-					{
-						$updKeyValues = $updKeyValues.", ";
-					}
-					else
-					{
-						$insKeys = $insKeys.", ";
-						$insValues = $insValues.", ";
-					}
-				}
-				/*else
-					$query = $query.", ";
-	
-				$query = $query.$field."='".$adb->quote(from_html($this->$field,$isUpdate))."'";
-				*/
-				if($isUpdate)
-				{
-					$updKeyValues = $updKeyValues.$field."=".$this->db->formatString($this->table_name,$field,from_html($this->$field,$isUpdate));
-				}
-				else
-				{
-					$insKeys = $insKeys.$field;
-					$insValues = $insValues.$this->db->formatString($this->table_name,$field,from_html($this->$field,$isUpdate));
-				}
-			}
-		}
-
-		if($isUpdate)
-		{
-			$query = $query.$updKeyValues." WHERE ID = '$this->id'";
-			$this->log->info("Update $this->object_name: ".$query);
-		}
-		else
-		{
-			$query = $query.$insKeys.") VALUES ".$insValues.")";
-	        	$this->log->info("Insert: ".$query);
-		}
-
-		$this->db->query($query, true);
-
-		// If this is not an update then store the id for later.
-		if(!$isUpdate && !$this->new_schema && !$this->new_with_id)
-		{
-			$this->db->println("Illegal Access - SugarBean");
-			//this is mysql specific
-	        	$this->id = $this->db->getOne("SELECT LAST_INSERT_ID()" );
-		}
-	        
-		return $this->id;
-	}
-
-    
-    /**
-     * This function retrieves a record of the appropriate type from the DB.
-     * It fills in all of the vtiger_fields from the DB into the object it was called on.
-     * param $id - If ID is specified, it overrides the current value of $this->id.  If not specified the current value of $this->id will be used.
-     * returns this - The object that it was called apon or null if exactly 1 record was not found.
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
- * All Rights Reserved.
- * Contributor(s): ______________________________________..
-	 function retrieve($id = -1, $encodeThis=true) {
-		if ($id == -1) {
-			$id = $this->id;
-		}
-		if($id == '') {
-			return null;
-		}
-// GS porting vtiger_crmentity
-$query = "SELECT * FROM $this->table_name WHERE $this->module_id = '$id'";
-//		$query = "SELECT * FROM $this->table_name WHERE ID = '$id'";
-		$this->log->debug("Retrieve $this->object_name: ".$query);
-
-		$result =& $this->db->requireSingleResult($query, true, "Retrieving record by id $this->table_name:$id found ");
-
-		if(empty($result))
-		{
-			return null;
-		}
-				
-		$row = $this->db->fetchByAssoc($result, -1, $encodeThis);
-
-		foreach($this->column_fields as $field)
-		{
-			if(isset($row[$field]))
-			{
-				$this->$field = $row[$field];
-			}
-		}
-		return $this;
-	}
-     */
-
-	function get_list($order_by = "", $where = "", $row_offset = 0, $limit=-1, $max=-1) {
-		$this->log->debug("get_list:  order_by = '$order_by' and where = '$where' and limit = '$limit'");
-		
-		$query = $this->create_list_query($order_by, $where);
-		
-		return $this->process_list_query($query, $row_offset, $limit, $max);
-	}
-
-	/**
-	 * This function returns a full (ie non-paged) list of the current object type.  
-	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
-	 * All Rights Reserved..
-	 * Contributor(s): ______________________________________..
-	 */
-	function get_full_list($order_by = "", $where = "") {
-		$this->log->debug("get_full_list:  order_by = '$order_by' and where = '$where'");
-		$query = "SELECT * FROM $this->table_name ";
-		
-		if($where != "")
-			$query .= "where ($where) AND deleted=0";
-		else
-			$query .= "where deleted=0";
-
-		if(!empty($order_by))
-			$query .= " ORDER BY $order_by";
-
-		$result =& $this->db->query($query, false);
-
-		if($this->db->getRowCount($result) > 0){
-		
-			// We have some data.
-			while ($row = $this->db->fetchByAssoc($result)) {
-				foreach($this->list_fields as $field)
-				{
-					if (isset($row[$field])) {
-						$this->$field = $row[$field];
-						
-						$this->log->debug("process_full_list: $this->object_name({$row['id']}): ".$field." = ".$this->$field);
-					}
-					else {
- 	                                                $this->$field = '';   
-					}
-				}
-
-
-				$list[] = clone($this);         //added clone tosupport PHP5
-			}
-		}
-
-		if (isset($list)) return $list;
-		else return null;
-
-	}
-
-	function create_list_query($order_by, $where)
-	{
-		$query = "SELECT * FROM $this->table_name ";
-		
-		if($where != "")
-			$query .= "where ($where) AND deleted=0";
-		else
-			$query .= "where deleted=0";
-
-		if(!empty($order_by))
-			$query .= " ORDER BY $order_by";
-
-		return $query;
-	}
-	
-
-	function process_list_query($query, $row_offset, $limit= -1, $max_per_page = -1)
-	{
-		global $list_max_entries_per_page;
-		$this->log->debug("process_list_query: ".$query);
-		if(!empty($limit) && $limit != -1){
-			$result =& $this->db->limitQuery($query, $row_offset + 0, $limit,true,"Error retrieving $this->object_name list: ");
-		}else{
-			$result =& $this->db->query($query,true,"Error retrieving $this->object_name list: ");
-		}
-
-		$list = Array();
-		if($max_per_page == -1){
-			$max_per_page 	= $list_max_entries_per_page;
-		}
-		$rows_found =  $this->db->getRowCount($result);
-
-		$this->log->debug("Found $rows_found ".$this->object_name."s");
-                
-		$previous_offset = $row_offset - $max_per_page;
-		$next_offset = $row_offset + $max_per_page;
-
-		if($rows_found != 0)
-		{
-
-			// We have some data.
-
-			for($index = $row_offset , $row = $this->db->fetchByAssoc($result, $index); $row && ($index < $row_offset + $max_per_page || $max_per_page == -99) ;$index++, $row = $this->db->fetchByAssoc($result, $index)){
-				foreach($this->list_fields as $field)
-				{
-					if (isset($row[$field])) {
-						$this->$field = $row[$field];
-						
-						
-						$this->log->debug("$this->object_name({$row['id']}): ".$field." = ".$this->$field);
-					}
-					else 
-					{
-						$this->$field = "";
-					}
-				}
-
-
-				$list[] = clone($this);   //added clone to support PHP5
-			}
-		}
-
-		$response = Array();
-		$response['list'] = $list;
-		$response['row_count'] = $rows_found;
-		$response['next_offset'] = $next_offset;
-		$response['previous_offset'] = $previous_offset;
-
-		return $response;
-	}
-
-	
-	/**
-	 * Track the viewing of a detail record.  This leverages get_summary_text() which is object specific
-	 * params $user_id - The user that is viewing the record.
-	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
-	 * All Rights Reserved..
-	 * Contributor(s): ______________________________________..
-	 */
-	function track_view($user_id, $current_module,$id='')
-	{
-		$this->log->debug("About to call vtiger_tracker (user_id, module_name, item_id)($user_id, $current_module, $this->id)");
-
-		$tracker = new Tracker();
-		$tracker->track_view($user_id, $current_module, $id, '');
-	}
-
-
-	/** This function should be overridden in each module.  It marks an item as deleted.
-	* If it is not overridden, then marking this type of item is not allowed
-	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
-	 * All Rights Reserved..
-	 * Contributor(s): ______________________________________..
-	*/
-	function mark_deleted($id)
-	{
-		$query = "UPDATE $this->table_name set deleted=1 where id='$id'";
-		$this->db->query($query, true,"Error marking record deleted: ");
-
-		$this->mark_relationships_deleted($id);
-
-		// Take the item off of the recently viewed lists.
-		$tracker = new Tracker();
-		$tracker->delete_item_history($id);
-
-	}
-
-
-	/* This is to allow subclasses to fill in row specific columns of a list view form 
-	function list_view_parse_additional_sections(&$list_form)
-	{
-	}
-	*/
-	/* This function assigns all of the values into the template for the list view 
-	function get_list_view_array(){
-		$return_array = Array();
-		
-		foreach($this->list_fields as $field)
-		{
-			$return_array[strtoupper($field)] = $this->$field;
-		}
-		
-		return $return_array;	
-	}
-	function get_list_view_data()
-	{
-		
-		return $this->get_list_view_array();
-	}
-
-	function get_where(&$fields_array)
-	{ 
-		$where_clause = "WHERE "; 
-		$first = 1; 
-		foreach ($fields_array as $name=>$value) 
-		{ 
-			if ($first) 
-			{ 
-				$first = 0;
-			} 
-			else 
-			{ 
-				$where_clause .= " AND ";
-			} 
-
-			$where_clause .= "$name = ".$adb->quote($value)."";
-		} 
-
-		$where_clause .= " AND deleted=0";
-		return $where_clause;
-	}
-
-
-	function retrieve_by_string_fields($fields_array, $encode=true) 
-	{ 
-		$where_clause = $this->get_where($fields_array);
-		
-		$query = "SELECT * FROM $this->table_name $where_clause";
-		$this->log->debug("Retrieve $this->object_name: ".$query);
-		$result =& $this->db->requireSingleResult($query, true, "Retrieving record $where_clause:");
-		if( empty($result)) 
-		{ 
-		 	return null; 
-		} 
-
-		 $row = $this->db->fetchByAssoc($result,-1, $encode);
-
-		foreach($this->column_fields as $field) 
-		{ 
-			if(isset($row[$field])) 
-			{ 
-				$this->$field = $row[$field];
-			}
-		} 
-		return $this;
-	}
-
-	// this method is called during an import before inserting a bean
-	// define an associative array called $special_fields
-	// the keys are user defined, and don't directly map to the bean's vtiger_fields
-	// the value is the method name within that bean that will do extra
-	// processing for that vtiger_field. example: 'full_name'=>'get_names_from_full_name'
-
-	function process_special_fields() 
-	{ 
-		foreach ($this->special_functions as $func_name) 
-		{ 
-			if ( method_exists($this,$func_name) ) 
-			{ 
-				$this->$func_name(); 
-			} 
-		} 
-	}
-
-	*/
-}
-
-
-?>
+<?php
+/*********************************************************************************
+ * The contents of this file are subject to the SugarCRM Public License Version 1.1.2
+ * ("License"); You may not use this file except in compliance with the 
+ * License. You may obtain a copy of the License at http://www.sugarcrm.com/SPL
+ * Software distributed under the License is distributed on an  "AS IS"  basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
+ * the specific language governing rights and limitations under the License.
+ * The Original Code is:  SugarCRM Open Source
+ * The Initial Developer of the Original Code is SugarCRM, Inc.
+ * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.;
+ * All Rights Reserved.
+ * Contributor(s): ______________________________________.
+ ********************************************************************************/
+/*********************************************************************************
+ * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/data/SugarBean.php,v 1.70 2005/03/16 10:25:16 shaw Exp $
+ * Description:  Defines the base class for all data entities used throughout the 
+ * application.  The base class including its methods and variables is designed to 
+ * be overloaded with module-specific methods and variables particular to the 
+ * module's base entity class. 
+ ********************************************************************************/
+
+include_once('config.php');
+require_once('include/logging.php');
+require_once('data/Tracker.php');
+require_once('include/utils/utils.php');
+require_once('include/utils/UserInfoUtil.php');
+require_once('include/database/PearDatabase.php');
+
+class SugarBean
+{
+    /**
+     * This method implements a generic insert and update logic for any SugarBean
+     * This method only works for subclasses that implement the same variable names.
+     * This method uses the presence of an id vtiger_field that is not null to signify and update.
+     * The id vtiger_field should not be set otherwise.
+     * todo - Add support for vtiger_field type validation and encoding of parameters.
+ * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
+ * All Rights Reserved.
+ * Contributor(s): ______________________________________..
+     */
+	
+
+	function save($module_name= '') 
+	{
+         global $adb; 
+          global $current_user;
+		$isUpdate = true;
+
+		if(!isset($this->id) || $this->id == "")
+		{
+			$isUpdate = false;
+		}
+
+		if ( $this->new_with_id == true )
+		{
+			$isUpdate = false;
+		}
+
+		//$this->date_modified = $this->db->formatDate(date('YmdHis'));
+		$this->date_modified = $this->db->formatDate(date('YmdHis'));	
+		if (isset($current_user)) $this->modified_user_id = $current_user->id;
+		
+		if($isUpdate)
+		{
+    			$query = "Update ".$this->table_name." set ";
+		}
+		else
+		{
+    			//$this->date_entered = $this->db->formatDate(date('YmdHis'));
+			$this->date_entered = $this->db->formatDate(date('YmdHis'));
+
+			if($this->new_schema && 
+				$this->new_with_id == false)
+			{
+                          $this->id = $this->db->getUniqueID("vtiger_users");
+			}
+                        
+			$query = "INSERT into ".$this->table_name;
+		}
+		// todo - add date modified to the list.
+
+		// write out the SQL statement.
+		//$query .= $this->table_name." set ";
+
+		$firstPass = 0;
+		$insKeys = '(';
+		$insValues = '(';
+		$updKeyValues='';
+		foreach($this->column_fields as $field)
+		{
+			// Do not write out the id vtiger_field on the update statement.
+			// We are not allowed to change ids.
+			if($isUpdate && ('id' == $field))
+				continue;
+
+			// Only assign variables that have been set.
+			if(isset($this->$field))
+			{				
+				// Try comparing this element with the head element.
+				if(0 == $firstPass)
+				{
+					$firstPass = 1;
+				}
+				else
+				{
+					if($isUpdate)
+					{
+						$updKeyValues = $updKeyValues.", ";
+					}
+					else
+					{
+						$insKeys = $insKeys.", ";
+						$insValues = $insValues.", ";
+					}
+				}
+				/*else
+					$query = $query.", ";
+	
+				$query = $query.$field."='".$adb->quote(from_html($this->$field,$isUpdate))."'";
+				*/
+				if($isUpdate)
+				{
+					$updKeyValues = $updKeyValues.$field."=".$this->db->formatString($this->table_name,$field,from_html($this->$field,$isUpdate));
+				}
+				else
+				{
+					$insKeys = $insKeys.$field;
+					$insValues = $insValues.$this->db->formatString($this->table_name,$field,from_html($this->$field,$isUpdate));
+				}
+			}
+		}
+
+		if($isUpdate)
+		{
+			$query = $query.$updKeyValues." WHERE ID = '$this->id'";
+			$this->log->info("Update $this->object_name: ".$query);
+		}
+		else
+		{
+			$query = $query.$insKeys.") VALUES ".$insValues.")";
+	        	$this->log->info("Insert: ".$query);
+		}
+
+		$this->db->query($query, true);
+
+		// If this is not an update then store the id for later.
+		if(!$isUpdate && !$this->new_schema && !$this->new_with_id)
+		{
+			$this->db->println("Illegal Access - SugarBean");
+			//this is mysql specific
+	        	$this->id = $this->db->getOne("SELECT LAST_INSERT_ID()" );
+		}
+	        
+		return $this->id;
+	}
+
+    
+    /**
+     * This function retrieves a record of the appropriate type from the DB.
+     * It fills in all of the vtiger_fields from the DB into the object it was called on.
+     * param $id - If ID is specified, it overrides the current value of $this->id.  If not specified the current value of $this->id will be used.
+     * returns this - The object that it was called apon or null if exactly 1 record was not found.
+ * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
+ * All Rights Reserved.
+ * Contributor(s): ______________________________________..
+	 function retrieve($id = -1, $encodeThis=true) {
+		if ($id == -1) {
+			$id = $this->id;
+		}
+		if($id == '') {
+			return null;
+		}
+// GS porting vtiger_crmentity
+$query = "SELECT * FROM $this->table_name WHERE $this->module_id = '$id'";
+//		$query = "SELECT * FROM $this->table_name WHERE ID = '$id'";
+		$this->log->debug("Retrieve $this->object_name: ".$query);
+
+		$result =& $this->db->requireSingleResult($query, true, "Retrieving record by id $this->table_name:$id found ");
+
+		if(empty($result))
+		{
+			return null;
+		}
+				
+		$row = $this->db->fetchByAssoc($result, -1, $encodeThis);
+
+		foreach($this->column_fields as $field)
+		{
+			if(isset($row[$field]))
+			{
+				$this->$field = $row[$field];
+			}
+		}
+		return $this;
+	}
+     */
+
+	function get_list($order_by = "", $where = "", $row_offset = 0, $limit=-1, $max=-1) {
+		$this->log->debug("get_list:  order_by = '$order_by' and where = '$where' and limit = '$limit'");
+		
+		$query = $this->create_list_query($order_by, $where);
+		
+		return $this->process_list_query($query, $row_offset, $limit, $max);
+	}
+
+	/**
+	 * This function returns a full (ie non-paged) list of the current object type.  
+	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
+	 * All Rights Reserved..
+	 * Contributor(s): ______________________________________..
+	 */
+	function get_full_list($order_by = "", $where = "") {
+		$this->log->debug("get_full_list:  order_by = '$order_by' and where = '$where'");
+		$query = "SELECT * FROM $this->table_name ";
+		
+		if($where != "")
+			$query .= "where ($where) AND deleted=0";
+		else
+			$query .= "where deleted=0";
+
+		if(!empty($order_by))
+			$query .= " ORDER BY $order_by";
+
+		$result =& $this->db->query($query, false);
+
+		if($this->db->getRowCount($result) > 0){
+		
+			// We have some data.
+			while ($row = $this->db->fetchByAssoc($result)) {
+				foreach($this->list_fields as $field)
+				{
+					if (isset($row[$field])) {
+						$this->$field = $row[$field];
+						
+						$this->log->debug("process_full_list: $this->object_name({$row['id']}): ".$field." = ".$this->$field);
+					}
+					else {
+ 	                                                $this->$field = '';   
+					}
+				}
+
+
+				$list[] = clone($this);         //added clone tosupport PHP5
+			}
+		}
+
+		if (isset($list)) return $list;
+		else return null;
+
+	}
+
+	function create_list_query($order_by, $where)
+	{
+		$query = "SELECT * FROM $this->table_name ";
+		
+		if($where != "")
+			$query .= "where ($where) AND deleted=0";
+		else
+			$query .= "where deleted=0";
+
+		if(!empty($order_by))
+			$query .= " ORDER BY $order_by";
+
+		return $query;
+	}
+	
+
+	function process_list_query($query, $row_offset, $limit= -1, $max_per_page = -1)
+	{
+		global $list_max_entries_per_page;
+		$this->log->debug("process_list_query: ".$query);
+		if(!empty($limit) && $limit != -1){
+			$result =& $this->db->limitQuery($query, $row_offset + 0, $limit,true,"Error retrieving $this->object_name list: ");
+		}else{
+			$result =& $this->db->query($query,true,"Error retrieving $this->object_name list: ");
+		}
+
+		$list = Array();
+		if($max_per_page == -1){
+			$max_per_page 	= $list_max_entries_per_page;
+		}
+		$rows_found =  $this->db->getRowCount($result);
+
+		$this->log->debug("Found $rows_found ".$this->object_name."s");
+                
+		$previous_offset = $row_offset - $max_per_page;
+		$next_offset = $row_offset + $max_per_page;
+
+		if($rows_found != 0)
+		{
+
+			// We have some data.
+
+			for($index = $row_offset , $row = $this->db->fetchByAssoc($result, $index); $row && ($index < $row_offset + $max_per_page || $max_per_page == -99) ;$index++, $row = $this->db->fetchByAssoc($result, $index)){
+				foreach($this->list_fields as $field)
+				{
+					if (isset($row[$field])) {
+						$this->$field = $row[$field];
+						
+						
+						$this->log->debug("$this->object_name({$row['id']}): ".$field." = ".$this->$field);
+					}
+					else 
+					{
+						$this->$field = "";
+					}
+				}
+
+
+				$list[] = clone($this);   //added clone to support PHP5
+			}
+		}
+
+		$response = Array();
+		$response['list'] = $list;
+		$response['row_count'] = $rows_found;
+		$response['next_offset'] = $next_offset;
+		$response['previous_offset'] = $previous_offset;
+
+		return $response;
+	}
+
+	
+	/**
+	 * Track the viewing of a detail record.  This leverages get_summary_text() which is object specific
+	 * params $user_id - The user that is viewing the record.
+	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
+	 * All Rights Reserved..
+	 * Contributor(s): ______________________________________..
+	 */
+	function track_view($user_id, $current_module,$id='')
+	{
+		$this->log->debug("About to call vtiger_tracker (user_id, module_name, item_id)($user_id, $current_module, $this->id)");
+
+		$tracker = new Tracker();
+		$tracker->track_view($user_id, $current_module, $id, '');
+	}
+
+
+	/** This function should be overridden in each module.  It marks an item as deleted.
+	* If it is not overridden, then marking this type of item is not allowed
+	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
+	 * All Rights Reserved..
+	 * Contributor(s): ______________________________________..
+	*/
+	function mark_deleted($id)
+	{
+		$query = "UPDATE $this->table_name set deleted=1 where id='$id'";
+		$this->db->query($query, true,"Error marking record deleted: ");
+
+		$this->mark_relationships_deleted($id);
+
+		// Take the item off of the recently viewed lists.
+		$tracker = new Tracker();
+		$tracker->delete_item_history($id);
+
+	}
+
+
+	/* This is to allow subclasses to fill in row specific columns of a list view form 
+	function list_view_parse_additional_sections(&$list_form)
+	{
+	}
+	*/
+	/* This function assigns all of the values into the template for the list view 
+	function get_list_view_array(){
+		$return_array = Array();
+		
+		foreach($this->list_fields as $field)
+		{
+			$return_array[strtoupper($field)] = $this->$field;
+		}
+		
+		return $return_array;	
+	}
+	function get_list_view_data()
+	{
+		
+		return $this->get_list_view_array();
+	}
+
+	function get_where(&$fields_array)
+	{ 
+		$where_clause = "WHERE "; 
+		$first = 1; 
+		foreach ($fields_array as $name=>$value) 
+		{ 
+			if ($first) 
+			{ 
+				$first = 0;
+			} 
+			else 
+			{ 
+				$where_clause .= " AND ";
+			} 
+
+			$where_clause .= "$name = ".$adb->quote($value)."";
+		} 
+
+		$where_clause .= " AND deleted=0";
+		return $where_clause;
+	}
+
+
+	function retrieve_by_string_fields($fields_array, $encode=true) 
+	{ 
+		$where_clause = $this->get_where($fields_array);
+		
+		$query = "SELECT * FROM $this->table_name $where_clause";
+		$this->log->debug("Retrieve $this->object_name: ".$query);
+		$result =& $this->db->requireSingleResult($query, true, "Retrieving record $where_clause:");
+		if( empty($result)) 
+		{ 
+		 	return null; 
+		} 
+
+		 $row = $this->db->fetchByAssoc($result,-1, $encode);
+
+		foreach($this->column_fields as $field) 
+		{ 
+			if(isset($row[$field])) 
+			{ 
+				$this->$field = $row[$field];
+			}
+		} 
+		return $this;
+	}
+
+	// this method is called during an import before inserting a bean
+	// define an associative array called $special_fields
+	// the keys are user defined, and don't directly map to the bean's vtiger_fields
+	// the value is the method name within that bean that will do extra
+	// processing for that vtiger_field. example: 'full_name'=>'get_names_from_full_name'
+
+	function process_special_fields() 
+	{ 
+		foreach ($this->special_functions as $func_name) 
+		{ 
+			if ( method_exists($this,$func_name) ) 
+			{ 
+				$this->$func_name(); 
+			} 
+		} 
+	}
+
+	*/
+}
+
+
+?>




From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 04:18:35 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 08:18:35 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9360 -
	/vtigercrm/trunk/include/utils/InventoryUtils.php
Message-ID: <20060909081835.3388D76C287@vtiger.fosslabs.com>

Author: richie
Date: Sat Sep  9 02:18:16 2006
New Revision: 9360

Log:
Postgres fixes by Jens done --By Don

Modified:
    vtigercrm/trunk/include/utils/InventoryUtils.php

Modified: vtigercrm/trunk/include/utils/InventoryUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/InventoryUtils.php (original)
+++ vtigercrm/trunk/include/utils/InventoryUtils.php Sat Sep  9 02:18:16 2006
@@ -334,8 +334,9 @@
 					"Invoice"=>"vtiger_invoicestatushistory"
 				    );
 
-	$modifiedtime = date('YmdHis');
-	$query = "insert into $history_table_array[$module] values('',$id,\"$relatedname\",\"$total\",\"$history_fldval\",\"$modifiedtime\")";
+	$histid = $adb->getUniqueID($history_table_array[$module]);
+ 	$modifiedtime = $adb->formatDate(date('YmdHis'));
+ 	$query = "insert into $history_table_array[$module] values($histid,$id,'$relatedname','$total','$history_fldval',$modifiedtime)";	
 	$adb->query($query);
 
 	$log->debug("Exit from function addInventoryHistory");
@@ -396,12 +397,17 @@
 		}
 		if($available != 'all' && $available == 'available_associated')
 		{
-			$query = "SELECT vtiger_producttaxrel.*, vtiger_inventorytaxinfo.* FROM vtiger_inventorytaxinfo left JOIN vtiger_producttaxrel ON vtiger_inventorytaxinfo.taxid = vtiger_producttaxrel.taxid WHERE vtiger_producttaxrel.productid = $productid or vtiger_inventorytaxinfo.deleted=0 group by vtiger_inventorytaxinfo.taxid";
+			$query = "SELECT vtiger_producttaxrel.*, vtiger_inventorytaxinfo.* FROM vtiger_inventorytaxinfo left JOIN vtiger_producttaxrel ON vtiger_inventorytaxinfo.taxid = vtiger_producttaxrel.taxid WHERE vtiger_producttaxrel.productid = $productid or vtiger_inventorytaxinfo.deleted=0 GROUP BY vtiger_inventorytaxinfo.taxid";
 		}
 		else
 		{
 			$query = "SELECT vtiger_producttaxrel.*, vtiger_inventorytaxinfo.* FROM vtiger_inventorytaxinfo INNER JOIN vtiger_producttaxrel ON vtiger_inventorytaxinfo.taxid = vtiger_producttaxrel.taxid WHERE vtiger_producttaxrel.productid = $productid $where";
 		}
+
+		//Postgres 8 fixes
+ 		if( $adb->dbType == "pgsql")
+ 		    $query = fixPostgresQuery( $query, $log, 0);
+		
 		$res = $adb->query($query);
 		for($i=0;$i<$adb->num_rows($res);$i++)
 		{
@@ -502,7 +508,7 @@
 		// and salepeople can control the order than their quote (etc) items print out
 		// so we create a new field "sequence_no" and stick the value of $i into it
 
-		$query ="insert into vtiger_inventoryproductrel(id, productid, sequence_no, quantity, listprice, comment) values($focus->id, $prod_id , $prod_seq, $qty, $listprice, \"$comment\")";
+		$query ="insert into vtiger_inventoryproductrel(id, productid, sequence_no, quantity, listprice, comment) values($focus->id, $prod_id , $prod_seq, $qty, $listprice, '$comment')";
 		$prod_seq++;
 		$adb->query($query);
 
@@ -551,7 +557,10 @@
 			}
 			$updatequery = trim($updatequery,',')." where id=$focus->id and productid=$prod_id";
 		}
-		$adb->query($updatequery);
+		// jens 2006/08/19 - protect against empy update queries
+ 		if( !preg_match( '/set\s+where/i', $updatequery)) {
+ 		    $adb->query($updatequery);
+ 		}
 	}
 
 	//we should update the netprice (subtotal), taxtype, group discount, S&H charge, S&H taxes, adjustment and total




From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 04:20:05 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 08:20:05 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9361 -
	/vtigercrm/trunk/index.php
Message-ID: <20060909082005.5B08D76C287@vtiger.fosslabs.com>

Author: richie
Date: Sat Sep  9 02:19:43 2006
New Revision: 9361

Log:
Postgres fixes by Jens done --By Don

Modified:
    vtigercrm/trunk/index.php

Modified: vtigercrm/trunk/index.php
==============================================================================
--- vtigercrm/trunk/index.php (original)
+++ vtigercrm/trunk/index.php Sat Sep  9 02:19:43 2006
@@ -382,7 +382,7 @@
 		else
 			$auditrecord = $record;	
 
-		$date_var = date('YmdHis');
+		$date_var = $adb->formatDate(date('YmdHis'));
 		if ($action != 'chat')
 		{	
 			$query = "insert into vtiger_audit_trial values(".$adb->getUniqueID('vtiger_audit_trial').",".$current_user->id.",'".$module."','".$action."','".$auditrecord."',$date_var)";




From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 04:22:21 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 08:22:21 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9362 -
	/vtigercrm/trunk/install/populateSeedData.php
Message-ID: <20060909082221.CECFF76C2E5@vtiger.fosslabs.com>

Author: richie
Date: Sat Sep  9 02:21:55 2006
New Revision: 9362

Log:
Postgres fixes by Jens done --By Don

Modified:
    vtigercrm/trunk/install/populateSeedData.php

Modified: vtigercrm/trunk/install/populateSeedData.php
==============================================================================
--- vtigercrm/trunk/install/populateSeedData.php (original)
+++ vtigercrm/trunk/install/populateSeedData.php Sat Sep  9 02:21:55 2006
@@ -186,7 +186,7 @@
 		$query = "insert into vtiger_freetags values ($freetag, '$cloudtag[1]', '$cloudtag[1]')";
 		$res = $adb->query($query);
 
-		$date = date('YmdHis'); 
+		$date = $adb->formatDate(date('YmdHis')); 
 		$query_tag = "insert into vtiger_freetagged_objects values ($freetag, 1,".$account->id.", $date, 'Accounts')";
 		$result = $adb->query($query_tag);
 	}
@@ -289,7 +289,7 @@
 		$query = "insert into vtiger_freetags values ($freetag, '$cloudtag[2]', '$cloudtag[2]')";
 		$res1 = $adb->query($query);
 
-		$date = date('YmdHis'); 
+		$date = $adb->formatDate(date('YmdHis')); 
 		$query_tag = "insert into vtiger_freetagged_objects values ($freetag, 1,".$contact->id.", $date, 'Contacts')";
 		$result1 = $adb->query($query_tag);
 	}
@@ -839,7 +839,7 @@
 		$query = "insert into vtiger_freetags values ($freetag, '$cloudtag[0]', '$cloudtag[0]')";
 		$res_inv = $adb->query($query);
 
-		$date = date('YmdHis'); 
+		$date = $adb->formatDate(date('YmdHis')); 
 		$query_tag = "insert into vtiger_freetagged_objects values ($freetag, 1,".$invoice->id.", $date, 'Invoice')";
 		$result_inv = $adb->query($query_tag);
 	}
@@ -996,7 +996,7 @@
 		$query = "insert into vtiger_freetags values ($freetag, '$cloudtag[3]', '$cloudtag[3]')";
 		$res_tkt = $adb->query($query);
 
-		$date = date('YmdHis'); 
+		$date = $adb->formatDate(date('YmdHis')); 
 		$query_tag = "insert into vtiger_freetagged_objects values ($freetag, 1,".$helpdesk->id.", $date, 'HelpDesk')";
 		$result_tkt = $adb->query($query_tag);
 	}




From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 04:28:16 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 08:28:16 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9363 -
	/vtigercrm/trunk/modules/Notes/Save.php
Message-ID: <20060909082816.3296476B577@vtiger.fosslabs.com>

Author: richie
Date: Sat Sep  9 02:27:44 2006
New Revision: 9363

Log:
Postgres fixes by Jens done --By Don

Modified:
    vtigercrm/trunk/modules/Notes/Save.php

Modified: vtigercrm/trunk/modules/Notes/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Notes/Save.php (original)
+++ vtigercrm/trunk/modules/Notes/Save.php Sat Sep  9 02:27:44 2006
@@ -56,7 +56,7 @@
 		$filepath = $adb->query_result($result,0,'path');
 
 		$new_attachmentid = $adb->getUniqueID("vtiger_crmentity");
-		$date_var = date('YmdHis');
+		$date_var = $adb->formatDate(date('YmdHis'));	
 
 		$upload_filepath = decideFilePath();
 




From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 04:29:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 08:29:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9364 -
 /vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php
Message-ID: <20060909082957.E2D8876BD02@vtiger.fosslabs.com>

Author: richie
Date: Sat Sep  9 02:29:30 2006
New Revision: 9364

Log:
Postgres fixes by Jens done --By Don

Modified:
    vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php

Modified: vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php (original)
+++ vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php Sat Sep  9 02:29:30 2006
@@ -45,8 +45,8 @@
 //get all the lead related columns 
 $row = $focus->column_fields;
 
-$date_entered = date('YmdHis');
-$date_modified = date('YmdHis');
+$date_entered = $adb->formatDate(date('YmdHis'));
+$date_modified = $adb->formatDate(date('YmdHis'));
 
 /** Function for getting the custom values from leads and saving to vtiger_account/contact/potential custom vtiger_fields.
  *  @param string $type - Field Type (eg: text, list)
@@ -315,8 +315,8 @@
 
 
 
-$date_entered = date('YmdHis');
-$date_modified = date('YmdHis');
+$date_entered = $adb->formatDate(date('YmdHis'));
+$date_modified = $adb->formatDate(date('YmdHis'));
 
 //Saving Contact - starts
 $crmcontactid = $adb->getUniqueID("vtiger_crmentity");
@@ -376,8 +376,9 @@
 if(! isset($createpotential) || ! $createpotential == "on")
 {
 	$log->info("createpotential is not set");
-	$date_entered = date('YmdHis');
-	$date_modified = date('YmdHis');
+
+	$date_entered = $adb->formatDate(date('YmdHis'));
+	$date_modified = $adb->formatDate(date('YmdHis'));
   
 
 	$oppid = $adb->getUniqueID("vtiger_crmentity");




From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 04:32:08 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 08:32:08 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9365 -
	/vtigercrm/trunk/modules/Invoice/Invoice.php
Message-ID: <20060909083209.10BEB76C334@vtiger.fosslabs.com>

Author: richie
Date: Sat Sep  9 02:31:33 2006
New Revision: 9365

Log:
Postgres fixes by Jens done --By Don

Modified:
    vtigercrm/trunk/modules/Invoice/Invoice.php

Modified: vtigercrm/trunk/modules/Invoice/Invoice.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/Invoice.php (original)
+++ vtigercrm/trunk/modules/Invoice/Invoice.php Sat Sep  9 02:31:33 2006
@@ -208,10 +208,10 @@
 		global $log;
 		$log->debug("Entering get_attachments(".$id.") method ...");
 		
-		$query = "select vtiger_notes.title,'Notes      '  ActivityType, vtiger_notes.filename,
-		vtiger_attachments.type  FileType,crm2.modifiedtime lastmodified,
-		vtiger_seattachmentsrel.attachmentsid attachmentsid, vtiger_notes.notesid crmid,
-			crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name
+		$query = "select vtiger_notes.title,'Notes      ' as ActivityType, vtiger_notes.filename,
+ 		vtiger_attachments.type as FileType,crm2.modifiedtime as lastmodified,
+ 		vtiger_seattachmentsrel.attachmentsid as attachmentsid, vtiger_notes.notesid as crmid,
+ 			crm2.createdtime, vtiger_notes.notecontent as description, vtiger_users.user_name	
 		from vtiger_notes
 			inner join vtiger_senotesrel on vtiger_senotesrel.notesid= vtiger_notes.notesid
 			inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_senotesrel.crmid
@@ -223,9 +223,9 @@
 		
 		$query .= ' union all ';
 
-		$query .= "select vtiger_attachments.description  title ,'Attachments'  ActivityType,
-		vtiger_attachments.name filename, vtiger_attachments.type FileType, crm2.modifiedtime lastmodified,
-		vtiger_attachments.attachmentsid attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid,
+		$query .= "select vtiger_attachments.description as title ,'Attachments' as ActivityType,
+ 		vtiger_attachments.name as filename, vtiger_attachments.type as FileType, crm2.modifiedtime as lastmodified,
+ 		vtiger_attachments.attachmentsid as attachmentsid, vtiger_seattachmentsrel.attachmentsid as crmid,	
 			crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name
 		from vtiger_attachments
 			inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid




From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 04:35:10 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 08:35:10 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9366 -
	/vtigercrm/trunk/modules/SalesOrder/SalesOrder.php
Message-ID: <20060909083510.C5CB176C416@vtiger.fosslabs.com>

Author: richie
Date: Sat Sep  9 02:34:39 2006
New Revision: 9366

Log:
Postgres fixes by Jens done --By Don

Modified:
    vtigercrm/trunk/modules/SalesOrder/SalesOrder.php

Modified: vtigercrm/trunk/modules/SalesOrder/SalesOrder.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/SalesOrder.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/SalesOrder.php Sat Sep  9 02:34:39 2006
@@ -198,10 +198,10 @@
 		global $log;
 		$log->debug("Entering get_attachments(".$id.") method ...");
 
-		$query = "select vtiger_notes.title,'Notes      '  ActivityType, vtiger_notes.filename,
-		vtiger_attachments.type  FileType,crm2.modifiedtime lastmodified,
-		vtiger_seattachmentsrel.attachmentsid attachmentsid, vtiger_notes.notesid crmid,
-		vtiger_crmentity.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name
+		$query = "select vtiger_notes.title,'Notes      ' as ActivityType, vtiger_notes.filename,
+ 		vtiger_attachments.type as FileType,crm2.modifiedtime as lastmodified,
+ 		vtiger_seattachmentsrel.attachmentsid as attachmentsid, vtiger_notes.notesid as crmid,
+ 		vtiger_crmentity.createdtime, vtiger_notes.notecontent as description, vtiger_users.user_name
 		from vtiger_notes
 			inner join vtiger_senotesrel on vtiger_senotesrel.notesid= vtiger_notes.notesid
 			inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_senotesrel.crmid
@@ -213,9 +213,9 @@
 
 		$query .= ' union all ';
 
-		$query .= "select vtiger_attachments.description  title ,'Attachments'  ActivityType,
-		vtiger_attachments.name  filename, vtiger_attachments.type  FileType, crm2.modifiedtime lastmodified,
-		vtiger_attachments.attachmentsid  attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid,
+		$query .= "select vtiger_attachments.description as title ,'Attachments' as ActivityType,
+ 		vtiger_attachments.name as filename, vtiger_attachments.type as FileType, crm2.modifiedtime as lastmodified,
+ 		vtiger_attachments.attachmentsid as attachmentsid, vtiger_seattachmentsrel.attachmentsid as crmid,
 		vtiger_crmentity.createdtime, vtiger_attachments.description, vtiger_users.user_name
 		from vtiger_attachments
 			inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid




From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 04:38:16 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 08:38:16 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9367 -
	/vtigercrm/trunk/modules/uploads/add2db.php
Message-ID: <20060909083816.9DD5B76C413@vtiger.fosslabs.com>

Author: richie
Date: Sat Sep  9 02:37:18 2006
New Revision: 9367

Log:
Postgres fixes by Jens done --By Don

Modified:
    vtigercrm/trunk/modules/uploads/add2db.php

Modified: vtigercrm/trunk/modules/uploads/add2db.php
==============================================================================
--- vtigercrm/trunk/modules/uploads/add2db.php (original)
+++ vtigercrm/trunk/modules/uploads/add2db.php Sat Sep  9 02:37:18 2006
@@ -47,10 +47,10 @@
 		{
 			$desc = $_REQUEST['txtDescription'];
 			$description = addslashes($desc);
-			$date_var = date('YmdHis');
+			$date_var = $adb->formatDate(date('YmdHis'));	
 
 			$query = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime) values('";
-			$query .= $current_id."','".$current_user->id."','".$current_user->id."','".$_REQUEST['return_module'].' Attachment'."','".$description."','".$date_var."')";
+			$query .= $current_id."','".$current_user->id."','".$current_user->id."','".$_REQUEST['return_module'].' Attachment'."','".$description."',".$date_var.")";	
 			$result = $adb->query($query);
 
 			$sql = "insert into vtiger_attachments values(";




From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 04:40:51 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 08:40:51 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9368 -
	/vtigercrm/trunk/modules/Users/UsersAjax.php
Message-ID: <20060909084051.44EFB76C413@vtiger.fosslabs.com>

Author: richie
Date: Sat Sep  9 02:40:13 2006
New Revision: 9368

Log:
Postgres fixes by Jens done --By Don

Modified:
    vtigercrm/trunk/modules/Users/UsersAjax.php

Modified: vtigercrm/trunk/modules/Users/UsersAjax.php
==============================================================================
--- vtigercrm/trunk/modules/Users/UsersAjax.php (original)
+++ vtigercrm/trunk/modules/Users/UsersAjax.php Sat Sep  9 02:40:13 2006
@@ -1,37 +1,37 @@
-<?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.
- *
- ********************************************************************************/
-
-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','".$date_var."')";
-	$result=$adb->query($query);
-	echo $announcement;
-}
-?>
+<?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.
+ *
+ ********************************************************************************/
+
+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  Sat Sep  9 04:44:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 08:44:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9369 -
	/vtigercrm/trunk/modules/Users/Authenticate.php
Message-ID: <20060909084409.C04DC76C423@vtiger.fosslabs.com>

Author: richie
Date: Sat Sep  9 02:43:45 2006
New Revision: 9369

Log:
Postgres fixes by Jens done --By Don

Modified:
    vtigercrm/trunk/modules/Users/Authenticate.php

Modified: vtigercrm/trunk/modules/Users/Authenticate.php
==============================================================================
--- vtigercrm/trunk/modules/Users/Authenticate.php (original)
+++ vtigercrm/trunk/modules/Users/Authenticate.php Sat Sep  9 02:43:45 2006
@@ -47,17 +47,9 @@
 		else
 			$auditrecord = $record;	
 
-		if( $adb->dbType = "pgsql")
-	       	{
- 			$date_var = date('Y-m-d H:i:s');
- 			$query = "insert into vtiger_audit_trial values(".$adb->getUniqueID('vtiger_audit_trial').",".$focus->id.",'Users','Authenticate','','$date_var')";
- 	    	}
-		else
-	       	{
+		$date_var = $adb->formatDate(date('YmdHis'));
+ 	    $query = "insert into vtiger_audit_trial values(".$adb->getUniqueID('vtiger_audit_trial').",".$focus->id.",'Users','Authenticate','',$date_var)";	
 			
-			$date_var = date('YmdHis');
-			$query = "insert into vtiger_audit_trial values(".$adb->getUniqueID('vtiger_audit_trial').",".$focus->id.",'Users','Authenticate','',$date_var)";
-		}	
 		$adb->query($query);
 	}
 




From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 04:46:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 08:46:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9370 -
	/vtigercrm/trunk/modules/Webmails/Save.php
Message-ID: <20060909084640.AE6B276C413@vtiger.fosslabs.com>

Author: richie
Date: Sat Sep  9 02:45:45 2006
New Revision: 9370

Log:
Postgres fixes by Jens done --By Don

Modified:
    vtigercrm/trunk/modules/Webmails/Save.php

Modified: vtigercrm/trunk/modules/Webmails/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Webmails/Save.php (original)
+++ vtigercrm/trunk/modules/Webmails/Save.php Sat Sep  9 02:45:45 2006
@@ -1,130 +1,130 @@
-<?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 Initial Developer of the Original Code is FOSS Labs.
-  * Portions created by FOSS Labs are Copyright (C) FOSS Labs.
-  * Portions created by vtiger are Copyright (C) vtiger.
-  * All Rights Reserved.
-  *
-  ********************************************************************************/
-
-require_once('modules/Emails/Email.php');
-require_once('modules/Webmails/Webmail.php');
-require_once('include/logging.php');
-require_once('include/database/PearDatabase.php');
-require_once('include/utils/UserInfoUtil.php');
-require_once('include/utils/CommonUtils.php');
-require_once('modules/Webmails/MailParse.php');
-require_once('modules/Webmails/MailBox.php');
-global $current_user;
-
-$local_log =& LoggerManager::getLogger('index');
-$focus = new Email();
-
-$to_address = explode(";",$_REQUEST['to_list']);
-$cc_address = explode(";",$_REQUEST['cc_list']);
-$bcc_address = explode(";",$_REQUEST['bcc_list']);
-
-$start_message=$_REQUEST["start_message"];
-if($_REQUEST["mailbox"] && $_REQUEST["mailbox"] != "") {$mailbox=$_REQUEST["mailbox"];} else {$mailbox="INBOX";}
-
-$MailBox = new MailBox($mailbox);
-$email = new Webmail($MailBox->mbox, $_REQUEST["mailid"]);
-$subject = $email->subject;
-$date = $email->date;
-
-$email->loadMail();
-$msgData = $email->body;
-
-$focus->column_fields['subject']=$subject;
-$focus->column_fields["activitytype"]="Emails";
-
-$ddate = date("Y-m-d");
-$dtime = date("h:m");
-$focus->column_fields["assigned_user_id"]=$current_user->id;
-$focus->column_fields["date_start"]=$ddate;
-$focus->column_fields["time_start"]=$dtime;
-
-//$tmpBody = preg_replace(array('/<br(.*?)>/i',"/&gt;/i","/&lt;/i","/&nbsp;/i","/&amp/i","/&copy;/i","/<style(.*?)>(.*?)<\/style>/i","/\{(.*?)\}/i","/BODY/i"),array("\r",">","<"," ","&","(c)","","",""),$msgData);
-//$focus->column_fields["description"]=strip_tags($tmpBody);
-$focus->column_fields["description"]=$msgData;
-
-
-//to save the email details in vtiger_emaildetails vtiger_tables
-$fieldid = $adb->query_result($adb->query('select fieldid from vtiger_field where tablename="contactdetails" and fieldname="email" and columnname="email"'),0,'fieldid');
-
-if($email->relationship != 0) {
-	$focus->column_fields['parent_id']=$email->relationship["id"].'@'.$fieldid.'|';
-
-	if($email->relationship["type"] == "Contacts")
-		add_attachment_to_contact($email->relationship["id"],$email);
-}else {
-	//if relationship is not available create a contact and relate the email to the contact
-	require_once('modules/Contacts/Contact.php');
-	$contact_focus = new Contact();	
-	$contact_focus->column_fields['lastname'] =$email->fromname; 
-	$contact_focus->column_fields['email'] = $email->from;
-	$contact_focus->save("Contacts");
-	$focus->column_fields['parent_id']=$contact_focus->id.'@'.$fieldid.'|';
-
-	add_attachment_to_contact($contact_focus->id,$email);
-}
-
-function add_attachment_to_contact($cid,$email) {
-	// add vtiger_attachments to contact
-	global $adb,$current_user;
-	for($j=0;$j<2;$j++) {
-	    if($j==0)
-	    	$attachments=$email->downloadAttachments();
-	    else
-	    	$attachments=$email->downloadInlineAttachments();
-
-	    $upload_filepath = decideFilePath();
-	    for($i=0,$num_files=count($attachments);$i<$num_files;$i++) {
-		$current_id = $adb->getUniqueID("vtiger_crmentity");
-		$date_var = date('YmdHis');
-
-		$filename = ereg_replace("[ ()-]+", "_",$attachments[$i]["filename"]);
-        	$filetype= substr($filename,strstr($filename,"."),strlen($filename));
-		$filesize = $attachments[$i]["filesize"];
-
-                $query = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime) values('";
-                $query .= $current_id."','".$current_user->id."','".$current_user->id."','Contacts Attachment','Uploaded from webmail during qualification','".$date_var."')";
-                $result = $adb->query($query);
-
-                $sql = "insert into vtiger_attachments values(";
-                $sql .= $current_id.",'".$filename."','Uploaded ".$filename." from webmail','".$filetype."','".$upload_filepath."')";
-		echo $query;
-                $result = $adb->query($sql);
-
-                $sql1 = "insert into vtiger_seattachmentsrel values('";
-                $sql1 .= $cid."','".$current_id."')";
-                $result = $adb->query($sql1);
-
-		$fp = fopen($upload_filepath.'/'.$filename, "w") or die("Can't open file");
-		fputs($fp, base64_decode($attachments[$i]["filedata"]));
-		fclose($fp);
-	    }
-	}
-}
-
-$_REQUEST['parent_id'] = $focus->column_fields['parent_id'];
-$focus->save("Emails");
-
-//saving in vtiger_emaildetails vtiger_table
-$id_lists = $focus->column_fields['parent_id'].'@'.$fieldid;
-$all_to_ids = $email->from;
-$query = 'insert into vtiger_emaildetails values ('.$focus->id.',"","'.$all_to_ids.'","","","","'.$id_lists.'","WEBMAIL")';
-$adb->query($query);
-
-$return_id = $_REQUEST["mailid"];
-$return_module='Webmails';
-$return_action='ListView';
-
-
-if($_POST["ajax"] != "true")
-	header("Location: index.php?action=$return_action&module=$return_module&record=$return_id"); 
-
-return;
-?>
+<?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 Initial Developer of the Original Code is FOSS Labs.
+  * Portions created by FOSS Labs are Copyright (C) FOSS Labs.
+  * Portions created by vtiger are Copyright (C) vtiger.
+  * All Rights Reserved.
+  *
+  ********************************************************************************/
+
+require_once('modules/Emails/Email.php');
+require_once('modules/Webmails/Webmail.php');
+require_once('include/logging.php');
+require_once('include/database/PearDatabase.php');
+require_once('include/utils/UserInfoUtil.php');
+require_once('include/utils/CommonUtils.php');
+require_once('modules/Webmails/MailParse.php');
+require_once('modules/Webmails/MailBox.php');
+global $current_user;
+
+$local_log =& LoggerManager::getLogger('index');
+$focus = new Email();
+
+$to_address = explode(";",$_REQUEST['to_list']);
+$cc_address = explode(";",$_REQUEST['cc_list']);
+$bcc_address = explode(";",$_REQUEST['bcc_list']);
+
+$start_message=$_REQUEST["start_message"];
+if($_REQUEST["mailbox"] && $_REQUEST["mailbox"] != "") {$mailbox=$_REQUEST["mailbox"];} else {$mailbox="INBOX";}
+
+$MailBox = new MailBox($mailbox);
+$email = new Webmail($MailBox->mbox, $_REQUEST["mailid"]);
+$subject = $email->subject;
+$date = $email->date;
+
+$email->loadMail();
+$msgData = $email->body;
+
+$focus->column_fields['subject']=$subject;
+$focus->column_fields["activitytype"]="Emails";
+
+$ddate = date("Y-m-d");
+$dtime = date("h:m");
+$focus->column_fields["assigned_user_id"]=$current_user->id;
+$focus->column_fields["date_start"]=$ddate;
+$focus->column_fields["time_start"]=$dtime;
+
+//$tmpBody = preg_replace(array('/<br(.*?)>/i',"/&gt;/i","/&lt;/i","/&nbsp;/i","/&amp/i","/&copy;/i","/<style(.*?)>(.*?)<\/style>/i","/\{(.*?)\}/i","/BODY/i"),array("\r",">","<"," ","&","(c)","","",""),$msgData);
+//$focus->column_fields["description"]=strip_tags($tmpBody);
+$focus->column_fields["description"]=$msgData;
+
+
+//to save the email details in vtiger_emaildetails vtiger_tables
+$fieldid = $adb->query_result($adb->query('select fieldid from vtiger_field where tablename="contactdetails" and fieldname="email" and columnname="email"'),0,'fieldid');
+
+if($email->relationship != 0) {
+	$focus->column_fields['parent_id']=$email->relationship["id"].'@'.$fieldid.'|';
+
+	if($email->relationship["type"] == "Contacts")
+		add_attachment_to_contact($email->relationship["id"],$email);
+}else {
+	//if relationship is not available create a contact and relate the email to the contact
+	require_once('modules/Contacts/Contact.php');
+	$contact_focus = new Contact();	
+	$contact_focus->column_fields['lastname'] =$email->fromname; 
+	$contact_focus->column_fields['email'] = $email->from;
+	$contact_focus->save("Contacts");
+	$focus->column_fields['parent_id']=$contact_focus->id.'@'.$fieldid.'|';
+
+	add_attachment_to_contact($contact_focus->id,$email);
+}
+
+function add_attachment_to_contact($cid,$email) {
+	// add vtiger_attachments to contact
+	global $adb,$current_user;
+	for($j=0;$j<2;$j++) {
+	    if($j==0)
+	    	$attachments=$email->downloadAttachments();
+	    else
+	    	$attachments=$email->downloadInlineAttachments();
+
+	    $upload_filepath = decideFilePath();
+	    for($i=0,$num_files=count($attachments);$i<$num_files;$i++) {
+		$current_id = $adb->getUniqueID("vtiger_crmentity");
+		$date_var = $adb->formatDate(date('YmdHis'));	
+
+		$filename = ereg_replace("[ ()-]+", "_",$attachments[$i]["filename"]);
+        	$filetype= substr($filename,strstr($filename,"."),strlen($filename));
+		$filesize = $attachments[$i]["filesize"];
+
+                $query = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime) values('";
+                $query .= $current_id."','".$current_user->id."','".$current_user->id."','Contacts Attachment','Uploaded from webmail during qualification',".$date_var.")";
+                $result = $adb->query($query);
+
+                $sql = "insert into vtiger_attachments values(";
+                $sql .= $current_id.",'".$filename."','Uploaded ".$filename." from webmail','".$filetype."','".$upload_filepath."')";
+		echo $query;
+                $result = $adb->query($sql);
+
+                $sql1 = "insert into vtiger_seattachmentsrel values('";
+                $sql1 .= $cid."','".$current_id."')";
+                $result = $adb->query($sql1);
+
+		$fp = fopen($upload_filepath.'/'.$filename, "w") or die("Can't open file");
+		fputs($fp, base64_decode($attachments[$i]["filedata"]));
+		fclose($fp);
+	    }
+	}
+}
+
+$_REQUEST['parent_id'] = $focus->column_fields['parent_id'];
+$focus->save("Emails");
+
+//saving in vtiger_emaildetails vtiger_table
+$id_lists = $focus->column_fields['parent_id'].'@'.$fieldid;
+$all_to_ids = $email->from;
+$query = 'insert into vtiger_emaildetails values ('.$focus->id.',"","'.$all_to_ids.'","","","","'.$id_lists.'","WEBMAIL")';
+$adb->query($query);
+
+$return_id = $_REQUEST["mailid"];
+$return_module='Webmails';
+$return_action='ListView';
+
+
+if($_POST["ajax"] != "true")
+	header("Location: index.php?action=$return_action&module=$return_module&record=$return_id"); 
+
+return;
+?>




From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 04:49:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 08:49:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9371 -
	/vtigercrm/trunk/soap/customerportal.php
Message-ID: <20060909084939.E46AC76C481@vtiger.fosslabs.com>

Author: richie
Date: Sat Sep  9 02:49:06 2006
New Revision: 9371

Log:
Postgres fixes by Jens done --By Don

Modified:
    vtigercrm/trunk/soap/customerportal.php

Modified: vtigercrm/trunk/soap/customerportal.php
==============================================================================
--- vtigercrm/trunk/soap/customerportal.php (original)
+++ vtigercrm/trunk/soap/customerportal.php Sat Sep  9 02:49:06 2006
@@ -412,10 +412,10 @@
 function save_faq_comment($faqid,$comment)
 {
 	global $adb;
-	$createdtime = date('Y-m-d H:i:s');
+	$createdtime = $adb->formatDate(date('YmdHis'));	
 	if(trim($comment) != '')
 	{
-		$faq_query = "insert into vtiger_faqcomments values('',".$faqid.",'".$comment."','".$createdtime."')";
+		$faq_query = "insert into vtiger_faqcomments values('',".$faqid.",'".$comment."',".$createdtime.")";
 		$adb->query($faq_query);
 	}
 	$result = get_KBase_details('');
@@ -561,15 +561,15 @@
 function update_ticket_comment($ticketid,$ownerid,$comments)
 {
 	global $adb;
-	$servercreatedtime = date("Y-m-d H:i:s");
-	if(trim($comments) != '')
-	{
-		$sql = "insert into vtiger_ticketcomments values('',".$ticketid.",'".$comments."','".$ownerid."','customer','".$servercreatedtime."')";
-		$adb->query($sql);
-
-		$updatequery = "update vtiger_crmentity set modifiedtime='".$servercreatedtime."' where crmid=".$ticketid;
-		$adb->query($updatequery);
-	}
+	$servercreatedtime = $adb->formatDate(date('YmdHis'));
+  	if(trim($comments) != '')
+  	{
+ 		$sql = "insert into vtiger_ticketcomments values('',".$ticketid.",'".$comments."','".$ownerid."','customer',".$servercreatedtime.")";
+  		$adb->query($sql);
+  
+ 		$updatequery = "update vtiger_crmentity set modifiedtime=".$servercreatedtime." where crmid=".$ticketid;
+  		$adb->query($updatequery);
+  	}	
 }
 
 /**	function used to close the ticket
@@ -633,11 +633,11 @@
 function update_login_details($id,$flag)
 {
         global $adb;
-	$current_time = date("Y-m-d H:i:s");
+	$current_time = $adb->formatDate(date('YmdHis'));	
 
 	if($flag == 'login')
 	{
-	        $sql = "update vtiger_portalinfo set login_time='".$current_time."' where id=".$id;
+	       	$sql = "update vtiger_portalinfo set login_time=".$current_time." where id=".$id; 
 	        $result = $adb->query($sql);
 	}
 	elseif($flag == 'logout')
@@ -647,7 +647,7 @@
                 if($adb->num_rows($result) != 0)
                         $last_login = $adb->query_result($result,0,'login_time');
 
-		$sql = "update vtiger_portalinfo set logout_time = '".$current_time."', last_login_time='".$last_login."' where id=".$id;
+		$sql = "update vtiger_portalinfo set logout_time=".$current_time.", last_login_time='".$last_login."' where id=".$id;	
 		$result = $adb->query($sql);
 	}
 
@@ -821,10 +821,10 @@
 	fclose($handle);	
 
 	//Now store this file information in db and relate with the ticket
-	$date_var = date('YmdHis');
-	$description = 'CustomerPortal Attachment';
-
-	$crmquery = "insert into vtiger_crmentity (crmid,setype,description,createdtime) values('".$attachmentid."','HelpDesk Attachment','".$description."','".$date_var."')";
+	$date_var = $adb->formatDate(date('YmdHis'));
+  	$description = 'CustomerPortal Attachment';
+  
+ 	$crmquery = "insert into vtiger_crmentity (crmid,setype,description,createdtime) values('".$attachmentid."','HelpDesk Attachment','".$description."',".$date_var.")";
 	$crmresult = $adb->query($crmquery);
 
 	$attachmentquery = "insert into vtiger_attachments values(".$attachmentid.",'".$filename."','".$description."','".$filetype."','".$upload_filepath."')";




From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 06:37:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 10:37:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9372 -
	/vtigercrm/trunk/Smarty/templates/HomePage.tpl
Message-ID: <20060909103739.0CB1776C498@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 04:37:32 2006
New Revision: 9372

Log:
UI Issue in Home Page Tables in IE has been fixed --Jeri

Modified:
    vtigercrm/trunk/Smarty/templates/HomePage.tpl

Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/HomePage.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/HomePage.tpl Sat Sep  9 04:37:32 2006
@@ -133,7 +133,7 @@
 															{/if}
 														</td>
 													</tr>
-												</table>										
+											</table>										
 									</td>
 								</tr>
 							</table>
@@ -146,7 +146,22 @@
 											<td align="left" class="homePageMatrixHdr"><b>{$APP.LBL_HOMEPAGE_DASHBOARD}</b></td>
 											<td align="right" class="homePageMatrixHdr"><img src="{$IMAGE_PATH}uparrow.gif" align="absmiddle" /></td>
 										</tr>
-											<tr ><td id="dashborad_cont" colspan="2" style="height:250px;">&nbsp;</td></tr>
+										<tr>	
+											<td colspan="2">
+											<div style="overflow:hidden;height:255px;width:99%"> 
+												<table border=0 cellspacing=0 cellpadding=5 width=100%>
+													<tr><td id="dashborad_cont" style="height:250px;">&nbsp;</td></tr>
+												</table>
+											</div>
+											<table border=0 cellspacing=0 cellpadding=5 width=100%>
+													<tr>
+														<td colspan="2" align="right" valign="bottom">
+															&nbsp;	
+														</td>
+													</tr>
+											</table>
+											</td>
+										</tr>
 									</table>
 								</div>
 						{/if}




From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 06:43:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 10:43:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9373 -
	/vtigercrm/trunk/Smarty/templates/Header.tpl
Message-ID: <20060909104359.4C7FB76C4A0@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 04:43:51 2006
New Revision: 9373

Log:
Changes given by Radiant for The AllMenu's out-of-screen positioning has been integrated --Jeri

Modified:
    vtigercrm/trunk/Smarty/templates/Header.tpl

Modified: vtigercrm/trunk/Smarty/templates/Header.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Header.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Header.tpl Sat Sep  9 04:43:51 2006
@@ -402,7 +402,7 @@
 {/literal}
 
 {* Quick Access Functionality *}
-<div id="allMenu" onmouseout="fninvsh('allMenu');" onMouseOver="fnvshNrm('allMenu');" style="width:650px">
+<div id="allMenu" onmouseout="fninvsh('allMenu');" onMouseOver="fnvshNrm('allMenu');" style="width:550px">
 	<table border=0 cellpadding="5" cellspacing="0" class="allMnuTable" >
 	<tr>
 		<td valign="top">
@@ -411,7 +411,7 @@
 			<span class="allMnuHdr">{$APP[$parenttab]}</span>
 			{foreach name=modulelist item=modules from=$details}
        		{math assign="num" equation="x + y" x=$parentno y=1}
-			{math assign="loopvalue" equation="x % y" x=$num y=14}
+			{math assign="loopvalue" equation="x % y" x=$num y=15}
 			{assign var="parentno" value=$num}
 			{if $loopvalue eq '0'}
 				</td><td valign="top">




From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 07:18:19 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 11:18:19 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9374 - in
	/vtigercrm/trunk/themes/alphagrey: ./ images/
Message-ID: <20060909111820.12E7876B50F@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 05:07:18 2006
New Revision: 9374

Log:
alpha grey theme added --Jeri

Added:
    vtigercrm/trunk/themes/alphagrey/
    vtigercrm/trunk/themes/alphagrey/footer.php
    vtigercrm/trunk/themes/alphagrey/header.php
    vtigercrm/trunk/themes/alphagrey/images/
    vtigercrm/trunk/themes/alphagrey/images/3hdrTabBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/Accounts.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/Call.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/Calls.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/Contacts.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/HomeBtm.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/Home_15.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/Leads.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/Meeting.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/Meetings.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/Opportunities.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/Potentials.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/Quotes.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/Reports_arrow.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/RolesDelete.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/RolesEdit.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/RolesMove.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/Rolesadd.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/Settings.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/Tasks.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/Thumbs.db   (with props)
    vtigercrm/trunk/themes/alphagrey/images/Tickets.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/TopOpenQuotes.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/ViewTemplate.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/aboutUS.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/about_btm.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/aboutus.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/addrss.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/advancedSearchLens.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/announ.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/arrow.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/arrow_down.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/arrow_up.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/assign.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/attachment.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/audit.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/backupserver.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/basicSearchLens.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/bl_bar.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/black.png   (with props)
    vtigercrm/trunk/themes/alphagrey/images/blank.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/bookMark.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/bottom_left.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/bottom_right.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/btnAlexa.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/btnL3Add-Faded.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/btnL3Add.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/btnL3AllMenu-Faded.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/btnL3AllMenu.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/btnL3Calc-Faded.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/btnL3Calc.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/btnL3Calendar-Faded.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/btnL3Calendar.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/btnL3Clock-Faded.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/btnL3Clock.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/btnL3Search-Faded.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/btnL3Search.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/btnL3Tracker-Faded.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/btnL3Tracker.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/busy.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/cal12x12Shared.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/cal16x16Call.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/cal16x16CallAdd.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/cal16x16Linked.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/cal16x16Meeting.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/cal16x16MeetingAdd.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/cal16x16Shared.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/cal16x16ToDo.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/cal16x16ToDoAdd.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calAddButtonBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calBottomBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calBottomLeft.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calBottomRight.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calNavNext.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calNavPrev.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calSep.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calTopLeft.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calTopRight.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/cal_Hdr.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/cal_Others.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/cal_add.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/cal_add.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/cal_clock.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/cal_event.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/cal_hdr.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/cal_nav.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/cal_next_nav.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/cal_prev_nav.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/cal_sel.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/cal_sharing.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/cal_title.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calc_back_btn.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calc_black_btn.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calc_blue_btn.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calc_bottom_center.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calc_bottom_left.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calc_bottom_right.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calc_canc_btn.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calc_grey_btn.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calc_logo.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calc_mem_btn.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calc_middle_right.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calc_red_btn.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calc_res_bc.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calc_res_bl.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calc_res_br.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calc_res_ml.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calc_res_mr.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calc_res_tc.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calc_res_tl.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calc_res_tr.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calc_top_left.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calc_top_right.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/calendar.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/cfcurrency.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/cfpicklist.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/check_mail.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/checkbox.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/clear_field.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/clock_bg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/close.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/collapse.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/company.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/compose.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/composeMail.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/currency.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/currencydelete.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/custom.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/dashBottomBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/dashSelectBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/dashTopBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/dash_btm.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/dash_btm_center.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/dash_btm_left.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/dash_btm_right.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/dash_down_arrow.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/dash_name.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/dash_screw.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/dash_screw.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/dash_scroll_up.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/dash_sel_btm.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/dash_sel_chart.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/dash_sel_left.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/dash_sel_top.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/dash_switch_view.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/dash_top.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/dash_top_shadow.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/dash_unsel_chart.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/date.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/dboardMatrixView.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/dboardNormalView.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/del.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/del_tag.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/delete.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/denied.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/disabled.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/editfield.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/email.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/empty.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/enabled.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/end.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/end_disabled.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/expand.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/free.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/hdrNameBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/hdrTabBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/head_end.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/head_start.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/help.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/help_icon.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/hometop.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/ico-groups.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/ico-profile.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/ico-roles.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/ico-users.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/inventory.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/jump.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/keyMetrics.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/layerPopupBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/left.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/left_arc.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/level2TabBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/loginBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/loginBottomBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/loginBottomURL.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/loginSIBottomLeft.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/loginSIBottomRight.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/loginSITopLeft.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/loginSITopRight.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/loginTopShade.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/logout.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/lvtNavBtnFirst.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/lvtNavBtnLast.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/lvtNavBtnNext.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/lvtNavBtnPrev.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/mailHdr.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/mailSubHeaderBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/mailTitle.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/mailmarge.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/menuDnArrow.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/menu_off_end.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/menu_off_start.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/menu_off_tile.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/menu_on_end.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/menu_on_start.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/menu_on_tile.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/menu_root.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/migrate.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/migration_sucess.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/minus.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/moduleSelectorBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/movecol_del.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/movecol_del_down.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/movecol_del_over.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/movecol_down.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/movecol_down_disabled.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/movecol_down_down.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/movecol_down_over.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/movecol_up.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/movecol_up_disabled.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/movecol_up_down.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/movecol_up_over.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/myGroupAllocation.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/myTickets.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/myTopAccounts.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/myTopInvoices.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/myTopOpenPotentials.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/myTopSalesOrders.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/myUpcoPendAct.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/next.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/nextRecord.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/next_disabled.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/no.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/notification.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/number.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/offstar.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/ogmailserver.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/one.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/onstar.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/orgshar.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/pendingEvents.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/pending_left.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/pending_right.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/percent.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/phone.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/picklist.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/picklistEditor.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/picklist_hint.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/plsWaitAnimated.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/plus.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/pointer.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/popupHdr.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/previous.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/previousRecord.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/previous_disabled.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/pricebook.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/primeTopBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/print.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/private.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/proxy.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/prvPrfBottomLeft.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/prvPrfBottomRight.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/prvPrfHdrArrow.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/prvPrfSelectedTick.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/prvPrfTopLeft.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/prvPrfTopRight.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/public.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/qcBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/qcName.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/reload.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/report_bg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/report_bottom.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/report_btn.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/report_newHdr.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/reportsCreate.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/reportsDelete.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/reportsFolderCreate.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/reportsMove.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/right.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/right_arc.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/rss.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/rssDisplayBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/rssDisplayBottom.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/rssDisplayBottomLeft.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/rssDisplayBottomRight.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/rssDisplayLeft.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/rssDisplayRight.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/rssDisplaySpeaker.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/rssDisplayTop.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/rssDisplayTopLeft.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/rssDisplayTopRight.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/rssHeader.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/rssOnHeader.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/rssdelete.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/rssforward.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/rssframeHdr.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/rssimage.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/rssroot.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/scroll_left.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/scroll_left_down.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/scroll_right.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/scroll_right_down.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/search.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/searchUIBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/searching.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/select.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/set-IcoLoginHistory.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/set-IcoTwoTabConfig.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/settingsActBtnDelete.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/settingsActBtnDuplicate.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/settingsActBtnEdit.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/settingsMTBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/settingsSelUIBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/settings_top.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/shareaccess.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/showDown.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/showPanelTopBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/showPanelTopLeft.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/showPanelTopRight.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/showsubmenu.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/site_hdr.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/site_sel.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/site_unsel.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/small_left.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/small_right.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/spacer.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/start.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/start_disabled.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/status.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/strikeline.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/summarize.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/system.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/tabRht.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/tabSelectedBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/tabSeperatorBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/tabUnSelectedBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/tabular.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/tagCloudBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/tagCloudName.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/tagcloud_03.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/taxConfiguration.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/tbarChat-Faded.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/tbarChat.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/tbarExport-Faded.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/tbarExport.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/tbarImport-Faded.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/tbarImport.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/tbarPrivateChat.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/tbarPublicChat.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/tbarSettings.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/tblPro1BtnHide.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/tblPro1ColBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/terms.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/text.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/titleMailClient.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/titleMySites.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/titleRSSReader.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/todaybg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/topBg.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/topBnr.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/top_left.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/top_right.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/topbar.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/topcut.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/up.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/uparrow.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/upcomingEvents.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/upcoming_left.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/upcoming_right.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/url.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/vtbusy.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/vtiger-crm.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/vtiger.jpg   (with props)
    vtigercrm/trunk/themes/alphagrey/images/vtigerDevDocs.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/webmail_downarrow.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/webmail_header.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/webmail_root.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/webmail_settings.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/webmail_trash.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/webmail_uparrow.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/images/yes.gif   (with props)
    vtigercrm/trunk/themes/alphagrey/layout_utils.php
    vtigercrm/trunk/themes/alphagrey/loginheader.html
    vtigercrm/trunk/themes/alphagrey/loginheader.php
    vtigercrm/trunk/themes/alphagrey/style.css




From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 08:34:44 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 12:34:44 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9375 - in
 /vtigercrm/trunk/themes/Aqua: footer.php header.html header.php
 layout_utils.php loginheader.html loginheader.php style.css
Message-ID: <20060909123444.C164E76C613@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 06:34:35 2006
New Revision: 9375

Log:
Aqua theme removed --Jeri

Removed:
    vtigercrm/trunk/themes/Aqua/footer.php
    vtigercrm/trunk/themes/Aqua/header.html
    vtigercrm/trunk/themes/Aqua/header.php
    vtigercrm/trunk/themes/Aqua/layout_utils.php
    vtigercrm/trunk/themes/Aqua/loginheader.html
    vtigercrm/trunk/themes/Aqua/loginheader.php
    vtigercrm/trunk/themes/Aqua/style.css




From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 08:35:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 12:35:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9376 - in
 /vtigercrm/trunk/themes/blue: footer.php header.php layout_utils.php
 loginheader.html loginheader.php style.css
Message-ID: <20060909123538.EF7E076CD88@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 06:35:28 2006
New Revision: 9376

Log:
Blue theme removed --Jeri

Removed:
    vtigercrm/trunk/themes/blue/footer.php
    vtigercrm/trunk/themes/blue/header.php
    vtigercrm/trunk/themes/blue/layout_utils.php
    vtigercrm/trunk/themes/blue/loginheader.html
    vtigercrm/trunk/themes/blue/loginheader.php
    vtigercrm/trunk/themes/blue/style.css




From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 08:36:25 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 12:36:25 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9377 -
	/vtigercrm/trunk/themes/Aqua/images/
Message-ID: <20060909123626.18DED76C623@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 06:35:01 2006
New Revision: 9377

Log:
Aqua theme removed --Jeri

Removed:
    vtigercrm/trunk/themes/Aqua/images/Accounts.gif
    vtigercrm/trunk/themes/Aqua/images/Activities.gif
    vtigercrm/trunk/themes/Aqua/images/Calls.gif
    vtigercrm/trunk/themes/Aqua/images/Cases.gif
    vtigercrm/trunk/themes/Aqua/images/Contacts.gif
    vtigercrm/trunk/themes/Aqua/images/Emails.gif
    vtigercrm/trunk/themes/Aqua/images/Faq.gif
    vtigercrm/trunk/themes/Aqua/images/HelpDesk.gif
    vtigercrm/trunk/themes/Aqua/images/Invoice.gif
    vtigercrm/trunk/themes/Aqua/images/Leads.gif
    vtigercrm/trunk/themes/Aqua/images/Meetings.gif
    vtigercrm/trunk/themes/Aqua/images/Notes.gif
    vtigercrm/trunk/themes/Aqua/images/Opportunities.gif
    vtigercrm/trunk/themes/Aqua/images/Potentials.gif
    vtigercrm/trunk/themes/Aqua/images/Products.gif
    vtigercrm/trunk/themes/Aqua/images/PurchaseOrder.gif
    vtigercrm/trunk/themes/Aqua/images/Quotes.gif
    vtigercrm/trunk/themes/Aqua/images/SalesOrder.gif
    vtigercrm/trunk/themes/Aqua/images/Settings.gif
    vtigercrm/trunk/themes/Aqua/images/Tasks.gif
    vtigercrm/trunk/themes/Aqua/images/Thumbs.db
    vtigercrm/trunk/themes/Aqua/images/Tickets.gif
    vtigercrm/trunk/themes/Aqua/images/TopOpenQuotes.gif
    vtigercrm/trunk/themes/Aqua/images/Users.gif
    vtigercrm/trunk/themes/Aqua/images/aboutus.gif
    vtigercrm/trunk/themes/Aqua/images/addrss.gif
    vtigercrm/trunk/themes/Aqua/images/admin.gif
    vtigercrm/trunk/themes/Aqua/images/appointment.gif
    vtigercrm/trunk/themes/Aqua/images/arrow_down.gif
    vtigercrm/trunk/themes/Aqua/images/arrow_up.gif
    vtigercrm/trunk/themes/Aqua/images/attachment.gif
    vtigercrm/trunk/themes/Aqua/images/bl_bar.jpg
    vtigercrm/trunk/themes/Aqua/images/black.png
    vtigercrm/trunk/themes/Aqua/images/blank.gif
    vtigercrm/trunk/themes/Aqua/images/bullet.gif
    vtigercrm/trunk/themes/Aqua/images/busy.gif
    vtigercrm/trunk/themes/Aqua/images/buttonbg.gif
    vtigercrm/trunk/themes/Aqua/images/calc_back_btn.gif
    vtigercrm/trunk/themes/Aqua/images/calc_black_btn.gif
    vtigercrm/trunk/themes/Aqua/images/calc_blue_btn.gif
    vtigercrm/trunk/themes/Aqua/images/calc_bottom_center.gif
    vtigercrm/trunk/themes/Aqua/images/calc_bottom_left.gif
    vtigercrm/trunk/themes/Aqua/images/calc_bottom_right.gif
    vtigercrm/trunk/themes/Aqua/images/calc_canc_btn.gif
    vtigercrm/trunk/themes/Aqua/images/calc_grey_btn.gif
    vtigercrm/trunk/themes/Aqua/images/calc_logo.gif
    vtigercrm/trunk/themes/Aqua/images/calc_mem_btn.gif
    vtigercrm/trunk/themes/Aqua/images/calc_middle_right.gif
    vtigercrm/trunk/themes/Aqua/images/calc_red_btn.gif
    vtigercrm/trunk/themes/Aqua/images/calc_res_bc.gif
    vtigercrm/trunk/themes/Aqua/images/calc_res_bl.gif
    vtigercrm/trunk/themes/Aqua/images/calc_res_br.gif
    vtigercrm/trunk/themes/Aqua/images/calc_res_ml.gif
    vtigercrm/trunk/themes/Aqua/images/calc_res_mr.gif
    vtigercrm/trunk/themes/Aqua/images/calc_res_tc.gif
    vtigercrm/trunk/themes/Aqua/images/calc_res_tl.gif
    vtigercrm/trunk/themes/Aqua/images/calc_res_tr.gif
    vtigercrm/trunk/themes/Aqua/images/calc_top_left.gif
    vtigercrm/trunk/themes/Aqua/images/calc_top_right.gif
    vtigercrm/trunk/themes/Aqua/images/calendar.gif
    vtigercrm/trunk/themes/Aqua/images/checkbox.gif
    vtigercrm/trunk/themes/Aqua/images/clear_field.gif
    vtigercrm/trunk/themes/Aqua/images/clock_bg.gif
    vtigercrm/trunk/themes/Aqua/images/close.gif
    vtigercrm/trunk/themes/Aqua/images/collapse.gif
    vtigercrm/trunk/themes/Aqua/images/comm_temp.gif
    vtigercrm/trunk/themes/Aqua/images/config.gif
    vtigercrm/trunk/themes/Aqua/images/currency.gif
    vtigercrm/trunk/themes/Aqua/images/date.gif
    vtigercrm/trunk/themes/Aqua/images/day.gif
    vtigercrm/trunk/themes/Aqua/images/day_sel.gif
    vtigercrm/trunk/themes/Aqua/images/delete.gif
    vtigercrm/trunk/themes/Aqua/images/email.gif
    vtigercrm/trunk/themes/Aqua/images/end.gif
    vtigercrm/trunk/themes/Aqua/images/end_disabled.gif
    vtigercrm/trunk/themes/Aqua/images/expand.gif
    vtigercrm/trunk/themes/Aqua/images/first.gif
    vtigercrm/trunk/themes/Aqua/images/formborder.gif
    vtigercrm/trunk/themes/Aqua/images/free.gif
    vtigercrm/trunk/themes/Aqua/images/header_end.gif
    vtigercrm/trunk/themes/Aqua/images/header_start.gif
    vtigercrm/trunk/themes/Aqua/images/header_tile.gif
    vtigercrm/trunk/themes/Aqua/images/help.gif
    vtigercrm/trunk/themes/Aqua/images/help_icon.gif
    vtigercrm/trunk/themes/Aqua/images/high_priority.gif
    vtigercrm/trunk/themes/Aqua/images/holidaybg.gif
    vtigercrm/trunk/themes/Aqua/images/keyMetrics.gif
    vtigercrm/trunk/themes/Aqua/images/last.gif
    vtigercrm/trunk/themes/Aqua/images/left.gif
    vtigercrm/trunk/themes/Aqua/images/left_arc.gif
    vtigercrm/trunk/themes/Aqua/images/logout.gif
    vtigercrm/trunk/themes/Aqua/images/menu_off_end.gif
    vtigercrm/trunk/themes/Aqua/images/menu_off_start.gif
    vtigercrm/trunk/themes/Aqua/images/menu_off_tile.gif
    vtigercrm/trunk/themes/Aqua/images/menu_on_end.gif
    vtigercrm/trunk/themes/Aqua/images/menu_on_start.gif
    vtigercrm/trunk/themes/Aqua/images/menu_on_tile.gif
    vtigercrm/trunk/themes/Aqua/images/minus.gif
    vtigercrm/trunk/themes/Aqua/images/modify.gif
    vtigercrm/trunk/themes/Aqua/images/month.gif
    vtigercrm/trunk/themes/Aqua/images/month_sel.gif
    vtigercrm/trunk/themes/Aqua/images/movecol_del.gif
    vtigercrm/trunk/themes/Aqua/images/movecol_del_down.gif
    vtigercrm/trunk/themes/Aqua/images/movecol_del_over.gif
    vtigercrm/trunk/themes/Aqua/images/movecol_down.gif
    vtigercrm/trunk/themes/Aqua/images/movecol_down_disabled.gif
    vtigercrm/trunk/themes/Aqua/images/movecol_down_down.gif
    vtigercrm/trunk/themes/Aqua/images/movecol_down_over.gif
    vtigercrm/trunk/themes/Aqua/images/movecol_up.gif
    vtigercrm/trunk/themes/Aqua/images/movecol_up_disabled.gif
    vtigercrm/trunk/themes/Aqua/images/movecol_up_down.gif
    vtigercrm/trunk/themes/Aqua/images/movecol_up_over.gif
    vtigercrm/trunk/themes/Aqua/images/myGroupAllocation.gif
    vtigercrm/trunk/themes/Aqua/images/myTickets.gif
    vtigercrm/trunk/themes/Aqua/images/myTopAccounts.gif
    vtigercrm/trunk/themes/Aqua/images/myTopInvoices.gif
    vtigercrm/trunk/themes/Aqua/images/myTopOpenPotentials.gif
    vtigercrm/trunk/themes/Aqua/images/myTopSalesOrders.gif
    vtigercrm/trunk/themes/Aqua/images/myUpcoPendAct.gif
    vtigercrm/trunk/themes/Aqua/images/next.gif
    vtigercrm/trunk/themes/Aqua/images/next_disabled.gif
    vtigercrm/trunk/themes/Aqua/images/no.gif
    vtigercrm/trunk/themes/Aqua/images/note.gif
    vtigercrm/trunk/themes/Aqua/images/number.gif
    vtigercrm/trunk/themes/Aqua/images/offstar.gif
    vtigercrm/trunk/themes/Aqua/images/onstar.gif
    vtigercrm/trunk/themes/Aqua/images/percent.gif
    vtigercrm/trunk/themes/Aqua/images/phone.gif
    vtigercrm/trunk/themes/Aqua/images/picklist.gif
    vtigercrm/trunk/themes/Aqua/images/picklist_hint.gif
    vtigercrm/trunk/themes/Aqua/images/plus.gif
    vtigercrm/trunk/themes/Aqua/images/previous.gif
    vtigercrm/trunk/themes/Aqua/images/previous_disabled.gif
    vtigercrm/trunk/themes/Aqua/images/pricebook.gif
    vtigercrm/trunk/themes/Aqua/images/print.gif
    vtigercrm/trunk/themes/Aqua/images/product.gif
    vtigercrm/trunk/themes/Aqua/images/prvPrfBottomLeft.gif
    vtigercrm/trunk/themes/Aqua/images/prvPrfBottomRight.gif
    vtigercrm/trunk/themes/Aqua/images/prvPrfHdrArrow.gif
    vtigercrm/trunk/themes/Aqua/images/prvPrfLine.gif
    vtigercrm/trunk/themes/Aqua/images/prvPrfSelectedTab.gif
    vtigercrm/trunk/themes/Aqua/images/prvPrfSelectedTick.gif
    vtigercrm/trunk/themes/Aqua/images/prvPrfTexture1.gif
    vtigercrm/trunk/themes/Aqua/images/prvPrfTopLeft.gif
    vtigercrm/trunk/themes/Aqua/images/prvPrfTopRight.gif
    vtigercrm/trunk/themes/Aqua/images/prvPrfUnSelectedTab.gif
    vtigercrm/trunk/themes/Aqua/images/purchase_order.gif
    vtigercrm/trunk/themes/Aqua/images/reload.gif
    vtigercrm/trunk/themes/Aqua/images/right.gif
    vtigercrm/trunk/themes/Aqua/images/right_arc.gif
    vtigercrm/trunk/themes/Aqua/images/rss.gif
    vtigercrm/trunk/themes/Aqua/images/rss_folder_cls.gif
    vtigercrm/trunk/themes/Aqua/images/rss_folder_opn.gif
    vtigercrm/trunk/themes/Aqua/images/sales_order.gif
    vtigercrm/trunk/themes/Aqua/images/scroll_left.gif
    vtigercrm/trunk/themes/Aqua/images/scroll_left_down.gif
    vtigercrm/trunk/themes/Aqua/images/scroll_right.gif
    vtigercrm/trunk/themes/Aqua/images/scroll_right_down.gif
    vtigercrm/trunk/themes/Aqua/images/search.gif
    vtigercrm/trunk/themes/Aqua/images/select.gif
    vtigercrm/trunk/themes/Aqua/images/settings_top.gif
    vtigercrm/trunk/themes/Aqua/images/showsubmenu.gif
    vtigercrm/trunk/themes/Aqua/images/start.gif
    vtigercrm/trunk/themes/Aqua/images/start_disabled.gif
    vtigercrm/trunk/themes/Aqua/images/strikeline.gif
    vtigercrm/trunk/themes/Aqua/images/studio.gif
    vtigercrm/trunk/themes/Aqua/images/summarize.gif
    vtigercrm/trunk/themes/Aqua/images/tabular.gif
    vtigercrm/trunk/themes/Aqua/images/text.gif
    vtigercrm/trunk/themes/Aqua/images/todaybg.gif
    vtigercrm/trunk/themes/Aqua/images/topband.gif
    vtigercrm/trunk/themes/Aqua/images/topbar.gif
    vtigercrm/trunk/themes/Aqua/images/url.gif
    vtigercrm/trunk/themes/Aqua/images/user.gif
    vtigercrm/trunk/themes/Aqua/images/user_mgmt.gif
    vtigercrm/trunk/themes/Aqua/images/vendor.gif
    vtigercrm/trunk/themes/Aqua/images/vtiger-crm.gif
    vtigercrm/trunk/themes/Aqua/images/vtiger.jpg
    vtigercrm/trunk/themes/Aqua/images/vtigerDevDocs.gif
    vtigercrm/trunk/themes/Aqua/images/week.gif
    vtigercrm/trunk/themes/Aqua/images/week_sel.gif
    vtigercrm/trunk/themes/Aqua/images/yes.gif




From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 08:38:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 12:38:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9378 -
	/vtigercrm/trunk/themes/blue/images/
Message-ID: <20060909123842.2850276C65B@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 06:36:12 2006
New Revision: 9378

Log:
Blue theme removed --Jeri

Removed:
    vtigercrm/trunk/themes/blue/images/Accounts.gif
    vtigercrm/trunk/themes/blue/images/Call.gif
    vtigercrm/trunk/themes/blue/images/Calls.gif
    vtigercrm/trunk/themes/blue/images/Contacts.gif
    vtigercrm/trunk/themes/blue/images/HomeBtm.gif
    vtigercrm/trunk/themes/blue/images/Home_15.gif
    vtigercrm/trunk/themes/blue/images/Leads.gif
    vtigercrm/trunk/themes/blue/images/Meeting.gif
    vtigercrm/trunk/themes/blue/images/Meetings.gif
    vtigercrm/trunk/themes/blue/images/Opportunities.gif
    vtigercrm/trunk/themes/blue/images/Potentials.gif
    vtigercrm/trunk/themes/blue/images/Quotes.gif
    vtigercrm/trunk/themes/blue/images/Reports_arrow.gif
    vtigercrm/trunk/themes/blue/images/RolesDelete.gif
    vtigercrm/trunk/themes/blue/images/RolesEdit.gif
    vtigercrm/trunk/themes/blue/images/RolesMove.gif
    vtigercrm/trunk/themes/blue/images/Rolesadd.gif
    vtigercrm/trunk/themes/blue/images/Settings.gif
    vtigercrm/trunk/themes/blue/images/Tasks.gif
    vtigercrm/trunk/themes/blue/images/Thumbs.db
    vtigercrm/trunk/themes/blue/images/Tickets.gif
    vtigercrm/trunk/themes/blue/images/TopOpenQuotes.gif
    vtigercrm/trunk/themes/blue/images/ViewTemplate.gif
    vtigercrm/trunk/themes/blue/images/aboutUS.jpg
    vtigercrm/trunk/themes/blue/images/about_btm.jpg
    vtigercrm/trunk/themes/blue/images/aboutus.gif
    vtigercrm/trunk/themes/blue/images/addrss.gif
    vtigercrm/trunk/themes/blue/images/advancedSearchLens.gif
    vtigercrm/trunk/themes/blue/images/announ.gif
    vtigercrm/trunk/themes/blue/images/arrow.jpg
    vtigercrm/trunk/themes/blue/images/arrow_down.gif
    vtigercrm/trunk/themes/blue/images/arrow_up.gif
    vtigercrm/trunk/themes/blue/images/assign.gif
    vtigercrm/trunk/themes/blue/images/attachment.gif
    vtigercrm/trunk/themes/blue/images/audit.gif
    vtigercrm/trunk/themes/blue/images/backupserver.gif
    vtigercrm/trunk/themes/blue/images/basicSearchLens.gif
    vtigercrm/trunk/themes/blue/images/bl_bar.jpg
    vtigercrm/trunk/themes/blue/images/black.png
    vtigercrm/trunk/themes/blue/images/blank.gif
    vtigercrm/trunk/themes/blue/images/bookMark.gif
    vtigercrm/trunk/themes/blue/images/bottom_left.jpg
    vtigercrm/trunk/themes/blue/images/bottom_right.jpg
    vtigercrm/trunk/themes/blue/images/btnL3Add-Faded.gif
    vtigercrm/trunk/themes/blue/images/btnL3Add.gif
    vtigercrm/trunk/themes/blue/images/btnL3AllMenu-Faded.gif
    vtigercrm/trunk/themes/blue/images/btnL3AllMenu.gif
    vtigercrm/trunk/themes/blue/images/btnL3Calc-Faded.gif
    vtigercrm/trunk/themes/blue/images/btnL3Calc.gif
    vtigercrm/trunk/themes/blue/images/btnL3Calendar-Faded.gif
    vtigercrm/trunk/themes/blue/images/btnL3Calendar.gif
    vtigercrm/trunk/themes/blue/images/btnL3Clock-Faded.gif
    vtigercrm/trunk/themes/blue/images/btnL3Clock.gif
    vtigercrm/trunk/themes/blue/images/btnL3Search-Faded.gif
    vtigercrm/trunk/themes/blue/images/btnL3Search.gif
    vtigercrm/trunk/themes/blue/images/btnL3Tracker-Faded.gif
    vtigercrm/trunk/themes/blue/images/btnL3Tracker.gif
    vtigercrm/trunk/themes/blue/images/busy.gif
    vtigercrm/trunk/themes/blue/images/cal16x16Call.jpg
    vtigercrm/trunk/themes/blue/images/cal16x16CallAdd.jpg
    vtigercrm/trunk/themes/blue/images/cal16x16Linked.jpg
    vtigercrm/trunk/themes/blue/images/cal16x16Meeting.jpg
    vtigercrm/trunk/themes/blue/images/cal16x16MeetingAdd.jpg
    vtigercrm/trunk/themes/blue/images/cal16x16ToDo.jpg
    vtigercrm/trunk/themes/blue/images/cal16x16ToDoAdd.jpg
    vtigercrm/trunk/themes/blue/images/calBg.gif
    vtigercrm/trunk/themes/blue/images/calBottomBg.gif
    vtigercrm/trunk/themes/blue/images/calBottomLeft.gif
    vtigercrm/trunk/themes/blue/images/calBottomRight.gif
    vtigercrm/trunk/themes/blue/images/calNavNext.gif
    vtigercrm/trunk/themes/blue/images/calNavPrev.gif
    vtigercrm/trunk/themes/blue/images/calSep.gif
    vtigercrm/trunk/themes/blue/images/calTopLeft.gif
    vtigercrm/trunk/themes/blue/images/calTopRight.gif
    vtigercrm/trunk/themes/blue/images/cal_Hdr.gif
    vtigercrm/trunk/themes/blue/images/cal_Others.gif
    vtigercrm/trunk/themes/blue/images/cal_add.gif
    vtigercrm/trunk/themes/blue/images/cal_add.jpg
    vtigercrm/trunk/themes/blue/images/cal_clock.jpg
    vtigercrm/trunk/themes/blue/images/cal_event.jpg
    vtigercrm/trunk/themes/blue/images/cal_hdr.jpg
    vtigercrm/trunk/themes/blue/images/cal_nav.gif
    vtigercrm/trunk/themes/blue/images/cal_next_nav.gif
    vtigercrm/trunk/themes/blue/images/cal_prev_nav.gif
    vtigercrm/trunk/themes/blue/images/cal_sel.jpg
    vtigercrm/trunk/themes/blue/images/cal_sharing.jpg
    vtigercrm/trunk/themes/blue/images/cal_title.jpg
    vtigercrm/trunk/themes/blue/images/calc_back_btn.gif
    vtigercrm/trunk/themes/blue/images/calc_black_btn.gif
    vtigercrm/trunk/themes/blue/images/calc_blue_btn.gif
    vtigercrm/trunk/themes/blue/images/calc_bottom_center.gif
    vtigercrm/trunk/themes/blue/images/calc_bottom_left.gif
    vtigercrm/trunk/themes/blue/images/calc_bottom_right.gif
    vtigercrm/trunk/themes/blue/images/calc_canc_btn.gif
    vtigercrm/trunk/themes/blue/images/calc_grey_btn.gif
    vtigercrm/trunk/themes/blue/images/calc_logo.gif
    vtigercrm/trunk/themes/blue/images/calc_mem_btn.gif
    vtigercrm/trunk/themes/blue/images/calc_middle_right.gif
    vtigercrm/trunk/themes/blue/images/calc_red_btn.gif
    vtigercrm/trunk/themes/blue/images/calc_res_bc.gif
    vtigercrm/trunk/themes/blue/images/calc_res_bl.gif
    vtigercrm/trunk/themes/blue/images/calc_res_br.gif
    vtigercrm/trunk/themes/blue/images/calc_res_ml.gif
    vtigercrm/trunk/themes/blue/images/calc_res_mr.gif
    vtigercrm/trunk/themes/blue/images/calc_res_tc.gif
    vtigercrm/trunk/themes/blue/images/calc_res_tl.gif
    vtigercrm/trunk/themes/blue/images/calc_res_tr.gif
    vtigercrm/trunk/themes/blue/images/calc_top_left.gif
    vtigercrm/trunk/themes/blue/images/calc_top_right.gif
    vtigercrm/trunk/themes/blue/images/calendar.gif
    vtigercrm/trunk/themes/blue/images/cfcurrency.gif
    vtigercrm/trunk/themes/blue/images/cfpicklist.gif
    vtigercrm/trunk/themes/blue/images/check_mail.gif
    vtigercrm/trunk/themes/blue/images/checkbox.gif
    vtigercrm/trunk/themes/blue/images/clear_field.gif
    vtigercrm/trunk/themes/blue/images/clock_bg.gif
    vtigercrm/trunk/themes/blue/images/close.gif
    vtigercrm/trunk/themes/blue/images/collapse.gif
    vtigercrm/trunk/themes/blue/images/company.gif
    vtigercrm/trunk/themes/blue/images/compose.gif
    vtigercrm/trunk/themes/blue/images/composeMail.jpg
    vtigercrm/trunk/themes/blue/images/currency.gif
    vtigercrm/trunk/themes/blue/images/currencydelete.gif
    vtigercrm/trunk/themes/blue/images/custom.gif
    vtigercrm/trunk/themes/blue/images/dash_btm.jpg
    vtigercrm/trunk/themes/blue/images/dash_btm_center.jpg
    vtigercrm/trunk/themes/blue/images/dash_btm_left.jpg
    vtigercrm/trunk/themes/blue/images/dash_btm_right.jpg
    vtigercrm/trunk/themes/blue/images/dash_down_arrow.jpg
    vtigercrm/trunk/themes/blue/images/dash_name.jpg
    vtigercrm/trunk/themes/blue/images/dash_screw.jpg
    vtigercrm/trunk/themes/blue/images/dash_scroll_up.jpg
    vtigercrm/trunk/themes/blue/images/dash_sel_btm.jpg
    vtigercrm/trunk/themes/blue/images/dash_sel_chart.jpg
    vtigercrm/trunk/themes/blue/images/dash_sel_left.jpg
    vtigercrm/trunk/themes/blue/images/dash_sel_top.jpg
    vtigercrm/trunk/themes/blue/images/dash_switch_view.jpg
    vtigercrm/trunk/themes/blue/images/dash_top.jpg
    vtigercrm/trunk/themes/blue/images/dash_top_shadow.jpg
    vtigercrm/trunk/themes/blue/images/dash_unsel_chart.jpg
    vtigercrm/trunk/themes/blue/images/date.gif
    vtigercrm/trunk/themes/blue/images/dboardMatrixView.gif
    vtigercrm/trunk/themes/blue/images/dboardNormalView.gif
    vtigercrm/trunk/themes/blue/images/del.gif
    vtigercrm/trunk/themes/blue/images/del_tag.gif
    vtigercrm/trunk/themes/blue/images/delete.gif
    vtigercrm/trunk/themes/blue/images/denied.gif
    vtigercrm/trunk/themes/blue/images/disabled.gif
    vtigercrm/trunk/themes/blue/images/editfield.gif
    vtigercrm/trunk/themes/blue/images/email.gif
    vtigercrm/trunk/themes/blue/images/empty.jpg
    vtigercrm/trunk/themes/blue/images/enabled.gif
    vtigercrm/trunk/themes/blue/images/end.gif
    vtigercrm/trunk/themes/blue/images/end_disabled.gif
    vtigercrm/trunk/themes/blue/images/expand.gif
    vtigercrm/trunk/themes/blue/images/free.gif
    vtigercrm/trunk/themes/blue/images/head_end.gif
    vtigercrm/trunk/themes/blue/images/head_start.gif
    vtigercrm/trunk/themes/blue/images/help.gif
    vtigercrm/trunk/themes/blue/images/help_icon.gif
    vtigercrm/trunk/themes/blue/images/hometop.gif
    vtigercrm/trunk/themes/blue/images/ico-groups.gif
    vtigercrm/trunk/themes/blue/images/ico-profile.gif
    vtigercrm/trunk/themes/blue/images/ico-roles.gif
    vtigercrm/trunk/themes/blue/images/ico-users.gif
    vtigercrm/trunk/themes/blue/images/inventory.gif
    vtigercrm/trunk/themes/blue/images/jump.gif
    vtigercrm/trunk/themes/blue/images/keyMetrics.gif
    vtigercrm/trunk/themes/blue/images/left.gif
    vtigercrm/trunk/themes/blue/images/left_arc.gif
    vtigercrm/trunk/themes/blue/images/level2TabBg.gif
    vtigercrm/trunk/themes/blue/images/loginBg.gif
    vtigercrm/trunk/themes/blue/images/loginBottomBg.gif
    vtigercrm/trunk/themes/blue/images/loginBottomURL.gif
    vtigercrm/trunk/themes/blue/images/loginSIBottomLeft.gif
    vtigercrm/trunk/themes/blue/images/loginSIBottomRight.gif
    vtigercrm/trunk/themes/blue/images/loginSITopLeft.gif
    vtigercrm/trunk/themes/blue/images/loginSITopRight.gif
    vtigercrm/trunk/themes/blue/images/loginTopShade.gif
    vtigercrm/trunk/themes/blue/images/logout.gif
    vtigercrm/trunk/themes/blue/images/lvtNavBtnFirst.gif
    vtigercrm/trunk/themes/blue/images/lvtNavBtnLast.gif
    vtigercrm/trunk/themes/blue/images/lvtNavBtnNext.gif
    vtigercrm/trunk/themes/blue/images/lvtNavBtnPrev.gif
    vtigercrm/trunk/themes/blue/images/mailHdr.jpg
    vtigercrm/trunk/themes/blue/images/mailTitle.jpg
    vtigercrm/trunk/themes/blue/images/mailmarge.gif
    vtigercrm/trunk/themes/blue/images/menuDnArrow.gif
    vtigercrm/trunk/themes/blue/images/menu_off_end.gif
    vtigercrm/trunk/themes/blue/images/menu_off_start.gif
    vtigercrm/trunk/themes/blue/images/menu_off_tile.gif
    vtigercrm/trunk/themes/blue/images/menu_on_end.gif
    vtigercrm/trunk/themes/blue/images/menu_on_start.gif
    vtigercrm/trunk/themes/blue/images/menu_on_tile.gif
    vtigercrm/trunk/themes/blue/images/menu_root.gif
    vtigercrm/trunk/themes/blue/images/migrate.gif
    vtigercrm/trunk/themes/blue/images/migration_sucess.jpg
    vtigercrm/trunk/themes/blue/images/minus.gif
    vtigercrm/trunk/themes/blue/images/moduleSelectorBg.gif
    vtigercrm/trunk/themes/blue/images/movecol_del.gif
    vtigercrm/trunk/themes/blue/images/movecol_del_down.gif
    vtigercrm/trunk/themes/blue/images/movecol_del_over.gif
    vtigercrm/trunk/themes/blue/images/movecol_down.gif
    vtigercrm/trunk/themes/blue/images/movecol_down_disabled.gif
    vtigercrm/trunk/themes/blue/images/movecol_down_down.gif
    vtigercrm/trunk/themes/blue/images/movecol_down_over.gif
    vtigercrm/trunk/themes/blue/images/movecol_up.gif
    vtigercrm/trunk/themes/blue/images/movecol_up_disabled.gif
    vtigercrm/trunk/themes/blue/images/movecol_up_down.gif
    vtigercrm/trunk/themes/blue/images/movecol_up_over.gif
    vtigercrm/trunk/themes/blue/images/myGroupAllocation.gif
    vtigercrm/trunk/themes/blue/images/myTickets.gif
    vtigercrm/trunk/themes/blue/images/myTopAccounts.gif
    vtigercrm/trunk/themes/blue/images/myTopInvoices.gif
    vtigercrm/trunk/themes/blue/images/myTopOpenPotentials.gif
    vtigercrm/trunk/themes/blue/images/myTopSalesOrders.gif
    vtigercrm/trunk/themes/blue/images/myUpcoPendAct.gif
    vtigercrm/trunk/themes/blue/images/next.gif
    vtigercrm/trunk/themes/blue/images/next_disabled.gif
    vtigercrm/trunk/themes/blue/images/no.gif
    vtigercrm/trunk/themes/blue/images/notification.gif
    vtigercrm/trunk/themes/blue/images/number.gif
    vtigercrm/trunk/themes/blue/images/offstar.gif
    vtigercrm/trunk/themes/blue/images/ogmailserver.gif
    vtigercrm/trunk/themes/blue/images/one.gif
    vtigercrm/trunk/themes/blue/images/onstar.gif
    vtigercrm/trunk/themes/blue/images/orgshar.gif
    vtigercrm/trunk/themes/blue/images/pendingEvents.gif
    vtigercrm/trunk/themes/blue/images/pending_left.gif
    vtigercrm/trunk/themes/blue/images/pending_right.gif
    vtigercrm/trunk/themes/blue/images/percent.gif
    vtigercrm/trunk/themes/blue/images/phone.gif
    vtigercrm/trunk/themes/blue/images/picklist.gif
    vtigercrm/trunk/themes/blue/images/picklistEditor.gif
    vtigercrm/trunk/themes/blue/images/picklist_hint.gif
    vtigercrm/trunk/themes/blue/images/plus.gif
    vtigercrm/trunk/themes/blue/images/pointer.gif
    vtigercrm/trunk/themes/blue/images/popupHdr.jpg
    vtigercrm/trunk/themes/blue/images/previous.gif
    vtigercrm/trunk/themes/blue/images/previous_disabled.gif
    vtigercrm/trunk/themes/blue/images/pricebook.gif
    vtigercrm/trunk/themes/blue/images/print.gif
    vtigercrm/trunk/themes/blue/images/private.gif
    vtigercrm/trunk/themes/blue/images/proxy.gif
    vtigercrm/trunk/themes/blue/images/prvPrfBottomLeft.gif
    vtigercrm/trunk/themes/blue/images/prvPrfBottomRight.gif
    vtigercrm/trunk/themes/blue/images/prvPrfHdrArrow.gif
    vtigercrm/trunk/themes/blue/images/prvPrfSelectedTick.gif
    vtigercrm/trunk/themes/blue/images/prvPrfTopLeft.gif
    vtigercrm/trunk/themes/blue/images/prvPrfTopRight.gif
    vtigercrm/trunk/themes/blue/images/public.gif
    vtigercrm/trunk/themes/blue/images/qcBg.gif
    vtigercrm/trunk/themes/blue/images/qcName.gif
    vtigercrm/trunk/themes/blue/images/reload.gif
    vtigercrm/trunk/themes/blue/images/report_bg.gif
    vtigercrm/trunk/themes/blue/images/report_bottom.gif
    vtigercrm/trunk/themes/blue/images/report_btn.gif
    vtigercrm/trunk/themes/blue/images/report_newHdr.gif
    vtigercrm/trunk/themes/blue/images/reportsCreate.gif
    vtigercrm/trunk/themes/blue/images/reportsDelete.gif
    vtigercrm/trunk/themes/blue/images/reportsFolderCreate.gif
    vtigercrm/trunk/themes/blue/images/reportsMove.gif
    vtigercrm/trunk/themes/blue/images/right.gif
    vtigercrm/trunk/themes/blue/images/right_arc.gif
    vtigercrm/trunk/themes/blue/images/rss.gif
    vtigercrm/trunk/themes/blue/images/rssHeader.gif
    vtigercrm/trunk/themes/blue/images/rssOnHeader.gif
    vtigercrm/trunk/themes/blue/images/rssdelete.gif
    vtigercrm/trunk/themes/blue/images/rssforward.gif
    vtigercrm/trunk/themes/blue/images/rssframeHdr.gif
    vtigercrm/trunk/themes/blue/images/rssimage.gif
    vtigercrm/trunk/themes/blue/images/rssroot.gif
    vtigercrm/trunk/themes/blue/images/scroll_left.gif
    vtigercrm/trunk/themes/blue/images/scroll_left_down.gif
    vtigercrm/trunk/themes/blue/images/scroll_right.gif
    vtigercrm/trunk/themes/blue/images/scroll_right_down.gif
    vtigercrm/trunk/themes/blue/images/search.gif
    vtigercrm/trunk/themes/blue/images/searching.gif
    vtigercrm/trunk/themes/blue/images/select.gif
    vtigercrm/trunk/themes/blue/images/set-IcoLoginHistory.gif
    vtigercrm/trunk/themes/blue/images/settingsActBtnDelete.gif
    vtigercrm/trunk/themes/blue/images/settingsActBtnDuplicate.gif
    vtigercrm/trunk/themes/blue/images/settingsActBtnEdit.gif
    vtigercrm/trunk/themes/blue/images/settingsMTBg.gif
    vtigercrm/trunk/themes/blue/images/settingsSelUIBg.gif
    vtigercrm/trunk/themes/blue/images/settings_top.gif
    vtigercrm/trunk/themes/blue/images/shareaccess.gif
    vtigercrm/trunk/themes/blue/images/showDown.gif
    vtigercrm/trunk/themes/blue/images/showPanelTopBg.gif
    vtigercrm/trunk/themes/blue/images/showPanelTopLeft.gif
    vtigercrm/trunk/themes/blue/images/showPanelTopRight.gif
    vtigercrm/trunk/themes/blue/images/showsubmenu.gif
    vtigercrm/trunk/themes/blue/images/site_hdr.jpg
    vtigercrm/trunk/themes/blue/images/site_sel.jpg
    vtigercrm/trunk/themes/blue/images/site_unsel.jpg
    vtigercrm/trunk/themes/blue/images/small_left.gif
    vtigercrm/trunk/themes/blue/images/small_right.gif
    vtigercrm/trunk/themes/blue/images/start.gif
    vtigercrm/trunk/themes/blue/images/start_disabled.gif
    vtigercrm/trunk/themes/blue/images/status.gif
    vtigercrm/trunk/themes/blue/images/strikeline.gif
    vtigercrm/trunk/themes/blue/images/summarize.gif
    vtigercrm/trunk/themes/blue/images/system.gif
    vtigercrm/trunk/themes/blue/images/tabRht.gif
    vtigercrm/trunk/themes/blue/images/tabSelectedBg.gif
    vtigercrm/trunk/themes/blue/images/tabSeperatorBg.gif
    vtigercrm/trunk/themes/blue/images/tabUnSelectedBg.gif
    vtigercrm/trunk/themes/blue/images/tabular.gif
    vtigercrm/trunk/themes/blue/images/tagCloudBg.gif
    vtigercrm/trunk/themes/blue/images/tagCloudName.gif
    vtigercrm/trunk/themes/blue/images/tagcloud_03.gif
    vtigercrm/trunk/themes/blue/images/taxConfiguration.gif
    vtigercrm/trunk/themes/blue/images/tbarChat-Faded.gif
    vtigercrm/trunk/themes/blue/images/tbarChat.gif
    vtigercrm/trunk/themes/blue/images/tbarExport-Faded.gif
    vtigercrm/trunk/themes/blue/images/tbarExport.gif
    vtigercrm/trunk/themes/blue/images/tbarImport-Faded.gif
    vtigercrm/trunk/themes/blue/images/tbarImport.gif
    vtigercrm/trunk/themes/blue/images/tbarSettings.gif
    vtigercrm/trunk/themes/blue/images/tblPro1BtnHide.gif
    vtigercrm/trunk/themes/blue/images/tblPro1ColBg.gif
    vtigercrm/trunk/themes/blue/images/terms.gif
    vtigercrm/trunk/themes/blue/images/text.gif
    vtigercrm/trunk/themes/blue/images/todaybg.gif
    vtigercrm/trunk/themes/blue/images/topBg.gif
    vtigercrm/trunk/themes/blue/images/topBnr.gif
    vtigercrm/trunk/themes/blue/images/top_left.jpg
    vtigercrm/trunk/themes/blue/images/top_right.jpg
    vtigercrm/trunk/themes/blue/images/topbar.gif
    vtigercrm/trunk/themes/blue/images/topcut.gif
    vtigercrm/trunk/themes/blue/images/up.gif
    vtigercrm/trunk/themes/blue/images/uparrow.gif
    vtigercrm/trunk/themes/blue/images/upcomingEvents.gif
    vtigercrm/trunk/themes/blue/images/upcoming_left.gif
    vtigercrm/trunk/themes/blue/images/upcoming_right.gif
    vtigercrm/trunk/themes/blue/images/url.gif
    vtigercrm/trunk/themes/blue/images/vtbusy.gif
    vtigercrm/trunk/themes/blue/images/vtiger-crm.gif
    vtigercrm/trunk/themes/blue/images/vtiger.jpg
    vtigercrm/trunk/themes/blue/images/vtigerDevDocs.gif
    vtigercrm/trunk/themes/blue/images/webmail_downarrow.gif
    vtigercrm/trunk/themes/blue/images/webmail_header.gif
    vtigercrm/trunk/themes/blue/images/webmail_root.gif
    vtigercrm/trunk/themes/blue/images/webmail_settings.gif
    vtigercrm/trunk/themes/blue/images/webmail_trash.gif
    vtigercrm/trunk/themes/blue/images/webmail_uparrow.gif
    vtigercrm/trunk/themes/blue/images/yes.gif




From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 08:41:52 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 12:41:52 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9379 -
	/vtigercrm/trunk/log4php/LoggerBasicConfigurator.php
Message-ID: <20060909124152.9611F76C65B@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 06:41:44 2006
New Revision: 9379

Log:
extra bracket removed --Jeri

Modified:
    vtigercrm/trunk/log4php/LoggerBasicConfigurator.php

Modified: vtigercrm/trunk/log4php/LoggerBasicConfigurator.php
==============================================================================
--- vtigercrm/trunk/log4php/LoggerBasicConfigurator.php (original)
+++ vtigercrm/trunk/log4php/LoggerBasicConfigurator.php Sat Sep  9 06:41:44 2006
@@ -59,7 +59,7 @@
         $layout = LoggerLayout::factory('LoggerLayoutTTCC');
         $appender->setLayout($layout);
 
-        $root->addAppender($appender));
+        $root->addAppender($appender);
     }
 
     /**
@@ -77,4 +77,4 @@
         LoggerManager::resetConfiguration();
     }
 }
-?>
+?>




From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 08:43:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 12:43:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9380 -
	/vtigercrm/trunk/themes/Aqua/images/
Message-ID: <20060909124341.86F2E76C65B@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 06:43:34 2006
New Revision: 9380

Log:
Aqua theme removed --Jeri

Removed:
    vtigercrm/trunk/themes/Aqua/images/




From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 08:44:46 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 12:44:46 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9381 -
	/vtigercrm/trunk/themes/blue/images/
Message-ID: <20060909124446.D066276C65B@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 06:44:37 2006
New Revision: 9381

Log:
Blue theme removed --Jeri

Removed:
    vtigercrm/trunk/themes/blue/images/




From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 08:45:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 12:45:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9382 -
	/vtigercrm/trunk/themes/Aqua/
Message-ID: <20060909124555.33D9C76C65B@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 06:45:46 2006
New Revision: 9382

Log:
Aqua theme removed --Jeri

Removed:
    vtigercrm/trunk/themes/Aqua/




From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 08:46:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 12:46:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9383 -
	/vtigercrm/trunk/themes/blue/
Message-ID: <20060909124641.A7A9676C8AD@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 06:46:34 2006
New Revision: 9383

Log:
Blue theme removed --Jeri

Removed:
    vtigercrm/trunk/themes/blue/




From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 08:48:27 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 12:48:27 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9384 -
	/vtigercrm/trunk/themes/blue lagoon/images/
Message-ID: <20060909124827.6237676C8AD@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 06:48:19 2006
New Revision: 9384

Log:
blue lagoon removed --Jeri

Removed:
    vtigercrm/trunk/themes/blue lagoon/images/




From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 08:49:08 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 12:49:08 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9385 - in
 /vtigercrm/trunk/themes/blue lagoon: footer.php header.php layout_utils.php
 loginheader.html loginheader.php style.css
Message-ID: <20060909124908.16F6876C65B@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 06:48:58 2006
New Revision: 9385

Log:
blue lagoon removed --Jeri

Removed:
    vtigercrm/trunk/themes/blue lagoon/footer.php
    vtigercrm/trunk/themes/blue lagoon/header.php
    vtigercrm/trunk/themes/blue lagoon/layout_utils.php
    vtigercrm/trunk/themes/blue lagoon/loginheader.html
    vtigercrm/trunk/themes/blue lagoon/loginheader.php
    vtigercrm/trunk/themes/blue lagoon/style.css




From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 08:50:54 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 12:50:54 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9386 -
	/vtigercrm/trunk/themes/blue lagoon/
Message-ID: <20060909125054.A2D2C76C8AD@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 06:50:45 2006
New Revision: 9386

Log:
blue lagoon removed --Jeri

Removed:
    vtigercrm/trunk/themes/blue lagoon/




From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 08:55:56 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 12:55:56 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9387 -
	/vtigercrm/trunk/modules/Users/User.php
Message-ID: <20060909125556.04D8A76D613@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 06:55:48 2006
New Revision: 9387

Log:
User privilege file written for user save
Currency array modified --Jeri 

Modified:
    vtigercrm/trunk/modules/Users/User.php

Modified: vtigercrm/trunk/modules/Users/User.php
==============================================================================
--- vtigercrm/trunk/modules/Users/User.php (original)
+++ vtigercrm/trunk/modules/Users/User.php Sat Sep  9 06:55:48 2006
@@ -634,7 +634,8 @@
 				$this->insertIntoEntityTable($table_name, $module);			
 			}
 		}
-
+		require_once('modules/Users/CreateUserPrivilegeFile.php');
+		createUserPrivilegesfile($this->id);
 		$this->db->completeTransaction();
 		$this->db->println("TRANS saveentity ends");
 	}
@@ -850,7 +851,7 @@
 			$currency_query = "select * from vtiger_currency_info where id =1";
 			$currency_result = $adb->query($currency_query);
 		}
-		$currency_array = array("$"=>"&#36;","&dollar;"=>"&#36;","&euro;"=>"&#8364;","&pound;"=>"&#163;","&yen;"=>"&#165;","Rs"=>"&#8360;");
+		$currency_array = array("$"=>"&#36;","&euro;"=>"&#8364;","&pound;"=>"&#163;","&yen;"=>"&#165;");
 			$ui_curr = $currency_array[$adb->query_result($currency_result,0,"currency_symbol")];
 		if($ui_curr == "")
 			$ui_curr = $adb->query_result($currency_result,0,"currency_symbol");




From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 09:02:19 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 13:02:19 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9388 -
	/vtigercrm/trunk/install/4createConfigFile.php
Message-ID: <20060909130219.BCC7076D7E4@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 07:02:11 2006
New Revision: 9388

Log:
Default theme set as bluelagoon --Jeri

Modified:
    vtigercrm/trunk/install/4createConfigFile.php

Modified: vtigercrm/trunk/install/4createConfigFile.php
==============================================================================
--- vtigercrm/trunk/install/4createConfigFile.php (original)
+++ vtigercrm/trunk/install/4createConfigFile.php Sat Sep  9 07:02:11 2006
@@ -375,7 +375,7 @@
  	$config .= "\$default_action = 'index';\n\n";
 
  	$config .= "//set default theme\n";
- 	$config .= "\$default_theme = 'blue';\n\n";
+ 	$config .= "\$default_theme = 'bluelagoon';\n\n";
 
  	$config .= "// If true, the time to compose each page is placed in the browser.\n";
  	$config .= "\$calculate_response_time = true;\n";




From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 09:02:56 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 13:02:56 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9389 -
	/vtigercrm/trunk/config.template.php
Message-ID: <20060909130256.2C85376D815@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 07:02:47 2006
New Revision: 9389

Log:
Default theme set as bluelagoon --Jeri

Modified:
    vtigercrm/trunk/config.template.php

Modified: vtigercrm/trunk/config.template.php
==============================================================================
--- vtigercrm/trunk/config.template.php (original)
+++ vtigercrm/trunk/config.template.php Sat Sep  9 07:02:47 2006
@@ -143,7 +143,7 @@
 
 // set default theme
 // default_theme default value = blue
-$default_theme = 'blue';
+$default_theme = 'bluelagoon';
 
 // show or hide time to compose each page
 // calculate_response_time default value = true




From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 09:03:22 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 13:03:22 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9390 - in
	/vtigercrm/trunk/themes/bluelagoon: ./ images/
Message-ID: <20060909130322.6D57076C65B@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 06:52:02 2006
New Revision: 9390

Log:
blue lagoon added --Jeri

Added:
    vtigercrm/trunk/themes/bluelagoon/
    vtigercrm/trunk/themes/bluelagoon/footer.php
    vtigercrm/trunk/themes/bluelagoon/header.php
    vtigercrm/trunk/themes/bluelagoon/images/
    vtigercrm/trunk/themes/bluelagoon/images/3hdrTabBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/Accounts.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/Call.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/Calls.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/Contacts.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/HomeBtm.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/Home_15.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/Leads.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/Meeting.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/Meetings.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/Opportunities.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/Potentials.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/Quotes.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/Reports_arrow.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/RolesDelete.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/RolesEdit.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/RolesMove.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/Rolesadd.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/Settings.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/Tasks.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/Thumbs.db   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/Tickets.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/TopOpenQuotes.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/ViewTemplate.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/aboutUS.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/about_btm.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/aboutus.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/addrss.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/advancedSearchLens.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/announ.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/arrow.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/arrow_down.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/arrow_up.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/assign.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/attachment.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/audit.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/backupserver.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/basicSearchLens.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/bl_bar.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/black.png   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/blank.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/bookMark.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/bottom_left.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/bottom_right.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/btnAlexa.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/btnL3Add-Faded.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/btnL3Add.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/btnL3AllMenu-Faded.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/btnL3AllMenu.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/btnL3Calc-Faded.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/btnL3Calc.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/btnL3Calendar-Faded.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/btnL3Calendar.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/btnL3Clock-Faded.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/btnL3Clock.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/btnL3Search-Faded.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/btnL3Search.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/btnL3Tracker-Faded.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/btnL3Tracker.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/busy.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/cal12x12Shared.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/cal16x16Call.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/cal16x16CallAdd.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/cal16x16Linked.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/cal16x16Meeting.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/cal16x16MeetingAdd.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/cal16x16Shared.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/cal16x16ToDo.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/cal16x16ToDoAdd.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calAddButtonBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calBottomBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calBottomLeft.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calBottomRight.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calNavNext.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calNavPrev.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calSep.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calTopLeft.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calTopRight.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/cal_Hdr.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/cal_Others.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/cal_add.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/cal_add.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/cal_clock.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/cal_event.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/cal_hdr.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/cal_nav.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/cal_next_nav.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/cal_prev_nav.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/cal_sel.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/cal_sharing.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/cal_title.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calc_back_btn.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calc_black_btn.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calc_blue_btn.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calc_bottom_center.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calc_bottom_left.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calc_bottom_right.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calc_canc_btn.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calc_grey_btn.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calc_logo.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calc_mem_btn.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calc_middle_right.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calc_red_btn.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calc_res_bc.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calc_res_bl.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calc_res_br.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calc_res_ml.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calc_res_mr.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calc_res_tc.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calc_res_tl.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calc_res_tr.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calc_top_left.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calc_top_right.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/calendar.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/cfcurrency.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/cfpicklist.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/check_mail.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/checkbox.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/clear_field.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/clock_bg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/close.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/collapse.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/company.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/compose.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/composeMail.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/currency.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/currencydelete.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/custom.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/dashBottomBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/dashSelectBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/dashTopBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/dash_btm.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/dash_btm_center.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/dash_btm_left.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/dash_btm_right.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/dash_down_arrow.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/dash_name.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/dash_screw.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/dash_screw.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/dash_scroll_up.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/dash_sel_btm.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/dash_sel_chart.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/dash_sel_left.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/dash_sel_top.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/dash_switch_view.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/dash_top.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/dash_top_shadow.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/dash_unsel_chart.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/date.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/dboardMatrixView.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/dboardNormalView.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/del.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/del_tag.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/delete.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/denied.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/disabled.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/editfield.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/email.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/empty.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/enabled.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/end.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/end_disabled.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/expand.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/free.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/hdrNameBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/hdrTabBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/head_end.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/head_start.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/help.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/help_icon.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/hometop.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/ico-groups.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/ico-profile.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/ico-roles.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/ico-users.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/inventory.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/jump.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/keyMetrics.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/layerPopupBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/left.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/left_arc.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/level2TabBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/loginBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/loginBottomBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/loginBottomURL.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/loginSIBottomLeft.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/loginSIBottomRight.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/loginSITopLeft.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/loginSITopRight.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/loginTopShade.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/logout.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/lvtNavBtnFirst.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/lvtNavBtnLast.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/lvtNavBtnNext.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/lvtNavBtnPrev.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/mailHdr.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/mailSubHeaderBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/mailTitle.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/mailmarge.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/menuDnArrow.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/menu_off_end.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/menu_off_start.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/menu_off_tile.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/menu_on_end.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/menu_on_start.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/menu_on_tile.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/menu_root.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/migrate.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/migration_sucess.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/minus.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/moduleSelectorBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/movecol_del.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/movecol_del_down.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/movecol_del_over.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/movecol_down.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/movecol_down_disabled.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/movecol_down_down.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/movecol_down_over.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/movecol_up.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/movecol_up_disabled.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/movecol_up_down.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/movecol_up_over.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/myGroupAllocation.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/myTickets.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/myTopAccounts.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/myTopInvoices.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/myTopOpenPotentials.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/myTopSalesOrders.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/myUpcoPendAct.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/next.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/nextRecord.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/next_disabled.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/no.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/notification.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/number.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/offstar.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/ogmailserver.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/one.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/onstar.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/orgshar.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/pendingEvents.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/pending_left.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/pending_right.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/percent.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/phone.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/picklist.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/picklistEditor.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/picklist_hint.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/plsWaitAnimated.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/plus.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/pointer.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/popupHdr.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/previous.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/previousRecord.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/previous_disabled.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/pricebook.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/primeTopBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/print.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/private.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/proxy.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/prvPrfBottomLeft.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/prvPrfBottomRight.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/prvPrfHdrArrow.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/prvPrfSelectedTick.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/prvPrfTopLeft.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/prvPrfTopRight.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/public.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/qcBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/qcName.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/reload.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/report_bg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/report_bottom.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/report_btn.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/report_newHdr.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/reportsCreate.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/reportsDelete.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/reportsFolderCreate.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/reportsMove.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/right.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/right_arc.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/rss.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/rssDisplayBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/rssDisplayBottom.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/rssDisplayBottomLeft.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/rssDisplayBottomRight.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/rssDisplayLeft.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/rssDisplayRight.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/rssDisplaySpeaker.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/rssDisplayTop.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/rssDisplayTopLeft.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/rssDisplayTopRight.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/rssHeader.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/rssOnHeader.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/rssdelete.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/rssforward.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/rssframeHdr.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/rssimage.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/rssroot.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/scroll_left.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/scroll_left_down.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/scroll_right.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/scroll_right_down.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/search.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/searchUIBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/searching.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/select.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/set-IcoLoginHistory.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/set-IcoTwoTabConfig.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/settingsActBtnDelete.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/settingsActBtnDuplicate.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/settingsActBtnEdit.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/settingsMTBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/settingsSelUIBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/settings_top.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/shareaccess.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/showDown.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/showPanelTopBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/showPanelTopLeft.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/showPanelTopRight.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/showsubmenu.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/site_hdr.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/site_sel.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/site_unsel.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/small_left.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/small_right.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/spacer.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/start.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/start_disabled.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/status.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/strikeline.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/summarize.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/system.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/tabRht.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/tabSelectedBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/tabSeperatorBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/tabUnSelectedBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/tabular.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/tagCloudBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/tagCloudName.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/tagcloud_03.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/taxConfiguration.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/tbarChat-Faded.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/tbarChat.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/tbarExport-Faded.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/tbarExport.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/tbarImport-Faded.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/tbarImport.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/tbarPrivateChat.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/tbarPublicChat.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/tbarSettings.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/tblPro1BtnHide.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/tblPro1ColBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/terms.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/text.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/titleMailClient.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/titleMySites.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/titleRSSReader.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/todaybg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/topBg.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/topBnr.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/top_left.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/top_right.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/topbar.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/topcut.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/up.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/uparrow.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/upcomingEvents.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/upcoming_left.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/upcoming_right.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/url.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/vtbusy.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/vtiger-crm.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/vtiger.jpg   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/vtigerDevDocs.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/webmail_downarrow.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/webmail_header.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/webmail_root.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/webmail_settings.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/webmail_trash.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/webmail_uparrow.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/images/yes.gif   (with props)
    vtigercrm/trunk/themes/bluelagoon/layout_utils.php
    vtigercrm/trunk/themes/bluelagoon/loginheader.html
    vtigercrm/trunk/themes/bluelagoon/loginheader.php
    vtigercrm/trunk/themes/bluelagoon/style.css




From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 09:05:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 13:05:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9391 -
	/vtigercrm/trunk/themes/alphagrey/style.css
Message-ID: <20060909130546.13BC176C8AD@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 07:05:37 2006
New Revision: 9391

Log:
Changes made by Radiant for alphagrey theme has been integrated--Jeri

Modified:
    vtigercrm/trunk/themes/alphagrey/style.css

Modified: vtigercrm/trunk/themes/alphagrey/style.css
==============================================================================
--- vtigercrm/trunk/themes/alphagrey/style.css (original)
+++ vtigercrm/trunk/themes/alphagrey/style.css Sat Sep  9 07:05:37 2006
@@ -348,7 +348,7 @@
 }
 
 .rightMailMerge {
-	border:2px solid #aae;
+	border:2px solid #aaa;
 }
 
 .rightMailMergeHeader {
@@ -376,10 +376,9 @@
 }
 
 .detailedViewHeader{
-	border-bottom:2px solid #4F94CD;
-	padding:5px; 
-	background-color:#afdbff;
-
+	border-bottom:2px solid #dadada;
+    	padding:5px;
+    	background-color:#aaaaaa;
 }
 
 .detailedViewTextBox {
@@ -2617,7 +2616,7 @@
 	    font-size: 11px;
 }
 .qcTransport{
-	    background-color:#d5d6ff;
+	    background-color:#dadada;
 
 }
 




From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 09:11:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 13:11:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9392 -
	/vtigercrm/trunk/themes/bluelagoon/style.css
Message-ID: <20060909131126.98B1176C519@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 07:11:19 2006
New Revision: 9392

Log:
Changes given by Radiant for blulagoon theme has been integrated --Jeri

Modified:
    vtigercrm/trunk/themes/bluelagoon/style.css

Modified: vtigercrm/trunk/themes/bluelagoon/style.css
==============================================================================
--- vtigercrm/trunk/themes/bluelagoon/style.css (original)
+++ vtigercrm/trunk/themes/bluelagoon/style.css Sat Sep  9 07:11:19 2006
@@ -224,9 +224,11 @@
 	border :0px #cccccc solid;
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 11px;
+	font-weight:bold;
 	width:30px;
 	height:19px;
-	background-color:#999;
+	background-color:#009;
+	color:white;
 }
 
 
@@ -3231,19 +3233,19 @@
 }
 
 .reportGenerateTable{
-	background-image:url(images/searchUIBg.gif);
-	border-left:2px dotted #a3a29a;
-	border-right:2px dotted #a3a29a;
-	border-bottom:2px dotted #a3a29a;
+	background-image:url(images/layerPopupBg.gif);
+	border-left:2px dotted #a5b5ee;
+	border-right:2px dotted #a5b5ee;
+	border-bottom:2px dotted #a5b5ee;
 }
 .reportCreateBottom{
-	background-color:#939271;
+	background-color:#ddf;
 	border-bottom:2px solid #737251;
 
 }
 .importLeadUI{
-	
-	background:#fffff5 url(images/layerPopupBg.gif) ;
+	/*background:#fffff5 url(images/select.gif) ; */
+	background-color:white;
 }
 
 a.customMnu{




From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 09:16:13 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 13:16:13 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9393 -
	/vtigercrm/trunk/themes/alphagrey/style.css
Message-ID: <20060909131613.7A58076C519@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 07:16:05 2006
New Revision: 9393

Log:
css for recalculate layer has been integrated --Jeri

Modified:
    vtigercrm/trunk/themes/alphagrey/style.css

Modified: vtigercrm/trunk/themes/alphagrey/style.css
==============================================================================
--- vtigercrm/trunk/themes/alphagrey/style.css (original)
+++ vtigercrm/trunk/themes/alphagrey/style.css Sat Sep  9 07:16:05 2006
@@ -3339,3 +3339,68 @@
 }
 
 
+
+/* Recalculate Disabling Window */
+
+.veil{
+   background: url(images/layerPopupBg.gif) ;
+    height: 100%;
+    width: 100%;
+    top: 0px;
+    left: 0px;
+    overflow: hidden;
+    z-index: 10000;
+    Filter: Alpha(opacity = 70);
+    -moz-opacity: 0.7;
+    text-align: center;
+    vertical-align: middle;
+    position: absolute;
+}
+
+.veil_new{
+   background: url(images/layerPopupBg.gif) ;
+    height: 100%;
+    width: 100%;
+    top: 0px;
+    left: 0px;
+    overflow: hidden;
+    z-index: 50000;
+    Filter: Alpha(opacity = 70);
+    -moz-opacity: 0.7;
+    text-align: center;
+    vertical-align: middle;
+    position: absolute;
+}
+
+.optioncontainer{
+    vertical-align: middle;   
+    height: 100%;
+    width: 100%;   
+    position: absolute;
+    z-index: 90000;   
+}
+
+
+.options{
+    	vertical-align: middle;   
+	margin-left: 25%;
+	margin-top: 16%;
+	color: #FFFFFF;
+	width:650px;
+	background-color: Black;
+	border: 2px solid #222;	
+    	position: relative;
+	text-align: left;
+    	z-index: 80000;   
+}
+
+.options h2{
+	color: White;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	border-bottom: 1px solid #373D4C;
+	margin: 0;
+	font-weight: normal;
+}
+
+/* Recalculate Disable Ends */
+




From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 12:09:33 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 16:09:33 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9394 -
 /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php
Message-ID: <20060909160933.E35C376D528@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 10:09:15 2006
New Revision: 9394

Log:
Migration script changed --Jeri

Modified:
    vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php

Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php
==============================================================================
--- vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php (original)
+++ vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php Sat Sep  9 10:09:15 2006
@@ -69,7 +69,6 @@
 		"alter table vtiger_def_org_field ADD PRIMARY KEY (fieldid)",
 		"alter table vtiger_leadgrouprelation ADD PRIMARY KEY (leadid)",
 		"alter table vtiger_leadgrouprelation drop key leadgrouprelation_IDX0",
-		"alter table vtiger_organizationdetails ADD PRIMARY KEY (organizationname)",
 		"alter table vtiger_profile2field ADD PRIMARY KEY (profileid,fieldid)",
 		"alter table vtiger_profile2standardpermissions ADD PRIMARY KEY (profileid,tabid,Operation)",
 		"alter table vtiger_profile2standardpermissions drop index idx_prof2stad",
@@ -754,6 +753,7 @@
 Execute($altersql1);
 $altersql2 = "alter table vtiger_vendor change column name vendorname varchar(100) default NULL";
 Execute($altersql2);
+Execute("update vtiger_field set fieldname='vendorname', columnname='vendorname' where tabid=18 and fieldname='name'");
 //TODO (check): Remove this company_name entry from the vtiger_field table if it already exists
 
 //Migration for Default Organisation Share -- Added by Don on 20-11-2005
@@ -989,7 +989,7 @@
 
 $insert_query_array4 = Array(
 				"insert into vtiger_parenttab values(1,'My Home Page',1,0),(2,'Marketing',2,0),(3,'Sales',3,0),(4,'Support',4,0),(5,'Analytics',5,0),(6,'Inventory',6,0), (7,'Tools',7,0),(8,'Settings',8,0)",
-				"insert into vtiger_parenttabrel values(1,9,2),(1,17,3),(1,10,4),(1,3,1),(3,7,1),(3,6,2),(3,4,3),(3,2,4),(3,20,5),(3,22,6),(3,23,7),(3,14,8),(3,19,9),(3,8,10),(4,13,1),(4,15,2),(4,6,3),(4,4,4),(4,14,5),(4,8,6),(5,1,1),(5,25,2),(6,14,1), (6,18,2), (6,19,3), (6,21,4), (6,22,5), (6,20,6), (6,23,7), (7,24,1), (7,27,2), (7,8,3), (2,26,1), (2,6,2), (2,4,3) "
+				"insert into vtiger_parenttabrel values(1,9,2),(1,17,3),(1,10,4),(1,3,1),(3,7,1),(3,6,2),(3,4,3),(3,2,4),(3,20,5),(3,22,6),(3,23,7),(3,14,8),(3,19,9),(3,8,10),(4,13,1),(4,15,2),(4,6,3),(4,4,4),(4,14,5),(4,8,6),(5,1,1),(5,25,2),(6,14,1), (6,18,2), (6,19,3), (6,21,4), (6,22,5), (6,20,6), (6,23,7), (7,24,1), (7,27,2), (7,8,3), (2,6,2), (2,4,3) "
 			    );
 foreach($insert_query_array4 as $query)
 {
@@ -1888,8 +1888,8 @@
 Execute($create_table_query1);
 
 $alter_query_array18 = Array(
-			"alter table vtiger_leaddetails add column campaignid int(19) default NULL after leadid",
-			"alter table vtiger_contactdetails add column  campaignid int(19) default NULL after accountid",
+			"alter table vtiger_potential add column campaignid int(19) default NULL after probability",
+			"alter table vtiger_potential drop column campaignsource",
 			//"alter table vtiger_notes drop PRIMARY KEY contact_id",
 			"alter table vtiger_notes drop PRIMARY KEY , add primary key(notesid)",
 			"update vtiger_field set uitype=99 where fieldname='update_log' and tabid=13"
@@ -1956,7 +1956,7 @@
 "ALTER TABLE `vtiger_durationhrs` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
 "ALTER TABLE `vtiger_durationmins` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
 "ALTER TABLE `vtiger_emailtemplates` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
-"ALTER TABLE `vtiger_emailtemplates_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
+//"ALTER TABLE `vtiger_emailtemplates_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
 "ALTER TABLE `vtiger_faqcategories` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
 "ALTER TABLE `vtiger_faqstatus` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
 "ALTER TABLE `vtiger_field_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
@@ -2368,7 +2368,7 @@
 "ALTER TABLE `vtiger_contactdetails` MODIFY COLUMN `imagename` VARCHAR(150) COLLATE latin1_swedish_ci DEFAULT NULL",
 "ALTER TABLE `vtiger_contactdetails` MODIFY COLUMN `reference` VARCHAR(3) COLLATE latin1_swedish_ci DEFAULT NULL",
 //"ALTER TABLE `vtiger_contactgrouprelation` MODIFY COLUMN `contactid` INTEGER(19) NOT NULL PRIMARY KEY",
-"ALTER TABLE `vtiger_convertleadmapping` MODIFY COLUMN `leadfid` INTEGER(19) NOT NULL",
+//"ALTER TABLE `vtiger_convertleadmapping` MODIFY COLUMN `leadfid` INTEGER(19) NOT NULL",
 //"ALTER TABLE `vtiger_crmentity` MODIFY COLUMN `crmid` INTEGER(19) NOT NULL PRIMARY KEY",
 "ALTER TABLE `vtiger_crmentity` MODIFY COLUMN `description` TEXT COLLATE latin1_swedish_ci",
 "ALTER TABLE `vtiger_crmentity` MODIFY COLUMN `createdtime` DATETIME NOT NULL",
@@ -2393,7 +2393,7 @@
 "ALTER TABLE `vtiger_defaultcv` MODIFY COLUMN `query` TEXT COLLATE latin1_swedish_ci",
 "ALTER TABLE `vtiger_emailtemplates` MODIFY COLUMN `description` TEXT COLLATE latin1_swedish_ci",
 "ALTER TABLE `vtiger_emailtemplates` MODIFY COLUMN `body` TEXT COLLATE latin1_swedish_ci",
-"ALTER TABLE `vtiger_emailtemplates_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL",
+//"ALTER TABLE `vtiger_emailtemplates_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL",
 "ALTER TABLE `vtiger_faq` MODIFY COLUMN `question` TEXT COLLATE latin1_swedish_ci",
 "ALTER TABLE `vtiger_faq` MODIFY COLUMN `answer` TEXT COLLATE latin1_swedish_ci",
 "ALTER TABLE `vtiger_faqcomments` MODIFY COLUMN `comments` TEXT COLLATE latin1_swedish_ci",
@@ -2724,8 +2724,8 @@
 
 
 $query_array2 = Array(
-				"INSERT INTO vtiger_parenttabrel VALUES(2,4,2)",
-				"INSERT INTO vtiger_parenttabrel VALUES(2,6,3)",
+				//"INSERT INTO vtiger_parenttabrel VALUES(2,4,2)",
+				//"INSERT INTO vtiger_parenttabrel VALUES(2,6,3)",
 				"update vtiger_cvcolumnlist set columnname ='vtiger_crmentity:smownerid:assigned_user_id:Emails_Sender:V' where cvid=20 and columnindex=3",
 				"update vtiger_field set sequence = 2 where columnname='filename' and tablename = 'vtiger_attachments'",
 				"delete from vtiger_cvcolumnlist where columnname = 'vtiger_seactivityrel:crmid:parent_id:Emails_Related_To:I'",
@@ -3146,10 +3146,6 @@
 Execute("insert into vtiger_relatedlists values(".$conn->getUniqueID('vtiger_relatedlists').",".getTabid("Leads").",".getTabid("Campaigns").",'get_campaigns',6,'Campaigns',0)");
 Execute("insert into vtiger_relatedlists values(".$conn->getUniqueID('vtiger_relatedlists').",".getTabid("Contacts").",".getTabid("Campaigns").",'get_campaigns',11,'Campaigns',0)");
 
-//campaignid removed from vtiger_leaddetails and vtiger_contactdetails tables
-Execute("alter table vtiger_leaddetails drop column campaignid");
-Execute("alter table vtiger_contactdetails drop column campaignid");
-
 //Contact Name has been removed from Events Information
 Execute("delete from vtiger_field where tabid=16 and fieldname='contact_id'");
 
@@ -3180,7 +3176,7 @@
 
 //type changed to support decimal places
 Execute("alter table vtiger_campaign change expectedrevenue expectedrevenue decimal(11,3)");
-Execute("alter table vtiger_campaign change budgetcost exbudgetcost decimal(11,3)");
+Execute("alter table vtiger_campaign change budgetcost budgetcost decimal(11,3)");
 Execute("alter table vtiger_campaign change actualcost actualcost decimal(11,3)");
 Execute("alter table vtiger_campaign change expectedroi expectedroi decimal(11,3)");
 Execute("alter table vtiger_campaign change actualroi actualroi decimal(11,3)");
@@ -3614,6 +3610,10 @@
 
 Execute("update vtiger_field set uitype = 16 where tabid=2 and uitype=111 and columnname='sales_stage'");
 
+Execute("update vtiger_field set quickcreate=1,quickcreatesequence=null where fieldname='duration_hours' and tabid=16");
+
+Execute("update vtiger_field set quickcreate=0,quickcreatesequence=5 where fieldname='due_date' and tabid=16");
+
 //we have to add id, sortorderid and presence in all existing custom field pick list tables.
 $cf_picklist_res = $conn->query("select fieldname from vtiger_field where uitype=15 and fieldname like 'cf_%'");
 $noofPicklists = $conn->num_rows($cf_picklist_res);
@@ -3628,7 +3628,34 @@
 	Execute($alterquery);
 }
 
+Execute("alter table vtiger_organizationdetails drop primary key");
 Execute("alter table vtiger_organizationdetails change column organizationame  organizationname varchar(60) NOT NULL");
+Execute("alter table vtiger_organizationdetails ADD PRIMARY KEY (organizationname)");
+
+//Activity related changes
+Execute('update vtiger_field set typeofdata="D~M~OTH~GE~date_start~Start Date & Time", uitype=23 where fieldname="due_date" and tabid=16');
+Execute('update vtiger_field set uitype=53 where tabid=16 and fieldname="assigned_user_id"');
+
+Execute('update vtiger_field set typeofdata="D~M~OTH~GE~date_start~Start Date & Time", uitype=23 where fieldname="due_date" and tabid=9');
+Execute('update vtiger_field set uitype=53 where tabid=9 and fieldname="assigned_user_id"');
+
+Execute("alter table vtiger_activity change column subject subject varchar(100) NOT NULL");
+Execute("alter table vtiger_activity change column activitytype activitytype varchar(50) NOT NULL");
+Execute("alter table vtiger_activity change column date_start date_start date NOT NULL");
+Execute("alter table vtiger_activity change column time_start time_start varchar(50) default NULL");
+Execute("alter table vtiger_activity change column visibility visibility varchar(50) NOT NULL default 'all'");
+
+Execute("delete from vtiger_field where tabid=14 and fieldname='currency'");
+Execute("insert into vtiger_field values(14, ".$conn->getUniqueID("vtiger_field").", 'imagename', 'vtiger_products', 1, 69, 'imagename', 'Product Image', 1, 0, 0, 100, 1, 35, 1, 'V~O', 1, NULL, 'ADV')");
+
+//Product related changes
+Execute('update vtiger_field set typeofdata="D~O~OTH~GE~sales_start_date~Sales Start Date" where tabid=14 and fieldname="sales_end_date"');
+Execute('update vtiger_field set typeofdata="D~O~OTH~GE~start_date~Start Date" where tabid=14 and fieldname="expiry_date"');
+
+//changes related to Incoming mail server settings
+Execute("alter table vtiger_mail_accounts drop column showbody");
+
+
 
 
 




From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 12:10:08 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 16:10:08 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9395 -
 /vtigercrm/trunk/modules/Products/language/en_us.lang.php
Message-ID: <20060909161008.B2B7176D528@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 10:09:51 2006
New Revision: 9395

Log:
language strings updated --Jeri

Modified:
    vtigercrm/trunk/modules/Products/language/en_us.lang.php

Modified: vtigercrm/trunk/modules/Products/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Products/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Products/language/en_us.lang.php Sat Sep  9 10:09:51 2006
@@ -117,7 +117,7 @@
 'Reorder Level'=>'Reorder Level',
 'Website'=>'Website',
 'Tax Class'=>'Tax Class',
-'Mfr PartNo'=>'Part No',
+'Mfr PartNo'=>'Mfr Part No',
 'Vendor PartNo'=>'Vendor Part No',
 'Serial No'=>'Serial No',
 'Qty In Stock'=>'Qty. in Stock',




From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 12:10:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 16:10:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9396 -
 /vtigercrm/trunk/modules/Settings/SaveMailAccount.php
Message-ID: <20060909161057.B9C6176D528@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Sat Sep  9 10:10:40 2006
New Revision: 9396

Log:
in savemail account columnname are give in the insert query --Jeri

Modified:
    vtigercrm/trunk/modules/Settings/SaveMailAccount.php

Modified: vtigercrm/trunk/modules/Settings/SaveMailAccount.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/SaveMailAccount.php (original)
+++ vtigercrm/trunk/modules/Settings/SaveMailAccount.php Sat Sep  9 10:10:40 2006
@@ -38,7 +38,7 @@
 else
 {
 	$account_id = $adb->getUniqueID("vtiger_mail_accounts");
-	$sql="insert into vtiger_mail_accounts values(" .$account_id .",'".$current_user->id."','".$displayname."','".$email."','".$account_name."','".$mailprotocol."','".$server_username."','".$server_password."','".$mail_servername."','".$box_refresh."','".$mails_per_page."', '".$ssltype."', '".$sslmeth."', '".$_REQUEST["int_mailer"]."','1','0')";
+	$sql="insert into vtiger_mail_accounts(account_id, user_id, display_name, mail_id, account_name, mail_protocol, mail_username, mail_password, mail_servername, box_refresh, mails_per_page, ssltype, sslmeth, int_mailer, status, set_default) values(" .$account_id .",'".$current_user->id."','".$displayname."','".$email."','".$account_name."','".$mailprotocol."','".$server_username."','".$server_password."','".$mail_servername."','".$box_refresh."','".$mails_per_page."', '".$ssltype."', '".$sslmeth."', '".$_REQUEST["int_mailer"]."','1','0')";
 }
 
 $adb->query($sql);




From vtigercrm-commits at vtiger.fosslabs.com  Sat Sep  9 14:47:04 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 09 Sep 2006 18:47:04 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9397 -
	/vtigercrm/trunk/cron/intimateTaskStatus.php
Message-ID: <20060909184704.562E676D567@vtiger.fosslabs.com>

Author: mmbrich
Date: Sat Sep  9 12:47:03 2006
New Revision: 9397

Log:
changed this whole file to use ADODB instead of MySQL.  Also added some query change to give better ticket status results, prior to this is was returning false positives.

Modified:
    vtigercrm/trunk/cron/intimateTaskStatus.php

Modified: vtigercrm/trunk/cron/intimateTaskStatus.php
==============================================================================
--- vtigercrm/trunk/cron/intimateTaskStatus.php (original)
+++ vtigercrm/trunk/cron/intimateTaskStatus.php Sat Sep  9 12:47:03 2006
@@ -1,46 +1,39 @@
 <?
+ini_set("include_path", "../:.");
+
 require('send_mail.php');
-require_once('../config.php');
+require_once('config.php');
+require_once('include/utils/utils.php');
 
-$dbhost = $dbconfig['db_hostname'];
-$dbuser =$dbconfig['db_username']; 
-$dbpass = $dbconfig['db_password'];
-$db = mysql_connect($dbhost, $dbuser, $dbpass) or die ('Error connecting to mysql');
-if (!$db) {
-  die('Could not connect: ' . mysql_error());
-}
-else
-{
-  echo 'Successfully connected to database '.$dbconfig['db_name'];
-}
-$selecteddb = $dbconfig['db_name'];
-mysql_select_db($selecteddb,$db);
-
-$emailresult = mysql_query("SELECT email1 from vtiger_users",$db);
-$emailid = mysql_fetch_row($emailresult);
+// Email Setup
+$emailresult = $adb->query("SELECT email1 from vtiger_users");
+$emailid = $adb->fetch_array($emailresult);
 $emailaddress = $emailid[0];
-$mailserveresult = mysql_query("SELECT server,server_username,server_password FROM vtiger_systems",$db);
-$mailrow = mysql_fetch_row($mailserveresult);
+$mailserveresult = $adb->query("SELECT server,server_username,server_password FROM vtiger_systems");
+$mailrow = $adb->fetch_array($mailserveresult);
 $mailserver = $mailrow[0];
 
 $mailuname = $mailrow[1];
 $mailpwd = $mailrow[1];
+// End Email Setup
+
 
 //query the vtiger_notificationscheduler vtiger_table and get data for those notifications which are active
+$sql = "select active from vtiger_notificationscheduler where schedulednotificationid=1";
+$result = $adb->query($sql);
 
+$activevalue = $adb->fetch_array($result);
 
-$sql = "select active from vtiger_notificationscheduler where schedulednotificationid=1";
-$result = mysql_query($sql);
-
-$activevalue = mysql_fetch_row($result);
 if($activevalue[0] == 1)
 {
 //Delayed Tasks Notification
 
 //get all those activities where the status is not completed even after the passing of 24 hours
 $today = date("Ymd"); 
-$result = mysql_query("select (vtiger_activity.date_start +1) from vtiger_activity where vtiger_activity.status !='Completed' and ".$today." > (vtiger_activity.date_start+1)",$db);
-while ($myrow = mysql_fetch_row($result))
+$result = $adb->query("select (vtiger_activity.date_start +1) from vtiger_activity where vtiger_activity.status <> 'Completed' and ".$today." > (vtiger_activity.date_start+1)",$db);
+
+" > (vtiger_activity.date_start+1)";
+while ($myrow = $adb->fetch_array($result))
 {
   $status=$myrow[0];
   if($status != 'Completed')
@@ -52,13 +45,13 @@
 
 //Big Deal Alert
 $sql = "select active from vtiger_notificationscheduler where schedulednotificationid=2";
-$result = mysql_query($sql);
+$result = $adb->query($sql);
 
-$activevalue = mysql_fetch_row($result);
+$activevalue = $adb->fetch_array($result);
 if($activevalue[0] == 1)
 {
-$result = mysql_query("SELECT sales_stage,amount FROM vtiger_potential",$db);
-while ($myrow = mysql_fetch_row($result))
+$result = $adb->query("SELECT sales_stage,amount FROM vtiger_potential",$db);
+while ($myrow = $adb->fetch_array($result))
 {
   $amount=$myrow[1];
   $stage = $myrow[0];
@@ -73,19 +66,19 @@
 
 //Pending tickets
 $sql = "select active from vtiger_notificationscheduler where schedulednotificationid=3";
-$result = mysql_query($sql);
+$result = $adb->query($sql);
 
-$activevalue = mysql_fetch_row($result);
+$activevalue = $adb->fetch_array($result);
 if($activevalue[0] == 1)
 {
-$result = mysql_query("SELECT status,ticketid FROM vtiger_troubletickets",$db);
-while ($myrow = mysql_fetch_row($result))
+$result = $adb->query("SELECT vtiger_troubletickets.status,ticketid FROM vtiger_troubletickets INNER JOIN vtiger_crmentity ON vtiger_crmentity.crmid=vtiger_troubletickets.ticketid WHERE vtiger_crmentity.deleted='0' AND vtiger_troubletickets.status <> 'Completed' AND vtiger_troubletickets.status <> 'Closed' ",$db);
+
+while ($myrow = $adb->fetch_array($result))
 {
   $status=$myrow[0];
   $ticketid = $myrow[1];
-  if($status != 'Completed')
+  if($status != "Completed" || $status != "Closed")
   {
-
     sendmail($emailaddress,$emailaddress,"Pending Ticket notification","Dear Admin,<br> This is to bring to your kind attention that ticket number ".$ticketid ." is yet to be closed<br> Thank You,<br> HelpDesk Team<br>",$mailserver,$mailuname,$mailpwd,"");	
   }
 }
@@ -95,14 +88,14 @@
 
 //Too many tickets related to a particular vtiger_account/company causing concern
 $sql = "select active from vtiger_notificationscheduler where schedulednotificationid=4";
-$result = mysql_query($sql);
+$result = $adb->query($sql);
 
-$activevalue = mysql_fetch_row($result);
+$activevalue = $adb->fetch_array($result);
 if($activevalue[0] == 1)
 {
 
-$result = mysql_query("SELECT status,vtiger_troubletickets.ticketid FROM vtiger_troubletickets where status!='Completed'",$db);
-while ($myrow = mysql_fetch_row($result))
+$result = $adb->query("SELECT status,vtiger_troubletickets.ticketid FROM vtiger_troubletickets where status <> 'Completed' AND status <> 'Closed'",$db);
+while ($myrow = $adb->fetch_array($result))
 {
   $status=$myrow[0];
   $ticketid = $myrow[1];
@@ -113,13 +106,13 @@
 
 //Support Starting
 $sql = "select active from vtiger_notificationscheduler where schedulednotificationid=5";
-$result = mysql_query($sql);
+$result = $adb->query($sql);
 
-$activevalue = mysql_fetch_row($result);
+$activevalue = $adb->fetch_array($result);
 if($activevalue[0] == 1)
 {
-$result = mysql_query("SELECT productname FROM vtiger_products where start_date like '".date('Y-m-d')."%'",$db);
-while ($myrow = mysql_fetch_row($result))
+$result = $adb->query("SELECT productname FROM vtiger_products where start_date like '".date('Y-m-d')."%'",$db);
+while ($myrow = $adb->fetch_array($result))
 {
   $productname=$myrow[0];
   sendmail($emailaddress,$emailaddress,"Support starting","Hello! Support Starts for ".$productname ."\n Congratulations! Your support starts from today",$mailserver,$mailuname,$mailpwd,"");	
@@ -129,20 +122,18 @@
 
 //Support ending
 $sql = "select active from vtiger_notificationscheduler where schedulednotificationid=6";
-$result = mysql_query($sql);
+$result = $adb->query($sql);
 
-$activevalue = mysql_fetch_row($result);
+$activevalue = $adb->fetch_array($result);
 if($activevalue[0] == 1)
 {
 
-$result = mysql_query("SELECT productname from vtiger_products where expiry_date like '".date('Y-m-d')."%'",$db);
-while ($myrow = mysql_fetch_row($result))
+$result = $adb->query("SELECT productname from vtiger_products where expiry_date like '".date('Y-m-d')."%'",$db);
+while ($myrow = $adb->fetch_array($result))
 {
   $productname=$myrow[0];
   sendmail($emailaddress,$emailaddress,"Support Ending","Dear Admin,<br> This is to inform you that the support for ".$productname ."\n ends shortly. Kindly renew your support please<br>Regards,<br>HelpDesk Team<br>",$mailserver,$mailuname,$mailpwd,"");	
 }
 
 }
-
-
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Sun Sep 10 15:36:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sun, 10 Sep 2006 19:36:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9398 - in /vtigercrm/trunk:
 Smarty/templates/Webmails.tpl modules/Webmails/DetailView.php
Message-ID: <20060910193645.B19B176D61C@vtiger.fosslabs.com>

Author: mmbrich
Date: Sun Sep 10 13:36:44 2006
New Revision: 9398

Log:
fixed typo in URL and added a hack to DetailView to work around 2139 Fixes #2139

Modified:
    vtigercrm/trunk/Smarty/templates/Webmails.tpl
    vtigercrm/trunk/modules/Webmails/DetailView.php

Modified: vtigercrm/trunk/Smarty/templates/Webmails.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Webmails.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Webmails.tpl Sun Sep 10 13:36:44 2006
@@ -208,7 +208,7 @@
                         url = 'index.php?module=Webmails&action=dlAttachments&mailid='+id+'&mailbox={$MAILBOX}';
                         break;
                 case 'full_view':
-                        url = 'index.php?module=Webmails&action=DetailView&&record='+id+'&mailid='+id+'&mailbox={$MAILBOX}';
+                        url = 'index.php?module=Webmails&action=DetailView&record='+id+'&mailid='+id+'&mailbox={$MAILBOX}';
                         break;
                 {rdelim}
         openPopUp('xComposeEmail',this,url,'createemailWin',830,662,'menubar=no,toolbar=no,location=no,status=no,resizable=yes,scrollbars=yes');

Modified: vtigercrm/trunk/modules/Webmails/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Webmails/DetailView.php (original)
+++ vtigercrm/trunk/modules/Webmails/DetailView.php Sun Sep 10 13:36:44 2006
@@ -22,7 +22,7 @@
 $MailBox = new MailBox($mailbox);
 
 $webmail = new Webmail($MailBox->mbox,$mailid);
-$elist = $MailBox->mailList["overview"][$mailid];
+$elist = $MailBox->mailList["overview"][($mailid-1)];
 
 echo '<table width="100%" cellpadding="0" cellspacing="0" border="0" class="previewWindow"><tr>';
 




From vtigercrm-commits at vtiger.fosslabs.com  Sun Sep 10 15:42:18 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sun, 10 Sep 2006 19:42:18 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9399 -
	/vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl
Message-ID: <20060910194218.CBB4576D56F@vtiger.fosslabs.com>

Author: mmbrich
Date: Sun Sep 10 13:42:17 2006
New Revision: 9399

Log:
removed POP AGAIN.. if you re-enable it, be prepared to support it on your own

Modified:
    vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl

Modified: vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl Sun Sep 10 13:42:17 2006
@@ -93,8 +93,8 @@
        <tr>
            <td class="dvtCellLabel" align="right">{$MOD.LBL_MAIL_PROTOCOL}</td>
            <td class="dvtCellInfo">
-		<input type="radio" name="mailprotocol" value="pop3" {$POP3}/>&nbsp;{$MOD.LBL_POP} <font color="red">* *</font>&nbsp;
-		<input type="radio" name="mailprotocol" value="imap" {$IMAP}/>&nbsp;{$MOD.LBL_IMAP} <font color="red">* *</font>&nbsp;
+		<!-- <input type="radio" name="mailprotocol" value="pop3" {$POP3}/>&nbsp;{$MOD.LBL_POP} <font color="red">* *</font>&nbsp;
+		<input type="radio" name="mailprotocol" value="imap" {$IMAP}/>&nbsp;{$MOD.LBL_IMAP} <font color="red">* *</font>&nbsp; -->
 		<input type="radio" name="mailprotocol" value="imap2" {$IMAP2}/>&nbsp;{$MOD.LBL_IMAP2}
 		<input type="radio" name="mailprotocol" value="IMAP4" {$IMAP4}/>&nbsp;{$MOD.LBL_IMAP4}
 	   </td>	




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 03:01:14 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 07:01:14 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9400 -
	/vtigercrm/trunk/modules/Calendar/addEventUI.php
Message-ID: <20060911070114.CCB0B76D61A@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Mon Sep 11 01:00:54 2006
New Revision: 9400

Log:
UI Changes given by Saint has been integrated --Jeri

Modified:
    vtigercrm/trunk/modules/Calendar/addEventUI.php

Modified: vtigercrm/trunk/modules/Calendar/addEventUI.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/addEventUI.php (original)
+++ vtigercrm/trunk/modules/Calendar/addEventUI.php Mon Sep 11 01:00:54 2006
@@ -710,9 +710,9 @@
 				<table border=0 cellspacing=0 cellpadding=3 width=100%>
 					<tr>
 						<td class="dvtTabCache" style="width:10px" nowrap>&nbsp;</td>
-						<td id="cellTabInvite" class="dvtSelectedCell" align=center nowrap><a href="#" onClick="switchClass('cellTabInvite','on');switchClass('cellTabRelatedto','off');gshow('addTaskAlarmUI','todo',document.createTodo.task_date_start.value,'',document.createTodo.starthr.value,document.createTodo.startmin.value,document.createTodo.startfmt.value,'','','',document.createTodo.viewOption.value,document.createTodo.subtab.value);ghide('addTaskRelatedtoUI');"><?php echo $mod_strings['LBL_NOTIFICATION']?></a></td>
+						<td id="cellTabNotification" class="dvtSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabNotification','on');switchClass('cellTabtodoRelatedto','off');gshow('addTaskAlarmUI','todo',document.createTodo.task_date_start.value,'',document.createTodo.starthr.value,document.createTodo.startmin.value,document.createTodo.startfmt.value,'','','',document.createTodo.viewOption.value,document.createTodo.subtab.value);ghide('addTaskRelatedtoUI');"><?php echo $mod_strings['LBL_NOTIFICATION']?></a></td>
 						<td class="dvtTabCache" style="width: 10px;" nowrap="nowrap">
-						<td id="cellTabRelatedto" class="dvtUnSelectedCell" align=center nowrap><a href="#" onClick="switchClass('cellTabRelatedto','on'); switchClass('cellTabInvite','off');gshow('addTaskRelatedtoUI','todo',document.createTodo.task_date_start.value,'',document.createTodo.starthr.value,document.createTodo.startmin.value,document.createTodo.startfmt.value,'','','',document.createTodo.viewOption.value,document.createTodo.subtab.value);ghide('addTaskAlarmUI');"><?php echo $mod_strings['LBL_RELATEDTO']?></a></td>					
+						<td id="cellTabtodoRelatedto" class="dvtUnSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabtodoRelatedto','on'); switchClass('cellTabNotification','off');gshow('addTaskRelatedtoUI','todo',document.createTodo.task_date_start.value,'',document.createTodo.starthr.value,document.createTodo.startmin.value,document.createTodo.startfmt.value,'','','',document.createTodo.viewOption.value,document.createTodo.subtab.value);ghide('addTaskAlarmUI');"><?php echo $mod_strings['LBL_RELATEDTO']?></a></td>					
 						<td class="dvtTabCache" style="width: 100%;">&nbsp;</td>
 					</tr>
 				</table>




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 03:01:47 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 07:01:47 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9401 - in
 /vtigercrm/trunk/Smarty/templates: ActivityDetailView.tpl
 ActivityEditView.tpl
Message-ID: <20060911070147.4496876D61A@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Mon Sep 11 01:01:11 2006
New Revision: 9401

Log:
UI Changes given by Saint has been integrated --Minnie

Modified:
    vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl
    vtigercrm/trunk/Smarty/templates/ActivityEditView.tpl

Modified: vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl Mon Sep 11 01:01:11 2006
@@ -1,485 +1,465 @@
-{*<!--
-
-/*********************************************************************************
-** 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.
-*
- ********************************************************************************/
-
--->*}
-<script type="text/javascript" src="modules/{$MODULE}/Activity.js"></script>
-<script type="text/javascript" src="include/js/reflection.js"></script>
-<script src="include/scriptaculous/prototype.js" type="text/javascript"></script>
-<script src="include/scriptaculous/scriptaculous.js" type="text/javascript"></script>
-<script language="JavaScript" type="text/javascript" src="include/js/dtlviewajax.js"></script>
-<span id="crmspanid" style="display:none;position:absolute;"  onmouseover="show('crmspanid');">
-   <a class="link"  align="right" href="javascript:;">{$APP.LBL_EDIT_BUTTON}</a>
-</span>
-
-<script>
-function tagvalidate()
-{ldelim}
-	if(document.getElementById('txtbox_tagfields').value != '')
-		SaveTag('txtbox_tagfields','{$ID}','{$MODULE}');	
-	else
-	{ldelim}
-		alert("Please enter a tag");
-		return false;
-	{rdelim}
-{rdelim}
-function DeleteTag(id)
-{ldelim}
-	$("vtbusy_info").style.display="inline";
-	Effect.Fade('tag_'+id);
-	new Ajax.Request(
-		'index.php',
-                {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
-                        method: 'post',
-                        postBody: "file=TagCloud&module={$MODULE}&action={$MODULE}Ajax&ajxaction=DELETETAG&tagid=" +id,
-                        onComplete: function(response) {ldelim}
-						getTagCloud();
-						$("vtbusy_info").style.display="none";
-                        {rdelim}
-                {rdelim}
-        );
-{rdelim}
-</script>
-<table width="100%" cellpadding="2" cellspacing="0" border="0">
-<form action="index.php" method="post" name="DetailView" id="form">
-<tr><td>&nbsp;</td>
-	<td>
-                <table cellpadding="0" cellspacing="5" border="0">
-			{include file='DetailViewHidden.tpl'}
-		</table>	
-
-<!-- Contents -->
-<table  border="0" cellpadding="5" cellspacing="0" width="100%" style="border:1px solid #cccccc">
-<tr>
-	<td class="lvtHeaderText" style="border-bottom:1px dotted #cccccc">
-	
-		<table align="center" border="0" cellpadding="0" cellspacing="0" width="95%">
-			<tr><td>		
-				 <span class="lvtHeaderText"><font color="purple">[ {$ID} ] </font>{$NAME} -  {$SINGLE_MOD} {$APP.LBL_INFORMATION}</span>&nbsp;&nbsp;<span id="vtbusy_info" style="display:none;" valign="bottom"><img src="{$IMAGE_PATH}vtbusy.gif" border="0"></span><span id="vtbusy_info" style="visibility:hidden;" valign="bottom"><img src="{$IMAGE_PATH}vtbusy.gif" border="0"></span></td><td>&nbsp;
-			</td></tr>
-			 <tr height=20><td>{$UPDATEINFO}</td></tr>
-		 </table>
-	</td>
-</tr>
-<tr><td>
-<table border="0" cellpadding="5" cellspacing="0" width="100%">
-	<tr>
-		<td valign=top align=left >
-                           <table border=0 cellspacing=0 cellpadding=3 width=100%>
-				<tr>
-					<td align=left>
-					<!-- content cache -->
-					
-					<table border=0 cellspacing=0 cellpadding=0 width=100%>
-			                  <tr>
-					     <td style="padding:10px">
-						     <!-- General details -->
-				                     <table border=0 cellspacing=0 cellpadding=0 width=100%>
-						     <tr nowrap>
-							<td  colspan=4 style="padding:5px">
-								{if $EDIT_DUPLICATE eq 'permitted'}
-                                                                <input title="{$APP.LBL_EDIT_BUTTON_TITLE}" accessKey="{$APP.LBL_EDIT_BUTTON_KEY}" class="crmbutton small edit" onclick="this.form.return_module.value='{$MODULE}'; this.form.return_action.value='DetailView'; this.form.return_id.value='{$ID}';this.form.module.value='{$MODULE}';this.form.action.value='EditView'" type="submit" name="Edit" value="&nbsp;{$APP.LBL_EDIT_BUTTON_LABEL}&nbsp;">&nbsp;
-                                                                <input title="{$APP.LBL_DUPLICATE_BUTTON_TITLE}" accessKey="{$APP.LBL_DUPLICATE_BUTTON_KEY}" class="crmbutton small create" onclick="this.form.return_module.value='{$MODULE}'; this.form.return_action.value='DetailView'; this.form.isDuplicate.value='true';this.form.module.value='{$MODULE}'; this.form.action.value='EditView'" type="submit" name="Duplicate" value="{$APP.LBL_DUPLICATE_BUTTON_LABEL}">&nbsp;
-                                                                {/if}
-								{if $DELETE eq 'permitted'}
-                                                                <input title="{$APP.LBL_DELETE_BUTTON_TITLE}" accessKey="{$APP.LBL_DELETE_BUTTON_KEY}" class="crmbutton small delete" onclick="this.form.return_module.value='{$MODULE}'; {if $VIEWTYPE eq 'calendar'} this.form.return_action.value='index'; {else} this.form.return_action.value='ListView'; {/if}  this.form.action.value='Delete'; return confirm('{$APP.NTC_DELETE_CONFIRMATION}')" type="submit" name="Delete" value="{$APP.LBL_DELETE_BUTTON_LABEL}">&nbsp;
-                                                                {/if}
-
-							</td>
-						     </tr>
-						     </table>
-						     {foreach key=header item=detail from=$BLOCKS}
-						     <table border=0 cellspacing=0 cellpadding=0 width=100% class="small">
-						     	<tr>{strip}
-						     		<td colspan=4 style="border-bottom:1px solid #999999;padding:5px;" bgcolor="#e5e5e5">
-									<b>{$header}</b>
-								</td>{/strip}
-					             	</tr>
-						     </table>
-						     {/foreach}
-						     {if $ACTIVITYDATA.activitytype neq 'Task'}	
-						     <table border=0 cellspacing=0 cellpadding=5 width=100% >
-               						 <tr>
-					                        <td width="20%" align="right"><b>{$MOD.LBL_EVENTTYPE}</b></td>
-								<td width="30%"align="left">{$ACTIVITYDATA.activitytype}</td>
-								<td width="20%" align="right">&nbsp;</td>
-								<td width="30%" align="left">&nbsp;</td>
-							 </tr>
-							 <tr>
-                        					<td width="20%" align="right"><b>{$MOD.LBL_EVENTNAME}</b></td>
-					                        <td width="30%" align="left" >{$ACTIVITYDATA.subject}</td>
-								<td width="20%" align="right"><b>{$LABEL.visibility}</b></td>
-                                                                <td width="30%" align="left" >{$ACTIVITYDATA.visibility}</td>
-             						 </tr>
-							 <tr>
-								<td align="right" width="20%" nowrap valign="top"><b>{$LABEL.description}</b></td>
-								<td valign="top" align="left" colspan="3" height="60px">{$ACTIVITYDATA.description}</td>
-							 </tr>
-							 <tr>
-                                                                <td width="20%" align="right"><b>{$LABEL.location}</b></td>
-                                                                <td valign="top" align="left" colspan="3">{$ACTIVITYDATA.location}</td>
-                                                         </tr>
-							 <tr>
-								<td colspan=2 width=80% align="center">
-								<table border=0 cellspacing=0 cellpadding=3 width=80%>
-									<tr>
-										<td ><b>{$LABEL.eventstatus}</b></td>
-										<td ><b>{$LABEL.assigned_user_id}</b></td>
-									</tr>
-									<tr>
-										<td>{$ACTIVITYDATA.eventstatus}</td>
-										<td>{$ACTIVITYDATA.assigned_user_id}</td>
-									</tr>
-									<tr>
-										<td ><b>{$LABEL.taskpriority}</b></td>
-										<td ><b>{$LABEL.sendnotification}</b></td>
-									</tr>
-									<tr>
-										<td >{$ACTIVITYDATA.taskpriority}</td>
-										<td >{$ACTIVITYDATA.sendnotification}</td>
-									</tr>
-								</table>
-								</td>
-							</tr>
-                                                        <tr>
-                                                                <td width="20%" align="right"><b>{$LABEL.createdtime}</b></td>
-                                                                <td width="30%" align="left">{$ACTIVITYDATA.createdtime}</td>
-                                                                <td width="20%" align="right"><b>{$LABEL.modifiedtime}</b></td>
-                                                                <td width="30%" align="left">{$ACTIVITYDATA.modifiedtime}</td>
-                                                        </tr>
-                                                     </table>
-						     <hr noshade size=1>
-						     <table border=0 cellspacing=0 cellpadding=5 width=90% align=center bgcolor="#FFFFFF">
-							<tr>
-								<td >
-									<table border=0 cellspacing=0 cellpadding=2 width=100%>
-									<tr><td width=50% valign=top style="border-right:1p
-x solid #dddddd">
-										 <table border=0 cellspacing=0 cellpadding=2 width=90%>
-											<tr><td><b>{$MOD.LBL_EVENTSTAT}</b></td></tr>
-											<tr><td>{$ACTIVITYDATA.starthr}:{$ACTIVITYDATA.startmin}{$ACTIVITYDATA.startfmt}</td></tr>
-											<tr><td>{$ACTIVITYDATA.date_start}</td></tr>
-										</table></td>
-									<td width=50% valign=top >
-										<table border=0 cellspacing=0 cellpadding=2 width=90%>
-											<tr><td><b>{$MOD.LBL_EVENTEDAT}</b></td></tr>
-											<tr><td>{$ACTIVITYDATA.endhr}:{$ACTIVITYDATA.endmin}{$ACTIVITYDATA.endfmt}</td></tr>
-											<tr><td>{$ACTIVITYDATA.due_date}</td></tr>
-										</table>
-									</td></tr>
-									</table>
-								</td>
-							</tr>
-						     </table>
-						     <br>
-					             <table border=0 cellspacing=0 cellpadding=0 width=100% align=center>
-                					 <tr>
-                        					<td>
-                         				        	<table border=0 cellspacing=0 cellpadding=3 width=100%>
-                             						<tr>
-                                        					<td class="dvtTabCache" style="width:10px" nowrap>&nbsp;</td>
-					                                        <td id="cellTabInvite" class="dvtSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabInvite','on');switchClass('cellTabAlarm','off');switchClass('cellTabRepeat','off');switchClass('cellTabRelatedto','off');ghide('addEventAlarmUI');dispLayer('addEventInviteUI');ghide('addEventRepeatUI');ghide('addEventRelatedtoUI');">{$MOD.LBL_INVITE}</a></td>
-										<td class="dvtTabCache" style="width:10px">&nbsp;</td>
-										<td id="cellTabAlarm" class="dvtUnSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabInvite','off');switchClass('cellTabAlarm','on');switchClass('cellTabRepeat','off');switchClass('cellTabRelatedto','off');dispLayer('addEventAlarmUI');ghide('addEventInviteUI');ghide('addEventRepeatUI');ghide('addEventRelatedtoUI');">{$MOD.LBL_REMINDER}</a></td>
-										<td class="dvtTabCache" style="width:10px">&nbsp;</td>
-										<td id="cellTabRepeat" class="dvtUnSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabInvite','off');switchClass('cellTabAlarm','off');switchClass('cellTabRepeat','on');switchClass('cellTabRelatedto','off');ghide('addEventAlarmUI');ghide('addEventInviteUI');dispLayer('addEventRepeatUI');ghide('addEventRelatedtoUI');">{$MOD.LBL_REPEAT}</a></td>
-										<td class="dvtTabCache" style="width:10px">&nbsp;</td>
-										<td id="cellTabRelatedto" class="dvtUnSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabInvite','off');switchClass('cellTabAlarm','off');switchClass('cellTabRepeat','off');switchClass('cellTabRelatedto','on');ghide('addEventAlarmUI');ghide('addEventInviteUI');dispLayer('addEventRelatedtoUI');ghide('addEventRepeatUI');">{$MOD.LBL_LIST_RELATED_TO}</a></td>
-										<td class="dvtTabCache" style="width:100%">&nbsp;</td>
-									</tr>
-									</table>
-								</td>
-							 </tr>
-							
-							 <tr>
-								<td width=100% valign=top align=left class="dvtContentSpace" style="padding:10px;height:120px">
-									<!-- Invite UI -->
-									<DIV id="addEventInviteUI" style="display:block;width:100%">
-									<table width="100%" cellpadding="5" cellspacing="0" border="0">
-										<tr>
-                                                                                        <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>
-                                                                                                {/foreach}
-											</td>
-                                                                                </tr>
-									</table>
-									</DIV>
-									<!-- Reminder UI -->
-					                                <DIV id="addEventAlarmUI" style="display:none;width:100%">
-									<table width="100%" cellpadding="5" cellspacing="0" border="0">
-                                                                                <tr>
-                                                                                        <td width="30%" align=right><b>{$MOD.LBL_SENDREMINDER}</b></td>
-                                                                                        <td width="70%" align=left>{$ACTIVITYDATA.set_reminder}</td>
-                                                                                </tr>
-										{if $ACTIVITYDATA.set_reminder != 'No'}
-										<tr>
-                                                                                        <td width="30%" align=right><b>{$MOD.LBL_RMD_ON}</b></td>
-											<td width="70%" align=left>{$ACTIVITYDATA.reminder_str}</td>
-										</tr>
-										{/if}
-                                                                        </table>
-									</DIV>
-									<!-- Repeat UI -->
-                                					<div id="addEventRepeatUI" style="display:none;width:100%">
-									<table width="100%" cellpadding="5" cellspacing="0" border="0">
-										<tr>
-                                                                                        <td width="30%" align=right><b>{$MOD.LBL_ENABLE_REPEAT}</b></td>
-                                                                                        <td width="70%" align=left>{$ACTIVITYDATA.recurringcheck}</td>
-                                                                                </tr>
-										{if $ACTIVITYDATA.recurringcheck != 'No'}
-										<tr>
-											<td width="30%" align=right>&nbsp;</td>
-											<td>{$MOD.LBL_REPEATEVENT}&nbsp;{$ACTIVITYDATA.repeat_frequency}&nbsp;{$MOD[$ACTIVITYDATA.recurringtype]}</td>
-										</tr>
-										<tr>
-                                                                                        <td width="30%" align=right>&nbsp;</td>
-                                                                                        <td>{$ACTIVITYDATA.repeat_str}</td>
-                                                                                </tr>
-										{/if}
-									</table>
-									</div>
-									<!-- Relatedto UI -->
-									<div id="addEventRelatedtoUI" style="display:none;width:100%">
-									<table width="100%" cellpadding="5" cellspacing="0" border="0">
-										<tr>
-											<td width="30%" align=right valign="top"><b>{$LABEL.parent_id}</b></td>
-											<td width="70%" align=left valign="top">{$ACTIVITYDATA.parent_name}</td>
-										</tr>
-										<tr>
-											<td width="30%" valign="top" align=right><b>{$MOD.LBL_CONTACT_NAME}</b></td>	
-											<td width="70%" valign="top" align=left>
-											{foreach item=contactname key=cntid from=$CONTACTS}
-	                                                                                {$contactname.0}&nbsp;{$contactname.1}<br>
-                                                                                        {/foreach}
-										</tr>
-									</table>
-									</div>
-								</td>
-                					 </tr>
-						     </table>
-						    {else}
-					 	     <table border="0" cellpadding="5" cellspacing="0" width="95%">
-							<tr>
-								<td width="20%" align="right"><b>{$MOD.LBL_TODO}</b></td>
-								<td width="80%" align="left">{$ACTIVITYDATA.subject}</td>
-							</tr>
-							<tr>
-								<td align="right" valign="top"><b>{$LABEL.description}</b></td>
-                                                                <td align="left" colspan="3" valign="top" height="60px">{$ACTIVITYDATA.description}</td>
-                					</tr>
-							<tr>
-                        					<td colspan="2" align="center" width="80%">
-                                					<table border="0" cellpadding="3" cellspacing="0" width="80%">
-                                        					<tr>
-                                                				<td align="left"><b>{$LABEL.taskstatus}</b></td>
-										<td align="left"><b>{$LABEL.taskpriority}</b></td>
-										<td align="left"><b>{$LABEL.assigned_user_id}</b></td>
-										</tr>
-										<tr>
-                                                				<td align="left" valign="top">{$ACTIVITYDATA.taskstatus}</td>
-										<td align="left" valign="top">{$ACTIVITYDATA.taskpriority}</td>
-										<td align="left" valign="top">{$ACTIVITYDATA.assigned_user_id}</td>
-										</tr>
-									</table>
-								</td>
-							</tr>
-						</table>
-						<br>
-						<table border=0 cellspacing=0 cellpadding=5 width=95% >
-							<tr>
-								<td ><b>{$LABEL.createdtime}</b></td>
-								<td >{$ACTIVITYDATA.createdtime}</td>
-								<td ><b>{$LABEL.modifiedtime}</b></td>
-								<td>{$ACTIVITYDATA.modifiedtime}</td>
-                                                        </tr>
-                                                </table>
-						<hr noshade="noshade" size="1">
-						<table bgcolor="#ffffff" border="0" cellpadding="5" cellspacing="0" width="95%" align=center>
-							<tr><td>
-								<table border="0" cellpadding="2" cellspacing="0" width="100%" align=center>
-									<tr><td width=50% valign=top style="border-right:1px solid #dddddd">
-										<table border=0 cellspacing=0 cellpadding=2 width=95% align=center>
-											<tr><td><b>{$MOD.LBL_TIMEDATE}</b></td></tr>
-											<tr><td>{$ACTIVITYDATA.starthr}:{$ACTIVITYDATA.startmin}{$ACTIVITYDATA.startfmt}</td></tr>
-											<tr><td>{$ACTIVITYDATA.date_start}</td></tr>
-										</table>
-									</td>
-									<td width=50% valign="top">
-										<table border=0 cellspacing=0 cellpadding=2 width=95% align=center>
-											<tr><td><b>{$LABEL.due_date}</b></td></tr>
-											<tr><td>{$ACTIVITYDATA.due_date}</td></tr>
-											<tr><td>&nbsp;</td></tr>
-										</table>
-									</td>
-								</table>	
-							</tr>
-						    </table>
-						    <br>
-						    <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%">
-							<tr>
-								<td>
-									<table border="0" cellpadding="3" cellspacing="0" width="100%">
-									<tr>
-										<td class="dvtTabCache" style="width: 10px;" nowrap="nowrap">&nbsp;</td>
-										<td id="cellTabInvite" class="dvtSelectedCell" align="center" nowrap="nowrap"><a href="javascript:doNothing()" onClick="switchClass('cellTabInvite','on');switchClass('cellTabRelatedto','off');dispLayer('addTaskAlarmUI');ghide('addTaskRelatedtoUI');">{$MOD.LBL_NOTIFICATION}</td></a>
-										<td class="dvtTabCache" style="width: 10px;" nowrap="nowrap">&nbsp;
-										<td id="cellTabRelatedto" class="dvtUnSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabInvite','off');switchClass('cellTabRelatedto','on');dispLayer('addTaskRelatedtoUI');ghide('addTaskAlarmUI');">{$MOD.LBL_RELATEDTO}</a></td>
-
-										<td class="dvtTabCache" style="width: 100%;">&nbsp;</td>
-									</tr>
-									</table>
-								</td>
-							</tr>
-							<tr>                                                                                                                              <td width=100% valign=top align=left class="dvtContentSpace" style="padding:10px;height:120px">
-								<!-- Notification UI -->
-                                                                        <DIV id="addTaskAlarmUI" style="display:block;wid
-th:100%">
-									<table width="100%" cellpadding="5" cellspacing="0" border="0">
-										<tr>
-											<td width="30%" align=right><b>{$MOD.LBL_SENDNOTIFICATION}</b></td>
-											<td width="70%" align=left>{$ACTIVITYDATA.sendnotification}</td>
-										</tr>
-                                                                        </table>
-                                                                        </DIV>
-									<div id="addTaskRelatedtoUI" style="display:none;width:100%">
-                                                                        <table width="100%" cellpadding="5" cellspacing="0" border="0">
-                                                                                <tr>
-                                                                                        <td width="30%" align=right><b>{$LABEL.parent_id}</b></td>
-                                                                                        <td width="70%" align=left>{$ACTIVITYDATA.parent_name}</td>
-                                                                                </tr>
-                                                                                <tr>
-                                                                                        <td align=right><b>{$MOD.LBL_CONTACT_NAME}</b></td>
-                                                                                        <td align=left>{$ACTIVITYDATA.contact_id}</td>
-                                                                                </tr>
-									</table>
-                                                                        </div>
-						  		</td>
-							</tr>
-                                                     </table>	
-						     {/if}
-
-                     	                      </td>
-					   </tr>
-                </tr>
-		<tr>
-			<td style="padding:10px">
-		           <table border=0 cellspacing=0 cellpadding=0 width=100%>
-				     {strip}<tr nowrap>
-							<td  colspan=4 style="padding:5px">
-								{if $EDIT_DUPLICATE eq 'permitted'}
-                                                                <input title="{$APP.LBL_EDIT_BUTTON_TITLE}" accessKey="{$APP.LBL_EDIT_BUTTON_KEY}" class="crmbutton small edit" onclick="this.form.return_module.value='{$MODULE}'; this.form.return_action.value='DetailView'; this.form.return_id.value='{$ID}';this.form.module.value='{$MODULE}';this.form.action.value='EditView'" type="submit" name="Edit" value="&nbsp;{$APP.LBL_EDIT_BUTTON_LABEL}&nbsp;">&nbsp;
-                                                                <input title="{$APP.LBL_DUPLICATE_BUTTON_TITLE}" accessKey="{$APP.LBL_DUPLICATE_BUTTON_KEY}" class="crmbutton small create" onclick="this.form.return_module.value='{$MODULE}'; this.form.return_action.value='DetailView'; this.form.isDuplicate.value='true';this.form.module.value='{$MODULE}'; this.form.action.value='EditView'" type="submit" name="Duplicate" value="{$APP.LBL_DUPLICATE_BUTTON_LABEL}">&nbsp;
-                                                                {/if}
-								{if $DELETE eq 'permitted'}
-                                                                <input title="{$APP.LBL_DELETE_BUTTON_TITLE}" accessKey="{$APP.LBL_DELETE_BUTTON_KEY}" class="crmbutton small delete" onclick="this.form.return_module.value='{$MODULE}'; this.form.return_action.value='index'; this.form.action.value='Delete'; return confirm('{$APP.NTC_DELETE_CONFIRMATION}')" type="submit" name="Delete" value="{$APP.LBL_DELETE_BUTTON_LABEL}">&nbsp;
-                                                                {/if}
-
-							</td>
-					</tr>{/strip}
-			   </table>
-			</td>
-		</tr>
-	</table>
-	</td>
-	<td width=22% valign=top style="border-left:2px dashed #cccccc;padding:13px">
-						<!-- right side relevant info -->
-
-		<!-- Add Tag link added just above the tag cloud image -->
-		<table border=0 cellspacing=0 cellpadding=5 width=100% >
-		<tr>
-			<td align="left" class="genHeaderSmall"  nowrap><div id="addtagdiv"><a href="javascript:;" onClick="show('tagdiv'),fnhide('addtagdiv'),document.getElementById('txtbox_tagfields').focus()"><b>{$APP.LBL_ADD_TAG}</b></a></div><div id="tagdiv" style="display:none;"><input class="textbox"  type="text" id="txtbox_tagfields" name="textbox_First Name" value=""></input>&nbsp;&nbsp;<input name="button_tagfileds" type="button" class="crmbutton small save" value="{$APP.LBL_TAG_IT}" onclick="return tagvalidate()"/><input name="close" type="button" class="crmbutton small cancel" value="{$APP.LBL_CLOSE}" onClick="fnhide('tagdiv'),show('addtagdiv')"></div></td>
-		</tr>
-		</table>
-		<br>
-		<!-- Eng Add Tag Link -->
-		<!-- Tag cloud display -->
-		<table border=0 cellspacing=0 cellpadding=0 width=100% class="tagCloud">
-		<tr>
-			<td class="tagCloudTopBg"><img src="{$IMAGE_PATH}tagCloudName.gif" border=0></td>
-		</tr>
-		<tr>
-			<td class="tagCloudDisplay" valign=top> <span id="tagfields">{$ALL_TAG}</span></td>
-		</tr>
-		</table>
-		<!-- End Tag cloud display -->
-			<!-- Mail Merge-->
-				<br>
-				{if $MERGEBUTTON eq 'permitted'}
-  				<table border=0 cellspacing=0 cellpadding=0 width=100% class="rightMailMerge">
-      				<tr>
-      					   <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>
-      				</tr>
-  				</table>
-				{/if}
-			</td>
-		</tr>
-		</table>
-		
-			
-			
-		
-		</div>
-		<!-- PUBLIC CONTENTS STOPS-->
-	</td>
-</tr>
-</table>
-
-{if $MODULE eq 'Products'}
-<script language="JavaScript" type="text/javascript" src="modules/Products/Productsslide.js"></script>
-<script language="JavaScript" type="text/javascript">Carousel();</script>
-{/if}
-
-<script>
-function getTagCloud()
-{ldelim}
-new Ajax.Request(
-        'index.php',
-        {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
-        method: 'post',
-        postBody: 'module={$MODULE}&action={$MODULE}Ajax&file=TagCloud&ajxaction=GETTAGCLOUD&recordid={$ID}',
-        onComplete: function(response) {ldelim}
-                                $("tagfields").innerHTML=response.responseText;
-                                $("txtbox_tagfields").value ='';
-                        {rdelim}
-        {rdelim}
-);
-{rdelim}
-getTagCloud();
-</script>
-<!-- added for validation -->
-<script language="javascript">
-  var fieldname = new Array({$VALIDATION_DATA_FIELDNAME});
-  var fieldlabel = new Array({$VALIDATION_DATA_FIELDLABEL});
-  var fielddatatype = new Array({$VALIDATION_DATA_FIELDDATATYPE});
-</script>
-</td>
-
-</tr></table></form>
-</td></tr></table>
-</td></tr></table>
-</td></tr></table>
-        </td></tr></table>
-        </td></tr></table>
-        </div>
-        </td>
-        <td valign=top><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
-        </tr>
-        </table>
-
-
+{*<!--
+
+/*********************************************************************************
+** 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.
+*
+ ********************************************************************************/
+
+-->*}
+<script type="text/javascript" src="modules/{$MODULE}/Activity.js"></script>
+<script type="text/javascript" src="include/js/reflection.js"></script>
+<script src="include/scriptaculous/prototype.js" type="text/javascript"></script>
+<script src="include/scriptaculous/scriptaculous.js" type="text/javascript"></script>
+<script language="JavaScript" type="text/javascript" src="include/js/dtlviewajax.js"></script>
+<span id="crmspanid" style="display:none;position:absolute;"  onmouseover="show('crmspanid');">
+   <a class="link"  align="right" href="javascript:;">{$APP.LBL_EDIT_BUTTON}</a>
+</span>
+
+<script>
+function tagvalidate()
+{ldelim}
+	if(document.getElementById('txtbox_tagfields').value != '')
+		SaveTag('txtbox_tagfields','{$ID}','{$MODULE}');	
+	else
+	{ldelim}
+		alert("Please enter a tag");
+		return false;
+	{rdelim}
+{rdelim}
+function DeleteTag(id)
+{ldelim}
+	$("vtbusy_info").style.display="inline";
+	Effect.Fade('tag_'+id);
+	new Ajax.Request(
+		'index.php',
+                {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+                        method: 'post',
+                        postBody: "file=TagCloud&module={$MODULE}&action={$MODULE}Ajax&ajxaction=DELETETAG&tagid=" +id,
+                        onComplete: function(response) {ldelim}
+						getTagCloud();
+						$("vtbusy_info").style.display="none";
+                        {rdelim}
+                {rdelim}
+        );
+{rdelim}
+</script>
+<table width="100%" cellpadding="2" cellspacing="0" border="0">
+<form action="index.php" method="post" name="DetailView" id="form">
+<tr><td>&nbsp;</td>
+	<td>
+                <table cellpadding="0" cellspacing="5" border="0">
+			{include file='DetailViewHidden.tpl'}
+		</table>	
+
+<!-- Contents -->
+<table  border="0" cellpadding="5" cellspacing="0" width="100%" >
+<tr>
+	<td class="lvtHeaderText" style="border-bottom:1px dotted #cccccc">
+	
+		<table align="center" border="0" cellpadding="0" cellspacing="0" width="95%">
+			<tr><td>		
+				 <span class="lvtHeaderText"><font color="purple">[ {$ID} ] </font>{$NAME} -  {$SINGLE_MOD} {$APP.LBL_INFORMATION}</span>&nbsp;&nbsp;<span id="vtbusy_info" style="display:none;" valign="bottom"><img src="{$IMAGE_PATH}vtbusy.gif" border="0"></span><span id="vtbusy_info" style="visibility:hidden;" valign="bottom"><img src="{$IMAGE_PATH}vtbusy.gif" border="0"></span></td><td>&nbsp;
+			</td></tr>
+			 <tr height=20><td class=small>{$UPDATEINFO}</td></tr>
+		 </table>
+	</td>
+</tr>
+<tr><td>
+<table border="0" cellpadding="0" cellspacing="0" width="100%">
+	<tr>
+		<td valign=top align=left >
+                           <table border=0 cellspacing=0 cellpadding=3 width=100%>
+				<tr>
+					<td align=left>
+					<!-- content cache -->
+					
+					<table border=0 cellspacing=0 cellpadding=0 width=100%>
+			                  <tr>
+					     <td style="padding:3px">
+						     <!-- General details -->
+				                     <table border=0 cellspacing=0 cellpadding=0 width=100%>
+						     <tr nowrap>
+							<td  colspan=4 style="padding:5px">
+								{if $EDIT_DUPLICATE eq 'permitted'}
+                                                                <input title="{$APP.LBL_EDIT_BUTTON_TITLE}" accessKey="{$APP.LBL_EDIT_BUTTON_KEY}" class="crmbutton small edit" onclick="this.form.return_module.value='{$MODULE}'; this.form.return_action.value='DetailView'; this.form.return_id.value='{$ID}';this.form.module.value='{$MODULE}';this.form.action.value='EditView'" type="submit" name="Edit" value="&nbsp;{$APP.LBL_EDIT_BUTTON_LABEL}&nbsp;">&nbsp;
+								{/if}
+							</td>
+							<td width=50% align=right>
+							{if $EDIT_DUPLICATE eq 'permitted'}
+                                                                <input title="{$APP.LBL_DUPLICATE_BUTTON_TITLE}" accessKey="{$APP.LBL_DUPLICATE_BUTTON_KEY}" class="crmbutton small create" onclick="this.form.return_module.value='{$MODULE}'; this.form.return_action.value='DetailView'; this.form.isDuplicate.value='true';this.form.module.value='{$MODULE}'; this.form.action.value='EditView'" type="submit" name="Duplicate" value="{$APP.LBL_DUPLICATE_BUTTON_LABEL}">&nbsp;
+                                                        {/if}
+							{if $DELETE eq 'permitted'}
+                                                                <input title="{$APP.LBL_DELETE_BUTTON_TITLE}" accessKey="{$APP.LBL_DELETE_BUTTON_KEY}" class="crmbutton small delete" onclick="this.form.return_module.value='{$MODULE}'; {if $VIEWTYPE eq 'calendar'} this.form.return_action.value='index'; {else} this.form.return_action.value='ListView'; {/if}  this.form.action.value='Delete'; return confirm('{$APP.NTC_DELETE_CONFIRMATION}')" type="submit" name="Delete" value="{$APP.LBL_DELETE_BUTTON_LABEL}">&nbsp;
+                                                         {/if}
+
+							</td>
+						     </tr>
+						     </table>
+						     {foreach key=header item=detail from=$BLOCKS}
+						     <table border=0 cellspacing=0 cellpadding=5 width=100% class="small">
+						     	<tr>{strip}
+						     		<td colspan=4 class="tableHeading">
+									<b>{$header}</b>
+								</td>{/strip}
+					             	</tr>
+						     </table>
+						     {/foreach}
+						     {if $ACTIVITYDATA.activitytype neq 'Task'}	
+							 <!-- display of fields starts -->
+						     <table border=0 cellspacing=0 cellpadding=5 width=100% >
+               						 <tr>
+								<td class="cellLabel" width="20%" align="right"><b>{$MOD.LBL_EVENTTYPE}</b></td>
+								<td class="cellInfo" width="30%"align="left">{$ACTIVITYDATA.activitytype}</td>
+								<td class="cellLabel" width="20%" align="right"><b>{$LABEL.visibility}</b></td>
+                                                                <td class="cellInfo" width="30%" align="left" >{$ACTIVITYDATA.visibility}</td>
+							 </tr>
+							 <tr>
+                        					<td class="cellLabel" align="right"><b>{$MOD.LBL_EVENTNAME}</b></td>
+					                        <td class="cellInfo" colspan=3 align="left" >{$ACTIVITYDATA.subject}</td>
+             						 </tr>
+							 <tr>
+								<td class="cellLabel" align="right" nowrap valign="top"><b>{$LABEL.description}</b></td>
+								<td class="cellInfo" valign="top" align="left" colspan="3" height="60px">{$ACTIVITYDATA.description}</td>
+							 </tr>
+							 <tr>
+								<td class="cellLabel" align="right" nowrap valign="top"><b>{$LABEL.eventstatus}</b></td>
+								<td class="cellInfo" align="left" nowrap valign="top">{$ACTIVITYDATA.eventstatus}</td>
+								<td class="cellLabel" align="right" nowrap valign="top"><b>{$LABEL.assigned_user_id}</b></td>
+								<td class="cellInfo" align="left" nowrap valign="top">{$ACTIVITYDATA.assigned_user_id}</td>
+                                                         </tr>
+							 <tr>
+                                                                <td class="cellLabel" align="right" nowrap valign="top"><b>{$LABEL.taskpriority}</b></td>
+                                                                <td class="cellInfo" align="left" nowrap valign="top">{$ACTIVITYDATA.taskpriority}</td>
+                                                                <td class="cellLabel" align="right" nowrap valign="top"><b>{$LABEL.sendnotification}</b></td>
+                                                                <td class="cellInfo" align="left" nowrap valign="top">{$ACTIVITYDATA.sendnotification}</td>
+                                                         </tr>
+                                                         <tr>
+                                                                <td class="cellLabel" align="right" nowrap valign="top"align="right"><b>{$LABEL.createdtime}</b></td>
+                                                                <td class="cellInfo" align="left" nowrap valign="top">{$ACTIVITYDATA.createdtime}</td>
+                                                                <td class="cellLabel" align="right" nowrap valign="top"align="right"><b>{$LABEL.modifiedtime}</b></td>
+                                                                <td class="cellInfo" align="left" nowrap valign="top">{$ACTIVITYDATA.modifiedtime}</td>
+                                                         </tr>
+						     </table>
+						     <table border=0 cellspacing=1 cellpadding=0 width=100%>
+							<tr><td width=50% valign=top >
+								<table border=0 cellspacing=0 cellpadding=2 width=100%>
+                                                                        <tr><td class="mailSubHeader"><b>{$MOD.LBL_EVENTSTAT}</b></td></tr>
+                                                                        <tr><td class=small>{$ACTIVITYDATA.starthr}:{$ACTIVITYDATA.startmin}{$ACTIVITYDATA.startfmt}</td></tr>
+                                                                        <tr><td class=small>{$ACTIVITYDATA.date_start}</td></tr>
+                                                                </table></td>
+							<td width=50% valign=top >
+                                                                <table border=0 cellspacing=0 cellpadding=2 width=100%>
+                                                                        <tr><td  class="mailSubHeader"><b>{$MOD.LBL_EVENTEDAT}</b></td></tr>
+                                                                        <tr><td class=small>{$ACTIVITYDATA.endhr}:{$ACTIVITYDATA.endmin}{$ACTIVITYDATA.endfmt}</td></tr>
+                                                                        <tr><td class=small>{$ACTIVITYDATA.due_date}</td></tr>
+                                                                </table>
+                                                        </td></tr>
+                                                     </table>
+						     <br>
+					             <table border=0 cellspacing=0 cellpadding=0 width=100% align=center>
+                					 <tr>
+                        					<td>
+                         				        	<table border=0 cellspacing=0 cellpadding=3 width=100%>
+                             						<tr>
+                                        					<td class="dvtTabCache" style="width:10px" nowrap>&nbsp;</td>
+					                                        <td id="cellTabInvite" class="dvtSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabInvite','on');switchClass('cellTabAlarm','off');switchClass('cellTabRepeat','off');switchClass('cellTabRelatedto','off');ghide('addEventAlarmUI');dispLayer('addEventInviteUI');ghide('addEventRepeatUI');ghide('addEventRelatedtoUI');">{$MOD.LBL_INVITE}</a></td>
+										<td class="dvtTabCache" style="width:10px">&nbsp;</td>
+										<td id="cellTabAlarm" class="dvtUnSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabInvite','off');switchClass('cellTabAlarm','on');switchClass('cellTabRepeat','off');switchClass('cellTabRelatedto','off');dispLayer('addEventAlarmUI');ghide('addEventInviteUI');ghide('addEventRepeatUI');ghide('addEventRelatedtoUI');">{$MOD.LBL_REMINDER}</a></td>
+										<td class="dvtTabCache" style="width:10px">&nbsp;</td>
+										<td id="cellTabRepeat" class="dvtUnSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabInvite','off');switchClass('cellTabAlarm','off');switchClass('cellTabRepeat','on');switchClass('cellTabRelatedto','off');ghide('addEventAlarmUI');ghide('addEventInviteUI');dispLayer('addEventRepeatUI');ghide('addEventRelatedtoUI');">{$MOD.LBL_REPEAT}</a></td>
+										<td class="dvtTabCache" style="width:10px">&nbsp;</td>
+										<td id="cellTabRelatedto" class="dvtUnSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabInvite','off');switchClass('cellTabAlarm','off');switchClass('cellTabRepeat','off');switchClass('cellTabRelatedto','on');ghide('addEventAlarmUI');ghide('addEventInviteUI');dispLayer('addEventRelatedtoUI');ghide('addEventRepeatUI');">{$MOD.LBL_LIST_RELATED_TO}</a></td>
+										<td class="dvtTabCache" style="width:100%">&nbsp;</td>
+									</tr>
+									</table>
+								</td>
+							 </tr>
+							
+							 <tr>
+								<td width=100% valign=top align=left class="dvtContentSpace" style="padding:10px;height:120px">
+									<!-- Invite UI -->
+									<DIV id="addEventInviteUI" style="display:block;width:100%">
+									<table width="100%" cellpadding="5" cellspacing="0" border="0">
+										<tr>
+                                                                                        <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>
+                                                                                                {/foreach}
+											</td>
+                                                                                </tr>
+									</table>
+									</DIV>
+									<!-- Reminder UI -->
+					                                <DIV id="addEventAlarmUI" style="display:none;width:100%">
+									<table width="100%" cellpadding="5" cellspacing="0" border="0">
+                                                                                <tr>
+                                                                                        <td width="30%" align=right><b>{$MOD.LBL_SENDREMINDER}</b></td>
+                                                                                        <td width="70%" align=left>{$ACTIVITYDATA.set_reminder}</td>
+                                                                                </tr>
+										{if $ACTIVITYDATA.set_reminder != 'No'}
+										<tr>
+                                                                                        <td width="30%" align=right><b>{$MOD.LBL_RMD_ON}</b></td>
+											<td width="70%" align=left>{$ACTIVITYDATA.reminder_str}</td>
+										</tr>
+										{/if}
+                                                                        </table>
+									</DIV>
+									<!-- Repeat UI -->
+                                					<div id="addEventRepeatUI" style="display:none;width:100%">
+									<table width="100%" cellpadding="5" cellspacing="0" border="0">
+										<tr>
+                                                                                        <td width="30%" align=right><b>{$MOD.LBL_ENABLE_REPEAT}</b></td>
+                                                                                        <td width="70%" align=left>{$ACTIVITYDATA.recurringcheck}</td>
+                                                                                </tr>
+										{if $ACTIVITYDATA.recurringcheck != 'No'}
+										<tr>
+											<td width="30%" align=right>&nbsp;</td>
+											<td>{$MOD.LBL_REPEATEVENT}&nbsp;{$ACTIVITYDATA.repeat_frequency}&nbsp;{$MOD[$ACTIVITYDATA.recurringtype]}</td>
+										</tr>
+										<tr>
+                                                                                        <td width="30%" align=right>&nbsp;</td>
+                                                                                        <td>{$ACTIVITYDATA.repeat_str}</td>
+                                                                                </tr>
+										{/if}
+									</table>
+									</div>
+									<!-- Relatedto UI -->
+									<div id="addEventRelatedtoUI" style="display:none;width:100%">
+									<table width="100%" cellpadding="5" cellspacing="0" border="0">
+										<tr>
+											<td width="30%" align=right valign="top"><b>{$LABEL.parent_id}</b></td>
+											<td width="70%" align=left valign="top">{$ACTIVITYDATA.parent_name}</td>
+										</tr>
+										<tr>
+											<td width="30%" valign="top" align=right><b>{$MOD.LBL_CONTACT_NAME}</b></td>	
+											<td width="70%" valign="top" align=left>
+											{foreach item=contactname key=cntid from=$CONTACTS}
+	                                                                                {$contactname.0}&nbsp;{$contactname.1}<br>
+                                                                                        {/foreach}
+										</tr>
+									</table>
+									</div>
+								</td>
+                					 </tr>
+						     </table>
+						    {else}
+							<!-- detailed view of a ToDo -->
+					 	     <table border="0" cellpadding="5" cellspacing="0" width="100%">
+							<tr>
+								<td class="cellLabel" width="20%" align="right"><b>{$MOD.LBL_TODO}</b></td>
+								<td class="cellInfo" width="80%" align="left">{$ACTIVITYDATA.subject}</td>
+							</tr>
+							<tr>
+								<td class="cellLabel" align="right" valign="top"><b>{$LABEL.description}</b></td>
+                                                                <td class="cellInfo" align="left" colspan="3" valign="top" height="60px">{$ACTIVITYDATA.description}</td>
+                					</tr>
+							<tr>
+                        					<td colspan="2" align="center" style="padding:0px">
+                                				<table border="0" cellpadding="5" cellspacing="1" width="100%" >
+                                       					<tr>
+                                                				<td class="cellLabel" width=33% align="left"><b>{$LABEL.taskstatus}</b></td>
+										<td class="cellLabel" width=33% align="left"><b>{$LABEL.taskpriority}</b></td>
+										<td class="cellLabel" width=34% align="left"><b>{$LABEL.assigned_user_id}</b></td>
+									</tr>
+									<tr>
+                                                				<td class="cellInfo" align="left" valign="top">{$ACTIVITYDATA.taskstatus}</td>
+										<td class="cellInfo" align="left" valign="top">{$ACTIVITYDATA.taskpriority}</td>
+										<td class="cellInfo" align="left" valign="top">{$ACTIVITYDATA.assigned_user_id}</td>
+									</tr>
+								</table>
+								</td>
+							</tr>
+						     </table>
+						     <table border="0" cellpadding="0" cellspacing="0" width="100%" align=center>
+	                                                <tr><td width=50% valign=top >
+								<table border=0 cellspacing=0 cellpadding=2 width=100% align=center>
+									<tr><td class="mailSubHeader" align=left ><b>{$MOD.LBL_TIMEDATE}</b></td></tr>
+									<tr><td class="small" >{$ACTIVITYDATA.starthr}:{$ACTIVITYDATA.startmin}{$ACTIVITYDATA.startfmt}</td></tr>
+									<tr><td class="cellInfo" style="padding-left:0px">{$ACTIVITYDATA.date_start}</td></tr>
+								</table>
+							</td>
+							<td width=50% valign="top">
+								<table border=0 cellspacing=0 cellpadding=2 width=100% align=center>
+									<tr><td class="mailSubHeader"><b>{$LABEL.due_date}</b></td></tr>
+									<tr><td class="small">{$ACTIVITYDATA.due_date}</td></tr>
+									<tr><td class="cellInfo">&nbsp;</td></tr>
+								</table>
+							</td>
+						     </table>
+						     <table border=0 cellspacing=0 cellpadding=5 width=100% >
+							<tr>
+								<td class="cellLabel" align=right nowrap width=20%><b>{$LABEL.createdtime}</b></td>
+                                                                <td class="cellInfo" align=left nowrap width=30%>{$ACTIVITYDATA.createdtime}</td>
+                                                                <td class="cellLabel" align=right nowrap width=20%><b>{$LABEL.modifiedtime}</b></td>
+                                                                <td class="cellInfo" align=left  nowrap width=30%>{$ACTIVITYDATA.modifiedtime}</td>
+                                                        </tr>
+                                                     </table>
+						     <br>
+						     <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%">
+							<tr>
+								<td>
+									<table border="0" cellpadding="3" cellspacing="0" width="100%">
+									<tr>
+										<td class="dvtTabCache" style="width: 10px;" nowrap="nowrap">&nbsp;</td>
+                                                                                <td id="cellTabInvite" class="dvtSelectedCell" align="center" nowrap="nowrap"><a href="javascript:doNothing()" onClick="switchClass('cellTabInvite','on');switchClass('cellTabRelatedto','off');dispLayer('addTaskAlarmUI');ghide('addTaskRelatedtoUI');">{$MOD.LBL_NOTIFICATION}</td></a>
+										<td class="dvtTabCache" style="width: 10px;" nowrap="nowrap">&nbsp;
+                                                                                <td id="cellTabRelatedto" class="dvtUnSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabInvite','off');switchClass('cellTabRelatedto','on');dispLayer('addTaskRelatedtoUI');ghide('addTaskAlarmUI');">{$MOD.LBL_RELATEDTO}</a></td>
+
+                                                                                <td class="dvtTabCache" style="width: 100%;">&nbsp;</td>
+									</tr>
+									</table>
+								</td>
+							</tr>
+							<tr>
+								<td width=100% valign=top align=left class="dvtContentSpace" style="padding:10px;height:120px">
+                                                                <!-- Notification UI -->
+                                                                        <DIV id="addTaskAlarmUI" style="display:block;width:100%">
+                                                                        <table width="100%" cellpadding="5" cellspacing="0" border="0">
+                                                                                <tr>
+                                                                                        <td width="30%" align=right><b>{$MOD.LBL_SENDNOTIFICATION}</b></td>
+                                                                                        <td width="70%" align=left>{$ACTIVITYDATA.sendnotification}</td>
+                                                                                </tr>
+                                                                        </table>
+                                                                        </DIV>
+									<div id="addTaskRelatedtoUI" style="display:none;width:100%">
+                                                                        <table width="100%" cellpadding="5" cellspacing="0" border="0">
+                                                                                <tr>
+                                                                                        <td width="30%" align=right><b>{$LABEL.parent_id}</b></td>
+                                                                                        <td width="70%" align=left>{$ACTIVITYDATA.parent_name}</td>
+                                                                                </tr>
+                                                                                <tr>
+                                                                                        <td align=right><b>{$MOD.LBL_CONTACT_NAME}</b></td>
+                                                                                        <td align=left>{$ACTIVITYDATA.contact_id}</td>
+                                                                                </tr>
+                                                                        </table>
+                                                                        </div>
+								</td>
+							</tr>
+						     </table>
+						     {/if}
+
+                     	                      </td>
+					   </tr>
+                </tr>
+		<tr>
+			<td style="padding:10px">
+		           <table border=0 cellspacing=0 cellpadding=0 width=100%>
+				     {strip}<tr nowrap>
+							<td  colspan=4 style="padding:5px">
+								{if $EDIT_DUPLICATE eq 'permitted'}
+                                                                <input title="{$APP.LBL_EDIT_BUTTON_TITLE}" accessKey="{$APP.LBL_EDIT_BUTTON_KEY}" class="crmbutton small edit" onclick="this.form.return_module.value='{$MODULE}'; this.form.return_action.value='DetailView'; this.form.return_id.value='{$ID}';this.form.module.value='{$MODULE}';this.form.action.value='EditView'" type="submit" name="Edit" value="&nbsp;{$APP.LBL_EDIT_BUTTON_LABEL}&nbsp;">&nbsp;
+								{/if}
+							</td>
+							<td align=right>
+								{if $EDIT_DUPLICATE eq 'permitted'}
+                                                                <input title="{$APP.LBL_DUPLICATE_BUTTON_TITLE}" accessKey="{$APP.LBL_DUPLICATE_BUTTON_KEY}" class="crmbutton small create" onclick="this.form.return_module.value='{$MODULE}'; this.form.return_action.value='DetailView'; this.form.isDuplicate.value='true';this.form.module.value='{$MODULE}'; this.form.action.value='EditView'" type="submit" name="Duplicate" value="{$APP.LBL_DUPLICATE_BUTTON_LABEL}">&nbsp;
+                                                                {/if}
+								{if $DELETE eq 'permitted'}
+                                                                <input title="{$APP.LBL_DELETE_BUTTON_TITLE}" accessKey="{$APP.LBL_DELETE_BUTTON_KEY}" class="crmbutton small delete" onclick="this.form.return_module.value='{$MODULE}'; this.form.return_action.value='index'; this.form.action.value='Delete'; return confirm('{$APP.NTC_DELETE_CONFIRMATION}')" type="submit" name="Delete" value="{$APP.LBL_DELETE_BUTTON_LABEL}">&nbsp;
+                                                                {/if}
+
+							</td>
+					</tr>{/strip}
+			   </table>
+			</td>
+		</tr>
+	</table>
+	</td>
+	<td width=22% valign=top style="border-left:2px dashed #cccccc;padding:13px">
+						<!-- right side relevant info -->
+
+		<!-- Add Tag link added just above the tag cloud image -->
+		<table border=0 cellspacing=0 cellpadding=5 width=100% >
+		<tr>
+			<td align="left" class="genHeaderSmall"  nowrap><div id="addtagdiv"><a href="javascript:;" onClick="show('tagdiv'),fnhide('addtagdiv'),document.getElementById('txtbox_tagfields').focus()"><b>{$APP.LBL_ADD_TAG}</b></a></div><div id="tagdiv" style="display:none;"><input class="textbox"  type="text" id="txtbox_tagfields" name="textbox_First Name" value=""></input>&nbsp;&nbsp;<input name="button_tagfileds" type="button" class="crmbutton small save" value="{$APP.LBL_TAG_IT}" onclick="return tagvalidate()"/><input name="close" type="button" class="crmbutton small cancel" value="{$APP.LBL_CLOSE}" onClick="fnhide('tagdiv'),show('addtagdiv')"></div></td>
+		</tr>
+		</table>
+		<br>
+		<!-- Eng Add Tag Link -->
+		<!-- Tag cloud display -->
+		<table border=0 cellspacing=0 cellpadding=0 width=100% class="tagCloud">
+		<tr>
+			<td class="tagCloudTopBg"><img src="{$IMAGE_PATH}tagCloudName.gif" border=0></td>
+		</tr>
+		<tr>
+			<td class="tagCloudDisplay" valign=top> <span id="tagfields">{$ALL_TAG}</span></td>
+		</tr>
+		</table>
+		<!-- End Tag cloud display -->
+			<!-- Mail Merge-->
+				<br>
+				{if $MERGEBUTTON eq 'permitted'}
+  				<table border=0 cellspacing=0 cellpadding=0 width=100% class="rightMailMerge">
+      				<tr>
+      					   <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>
+      				</tr>
+  				</table>
+				{/if}
+			</td>
+		</tr>
+		</table>
+		
+			
+			
+		
+		</div>
+		<!-- PUBLIC CONTENTS STOPS-->
+	</td>
+</tr>
+</table>
+
+{if $MODULE eq 'Products'}
+<script language="JavaScript" type="text/javascript" src="modules/Products/Productsslide.js"></script>
+<script language="JavaScript" type="text/javascript">Carousel();</script>
+{/if}
+
+<script>
+function getTagCloud()
+{ldelim}
+new Ajax.Request(
+        'index.php',
+        {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+        method: 'post',
+        postBody: 'module={$MODULE}&action={$MODULE}Ajax&file=TagCloud&ajxaction=GETTAGCLOUD&recordid={$ID}',
+        onComplete: function(response) {ldelim}
+                                $("tagfields").innerHTML=response.responseText;
+                                $("txtbox_tagfields").value ='';
+                        {rdelim}
+        {rdelim}
+);
+{rdelim}
+getTagCloud();
+</script>
+<!-- added for validation -->
+<script language="javascript">
+  var fieldname = new Array({$VALIDATION_DATA_FIELDNAME});
+  var fieldlabel = new Array({$VALIDATION_DATA_FIELDLABEL});
+  var fielddatatype = new Array({$VALIDATION_DATA_FIELDDATATYPE});
+</script>
+</td>
+
+</tr></table></form>
+</td></tr></table>
+</td></tr></table>
+</td></tr></table>
+        </td></tr></table>
+        </td></tr></table>
+        </div>
+        </td>
+        <td valign=top><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+        </tr>
+        </table>
+
+

Modified: vtigercrm/trunk/Smarty/templates/ActivityEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ActivityEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ActivityEditView.tpl Mon Sep 11 01:01:11 2006
@@ -1,831 +1,823 @@
-{*<!--
-
-/*********************************************************************************
-** 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}/Activity.js"></script>
-<script type="text/javascript">
-</script>
-
-{*<!-- Contents -->*}
-<table width="100%" cellpadding="2" cellspacing="0" border="0">
-<form name="EditView" method="POST" action="index.php">
-<input type="hidden" name="time_start" id="time_start">
-<tr><td>&nbsp;</td>
-        <td>
-                <table cellpadding="0" cellspacing="5" border="0">
-			{include file='EditViewHidden.tpl'}
-                </table>
-<table  border="0" cellpadding="5" cellspacing="0" width="100%" style="border:1px solid #cccccc">
-<tr>
-        <td class="lvtHeaderText" style="border-bottom:1px dotted #cccccc">
-
-                <table align="center" border="0" cellpadding="0" cellspacing="0" width="95%">
-                        <tr><td>
-		
-				{if $OP_MODE eq 'edit_view'}   
-					<span class="lvtHeaderText"><font color="purple">[ {$ID} ] </font>{$NAME} - {$APP.LBL_EDITING} {$SINGLE_MOD} {$APP.LBL_INFORMATION}</span> <br>
-					{$UPDATEINFO}	 
-				{/if}
-				{if $OP_MODE eq 'create_view'}
-					<span class="lvtHeaderText">{$APP.LBL_CREATING} {$SINGLE_MOD}</span> <br>
-				{/if}
-			</td></tr>
-		</table>
-        </td>
-</tr>
-<tr><td>
-<table border="0" cellpadding="5" cellspacing="0" width="100%">
-        <tr>
-                <td valign=top align=left >
-                           <table border=0 cellspacing=0 cellpadding=0 width=100%>
-                                <tr>
-					<td align=left>
-					<!-- content cache -->
-
-					<table border=0 cellspacing=0 cellpadding=0 width=100%>
-					  <tr>
-					     <td style="padding:10px">
-						     <!-- General details -->
-						     <table border=0 cellspacing=0 cellpadding=0 width=100% >
-						     <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" {if $ACTIVITY_MODE neq 'Task'} onclick="this.form.action.value='Save';  displaydeleted();return maincheck_form();"{else} onclick="this.form.action.value='Save';  displaydeleted(); maintask_check_form();return formValidate();" {/if} 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>
-						     <!-- included to handle the edit fields based on ui types -->
-						     {foreach key=header item=data from=$BLOCKS}
-						     <table border=0 cellspacing=0 cellpadding=0 width=100% class="small">
-						     <tr>
-							<td colspan=4 style="border-bottom:1px solid #999999;padding:5px;" bgcolor="#e5e5e5">
-								<b>{$header}</b>
-							</td>
-						     </tr>
-						     </table>
-						     {/foreach}
-						     {if $ACTIVITY_MODE neq 'Task'}
-							<input type="hidden" name="time_end" id="time_end">
-							<input type=hidden name="inviteesid" id="inviteesid" value="">
-							<input type="hidden" name="duration_hours" value="0">
-							<input type="hidden" name="duration_minutes" value="0">
-						     <table border=0 cellspacing=0 cellpadding=5 width=100% >
-							<tr>
-								<td nowrap  width=20% align="right"><b>{$MOD.LBL_EVENTTYPE}</b></td>
-								<td width=80% align="left">
-									<table>
-										<tr>
-										{foreach key=tyeparrkey item=typearr from=$ACTIVITYDATA.activitytype}
-                                                                                {foreach key=sel_value item=value from=$typearr}
-                                                                                {if $value eq 'selected' && $sel_value eq 'Meeting'}
-                                                                                        {assign var='meetcheck' value='checked'}
-                                                                                        {assign var='callcheck' value=''}
-                                                                                {else}
-                                                                                        {assign var='meetcheck' value=''}
-                                                                                        {assign var='callcheck' value='checked'}
-                                                                                {/if}
-                                                                                {/foreach}
-                                                                                {/foreach}
-											<td><input type="radio" name='activitytype' value='Call' style='vertical-align: middle;' {$callcheck}></td><td>{$APP.Call}</td><td style="width:10px">
-											<td><input type="radio" name='activitytype' value='Meeting' style='vertical-align: middle;' {$meetcheck}></td><td>{$APP.Meeting}</td><td style="width:20px">
-										</tr>
-									</table>
-								</td>
-							</tr>
-							<tr>
-								<td nowrap align="right"><b>{$MOD.LBL_EVENTNAME}</b></td>
-								<td align="left"><input name="subject" type="text" class="textbox" value="{$ACTIVITYDATA.subject}" style="width:50%">&nbsp;&nbsp;&nbsp;
-								{foreach key=key_one item=arr from=$ACTIVITYDATA.visibility}
-                                                                        {foreach key=sel_value item=value from=$arr}
-                                                                        {if $value eq 'selected' && $sel_value eq 'Public'}
-                                                                                {assign var="visiblecheck" value="checked"}
-                                                                        {else}
-                                                                                {assign var="visiblecheck" value=""}
-                                                                        {/if}
-                                                                        {/foreach}
-                                                                        {/foreach}
-                                                                        <input name="visibility" value="Public" type="checkbox" {$visiblecheck}>{$MOD.LBL_PUBLIC}
-								</td>
-							</tr>
-							<tr>
-                        					<td valign="top" nowrap align="right"><b>{$LABEL.description}</b></td>
-								<td align="left"><textarea style="width:100%; height : 60px;" name="description">{$ACTIVITYDATA.description}</textarea></td>
-                					</tr>
-							<tr>
-								<td valign="top" nowrap align="right"><b>{$LABEL.location}</b></td>
-								 <td align="left"><input type="text" class="textbox" name="location" id ="location" value="{$ACTIVITYDATA.location}" style="width:50%"></td>
-							</tr>
-							<tr>
-								<td colspan=2 width=80% align="center">
-                                				<table border=0 cellspacing=0 cellpadding=3 width=80%>
-                                        				<tr>
-										<td ><b>{$LABEL.eventstatus}</b></td>
-										<td ><b>{$LABEL.assigned_user_id}</b></td>
-									</tr>
-									<tr>
-										<td valign=top>
-                                                                                <select name="eventstatus" id="eventstatus" class=small>
-                                                                                        {foreach item=arr from=$ACTIVITYDATA.eventstatus}
-                                                                                        {foreach key=sel_value item=value from=$arr}
-                                                                                        <option value="{$sel_value}" {$value}>
-                                                                                                {if $APP[$sel_value] neq ''}
-                                                                                                {$APP[$sel_value]}
-                                                                                                {else}
-                                                                                                        {$sel_value}
-                                                                                                {/if}
-                                                                                        </option>
-                                                                                        {/foreach}
-                                                                                        {/foreach}
-                                                                                </select>
-                                                                        	</td>
-										<td valign=top rowspan=2>
-											{assign var=check value=1}
-                                        						{foreach key=key_one item=arr from=$ACTIVITYDATA.assigned_user_id}
-                                                					{foreach key=sel_value item=value from=$arr}
-                                                        					{if $value ne ''}
-                                                                					{assign var=check value=$check*0}
-                                                        					{else}
-                                                                					{assign var=check value=$check*1}
-                                                        					{/if}
-                                                					{/foreach}
-                                        						{/foreach}
-
-                                        						{if $check eq 0}
-                                                						{assign var=select_user value='checked'}
-                                                						{assign var=style_user value='display:block'}
-                                                						{assign var=style_group value='display:none'}
-                                        						{else}
-                                                						{assign var=select_group value='checked'}
-                                                						{assign var=style_user value='display:none'}
-                                                						{assign var=style_group value='display:block'}
-                                        						{/if}
-                                        						<input type="radio" name="assigntype" {$select_user} value="U" onclick="toggleAssignType(this.value)">&nbsp;{$APP.LBL_USER}
-                                        						{if $secondvalue.assigned_user_id neq ''}
-                                                					<input type="radio" name="assigntype" {$select_group} value="T" onclick="toggleAssignType(this.value)">&nbsp;{$APP.LBL_GROUP}
-                                        						{/if}
-											<span id="assign_user" style="{$style_user}">
-                                     				           			<select name="assigned_user_id">
-                                                        					{foreach key=key_one item=arr from=$ACTIVITYDATA.assigned_user_id}
-                                                                				{foreach key=sel_value item=value from=$arr}
-                                                                        				<option value="{$key_one}" {$value}>{$sel_value}</option>
-                                                                				{/foreach}
-                                                        					{/foreach}
-                                                			   			</select>
-                                        			       			</span>
-
-                                        						{if $secondvalue.assigned_user_id neq ''}
-                                                					<span id="assign_team" style="{$style_group}">
-                                                        					<select name="assigned_group_name" >';
-                                                                				{foreach key=key_one item=arr from=$secondvalue.assigned_user_id}
-                                                                        			{foreach key=sel_value item=value from=$arr}
-                                                                                			<option value="{$sel_value}" {$value}>{$sel_value}</option>
-                                                                        			{/foreach}
-                                                                				{/foreach}
-                                                        					</select>
-                                                					</span>
-                                        						{/if}
-											<br><input type="checkbox" name="sendnotification" >&nbsp;{$LABEL.sendnotification}
-										</td>
-									</tr>
-									<tr>
-										<td valign=top><b>{$LABEL.taskpriority}</b>
-										<br>
-										<select name="taskpriority" id="taskpriority">
-                                                                                        {foreach item=arr from=$ACTIVITYDATA.taskpriority}
-                                                                                        {foreach key=sel_value item=value from=$arr}
-                                                                                        <option value="{$sel_value}" {$value}>
-                                                                                                {if $APP[$sel_value] neq ''}
-                                                                                                {$APP[$sel_value]}
-                                                                                                {else}
-                                                                                                        {$sel_value}
-                                                                                                {/if}
-                                                                                        </option>
-                                                                                        {/foreach}
-                                                                                        {/foreach}
-                                                                                </select>
-										</td> 
-										
-									</tr>
-								</table>
-							</td></tr>
-						     </table>
-						     <hr noshade size=1>
-						     <table border=0 cellspacing=0 cellpadding=5 width=90% align=center bgcolor="#FFFFFF">
-							<tr>
-								<td >
-									<table border=0 cellspacing=0 cellpadding=2 width=100% align=center>
-									<tr><td width=50% valign=top style="border-right:1px solid #dddddd">
-										<table border=0 cellspacing=0 cellpadding=2 width=90% align=center>
-											<tr><td colspan=3 ><b>{$MOD.LBL_EVENTSTAT}</b></td></tr>
-											<tr><td colspan=3>{$STARTHOUR}</td></tr>
-											<tr><td>
-												{foreach key=date_value item=time_value from=$ACTIVITYDATA.date_start}
-                                                                                                        {assign var=date_val value="$date_value"}
-                                                                                                        {assign var=time_val value="$time_value"}
-	                                                                                        {/foreach}
-                                                                                                <input type="text" name="date_start" id="jscal_field_date_start" class="textbox" style="width:90px" value="{$date_val}"></td><td width=100%><img border=0 src="{$IMAGE_PATH}btnL3Calendar.gif" alt="Set date.." title="Set date.." id="jscal_trigger_date_start">
-													{foreach key=date_fmt item=date_str from=$secondvalue.date_start}
-													{assign var=date_vl value="$date_fmt"}
-													{/foreach}
-													<script type="text/javascript">
-														Calendar.setup ({ldelim}
-														inputField : "jscal_field_date_start", ifFormat : "{$date_vl}", showsTime : false, button : "jscal_trigger_date_start", singleClick : true, step : 1
-														{rdelim})
-													</script>
-											</td></tr>
-										</table></td>
-										<td width=50% valign=top >
-											<table border=0 cellspacing=0 cellpadding=2 width=90% align=center>
-												<tr><td colspan=3><b>{$MOD.LBL_EVENTEDAT}</b></td></tr>
-												<tr><td colspan=3>{$ENDHOUR}
-												</td></tr>
-												<tr><td>
-													{foreach key=date_value item=time_value from=$ACTIVITYDATA.due_date}
-													{assign var=date_val value="$date_value"}
-													{assign var=time_val value="$time_value"}
-													{/foreach}
-													<input type="text" name="due_date" id="jscal_field_due_date" class="textbox" style="width:90px" value="{$date_val}"></td><td width=100%><img border=0 src="{$IMAGE_PATH}btnL3Calendar.gif" alt="Set date.." title="Set date.." id="jscal_trigger_due_date">
-													{foreach key=date_fmt item=date_str from=$secondvalue.due_date}
-													{assign var=date_vl value="$date_fmt"}
-                                                                                                        {/foreach}
-													<script type="text/javascript">
-														Calendar.setup ({ldelim}
-														inputField : "jscal_field_due_date", ifFormat : "{$date_vl}", showsTime : false, button : "jscal_trigger_due_date", singleClick : true, step : 1
-														{rdelim})
-													</script>
-												</td></tr>
-											</table>
-										</td>
-									</tr>
-								</table></td>
-							</tr>
-						     </table>
-						     <br>
-						     <table border=0 cellspacing=0 cellpadding=0 width=100% align=center>
-							<tr><td>
-								<table border=0 cellspacing=0 cellpadding=3 width=100%>
-									<tr>
-										<td class="dvtTabCache" style="width:10px" nowrap>&nbsp;</td>
-										<td id="cellTabInvite" class="dvtSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabInvite','on');switchClass('cellTabAlarm','off');switchClass('cellTabRepeat','off');switchClass('cellTabRelatedto','off');ghide('addEventAlarmUI');gshow('addEventInviteUI','',document.EditView.date_start.value,document.EditView.due_date.value,document.EditView.starthr.value,document.EditView.startmin.value,document.EditView.startfmt.value,document.EditView.endhr.value,document.EditView.endmin.value,document.EditView.endfmt.value);ghide('addEventRepeatUI');ghide('addEventRelatedtoUI');">{$MOD.LBL_INVITE}</a></td>
-										<td class="dvtTabCache" style="width:10px">&nbsp;</td>
-										<td id="cellTabAlarm" class="dvtUnSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabInvite','off');switchClass('cellTabAlarm','on');switchClass('cellTabRepeat','off');switchClass('cellTabRelatedto','off');gshow('addEventAlarmUI','',document.EditView.date_start.value,document.EditView.due_date.value,document.EditView.starthr.value,document.EditView.startmin.value,document.EditView.startfmt.value,document.EditView.endhr.value,document.EditView.endmin.value,document.EditView.endfmt.value);ghide('addEventInviteUI');ghide('addEventRepeatUI');ghide('addEventRelatedtoUI');">{$MOD.LBL_REMINDER}</a></td>
-										<td class="dvtTabCache" style="width:10px">&nbsp;</td>
-										<td id="cellTabRepeat" class="dvtUnSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabInvite','off');switchClass('cellTabAlarm','off');switchClass('cellTabRepeat','on');switchClass('cellTabRelatedto','off');ghide('addEventAlarmUI');ghide('addEventInviteUI');gshow('addEventRepeatUI','',document.EditView.date_start.value,document.EditView.due_date.value,document.EditView.starthr.value,document.EditView.startmin.value,document.EditView.startfmt.value,document.EditView.endhr.value,document.EditView.endmin.value,document.EditView.endfmt.value);ghide('addEventRelatedtoUI');">{$MOD.LBL_REPEAT}</a></td>
-										<td class="dvtTabCache" style="width:10px">&nbsp;</td>
-										<td id="cellTabRelatedto" class="dvtUnSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabInvite','off');switchClass('cellTabAlarm','off');switchClass('cellTabRepeat','off');switchClass('cellTabRelatedto','on');ghide('addEventAlarmUI');ghide('addEventInviteUI');gshow('addEventRelatedtoUI','',document.EditView.date_start.value,document.EditView.due_date.value,document.EditView.starthr.value,document.EditView.startmin.value,document.EditView.startfmt.value,document.EditView.endhr.value,document.EditView.endmin.value,document.EditView.endfmt.value);ghide('addEventRepeatUI');">{$MOD.LBL_RELATEDTO}</a></td>
-										<td class="dvtTabCache" style="width:100%">&nbsp;</td>
-									</tr>
-								</table>
-							</td></tr>
-							<tr>
-								<td width=100% valign=top align=left class="dvtContentSpace" style="padding:10px;height:120px">
-								<!-- Invite UI -->
-									<DIV id="addEventInviteUI" style="display:block;width:100%">
-									<table border=0 cellspacing=0 cellpadding=2 width=100%>
-										<tr>
-											<td valign=top> 
-												<table border=0 cellspacing=0 cellpadding=2 width=100%>
-													<tr><td colspan=3>
-														<ul style="padding-left:20px">
-														<li>{$MOD.LBL_INVITE_INST1}
-														<li>{$MOD.LBL_INVITE_INST2}
-														</ul>
-													</td></tr>
-													<tr>
-														<td><b>{$MOD.LBL_AVL_USERS}</b></td>
-														<td>&nbsp;</td>
-														<td><b>{$MOD.LBL_SEL_USERS}</b></td>
-													</tr>
-													<tr>
-														<td width=40% align=center valign=top>
-														<select name="availableusers" id="availableusers" class=small size=5 multiple style="height:70px;width:100%">
-														{foreach item=username key=userid from=$USERSLIST}
-														{if $userid != ''}
-														<option value="{$userid}">{$username}</option>
-														{/if}
-														{/foreach}
-														</select>
-														</td>
-														<td width=20% align=center valign=top>
-														<input type=button value="{$MOD.LBL_ADD_BUTTON} >>" class="crm button small save" style="width:100%" onClick="addColumn()"><br>
-														<input type=button value="<< {$MOD.LBL_RMV_BUTTON} " class="crm button small cancel" style="width:100%" onClick="delColumn()">
-														</td>
-														<td width=40% align=center valign=top>
-														<select name="selectedusers" id="selectedusers" class=small size=5 multiple style="height:70px;width:100%">
-														{foreach item=username key=userid from=$INVITEDUSERS}
-														{if $userid != ''}
-														<option value="{$userid}">{$username}</option>
-                                                                                                                {/if}
-                                                                                                                {/foreach}
-														</select>
-														<div align=left> {$MOD.LBL_SELUSR_INFO}
-														</div>
-														</td>
-													</tr>
-												</table>
-											</td>
-										</tr>
-									</table>
-									</DIV>
-									<!-- Reminder UI -->	
-									<DIV id="addEventAlarmUI" style="display:none;width:100%">
-										<table>
-											{assign var=secondval value=$secondvalue.reminder_time}
-											{assign var=check value=$secondval[0]}
-											{assign var=yes_val value=$secondval[1]}
-											{assign var=no_val value=$secondval[2]}
-											
-											<tr><td>{$LABEL.reminder_time}</td><td>
-											<input type="radio" name="set_reminder" value="Yes" {$check} onClick="showBlock('reminderOptions')">&nbsp;{$yes_val}&nbsp;
-											<input type="radio" name="set_reminder" value="No" onClick="fnhide('reminderOptions')">&nbsp;{$no_val}&nbsp;
-											</td></tr>
-										</table>
-									{if $check eq 'CHECKED'}
-										{assign var=reminstyle value='style="display:block;width:100%"'}
-									{else}
-										{assign var=reminstyle value='style="display:none;width:100%"'}
-									{/if}
-									<DIV id="reminderOptions" {$reminstyle}>
-										<table border=0 cellspacing=0 cellpadding=2  width=100%>
-											<tr>
-												<td nowrap align=right width=20% valign=top><b>{$MOD.LBL_RMD_ON} : </b></td>
-												<td width=80%>
-													<table border=0>
-													<tr>
-														<td colspan=2>
-														{foreach item=val_arr from=$ACTIVITYDATA.reminder_time}
-														{assign var=start value="$val_arr[0]"}
-														{assign var=end value="$val_arr[1]"}
-														{assign var=sendname value="$val_arr[2]"}
-														{assign var=disp_text value="$val_arr[3]"}
-														{assign var=sel_val value="$val_arr[4]"}
-														<select name="{$sendname}">
-														{section name=reminder start=$start max=$end loop=$end step=1 }
-														{if $smarty.section.reminder.index eq $sel_val}
-														{assign var=sel_value value="SELECTED"}
-														{else}
-														{assign var=sel_value value=""}
-														{/if}
-														<OPTION VALUE="{$smarty.section.reminder.index}" "{$sel_value}">{$smarty.section.reminder.index}</OPTION>
-														{/section}
-														</select>
-														&nbsp;{$disp_text}
-														{/foreach}
-														</td>
-													</tr>
-													</table>
-												</td>
-											</tr>
-											<tr>
-												<td nowrap align=right>
-													{$MOD.LBL_SDRMD}
-												</td>
-												<td >
-													<input type=text name="toemail" class=textbox style="width:90%" value="{$USEREMAILID}">
-												</td>
-											</tr>
-										</table>
-									</DIV>
-									</DIV>
-									<!-- Repeat UI -->
-									<div id="addEventRepeatUI" style="display:none;width:100%">
-
-									<table border=0 cellspacing=0 cellpadding=2  width=100%>
-										<tr>
-											<td nowrap align=right width=20% valign=top>
-												<strong>{$MOD.LBL_REPEAT}</strong>
-											</td>
-											<td nowrap width=80% valign=top>
-												<table border=0 cellspacing=0 cellpadding=0>
-												<tr>
-							
-													<td width=20>
-													{if $ACTIVITYDATA.recurringcheck eq 'Yes'}
-														{assign var=rptstyle value='style="display:block"'}
-														{if $ACTIVITYDATA.eventrecurringtype eq 'Daily'}
-															{assign var=rptmonthstyle value='style="display:none"'}
-															{assign var=rptweekstyle value='style="display:none"'}
-														{elseif $ACTIVITYDATA.eventrecurringtype eq 'Weekly'}
-															{assign var=rptmonthstyle value='style="display:none"'}
-															{assign var=rptweekstyle value='style="display:block"'}
-														{elseif $ACTIVITYDATA.eventrecurringtype eq 'Monthly'}
-															{assign var=rptmonthstyle value='style="display:block"'}
-															{assign var=rptweekstyle value='style="display:none"'}
-														{elseif $ACTIVITYDATA.eventrecurringtype eq 'Yearly'}
-															{assign var=rptmonthstyle value='style="display:none"'}
-															{assign var=rptweekstyle value='style="display:none"'}
-														{/if}
-													<input type="checkbox" name="recurringcheck" onClick="showhide('repeatOptions')" checked>
-													{else}
-														{assign var=rptstyle value='style="display:none"'}
-														{assign var=rptmonthstyle value='style="display:none"'}
-														{assign var=rptweekstyle value='style="display:none"'}
-													<input type="checkbox" name="recurringcheck" onClick="showhide('repeatOptions')">
-													{/if}
-													</td>
-													<td colspan=2>Enable Repeat</td>
-												</tr>
-												<tr>
-													<td colspan=2>
-													<div id="repeatOptions" {$rptstyle}>
-													<table border=0 cellspacing=0 cellpadding=2>
-													<tr>
-													<td>Repeat once in every</td>
-													<td><input type="text" name="repeat_frequency" class="textbox" style="width:20px" value="{$ACTIVITYDATA.repeat_frequency}" ></td>
-													<td><select name="recurringtype">
-													<option value="Daily" onClick="ghide('repeatWeekUI'); ghide('repeatMonthUI');" {if $ACTIVITYDATA.eventrecurringtype eq 'Daily'} selected {/if}>{$MOD.LBL_DAYS}</option>
-													<option value="Weekly" onClick="gshow('repeatWeekUI'); ghide('repeatMonthUI');" {if $ACTIVITYDATA.eventrecurringtype eq 'Weekly'} selected {/if}>{$MOD.LBL_WEEKS}</option>
-												<option value="Monthly" onClick="ghide('repeatWeekUI'); gshow('repeatMonthUI');" {if $ACTIVITYDATA.eventrecurringtype eq 'Monthly'} selected {/if}>{$MOD.LBL_MONTHS}</option>
-													<option value="Yearly" onClick="ghide('repeatWeekUI'); ghide('repeatMonthUI');"; {if $ACTIVITYDATA.eventrecurringtype eq 'Yearly'} selected {/if}>{$MOD.LBL_YEAR}</option>
-													</select>
-													</td>
-												</tr>
-												</table>
-												<div id="repeatWeekUI" {$rptweekstyle}>
-												<table border=0 cellspacing=0 cellpadding=2>
-												<tr>
-													<td><input name="sun_flag" value="sunday" {$ACTIVITYDATA.week0} type="checkbox"></td><td>Sun</td>
-													<td><input name="mon_flag" value="monday" {$ACTIVITYDATA.week1} type="checkbox"></td><td>Mon</td>
-													<td><input name="tue_flag" value="tuesday" {$ACTIVITYDATA.week2} type="checkbox"></td><td>Tue</td>
-													<td><input name="wed_flag" value="wednesday" {$ACTIVITYDATA.week3} type="checkbox"></td><td>Wed</td>
-													<td><input name="thu_flag" value="thursday" {$ACTIVITYDATA.week4} type="checkbox"></td><td>Thu</td>
-													<td><input name="fri_flag" value="friday" {$ACTIVITYDATA.week5} type="checkbox"></td><td>Fri</td>
-													<td><input name="sat_flag" value="saturday" {$ACTIVITYDATA.week6} type="checkbox"></td><td>Sat</td>
-												</tr>
-												</table>
-												</div>
-	
-												<div id="repeatMonthUI" {$rptmonthstyle}>
-												<table border=0 cellspacing=0 cellpadding=2>
-												<tr>
-													<td>
-														<table border=0 cellspacing=0 cellpadding=2>
-														<tr>
-														<td><input type="radio" checked name="repeatMonth" {if $ACTIVITYDATA.repeatMonth eq 'date'} checked {/if} value="date"></td><td>on</td><td><input type="text" class=textbox style="width:20px" value="{$ACTIVITYDATA.repeatMonth_date}" name="repeatMonth_date" ></td><td>day of the month</td>
-														</tr>
-														</table>
-													</td>
-												</tr>
-												<tr>
-													<td>
-														<table border=0 cellspacing=0 cellpadding=2>
-														<tr><td>
-														<input type="radio" name="repeatMonth" {if $ACTIVITYDATA.repeatMonth eq 'day'} checked {/if} value="day"></td>
-														<td>on</td>
-														<td>
-														<select name="repeatMonth_daytype">
-															<option value="first" {if $ACTIVITYDATA.repeatMonth_daytype eq 'first'} selected {/if}>First</option>
-															<option value="last" {if $ACTIVITYDATA.repeatMonth_daytype eq 'last'} selected {/if}>Last</option>
-														</select>
-														</td>
-														<td>
-														<select name="repeatMonth_day">
-															<option value=1 {if $ACTIVITYDATA.repeatMonth_day eq 1} selected {/if}>{$MOD.LBL_DAY1}</option>
-															<option value=2 {if $ACTIVITYDATA.repeatMonth_day eq 2} selected {/if}>{$MOD.LBL_DAY2}</option>
-															<option value=3 {if $ACTIVITYDATA.repeatMonth_day eq 3} selected {/if}>{$MOD.LBL_DAY3}</option>
-															<option value=4 {if $ACTIVITYDATA.repeatMonth_day eq 4} selected {/if}>{$MOD.LBL_DAY4}</option>
-															<option value=5 {if $ACTIVITYDATA.repeatMonth_day eq 5} selected {/if}>{$MOD.LBL_DAY5}</option>
-															<option value=6 {if $ACTIVITYDATA.repeatMonth_day eq 6} selected {/if}>{$MOD.LBL_DAY6}</option>
-														</select>
-														</td>
-														</tr>
-														</table>
-													</td>
-												</tr>
-												</table>
-												</div>
-								
-											</div>
-										</td>
-										</tr>
-									</table>
-								</td>
-							</tr>
-						</table>
-						</div>
-						<div id="addEventRelatedtoUI" style="display:none;width:100%">
-						<table width="100%" cellpadding="5" cellspacing="0" border="0">
-							<tr>
-								<td><b>{$MOD.LBL_RELATEDTO}</b></td>
-								<td>
-									<input name="parent_id" type="hidden" value="{$secondvalue.parent_id}">
-									<select name="parent_type" class="small" id="parent_type" onChange="document.EditView.parent_name.value='';document.EditView.parent_id.value=''">
-									{section name=combo loop=$LABEL.parent_id}
-										<option value="{$fldlabel_combo.parent_id[combo]}" {$fldlabel_sel.parent_id[combo]}>{$LABEL.parent_id[combo]}</option>
-									{/section}
-                                             				</select>
-								</td>
-								<td>
-									<div id="eventrelatedto" align="left">
-										<input name="parent_name" readonly type="text" class="calTxt small" value="{$ACTIVITYDATA.parent_id}">
-										<input type="button" name="selectparent" class="crmButton small edit" value="Select" onclick="return window.open('index.php?module='+document.EditView.parent_type.value+'&action=Popup','test','width=640,height=602,resizable=0,scrollbars=0,top=150,left=200');">
-									</div>
-								</td>
-							</tr>
-							<tr>
-								<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;
-									<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>
-						</table>
-					</div>
-			</td>
-		</tr>
-		</table>
-		<!-- Alarm, Repeat, Invite stops-->
-		{else}
-		<table border="0" cellpadding="5" cellspacing="0" width="100%">
-			<tr>
-                        	<td width="20%" align="right"><b>{$MOD.LBL_TODO}</b></td>
-                        	<td width="80%" align="left"><input name="subject" value="{$ACTIVITYDATA.subject}" class="textbox" style="width: 70%;" type="text"></td>
-           		</tr>
-			<tr>
-				<td align="right"><b>{$LABEL.description}</b></td>
-				<td align="left"><textarea style="width: 90%; height: 60px;" name="description">{$ACTIVITYDATA.description}</textarea>
-			</tr>
-			<tr>
-		    		<td colspan="2" align="center" width="80%">
-					<table border="0" cellpadding="3" cellspacing="0" width="80%">
-            					<tr>
-							<td align="left"><b>{$LABEL.taskstatus}</td>
-              						<td align="left"><b>{$LABEL.taskpriority}</b></td>
-              						<td align="left"><b>{$LABEL.assigned_user_id}</b></td>
-						</tr>
-						<tr>
-							<td align="left" valign="top">
-								<select name="taskstatus" id="taskstatus" class=small>
-                                        			{foreach item=arr from=$ACTIVITYDATA.taskstatus}
-                                        			{foreach key=sel_value item=value from=$arr}
-                                                			<option value="{$sel_value}" {$value}>
-                                                        		{if $APP[$sel_value] neq ''}
-                                                                		{$APP[$sel_value]}
-                                                        		{else}
-                                                                		{$sel_value}
-                                                        		{/if}
-                                                			</option>
-                                        			{/foreach}
-                                        			{/foreach}
-                                				</select>
-							</td>
-							<td align="left" valign="top">
-								<select name="taskpriority" id="taskpriority" class=small>
-        			                                {foreach item=arr from=$ACTIVITYDATA.taskpriority}
-                                			        {foreach key=sel_value item=value from=$arr}
-			                                                <option value="{$sel_value}" {$value}>
-                        		                                {if $APP[$sel_value] neq ''}
-                                        		                        {$APP[$sel_value]}
-                                                       			{else}
-                                                                		{$sel_value}
-                                                        		{/if}
-                                                			</option>
-                                        			{/foreach}
-                                        			{/foreach}
-                                				</select>
-							</td>
-							<td align="left" valign="top">
-								{assign var=check value=1}
-                                        			{foreach key=key_one item=arr from=$ACTIVITYDATA.assigned_user_id}
-			                                        {foreach key=sel_value item=value from=$arr}
-                        		                              	{if $value ne ''}
-                                        		                      	{assign var=check value=$check*0}
-                                                        		{else}
-                                                                		{assign var=check value=$check*1}
-                                                        		{/if}
-                                                		{/foreach}
-                                        			{/foreach}
-								{if $check eq 0}
-                                             				{assign var=select_user value='checked'}
-                                                			{assign var=style_user value='display:block'}
-                                                			{assign var=style_group value='display:none'}
-                                        			{else}
-                                                			{assign var=select_group value='checked'}
-                                                			{assign var=style_user value='display:none'}
-                                                			{assign var=style_group value='display:block'}
-                                        			{/if}
-				                                <input type="radio" name="assigntype" {$select_user} value="U" onclick="toggleAssignType(this.value)">&nbsp;User
-				                                {if $secondvalue.assigned_user_id neq ''}
-                                			        <input type="radio" name="assigntype" {$select_group} value="T" onclick="toggleAssignType(this.value)">&nbsp;Group
-                                        			{/if}
-                                        			<span id="assign_user" style="{$style_user}">
-                                                		<select name="assigned_user_id" class=small>
-                                                        	{foreach key=key_one item=arr from=$ACTIVITYDATA.assigned_user_id}
-				                                {foreach key=sel_value item=value from=$arr}
-                                		                	<option value="{$key_one}" {$value}>{$sel_value}</option>
-								{/foreach}
-                                                        	{/foreach}
-                                                		</select>
-								</span>
-								{if $secondvalue.assigned_user_id neq ''}
-                                                		<span id="assign_team" style="{$style_group}">
-                                                        		<select name="assigned_group_name" class=small>';
-                                                                		{foreach key=key_one item=arr from=$secondvalue.assigned_user_id}
-                                                                       		{foreach key=sel_value item=value from=$arr}
-                                                                               		<option value="{$sel_value}" {$value}>{$sel_value}</option>
-                                                                       		{/foreach}
-                                                                		{/foreach}
-                                                        		</select>
-				                                </span>
-                                				{/if}	
-							</td>
-						</tr>
-					</table>
-				</td>
-			</tr>
-			<tr><td colspan="2">    <hr noshade="noshade" size="1"></td></tr>
-			</table>
-			<table bgcolor="#ffffff" border="0" cellpadding="5" cellspacing="0" width="90%" align=center>
-			<tr><td>
-				<table border="0" cellpadding="0" cellspacing="0" width="100%" align=center>
-				<tr><td width=50% valign=top style="border-right:1px solid #dddddd">
-					<table border=0 cellspacing=0 cellpadding=2 width=90% align=center>
-						<tr><td colspan=3 ><b>{$MOD.LBL_TODODATETIME}</b></td></tr>
-						<tr><td colspan=3>{$STARTHOUR}</td></tr>
-						<tr><td>
-							{foreach key=date_value item=time_value from=$ACTIVITYDATA.date_start}
-	                                        		{assign var=date_val value="$date_value"}
-								{assign var=time_val value="$time_value"}
-                                        		{/foreach}
-							<input name="date_start" id="date_start" class="textbox" style="width: 90px;" value="{$date_val}" type="text"></td><td width=100%><img src="{$IMAGE_PATH}btnL3Calendar.gif" alt="Set date.." title="Set date.." id="jscal_trigger_date_start" align="middle" border="0">
-							{foreach key=date_fmt item=date_str from=$secondvalue.date_start}
-								{assign var=date_vl value="$date_fmt"}
-							{/foreach}				
-							<script type="text/javascript">
-								Calendar.setup ({ldelim}
-	        	                                	inputField : "date_start", ifFormat : "{$date_vl}", showsTime : false, button : "jscal_trigger_date_start", singleClick : true, step : 1
-							{rdelim})
-							</script>
-						</td></tr>
-					</table></td>
-					<td width=50% valign="top">
-                                                <table border="0" cellpadding="2" cellspacing="0" width="90%" align=center>
-							<tr><td colspan=3><b>{$LABEL.due_date}</b></td></tr>
-							<tr><td>
-								{foreach key=date_value item=time_value from=$ACTIVITYDATA.due_date}
-									{assign var=date_val value="$date_value"}
-									{assign var=time_val value="$time_value"}
-								{/foreach}
-								<input name="due_date" id="due_date" class="textbox" style="width: 90px;" value="{$date_val}" type="text"></td><td width=100%><img src="{$IMAGE_PATH}btnL3Calendar.gif" alt="Set date.." title="Set date.." id="jscal_trigger_due_date" border="0">
-								{foreach key=date_fmt item=date_str from=$secondvalue.due_date}
-                                                			{assign var=date_vl value="$date_fmt"}
-                                        			{/foreach}
-				      				<script type="text/javascript">
-								Calendar.setup ({ldelim}
-	                                        			inputField : "date_start", ifFormat : "{$date_vl}", showsTime : false, button : "jscal_trigger_due_date", singleClick : true, step : 1
-					   			{rdelim})
-								</script>
-        						</td></tr>
-						</table></td>
-					</tr>
-				</table>
-				</td></tr>
-                	<tr><td>&nbsp;</td></tr>
-        	</table>
-		<table align="center" border="0" cellpadding="0" cellspacing="0" width="95%" bgcolor="#FFFFFF">
-			<tr>
-				<td>
-					<table border="0" cellpadding="3" cellspacing="0" width="100%">
-						<tr>
-							<td class="dvtTabCache" style="width: 10px;" nowrap="nowrap">&nbsp;</td>
-							<td id="cellTabInvite" class="dvtSelectedCell" align="center" nowrap="nowrap"><a href="javascript:doNothing()" onClick="switchClass('cellTabInvite','on');switchClass('cellTabRelatedto','off');Taskshow('addTaskAlarmUI','todo',document.EditView.date_start.value,document.EditView.starthr.value,document.EditView.startmin.value,document.EditView.startfmt.value);ghide('addTaskRelatedtoUI');">{$MOD.LBL_NOTIFICATION}</a></td>
-							<td class="dvtTabCache" style="width: 10px;" nowrap="nowrap">&nbsp;
-                                                        <td id="cellTabRelatedto" class="dvtUnSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabInvite','off');switchClass('cellTabRelatedto','on');Taskshow('addTaskRelatedtoUI','todo',document.EditView.date_start.value,document.EditView.starthr.value,document.EditView.startmin.value,document.EditView.startfmt.value);ghide('addTaskAlarmUI');">{$MOD.LBL_RELATEDTO}</a></td>
-                                                        <td class="dvtTabCache" style="width:100%">
-						</tr>
-
-					</table>
-				</td>
-			</tr>
-			<tr>
-				<td class="dvtContentSpace" style="padding: 10px; height: 120px;" align="left" valign="top" width="100%">
-			<!-- Reminder UI -->
-			<div id="addTaskAlarmUI" style="display: block; width: 100%;">
-                	<table>
-				<tr><td>{$LABEL.sendnotification}</td>
-					{if $ACTIVITYDATA.sendnotification eq 1}
-                                        <td>
-                                                <input name="sendnotification" type="checkbox" checked>
-                                        </td>
-                                	{else}
-                                        <td>
-                                                <input name="sendnotification" type="checkbox">
-                                        </td>
-                                	{/if}
-				</tr>
-			</table>
-			</div>
-			<div id="addTaskRelatedtoUI" style="display:none;width:100%">
-           		     <table width="100%" cellpadding="5" cellspacing="0" border="0">
-                	     <tr>
-                        	     <td><b>{$MOD.LBL_RELATEDTO}</b></td>
-                                     <td>
-					<input name="parent_id" type="hidden" value="{$secondvalue.parent_id}">
-                                             <select name="parent_type" class="small" id="parent_type" onChange="document.EditView.parent_name.value='';document.EditView.parent_id.value=''">
-							{section name=combo loop=$LABEL.parent_id}
-								<option value="{$fldlabel_combo.parent_id[combo]}" {$fldlabel_sel.parent_id[combo]}>{$LABEL.parent_id[combo]}</option>
-							{/section}
-					     </select>
-                                     </td>
-                                     <td>
-                              	        <div id="taskrelatedto" align="left">
-						<input name="parent_name" readonly type="text" class="calTxt small" value="{$ACTIVITYDATA.parent_id}">
-						<input type="button" name="selectparent" class="crmButton small edit" value="Select" onclick="return window.open('index.php?module='+document.EditView.parent_type.value+'&action=Popup','test','width=640,height=602,resizable=0,scrollbars=0,top=150,left=200');">
-					 </div>
-                                     </td>
-			     </tr>
-			     <tr>
-                                     <td><b>{$LABEL.contact_id}</b></td>
-				     <td colspan="2">
-						<input name="contact_name" readonly type="text" class="calTxt" value="{$ACTIVITYDATA.contact_id}"><input name="contact_id" type="hidden" value="{$secondvalue.contact_id}">&nbsp;
-						<input type="button" onclick="return window.open('index.php?module=Contacts&action=Popup&html=Popup_picker&popuptype=specific&form=EditView','test','width=640,height=602,resizable=0,scrollbars=0');" class="crmButton small edit" name="selectcnt" value="Select Contact">
-				     </td>
-                             </tr>
-		</table>
-              	</div>
-                </td></tr></table>
-
-		{/if}
-			</td></tr>
-			<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" {if $ACTIVITY_MODE neq 'Task'} onclick="this.form.action.value='Save';  displaydeleted();return maincheck_form();"{else} onclick="this.form.action.value='Save';  displaydeleted(); maintask_check_form();return formValidate();" {/if} 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>
-		</td></tr></table>
-		</td></tr></table>
-		</td></tr></table>
-</td></tr>
-</form></table>
-</td></tr></table>
-</td></tr></table>
-</td></tr></table>
-        </td></tr></table>
-        </td></tr></table>
-        </div>
-        </td>
-        <td valign=top><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
-        </tr>
-        </table>
-<script>
-{if $ACTIVITY_MODE eq 'Task'}
-	var fieldname = new Array('subject','date_start','time_start','taskstatus');
-	var fieldlabel = new Array('Subject','Date','Time','Status');
-	var fielddatatype = new Array('V~M','D~M~time_start','T~O','V~O');
-{else}
-	var fieldname = new Array('subject','date_start','due_date','taskpriority','sendnotification','parent_id','contact_id','reminder_time','recurringtype');
-	var fieldlabel = new Array('Subject','Start Date','Due Date','Priority','Send Notification','Related To','Contact Name','Send Reminder','Recurrence');
-	var fielddatatype = new Array('V~M','D~M','D~M~OTH~GE~date_start~Start Date','V~O','C~O','I~O','I~O','I~O','O~O');
-{/if}
-</script>
-<script>	
-	var ProductImages=new Array();
-	var count=0;
-
-	function delRowEmt(imagename)
-	{ldelim}
-		ProductImages[count++]=imagename;
-	{rdelim}
-
-	function displaydeleted()
-	{ldelim}
-		var imagelists='';
-		for(var x = 0; x < ProductImages.length; x++)
-		{ldelim}
-			imagelists+=ProductImages[x]+'###';
-		{rdelim}
-
-		if(imagelists != '')
-			document.EditView.imagelist.value=imagelists
-	{rdelim}
-
-</script>
-<script language="JavaScript" type="text/JavaScript">
-	setObjects();
-</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}/Activity.js"></script>
+<script type="text/javascript">
+</script>
+
+{*<!-- Contents -->*}
+<table width="100%" cellpadding="2" cellspacing="0" border="0">
+<form name="EditView" method="POST" action="index.php">
+<input type="hidden" name="time_start" id="time_start">
+<tr>
+        <td>
+                <table cellpadding="0" cellspacing="5" border="0">
+			{include file='EditViewHidden.tpl'}
+                </table>
+<table  border="0" cellpadding="5" cellspacing="0" width="100%" >
+<tr>
+        <td class="lvtHeaderText" style="border-bottom:1px dotted #cccccc">
+
+                <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%">
+                        <tr><td>
+		
+				{if $OP_MODE eq 'edit_view'}   
+					<span class="lvtHeaderText"><font color="purple">[ {$ID} ] </font>{$NAME} - {$APP.LBL_EDITING} {$SINGLE_MOD} {$APP.LBL_INFORMATION}</span> <br>
+					<span class="small">{$UPDATEINFO}	 </span> 
+				{/if}
+				{if $OP_MODE eq 'create_view'}
+					<span class="lvtHeaderText">{$APP.LBL_CREATING} {$SINGLE_MOD}</span> <br>
+				{/if}
+			</td></tr>
+		</table>
+        </td>
+</tr>
+
+<tr><td>
+<table border="0" cellpadding="5" cellspacing="0" width="100%">
+        <tr>
+                <td valign=top align=left >
+                           <table border=0 cellspacing=0 cellpadding=0 width=100%>
+                                <tr>
+					<td align=left>
+					<!-- content cache -->
+
+					<table border=0 cellspacing=0 cellpadding=0 width=100%>
+					  <tr>
+					     <td style="padding:10px">
+						     <!-- General details -->
+						     <table border=0 cellspacing=0 cellpadding=0 width=100% >
+						     <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" {if $ACTIVITY_MODE neq 'Task'} onclick="this.form.action.value='Save';  displaydeleted();return maincheck_form();"{else} onclick="this.form.action.value='Save';  displaydeleted(); maintask_check_form();return formValidate();" {/if} 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>
+						     <!-- included to handle the edit fields based on ui types -->
+						     {foreach key=header item=data from=$BLOCKS}
+						     <table border=0 cellspacing=0 cellpadding=0 width=100% class="small">
+						     <tr>
+							<td colspan=4 class="tableHeading">
+								<b>{$header}</b>
+							</td>
+						     </tr>
+						     </table>
+						     {/foreach}
+						     {if $ACTIVITY_MODE neq 'Task'}
+							<input type="hidden" name="time_end" id="time_end">
+							<input type=hidden name="inviteesid" id="inviteesid" value="">
+							<input type="hidden" name="duration_hours" value="0">
+							<input type="hidden" name="duration_minutes" value="0">
+						     <table border=0 cellspacing=0 cellpadding=5 width=100% >
+							<tr>
+								<td class="cellLabel" nowrap  width=20% align="right"><b>{$MOD.LBL_EVENTTYPE}</b></td>
+								<td class="cellInfo" width=80% align="left">
+									<table>
+										<tr>
+										{foreach key=tyeparrkey item=typearr from=$ACTIVITYDATA.activitytype}
+                                                                                {foreach key=sel_value item=value from=$typearr}
+                                                                                {if $value eq 'selected' && $sel_value eq 'Meeting'}
+                                                                                        {assign var='meetcheck' value='checked'}
+                                                                                        {assign var='callcheck' value=''}
+                                                                                {else}
+                                                                                        {assign var='meetcheck' value=''}
+                                                                                        {assign var='callcheck' value='checked'}
+                                                                                {/if}
+                                                                                {/foreach}
+                                                                                {/foreach}
+											<td><input type="radio" name='activitytype' value='Call' style='vertical-align: middle;' {$callcheck}></td><td>{$APP.Call}</td><td style="width:10px">
+											<td><input type="radio" name='activitytype' value='Meeting' style='vertical-align: middle;' {$meetcheck}></td><td>{$APP.Meeting}</td><td style="width:20px">
+										</tr>
+									</table>
+								</td>
+							</tr>
+							<tr>
+								<td class="cellLabel" nowrap align="right"><b>{$MOD.LBL_EVENTNAME}</b></td>
+								<td class="cellInfo" align="left"><input name="subject" type="text" class="textbox" value="{$ACTIVITYDATA.subject}" style="width:50%">&nbsp;&nbsp;&nbsp;
+								{foreach key=key_one item=arr from=$ACTIVITYDATA.visibility}
+                                                                        {foreach key=sel_value item=value from=$arr}
+                                                                        {if $value eq 'selected' && $sel_value eq 'Public'}
+                                                                                {assign var="visiblecheck" value="checked"}
+                                                                        {else}
+                                                                                {assign var="visiblecheck" value=""}
+                                                                        {/if}
+                                                                        {/foreach}
+                                                                        {/foreach}
+                                                                        <input name="visibility" value="Public" type="checkbox" {$visiblecheck}>{$MOD.LBL_PUBLIC}
+								</td>
+							</tr>
+							<tr>
+                        					<td class="cellLabel" valign="top" nowrap align="right"><b>{$LABEL.description}</b></td>
+								<td class="cellInfo" align="left"><textarea style="width:100%; height : 60px;" name="description">{$ACTIVITYDATA.description}</textarea></td>
+                					</tr>
+							<tr>
+								<td colspan=2 width=80% align="center">
+								<table border=0 cellspacing=0 cellpadding=3 width=80%>
+									<tr>
+										<td ><b>{$LABEL.eventstatus}</b></td>
+                                                                                <td ><b>{$LABEL.assigned_user_id}</b></td>
+									</tr>
+									<tr>
+										<td valign=top>
+                                                                                <select name="eventstatus" id="eventstatus" class=small>
+                                                                                        {foreach item=arr from=$ACTIVITYDATA.eventstatus}
+                                                                                        {foreach key=sel_value item=value from=$arr}
+                                                                                        <option value="{$sel_value}" {$value}>
+                                                                                                {if $APP[$sel_value] neq ''}
+                                                                                                {$APP[$sel_value]}
+                                                                                                {else}
+                                                                                                        {$sel_value}
+                                                                                                {/if}
+                                                                                        </option>
+                                                                                        {/foreach}
+                                                                                        {/foreach}
+                                                                                </select>
+                                                                        	</td>
+										<td valign=top rowspan=2>
+											{assign var=check value=1}
+                                        						{foreach key=key_one item=arr from=$ACTIVITYDATA.assigned_user_id}
+                                                					{foreach key=sel_value item=value from=$arr}
+                                                        					{if $value ne ''}
+                                                                					{assign var=check value=$check*0}
+                                                        					{else}
+                                                                					{assign var=check value=$check*1}
+                                                        					{/if}
+                                                					{/foreach}
+                                        						{/foreach}
+
+                                        						{if $check eq 0}
+                                                						{assign var=select_user value='checked'}
+                                                						{assign var=style_user value='display:block'}
+                                                						{assign var=style_group value='display:none'}
+                                        						{else}
+                                                						{assign var=select_group value='checked'}
+                                                						{assign var=style_user value='display:none'}
+                                                						{assign var=style_group value='display:block'}
+                                        						{/if}
+                                        						<input type="radio" name="assigntype" {$select_user} value="U" onclick="toggleAssignType(this.value)">&nbsp;{$APP.LBL_USER}
+                                        						{if $secondvalue.assigned_user_id neq ''}
+                                                					<input type="radio" name="assigntype" {$select_group} value="T" onclick="toggleAssignType(this.value)">&nbsp;{$APP.LBL_GROUP}
+                                        						{/if}
+											<span id="assign_user" style="{$style_user}">
+                                     				           			<select name="assigned_user_id">
+                                                        					{foreach key=key_one item=arr from=$ACTIVITYDATA.assigned_user_id}
+                                                                				{foreach key=sel_value item=value from=$arr}
+                                                                        				<option value="{$key_one}" {$value}>{$sel_value}</option>
+                                                                				{/foreach}
+                                                        					{/foreach}
+                                                			   			</select>
+                                        			       			</span>
+
+                                        						{if $secondvalue.assigned_user_id neq ''}
+                                                					<span id="assign_team" style="{$style_group}">
+                                                        					<select name="assigned_group_name" >';
+                                                                				{foreach key=key_one item=arr from=$secondvalue.assigned_user_id}
+                                                                        			{foreach key=sel_value item=value from=$arr}
+                                                                                			<option value="{$sel_value}" {$value}>{$sel_value}</option>
+                                                                        			{/foreach}
+                                                                				{/foreach}
+                                                        					</select>
+                                                					</span>
+                                        						{/if}
+											<br><input type="checkbox" name="sendnotification" >&nbsp;{$LABEL.sendnotification}
+										</td>
+									</tr>
+									<tr>
+										<td valign=top><b>{$LABEL.taskpriority}</b>
+										<br>
+										<select name="taskpriority" id="taskpriority">
+                                                                                        {foreach item=arr from=$ACTIVITYDATA.taskpriority}
+                                                                                        {foreach key=sel_value item=value from=$arr}
+                                                                                        <option value="{$sel_value}" {$value}>
+                                                                                                {if $APP[$sel_value] neq ''}
+                                                                                                {$APP[$sel_value]}
+                                                                                                {else}
+                                                                                                        {$sel_value}
+                                                                                                {/if}
+                                                                                        </option>
+                                                                                        {/foreach}
+                                                                                        {/foreach}
+                                                                                </select>
+										</td> 
+										
+									</tr>
+								</table>
+							</td></tr>
+						     </table>
+						     <hr noshade size=1>
+						     <table border=0 cellspacing=0 cellpadding=5 width=90% align=center bgcolor="#FFFFFF">
+							<tr>
+								<td >
+									<table border=0 cellspacing=0 cellpadding=2 width=100% align=center>
+									<tr><td width=50% valign=top style="border-right:1px solid #dddddd">
+										<table border=0 cellspacing=0 cellpadding=2 width=90% align=center>
+											<tr><td colspan=3 ><b>{$MOD.LBL_EVENTSTAT}</b></td></tr>
+											<tr><td colspan=3>{$STARTHOUR}</td></tr>
+											<tr><td>
+												{foreach key=date_value item=time_value from=$ACTIVITYDATA.date_start}
+                                                                                                        {assign var=date_val value="$date_value"}
+                                                                                                        {assign var=time_val value="$time_value"}
+	                                                                                        {/foreach}
+                                                                                                <input type="text" name="date_start" id="jscal_field_date_start" class="textbox" style="width:90px" value="{$date_val}"></td><td width=100%><img border=0 src="{$IMAGE_PATH}btnL3Calendar.gif" alt="Set date.." title="Set date.." id="jscal_trigger_date_start">
+													{foreach key=date_fmt item=date_str from=$secondvalue.date_start}
+													{assign var=date_vl value="$date_fmt"}
+													{/foreach}
+													<script type="text/javascript">
+														Calendar.setup ({ldelim}
+														inputField : "jscal_field_date_start", ifFormat : "{$date_vl}", showsTime : false, button : "jscal_trigger_date_start", singleClick : true, step : 1
+														{rdelim})
+													</script>
+											</td></tr>
+										</table></td>
+										<td width=50% valign=top >
+											<table border=0 cellspacing=0 cellpadding=2 width=90% align=center>
+												<tr><td colspan=3><b>{$MOD.LBL_EVENTEDAT}</b></td></tr>
+												<tr><td colspan=3>{$ENDHOUR}
+												</td></tr>
+												<tr><td>
+													{foreach key=date_value item=time_value from=$ACTIVITYDATA.due_date}
+													{assign var=date_val value="$date_value"}
+													{assign var=time_val value="$time_value"}
+													{/foreach}
+													<input type="text" name="due_date" id="jscal_field_due_date" class="textbox" style="width:90px" value="{$date_val}"></td><td width=100%><img border=0 src="{$IMAGE_PATH}btnL3Calendar.gif" alt="Set date.." title="Set date.." id="jscal_trigger_due_date">
+													{foreach key=date_fmt item=date_str from=$secondvalue.due_date}
+													{assign var=date_vl value="$date_fmt"}
+                                                                                                        {/foreach}
+													<script type="text/javascript">
+														Calendar.setup ({ldelim}
+														inputField : "jscal_field_due_date", ifFormat : "{$date_vl}", showsTime : false, button : "jscal_trigger_due_date", singleClick : true, step : 1
+														{rdelim})
+													</script>
+												</td></tr>
+											</table>
+										</td>
+									</tr>
+								</table></td>
+							</tr>
+						     </table>
+						     <br>
+						     <table border=0 cellspacing=0 cellpadding=0 width=100% align=center>
+							<tr><td>
+								<table border=0 cellspacing=0 cellpadding=3 width=100%>
+									<tr>
+										<td class="dvtTabCache" style="width:10px" nowrap>&nbsp;</td>
+										<td id="cellTabInvite" class="dvtSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabInvite','on');switchClass('cellTabAlarm','off');switchClass('cellTabRepeat','off');switchClass('cellTabRelatedto','off');ghide('addEventAlarmUI');gshow('addEventInviteUI','',document.EditView.date_start.value,document.EditView.due_date.value,document.EditView.starthr.value,document.EditView.startmin.value,document.EditView.startfmt.value,document.EditView.endhr.value,document.EditView.endmin.value,document.EditView.endfmt.value);ghide('addEventRepeatUI');ghide('addEventRelatedtoUI');">{$MOD.LBL_INVITE}</a></td>
+										<td class="dvtTabCache" style="width:10px">&nbsp;</td>
+										<td id="cellTabAlarm" class="dvtUnSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabInvite','off');switchClass('cellTabAlarm','on');switchClass('cellTabRepeat','off');switchClass('cellTabRelatedto','off');gshow('addEventAlarmUI','',document.EditView.date_start.value,document.EditView.due_date.value,document.EditView.starthr.value,document.EditView.startmin.value,document.EditView.startfmt.value,document.EditView.endhr.value,document.EditView.endmin.value,document.EditView.endfmt.value);ghide('addEventInviteUI');ghide('addEventRepeatUI');ghide('addEventRelatedtoUI');">{$MOD.LBL_REMINDER}</a></td>
+										<td class="dvtTabCache" style="width:10px">&nbsp;</td>
+										<td id="cellTabRepeat" class="dvtUnSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabInvite','off');switchClass('cellTabAlarm','off');switchClass('cellTabRepeat','on');switchClass('cellTabRelatedto','off');ghide('addEventAlarmUI');ghide('addEventInviteUI');gshow('addEventRepeatUI','',document.EditView.date_start.value,document.EditView.due_date.value,document.EditView.starthr.value,document.EditView.startmin.value,document.EditView.startfmt.value,document.EditView.endhr.value,document.EditView.endmin.value,document.EditView.endfmt.value);ghide('addEventRelatedtoUI');">{$MOD.LBL_REPEAT}</a></td>
+										<td class="dvtTabCache" style="width:10px">&nbsp;</td>
+										<td id="cellTabRelatedto" class="dvtUnSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabInvite','off');switchClass('cellTabAlarm','off');switchClass('cellTabRepeat','off');switchClass('cellTabRelatedto','on');ghide('addEventAlarmUI');ghide('addEventInviteUI');gshow('addEventRelatedtoUI','',document.EditView.date_start.value,document.EditView.due_date.value,document.EditView.starthr.value,document.EditView.startmin.value,document.EditView.startfmt.value,document.EditView.endhr.value,document.EditView.endmin.value,document.EditView.endfmt.value);ghide('addEventRepeatUI');">{$MOD.LBL_RELATEDTO}</a></td>
+										<td class="dvtTabCache" style="width:100%">&nbsp;</td>
+									</tr>
+								</table>
+							</td></tr>
+							<tr>
+								<td width=100% valign=top align=left class="dvtContentSpace" style="padding:10px;height:120px">
+								<!-- Invite UI -->
+									<DIV id="addEventInviteUI" style="display:block;width:100%">
+									<table border=0 cellspacing=0 cellpadding=2 width=100%>
+										<tr>
+											<td valign=top> 
+												<table border=0 cellspacing=0 cellpadding=2 width=100%>
+													<tr><td colspan=3>
+														<ul style="padding-left:20px">
+														<li>{$MOD.LBL_INVITE_INST1}
+														<li>{$MOD.LBL_INVITE_INST2}
+														</ul>
+													</td></tr>
+													<tr>
+														<td><b>{$MOD.LBL_AVL_USERS}</b></td>
+														<td>&nbsp;</td>
+														<td><b>{$MOD.LBL_SEL_USERS}</b></td>
+													</tr>
+													<tr>
+														<td width=40% align=center valign=top>
+														<select name="availableusers" id="availableusers" class=small size=5 multiple style="height:70px;width:100%">
+														{foreach item=username key=userid from=$USERSLIST}
+														{if $userid != ''}
+														<option value="{$userid}">{$username}</option>
+														{/if}
+														{/foreach}
+														</select>
+														</td>
+														<td width=20% align=center valign=top>
+														<input type=button value="{$MOD.LBL_ADD_BUTTON} >>" class="crm button small save" style="width:100%" onClick="addColumn()"><br>
+														<input type=button value="<< {$MOD.LBL_RMV_BUTTON} " class="crm button small cancel" style="width:100%" onClick="delColumn()">
+														</td>
+														<td width=40% align=center valign=top>
+														<select name="selectedusers" id="selectedusers" class=small size=5 multiple style="height:70px;width:100%">
+														{foreach item=username key=userid from=$INVITEDUSERS}
+														{if $userid != ''}
+														<option value="{$userid}">{$username}</option>
+                                                                                                                {/if}
+                                                                                                                {/foreach}
+														</select>
+														<div align=left> {$MOD.LBL_SELUSR_INFO}
+														</div>
+														</td>
+													</tr>
+												</table>
+											</td>
+										</tr>
+									</table>
+									</DIV>
+									<!-- Reminder UI -->	
+									<DIV id="addEventAlarmUI" style="display:none;width:100%">
+										<table>
+											{assign var=secondval value=$secondvalue.reminder_time}
+											{assign var=check value=$secondval[0]}
+											{assign var=yes_val value=$secondval[1]}
+											{assign var=no_val value=$secondval[2]}
+											
+											<tr><td>{$LABEL.reminder_time}</td><td>
+											<input type="radio" name="set_reminder" value="Yes" {$check} onClick="showBlock('reminderOptions')">&nbsp;{$yes_val}&nbsp;
+											<input type="radio" name="set_reminder" value="No" onClick="fnhide('reminderOptions')">&nbsp;{$no_val}&nbsp;
+											</td></tr>
+										</table>
+									{if $check eq 'CHECKED'}
+										{assign var=reminstyle value='style="display:block;width:100%"'}
+									{else}
+										{assign var=reminstyle value='style="display:none;width:100%"'}
+									{/if}
+									<DIV id="reminderOptions" {$reminstyle}>
+										<table border=0 cellspacing=0 cellpadding=2  width=100%>
+											<tr>
+												<td nowrap align=right width=20% valign=top><b>{$MOD.LBL_RMD_ON} : </b></td>
+												<td width=80%>
+													<table border=0>
+													<tr>
+														<td colspan=2>
+														{foreach item=val_arr from=$ACTIVITYDATA.reminder_time}
+														{assign var=start value="$val_arr[0]"}
+														{assign var=end value="$val_arr[1]"}
+														{assign var=sendname value="$val_arr[2]"}
+														{assign var=disp_text value="$val_arr[3]"}
+														{assign var=sel_val value="$val_arr[4]"}
+														<select name="{$sendname}">
+														{section name=reminder start=$start max=$end loop=$end step=1 }
+														{if $smarty.section.reminder.index eq $sel_val}
+														{assign var=sel_value value="SELECTED"}
+														{else}
+														{assign var=sel_value value=""}
+														{/if}
+														<OPTION VALUE="{$smarty.section.reminder.index}" "{$sel_value}">{$smarty.section.reminder.index}</OPTION>
+														{/section}
+														</select>
+														&nbsp;{$disp_text}
+														{/foreach}
+														</td>
+													</tr>
+													</table>
+												</td>
+											</tr>
+											<tr>
+												<td nowrap align=right>
+													{$MOD.LBL_SDRMD}
+												</td>
+												<td >
+													<input type=text name="toemail" class=textbox style="width:90%" value="{$USEREMAILID}">
+												</td>
+											</tr>
+										</table>
+									</DIV>
+									</DIV>
+									<!-- Repeat UI -->
+									<div id="addEventRepeatUI" style="display:none;width:100%">
+
+									<table border=0 cellspacing=0 cellpadding=2  width=100%>
+										<tr>
+											<td nowrap align=right width=20% valign=top>
+												<strong>{$MOD.LBL_REPEAT}</strong>
+											</td>
+											<td nowrap width=80% valign=top>
+												<table border=0 cellspacing=0 cellpadding=0>
+												<tr>
+							
+													<td width=20>
+													{if $ACTIVITYDATA.recurringcheck eq 'Yes'}
+														{assign var=rptstyle value='style="display:block"'}
+														{if $ACTIVITYDATA.eventrecurringtype eq 'Daily'}
+															{assign var=rptmonthstyle value='style="display:none"'}
+															{assign var=rptweekstyle value='style="display:none"'}
+														{elseif $ACTIVITYDATA.eventrecurringtype eq 'Weekly'}
+															{assign var=rptmonthstyle value='style="display:none"'}
+															{assign var=rptweekstyle value='style="display:block"'}
+														{elseif $ACTIVITYDATA.eventrecurringtype eq 'Monthly'}
+															{assign var=rptmonthstyle value='style="display:block"'}
+															{assign var=rptweekstyle value='style="display:none"'}
+														{elseif $ACTIVITYDATA.eventrecurringtype eq 'Yearly'}
+															{assign var=rptmonthstyle value='style="display:none"'}
+															{assign var=rptweekstyle value='style="display:none"'}
+														{/if}
+													<input type="checkbox" name="recurringcheck" onClick="showhide('repeatOptions')" checked>
+													{else}
+														{assign var=rptstyle value='style="display:none"'}
+														{assign var=rptmonthstyle value='style="display:none"'}
+														{assign var=rptweekstyle value='style="display:none"'}
+													<input type="checkbox" name="recurringcheck" onClick="showhide('repeatOptions')">
+													{/if}
+													</td>
+													<td colspan=2>Enable Repeat</td>
+												</tr>
+												<tr>
+													<td colspan=2>
+													<div id="repeatOptions" {$rptstyle}>
+													<table border=0 cellspacing=0 cellpadding=2>
+													<tr>
+													<td>Repeat once in every</td>
+													<td><input type="text" name="repeat_frequency" class="textbox" style="width:20px" value="{$ACTIVITYDATA.repeat_frequency}" ></td>
+													<td><select name="recurringtype">
+													<option value="Daily" onClick="ghide('repeatWeekUI'); ghide('repeatMonthUI');" {if $ACTIVITYDATA.eventrecurringtype eq 'Daily'} selected {/if}>{$MOD.LBL_DAYS}</option>
+													<option value="Weekly" onClick="gshow('repeatWeekUI'); ghide('repeatMonthUI');" {if $ACTIVITYDATA.eventrecurringtype eq 'Weekly'} selected {/if}>{$MOD.LBL_WEEKS}</option>
+												<option value="Monthly" onClick="ghide('repeatWeekUI'); gshow('repeatMonthUI');" {if $ACTIVITYDATA.eventrecurringtype eq 'Monthly'} selected {/if}>{$MOD.LBL_MONTHS}</option>
+													<option value="Yearly" onClick="ghide('repeatWeekUI'); ghide('repeatMonthUI');"; {if $ACTIVITYDATA.eventrecurringtype eq 'Yearly'} selected {/if}>{$MOD.LBL_YEAR}</option>
+													</select>
+													</td>
+												</tr>
+												</table>
+												<div id="repeatWeekUI" {$rptweekstyle}>
+												<table border=0 cellspacing=0 cellpadding=2>
+												<tr>
+													<td><input name="sun_flag" value="sunday" {$ACTIVITYDATA.week0} type="checkbox"></td><td>Sun</td>
+													<td><input name="mon_flag" value="monday" {$ACTIVITYDATA.week1} type="checkbox"></td><td>Mon</td>
+													<td><input name="tue_flag" value="tuesday" {$ACTIVITYDATA.week2} type="checkbox"></td><td>Tue</td>
+													<td><input name="wed_flag" value="wednesday" {$ACTIVITYDATA.week3} type="checkbox"></td><td>Wed</td>
+													<td><input name="thu_flag" value="thursday" {$ACTIVITYDATA.week4} type="checkbox"></td><td>Thu</td>
+													<td><input name="fri_flag" value="friday" {$ACTIVITYDATA.week5} type="checkbox"></td><td>Fri</td>
+													<td><input name="sat_flag" value="saturday" {$ACTIVITYDATA.week6} type="checkbox"></td><td>Sat</td>
+												</tr>
+												</table>
+												</div>
+	
+												<div id="repeatMonthUI" {$rptmonthstyle}>
+												<table border=0 cellspacing=0 cellpadding=2>
+												<tr>
+													<td>
+														<table border=0 cellspacing=0 cellpadding=2>
+														<tr>
+														<td><input type="radio" checked name="repeatMonth" {if $ACTIVITYDATA.repeatMonth eq 'date'} checked {/if} value="date"></td><td>on</td><td><input type="text" class=textbox style="width:20px" value="{$ACTIVITYDATA.repeatMonth_date}" name="repeatMonth_date" ></td><td>day of the month</td>
+														</tr>
+														</table>
+													</td>
+												</tr>
+												<tr>
+													<td>
+														<table border=0 cellspacing=0 cellpadding=2>
+														<tr><td>
+														<input type="radio" name="repeatMonth" {if $ACTIVITYDATA.repeatMonth eq 'day'} checked {/if} value="day"></td>
+														<td>on</td>
+														<td>
+														<select name="repeatMonth_daytype">
+															<option value="first" {if $ACTIVITYDATA.repeatMonth_daytype eq 'first'} selected {/if}>First</option>
+															<option value="last" {if $ACTIVITYDATA.repeatMonth_daytype eq 'last'} selected {/if}>Last</option>
+														</select>
+														</td>
+														<td>
+														<select name="repeatMonth_day">
+															<option value=1 {if $ACTIVITYDATA.repeatMonth_day eq 1} selected {/if}>{$MOD.LBL_DAY1}</option>
+															<option value=2 {if $ACTIVITYDATA.repeatMonth_day eq 2} selected {/if}>{$MOD.LBL_DAY2}</option>
+															<option value=3 {if $ACTIVITYDATA.repeatMonth_day eq 3} selected {/if}>{$MOD.LBL_DAY3}</option>
+															<option value=4 {if $ACTIVITYDATA.repeatMonth_day eq 4} selected {/if}>{$MOD.LBL_DAY4}</option>
+															<option value=5 {if $ACTIVITYDATA.repeatMonth_day eq 5} selected {/if}>{$MOD.LBL_DAY5}</option>
+															<option value=6 {if $ACTIVITYDATA.repeatMonth_day eq 6} selected {/if}>{$MOD.LBL_DAY6}</option>
+														</select>
+														</td>
+														</tr>
+														</table>
+													</td>
+												</tr>
+												</table>
+												</div>
+								
+											</div>
+										</td>
+										</tr>
+									</table>
+								</td>
+							</tr>
+						</table>
+						</div>
+						<div id="addEventRelatedtoUI" style="display:none;width:100%">
+						<table width="100%" cellpadding="5" cellspacing="0" border="0">
+							<tr>
+								<td><b>{$MOD.LBL_RELATEDTO}</b></td>
+								<td>
+									<input name="parent_id" type="hidden" value="{$secondvalue.parent_id}">
+									<select name="parent_type" class="small" id="parent_type" onChange="document.EditView.parent_name.value='';document.EditView.parent_id.value=''">
+									{section name=combo loop=$LABEL.parent_id}
+										<option value="{$fldlabel_combo.parent_id[combo]}" {$fldlabel_sel.parent_id[combo]}>{$LABEL.parent_id[combo]}</option>
+									{/section}
+                                             				</select>
+								</td>
+								<td>
+									<div id="eventrelatedto" align="left">
+										<input name="parent_name" readonly type="text" class="calTxt small" value="{$ACTIVITYDATA.parent_id}">
+										<input type="button" name="selectparent" class="crmButton small edit" value="Select" onclick="return window.open('index.php?module='+document.EditView.parent_type.value+'&action=Popup','test','width=640,height=602,resizable=0,scrollbars=0,top=150,left=200');">
+									</div>
+								</td>
+							</tr>
+							<tr>
+								<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;
+									<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>
+						</table>
+					</div>
+			</td>
+		</tr>
+		</table>
+		<!-- Alarm, Repeat, Invite stops-->
+		{else}
+		<table border="0" cellpadding="5" cellspacing="0" width="100%">
+			<tr>
+                        	<td class="cellLabel" width="20%" align="right"><b>{$MOD.LBL_TODO}</b></td>
+                        	<td class="cellInfo" width="80%" align="left"><input name="subject" value="{$ACTIVITYDATA.subject}" class="textbox" style="width: 70%;" type="text"></td>
+           		</tr>
+			<tr>
+				<td class="cellLabel" align="right"><b>{$LABEL.description}</b></td>
+				<td class="cellInfo" align="left"><textarea style="width: 90%; height: 60px;" name="description">{$ACTIVITYDATA.description}</textarea>
+			</tr>
+			<tr>
+		    		<td colspan="2" align="center" width="100%" style="padding:0px">
+					<table border="0" cellpadding="5" cellspacing="1" width="100%">
+            					<tr>
+							<td class="cellLabel" width=33% align="left"><b>{$LABEL.taskstatus}</td>
+              						<td class="cellLabel" width=33% align="left"><b>{$LABEL.taskpriority}</b></td>
+              						<td class="cellLabel" width=34% align="left"><b>{$LABEL.assigned_user_id}</b></td>
+						</tr>
+						<tr>
+							<td align="left" valign="top">
+								<select name="taskstatus" id="taskstatus" class=small>
+                                        			{foreach item=arr from=$ACTIVITYDATA.taskstatus}
+                                        			{foreach key=sel_value item=value from=$arr}
+                                                			<option value="{$sel_value}" {$value}>
+                                                        		{if $APP[$sel_value] neq ''}
+                                                                		{$APP[$sel_value]}
+                                                        		{else}
+                                                                		{$sel_value}
+                                                        		{/if}
+                                                			</option>
+                                        			{/foreach}
+                                        			{/foreach}
+                                				</select>
+							</td>
+							<td align="left" valign="top">
+								<select name="taskpriority" id="taskpriority" class=small>
+        			                                {foreach item=arr from=$ACTIVITYDATA.taskpriority}
+                                			        {foreach key=sel_value item=value from=$arr}
+			                                                <option value="{$sel_value}" {$value}>
+                        		                                {if $APP[$sel_value] neq ''}
+                                        		                        {$APP[$sel_value]}
+                                                       			{else}
+                                                                		{$sel_value}
+                                                        		{/if}
+                                                			</option>
+                                        			{/foreach}
+                                        			{/foreach}
+                                				</select>
+							</td>
+							<td align="left" valign="top">
+								{assign var=check value=1}
+                                        			{foreach key=key_one item=arr from=$ACTIVITYDATA.assigned_user_id}
+			                                        {foreach key=sel_value item=value from=$arr}
+                        		                              	{if $value ne ''}
+                                        		                      	{assign var=check value=$check*0}
+                                                        		{else}
+                                                                		{assign var=check value=$check*1}
+                                                        		{/if}
+                                                		{/foreach}
+                                        			{/foreach}
+								{if $check eq 0}
+                                             				{assign var=select_user value='checked'}
+                                                			{assign var=style_user value='display:block'}
+                                                			{assign var=style_group value='display:none'}
+                                        			{else}
+                                                			{assign var=select_group value='checked'}
+                                                			{assign var=style_user value='display:none'}
+                                                			{assign var=style_group value='display:block'}
+                                        			{/if}
+				                                <input type="radio" name="assigntype" {$select_user} value="U" onclick="toggleAssignType(this.value)">&nbsp;User
+				                                {if $secondvalue.assigned_user_id neq ''}
+                                			        <input type="radio" name="assigntype" {$select_group} value="T" onclick="toggleAssignType(this.value)">&nbsp;Group
+                                        			{/if}
+                                        			<span id="assign_user" style="{$style_user}">
+                                                		<select name="assigned_user_id" class=small>
+                                                        	{foreach key=key_one item=arr from=$ACTIVITYDATA.assigned_user_id}
+				                                {foreach key=sel_value item=value from=$arr}
+                                		                	<option value="{$key_one}" {$value}>{$sel_value}</option>
+								{/foreach}
+                                                        	{/foreach}
+                                                		</select>
+								</span>
+								{if $secondvalue.assigned_user_id neq ''}
+                                                		<span id="assign_team" style="{$style_group}">
+                                                        		<select name="assigned_group_name" class=small>';
+                                                                		{foreach key=key_one item=arr from=$secondvalue.assigned_user_id}
+                                                                       		{foreach key=sel_value item=value from=$arr}
+                                                                               		<option value="{$sel_value}" {$value}>{$sel_value}</option>
+                                                                       		{/foreach}
+                                                                		{/foreach}
+                                                        		</select>
+				                                </span>
+                                				{/if}	
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			</table>
+			<table border="0" cellpadding="0" cellspacing="1" width="100%" align=center>
+			<tr><td width=50% valign=top>
+				<table border=0 cellspacing=0 cellpadding=2 width=100% align=center >
+					<tr><td colspan=3  class="mailSubHeader"><b>{$MOD.LBL_TODODATETIME}</b></td></tr>
+					<tr><td colspan=3>{$STARTHOUR}</td></tr>
+					<tr><td>
+							{foreach key=date_value item=time_value from=$ACTIVITYDATA.date_start}
+	                                        		{assign var=date_val value="$date_value"}
+								{assign var=time_val value="$time_value"}
+                                        		{/foreach}
+							<input name="date_start" id="date_start" class="textbox" style="width: 90px;" value="{$date_val}" type="text"></td><td width=100%><img src="{$IMAGE_PATH}btnL3Calendar.gif" alt="Set date.." title="Set date.." id="jscal_trigger_date_start" align="middle" border="0">
+							{foreach key=date_fmt item=date_str from=$secondvalue.date_start}
+								{assign var=date_vl value="$date_fmt"}
+							{/foreach}				
+							<script type="text/javascript">
+								Calendar.setup ({ldelim}
+	        	                                	inputField : "date_start", ifFormat : "{$date_vl}", showsTime : false, button : "jscal_trigger_date_start", singleClick : true, step : 1
+							{rdelim})
+							</script>
+						</td></tr>
+					</table></td>
+					<td width=50% valign="top">
+                                                <table border="0" cellpadding="2" cellspacing="0" width="100%" align=center>
+							<tr><td class="mailSubHeader" colspan=3><b>{$LABEL.due_date}</b></td></tr>
+							<tr><td>
+								{foreach key=date_value item=time_value from=$ACTIVITYDATA.due_date}
+									{assign var=date_val value="$date_value"}
+									{assign var=time_val value="$time_value"}
+								{/foreach}
+								<input name="due_date" id="due_date" class="textbox" style="width: 90px;" value="{$date_val}" type="text"></td><td width=100%><img src="{$IMAGE_PATH}btnL3Calendar.gif" alt="Set date.." title="Set date.." id="jscal_trigger_due_date" border="0">
+								{foreach key=date_fmt item=date_str from=$secondvalue.due_date}
+                                                			{assign var=date_vl value="$date_fmt"}
+                                        			{/foreach}
+				      				<script type="text/javascript">
+								Calendar.setup ({ldelim}
+	                                        			inputField : "date_start", ifFormat : "{$date_vl}", showsTime : false, button : "jscal_trigger_due_date", singleClick : true, step : 1
+					   			{rdelim})
+								</script>
+        						</td></tr>
+						</table></td>
+					</tr>
+				</table>
+				<br><br>
+		<table align="center" border="0" cellpadding="0" cellspacing="0" width="95%" bgcolor="#FFFFFF">
+			<tr>
+				<td>
+					<table border="0" cellpadding="3" cellspacing="0" width="100%">
+						<tr>
+							<td class="dvtTabCache" style="width: 10px;" nowrap="nowrap">&nbsp;</td>
+							<td id="cellTabInvite" class="dvtSelectedCell" align="center" nowrap="nowrap"><a href="javascript:doNothing()" onClick="switchClass('cellTabInvite','on');switchClass('cellTabRelatedto','off');Taskshow('addTaskAlarmUI','todo',document.EditView.date_start.value,document.EditView.starthr.value,document.EditView.startmin.value,document.EditView.startfmt.value);ghide('addTaskRelatedtoUI');">{$MOD.LBL_NOTIFICATION}</a></td>
+							<td class="dvtTabCache" style="width: 10px;" nowrap="nowrap">&nbsp;
+                                                        <td id="cellTabRelatedto" class="dvtUnSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabInvite','off');switchClass('cellTabRelatedto','on');Taskshow('addTaskRelatedtoUI','todo',document.EditView.date_start.value,document.EditView.starthr.value,document.EditView.startmin.value,document.EditView.startfmt.value);ghide('addTaskAlarmUI');">{$MOD.LBL_RELATEDTO}</a></td>
+                                                        <td class="dvtTabCache" style="width:100%">
+						</tr>
+
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td class="dvtContentSpace" style="padding: 10px; height: 120px;" align="left" valign="top" width="100%">
+			<!-- Reminder UI -->
+			<div id="addTaskAlarmUI" style="display: block; width: 100%;">
+                	<table>
+				<tr><td>{$LABEL.sendnotification}</td>
+					{if $ACTIVITYDATA.sendnotification eq 1}
+                                        <td>
+                                                <input name="sendnotification" type="checkbox" checked>
+                                        </td>
+                                	{else}
+                                        <td>
+                                                <input name="sendnotification" type="checkbox">
+                                        </td>
+                                	{/if}
+				</tr>
+			</table>
+			</div>
+			<div id="addTaskRelatedtoUI" style="display:none;width:100%">
+           		     <table width="100%" cellpadding="5" cellspacing="0" border="0">
+                	     <tr>
+                        	     <td><b>{$MOD.LBL_RELATEDTO}</b></td>
+                                     <td>
+					<input name="parent_id" type="hidden" value="{$secondvalue.parent_id}">
+                                             <select name="parent_type" class="small" id="parent_type" onChange="document.EditView.parent_name.value='';document.EditView.parent_id.value=''">
+							{section name=combo loop=$LABEL.parent_id}
+								<option value="{$fldlabel_combo.parent_id[combo]}" {$fldlabel_sel.parent_id[combo]}>{$LABEL.parent_id[combo]}</option>
+							{/section}
+					     </select>
+                                     </td>
+                                     <td>
+                              	        <div id="taskrelatedto" align="left">
+						<input name="parent_name" readonly type="text" class="calTxt small" value="{$ACTIVITYDATA.parent_id}">
+						<input type="button" name="selectparent" class="crmButton small edit" value="Select" onclick="return window.open('index.php?module='+document.EditView.parent_type.value+'&action=Popup','test','width=640,height=602,resizable=0,scrollbars=0,top=150,left=200');">
+					 </div>
+                                     </td>
+			     </tr>
+			     <tr>
+                                     <td><b>{$LABEL.contact_id}</b></td>
+				     <td colspan="2">
+						<input name="contact_name" readonly type="text" class="calTxt" value="{$ACTIVITYDATA.contact_id}"><input name="contact_id" type="hidden" value="{$secondvalue.contact_id}">&nbsp;
+						<input type="button" onclick="return window.open('index.php?module=Contacts&action=Popup&html=Popup_picker&popuptype=specific&form=EditView','test','width=640,height=602,resizable=0,scrollbars=0');" class="crmButton small edit" name="selectcnt" value="Select Contact">
+				     </td>
+                             </tr>
+		</table>
+              	</div>
+                </td></tr></table>
+
+		{/if}
+			</td></tr>
+			<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" {if $ACTIVITY_MODE neq 'Task'} onclick="this.form.action.value='Save';  displaydeleted();return maincheck_form();"{else} onclick="this.form.action.value='Save';  displaydeleted(); maintask_check_form();return formValidate();" {/if} 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>
+		</td></tr></table>
+		</td></tr></table>
+		</td></tr></table>
+</td></tr>
+</form></table>
+</td></tr></table>
+</td></tr></table>
+</td></tr></table>
+        </td></tr></table>
+        </td></tr></table>
+        </div>
+        </td>
+        <td valign=top><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+        </tr>
+        </table>
+<script>
+{if $ACTIVITY_MODE eq 'Task'}
+	var fieldname = new Array('subject','date_start','time_start','taskstatus');
+	var fieldlabel = new Array('Subject','Date','Time','Status');
+	var fielddatatype = new Array('V~M','D~M~time_start','T~O','V~O');
+{else}
+	var fieldname = new Array('subject','date_start','due_date','taskpriority','sendnotification','parent_id','contact_id','reminder_time','recurringtype');
+	var fieldlabel = new Array('Subject','Start Date','Due Date','Priority','Send Notification','Related To','Contact Name','Send Reminder','Recurrence');
+	var fielddatatype = new Array('V~M','D~M','D~M~OTH~GE~date_start~Start Date','V~O','C~O','I~O','I~O','I~O','O~O');
+{/if}
+</script>
+<script>	
+	var ProductImages=new Array();
+	var count=0;
+
+	function delRowEmt(imagename)
+	{ldelim}
+		ProductImages[count++]=imagename;
+	{rdelim}
+
+	function displaydeleted()
+	{ldelim}
+		var imagelists='';
+		for(var x = 0; x < ProductImages.length; x++)
+		{ldelim}
+			imagelists+=ProductImages[x]+'###';
+		{rdelim}
+
+		if(imagelists != '')
+			document.EditView.imagelist.value=imagelists
+	{rdelim}
+
+</script>
+<script language="JavaScript" type="text/JavaScript">
+	setObjects();
+</script>




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 03:06:10 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 07:06:10 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9402 -
	/vtigercrm/trunk/install/0welcome.php
Message-ID: <20060911070610.69E9676D61A@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Mon Sep 11 01:05:17 2006
New Revision: 9402

Log:
Version changed from RC to 5.0.0 --Jeri

Modified:
    vtigercrm/trunk/install/0welcome.php

Modified: vtigercrm/trunk/install/0welcome.php
==============================================================================
--- vtigercrm/trunk/install/0welcome.php (original)
+++ vtigercrm/trunk/install/0welcome.php Mon Sep 11 01:05:17 2006
@@ -97,10 +97,10 @@
 
 					<tr>
 						<td align=left class="small" style="padding-left:20px">
-		<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;This Configuration Wizard will create vtiger CRM 5.0 RC databases and tables and configuration files you need to start. The entire process should take about four minutes. Click the Start button when you are ready. 
+		<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;This Configuration Wizard will create vtiger CRM 5.0.0 databases and tables and configuration files you need to start. The entire process should take about four minutes. Click the Start button when you are ready. 
 <br><br>
-<p><span style="color:#555555">- vtiger CRM 5.0 RC is tested on mySQL 4.1.X, mySQL 5.0.19, PHP 5.0.19 and Apache 2.0.40.</p> 
-<p align="center"><font color='red'><b>vtiger CRM 5 RC will not work on mysql 4.0.x versions</b></font></center><center><font color='blue'><b>vtiger crm can run on a system which has xampp/lampp/wampp already installed in it provided it meets the above mentioned requirements</b></font></center>
+<p><span style="color:#555555">- vtiger CRM 5.0.0 is tested on mySQL 4.1.X, mySQL 5.0.19, PHP 5.0.19 and Apache 2.0.40.</p> 
+<p align="center"><font color='red'><b>vtiger CRM 5.0.0 will not work on mysql 4.0.x versions</b></font></center><center><font color='blue'><b>vtiger crm can run on a system which has xampp/lampp/wampp already installed in it provided it meets the above mentioned requirements</b></font></center>
 <p>The installation wizard will guide you with the installation regardless of the setup you may have.</span>
 						
 					  </td>




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 07:18:22 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 11:18:22 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9403 -
	/vtigercrm/trunk/modules/Users/add2db.php
Message-ID: <20060911111822.6D51576D630@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Mon Sep 11 05:18:08 2006
New Revision: 9403

Log:
Issue while uploading templated because of vtiger_ prefix has been fixed --Jeri

Modified:
    vtigercrm/trunk/modules/Users/add2db.php

Modified: vtigercrm/trunk/modules/Users/add2db.php
==============================================================================
--- vtigercrm/trunk/modules/Users/add2db.php (original)
+++ vtigercrm/trunk/modules/Users/add2db.php Mon Sep 11 05:18:08 2006
@@ -89,7 +89,7 @@
 			$module = $_REQUEST['target_module'];
 			$sql = "INSERT INTO vtiger_wordtemplates ";
 			$sql .= "(templateid,module,date_entered,parent_type,data,description,filename,filesize,filetype) ";
-			$sql .= "VALUES (".$genQueryId.",'".$module."',".$adb->formatString('wordtemplates','date_entered',$date_entered).",'$parent_type',".$adb->getEmptyBlob().",'$strDescription',";
+			$sql .= "VALUES (".$genQueryId.",'".$module."',".$adb->formatString('vtiger_wordtemplates','date_entered',$date_entered).",'$parent_type',".$adb->getEmptyBlob().",'$strDescription',";
 			$sql .= "'$filename', '$filesize', '$filetype')";
 
 			$result = $adb->query($sql);




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 09:05:35 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 13:05:35 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9404 -
	/vtigercrm/trunk/include/js/dtlviewajax.js
Message-ID: <20060911130535.041B176D633@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Mon Sep 11 07:05:22 2006
New Revision: 9404

Log:
Issue in assigned user ajax edit has been fixed --Jeri

Modified:
    vtigercrm/trunk/include/js/dtlviewajax.js

Modified: vtigercrm/trunk/include/js/dtlviewajax.js
==============================================================================
--- vtigercrm/trunk/include/js/dtlviewajax.js (original)
+++ vtigercrm/trunk/include/js/dtlviewajax.js Mon Sep 11 07:05:22 2006
@@ -135,7 +135,7 @@
 			var groupurl = "&assigned_group_name="+group_name+"&assigntype=T"
 		}
 
-	}if(globaluitype == 33)
+	}else if(globaluitype == 33)
 	{
 	  var txtBox= "txtbox_"+ fieldLabel;
 	  var oMulSelect = $(txtBox);
@@ -145,8 +145,7 @@
       if (oMulSelect.options[iter].selected)
         r[r.length] = oMulSelect.options[iter].value;
       }
-	}
-  else
+	}else
 	{
 		var txtBox= "txtbox_"+ fieldLabel;
 	}
@@ -163,7 +162,6 @@
 	$("vtbusy_info").style.display="inline";
 	var isAdmin = document.getElementById("hdtxt_IsAdmin").value; 
 
-	var tagValue = trim(document.getElementById(txtBox).value);
 
 	//overriden the tagValue based on UI Type for checkbox 
 	if(uitype == '56')
@@ -186,8 +184,11 @@
 		}
 	}else if(uitype == '33')
 	{
-			tagValue = r.join(" |##| ");
-  	}
+		tagValue = r.join(" |##| ");
+  	}else
+	{
+		tagValue = trim(document.getElementById(txtBox).value);
+	}
 
 
 	var data = "file=DetailViewAjax&module=" + module + "&action=" + module + "Ajax&record=" + crmId+"&recordid=" + crmId ;
@@ -212,12 +213,10 @@
 	if(uitype == '13' || uitype == '104')
 	{
 		getObj(dtlView).innerHTML = "<a href=\"mailto:"+ tagValue+"\" target=\"_blank\">"+tagValue+"&nbsp;</a>";
-	}
-	else if(uitype == '17')
+	}else if(uitype == '17')
 	{
 		getObj(dtlView).innerHTML = "<a href=\"http://"+ tagValue+"\" target=\"_blank\">"+tagValue+"&nbsp;</a>";
-	}
-	else if(uitype == '53')
+	}else if(uitype == '53')
 	{
 		var hdObj = getObj(hdTxt);
 		if(typeof(document.DetailView.assigntype[0]) != 'undefined')
@@ -238,8 +237,7 @@
 		{
 			getObj(dtlView).innerHTML = "<a href=\"index.php?module=Users&action=GroupDetailView&groupId="+tagValue+"\">"+hdObj.value+"&nbsp;</a>";
 		}
-	}
-	else if(uitype == '56')
+	}else if(uitype == '56')
 	{
 		if(tagValue == '1')
 		{




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 09:31:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 13:31:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9405 -
	/vtigercrm/trunk/include/js/conveyor.js
Message-ID: <20060911133149.6024D76D62B@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Mon Sep 11 07:31:42 2006
New Revision: 9405

Log:
unwanted file deleted --Jeri

Removed:
    vtigercrm/trunk/include/js/conveyor.js




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 09:47:19 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 13:47:19 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9406 -
	/vtigercrm/trunk/modules/Users/about_us.php
Message-ID: <20060911134719.A7A5576D5EF@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep 11 07:46:57 2006
New Revision: 9406

Log:
Updated for the latest 5 GA release

Modified:
    vtigercrm/trunk/modules/Users/about_us.php

Modified: vtigercrm/trunk/modules/Users/about_us.php
==============================================================================
--- vtigercrm/trunk/modules/Users/about_us.php (original)
+++ vtigercrm/trunk/modules/Users/about_us.php Mon Sep 11 07:46:57 2006
@@ -82,7 +82,7 @@
 				<td width="70%" style="border:3px solid #CCCCCC;" height="100" >
 						<marquee behavior="scroll" direction="up" width="100%" scrollamount="1" scrolldelay="50"  height="100" onMouseOut="javascript:start();" onMouseOver="javascript:stop();">
 								<table width="100%" border="0" cellpadding="0" cellspacing="0" class="rollOver">
-										<tr><th>Team</th></tr>
+								<tr><th><?php echo $mod_strings['LBL_TEAM'];?></th></tr>
 										<tr><td>Ahmed</td></tr>
 										<tr><td>Don</td></tr>
 										<tr><td>Ela</td></tr>
@@ -92,31 +92,74 @@
 										<tr><td>Mickie</td></tr>
 										<tr><td>Minnie</td></tr>
 										<tr><td>Philip</td></tr>
+										<tr><td>Radiant</td></tr>
 										<tr><td>Richie</td></tr>
-										<tr><td>Saint</td></tr>
 										<tr><td>SRaj</td></tr>
 										<tr><td>&nbsp;</td></tr>
-										<tr><th>Credits</th></tr>
-										<tr><td>Matthew Brichacek</td></tr>
-										<tr><td>Michel JACQUEMES </td></tr>
-										<tr><td>Mike Crowe </td></tr>
+										<tr><th><?php echo $mod_strings['LBL_CREDITS'];?></th></tr>
+										<tr><td>Aissa Belaid</td></tr>
 										<tr><td>Allan Bush</td></tr>
-										<tr><td>Frank Piepiorra</td></tr>
-										<tr><td>Dino Eberle </td></tr>
-										<tr><td>Jamie Jackson</td></tr>
-										<tr><td>Aissa Belaid</td></tr>
-										<tr><td>Sergio A. Kessler</td></tr>
-										<tr><td>Jeff Kowalczyk</td></tr>
 										<tr><td>Brian Devendorf</td></tr>
 										<tr><td>Brian Laughlin</td></tr>
+										<tr><td>Davide Giarolo</td></tr>	
 										<tr><td>Dennis Grant</td></tr>
+										<tr><td>Dhr. R.R. Gerbrands</td></tr>
+										<tr><td>Dino Eberle</td></tr> 
+										<tr><td>Dirk Gorny</td></tr>
 										<tr><td>Fathi Boudra</td></tr>
+										<tr><td>Frank Piepiorra</td></tr>
 										<tr><td>Jamie Jackson</td></tr>
+										<tr><td>Jeff Kowalczyk</td></tr>
+										<tr><td>Jens Gammelgaard</td></tr>
+										<tr><td>Jens Hamisch</td></tr>
+										<tr><td>Joao Oliveira</td></tr>
 										<tr><td>Joel Rydbeck</td></tr>
 										<tr><td>Josh Lee</td></tr>
+										<tr><td>Ken Lyle</td></tr>
+										<tr><td>Kim Haverblad</td></tr>
+										<tr><td>Manilal K M</td></tr>
+										<tr><td>Matjaz Slak</td></tr>
+										<tr><td>Matthew Brichacek</td></tr>
+										<tr><td>Michel Jacquemes</td></tr> 
+										<tr><td>Mike Crowe</td></tr> 
 										<tr><td>Mike Fedyk</td></tr>
+										<tr><td>Neil</td></tr>
+										<tr><td>Tim Smith</td></tr>
+										<tr><td>Sergio A. Kessler</td></tr>
+										<tr><td>Valmir Carlos Trindade</td></tr>
 										<tr><td>&nbsp;</td></tr>
-										<tr><td><b>And vtiger Community</b></td></tr>
+										<tr><th><?php echo $mod_strings['LBL_CREDITS'];?> - <?php echo $mod_strings['LBL_THIRD_PARTY'];?></th></tr>
+										<tr><td><a href="http://adodb.sourceforge.net" target="_blank">ADOdb</a></td></tr>
+										<tr><td><a href="http://www.os-solution.com/demo/ajaxcsspopupchat/index.php" target="_blank">Ajax Popup Chat</a></td></tr>
+										<tr><td><a href="http://httpd.apache.org/" target="_blank">Apache HTTP Server</a></td></tr>
+										<tr><td><a href="http://www.linuxscope.net/articles/mailAttachmentsPHP.html" target="_blank">Attachments in E-mail Client</a></td></tr>
+										<tr><td><a href="http://www.hmhd.com/steve" target="_blank">Calculator</a></td></tr>
+										<tr><td><a href="http://www.dynamicdrive.com/dynamicindex14/carousel2.htm" target="_blank">Carousel Slideshow</a></td></tr>
+										<tr><td><a href="http://www.troywolf.com/articles/php/class_http/" target="_blank">class_http</a></td></tr>
+										<tr><td><a href="http://freshmeat.net/projects/phpexcelreader/" target="_blank">ExcelReader</a></td></tr>
+										<tr><td><a href="http://www.fckeditor.net/download/default.html" target="_blank">FCKeditor</a></td></tr>
+										<tr><td><a href="http://www.fpdf.org" target="_blank">FPDF</a></td></tr>
+										<tr><td><a href="http://www.getluky.net" target="_blank">freetag</a></td></tr>
+										<tr><td><a href="http://www.boutell.com/gd/" target="_blank">gdwin32</a></td></tr>
+										<tr><td><a href="http://pear.php.net/package/Image_Graph" target="_blank">Graph</a></td></tr>
+										<tr><td><a href="http://slayeroffice.com/code/imageCrossFade/xfade2.html" target="_blank">Image Crossfade Redux</a></td></tr>
+										<tr><td><a href="http://pear.php.net/pepr/pepr-proposal-show.php?id=212" target="_blank">Image_Canvas</a></td></tr>
+										<tr><td><a href="http://pear.php.net/package/Image_Color" target="_blank">Image_Color</a></td></tr>
+										<tr><td><a href="http://www.dynarch.com/projects/calendar/" target="_blank">jscalendar</a></td></tr>
+										<tr><td><a href="http://www.vxr.it/log4php/" target="_blank">log4php</a></td></tr>
+										<tr><td><a href="http://magpierss.sourceforge.net/" target="_blank">MagpieRSS</a></td></tr>
+										<tr><td><a href="http://wiki.wonko.com/software/mailfeed/" target="_blank">Mailfeed</a></td></tr>
+										<tr><td><a href="http://www.mysql.com" target="_blank">MySQL</a></td></tr>
+										<tr><td><a href="http://sourceforge.net/projects/nusoap" target="_blank">nusoap</a></td></tr>
+										<tr><td><a href="http://www.php.net" target="_blank">PHP</a></td></tr>
+										<tr><td><a href="http://phpmailer.sourceforge.net/" target="_blank">PHPMailer</a></td></tr>
+										<tr><td><a href="http://phpsysinfo.sourceforge.net/" target="_blank">phpSysinfo</a></td></tr>
+										<tr><td><a href="http://prototype.conio.net" target="_blank">Prototype</a></td></tr>
+										<tr><td><a href="http://script.aculo.us" target="_blank">script.oculo.us</a></td></tr>
+										<tr><td><a href="http://smarty.php.net/" target="_blank">Smarty Template Engine</a></td></tr>
+										<tr><td><a href="http://www.sugarcrm.com" target="_blank">SugarCRM</a> (SPL 1.1.2)</td></tr>
+										<tr><td>&nbsp;</td></tr>
+										<tr><td><b><?php echo $mod_strings['LBL_COMMUNITY'];?></b></td></tr>
 										<tr><td>&nbsp;</td></tr>
 										<tr><td>&nbsp;</td></tr>
 								</table>
@@ -129,13 +172,13 @@
 		  <td colspan="3" background="<? echo $image_path;?>about_btm.jpg" height="75">
 		  		<table width="100%" border="0" cellpadding="5" cellspacing="0">
 						<tr>
-							<td width="70%" align="left">
-									<span class="small" style="color:#999999;">Version : 5.0.0 rc</span>&nbsp;|&nbsp;
-									<a href="http://www.vtiger.com/copyrights/LICENSE_AGREEMENT.txt" class="webMnu" target="_blank">Read License</a>&nbsp;|&nbsp;
-									<a href="http://www.vtiger.com/index.php?option=com_content&task=view&id=26&Itemid=54" class="webMnu" target="_blank">Contact Us</a>
+							<td width="70%" align="left" class="small">
+							<span class="small" style="color:#999999;"><?php echo $mod_strings['LBL_VERSION'];?> : 5.0.0 </span>&nbsp;|&nbsp;
+									<a href="http://www.vtiger.com/copyrights/LICENSE_AGREEMENT.txt" target="_blank"><?php echo $mod_strings['LBL_READ_LICENSE'];?></a>&nbsp;|&nbsp;
+									<a href="http://www.vtiger.com/index.php?option=com_content&task=view&id=26&Itemid=54" target="_blank"><?php echo $mod_strings['LBL_CONTACT_US'];?></a>
 							</td>
 							<td align="right">
-									<input type="button" name="close" value=" &nbsp;Close&nbsp; " onClick="window.close();" class="crmbutton small cancel">
+									<input type="button" name="close" value=" &nbsp;<?php echo $mod_strings['LBL_CLOSE'];?>&nbsp; " onClick="window.close();" class="crmbutton small cancel">
 							</td>
 						</tr>
 				</table>




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 09:49:11 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 13:49:11 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9407 -
 /vtigercrm/trunk/modules/Users/language/en_us.lang.php
Message-ID: <20060911134911.B8B3076D63B@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep 11 07:49:01 2006
New Revision: 9407

Log:
i18n for about us -- By Ahmed

Modified:
    vtigercrm/trunk/modules/Users/language/en_us.lang.php

Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Users/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Users/language/en_us.lang.php Mon Sep 11 07:49:01 2006
@@ -599,6 +599,18 @@
 'LBL_MANDATORY_MSG'=>'Mandatory Fields',
 'LBL_DISABLE_FIELD_MSG'=>'Fields Disabled from Global Field Access Settings',
 
+//Added for About Us
+
+'LBL_CONTACT_US'=>'Contact Us',
+'LBL_READ_LICENSE'=>'Read License',
+'LBL_VERSION'=>'Version',
+'LBL_TEAM'=>'Team',
+'LBL_CREDITS'=>'Credits',
+'LBL_THIRD_PARTY'=>'Third Party Packages',
+'LBL_COMMUNITY'=>'And vtiger Community',
+
+'LBL_ASSIGN_ROLE'=>'Assign Role',
+
 );
 
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 09:52:28 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 13:52:28 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9408 -
	/vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl
Message-ID: <20060911135228.58E8F76D63B@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep 11 07:52:20 2006
New Revision: 9408

Log:
Fixed the Settings link URL --By Ahmed

Modified:
    vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl

Modified: vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl Mon Sep 11 07:52:20 2006
@@ -31,7 +31,8 @@
 <tr><td style="height:2px"></td></tr>
 <tr>
 	{if $CATEGORY eq 'Settings'}
-		<td style="padding-left:10px;padding-right:50px" class="moduleName" nowrap><a class="hdrLink" href="index.php?action=ListView&module={$MODULE}&parenttab={$CATEGORY}">{$APP.$MODULE}</a></td>
+<!-- No List View in Settings - Action is index -->
+		<td style="padding-left:10px;padding-right:50px" class="moduleName" nowrap><a class="hdrLink" href="index.php?action=index&module={$MODULE}&parenttab={$CATEGORY}">{$APP.$MODULE}</a></td>
 	{else}
 		<td style="padding-left:10px;padding-right:50px" class="moduleName" nowrap>{$APP.$CATEGORY} > <a class="hdrLink" href="index.php?action=ListView&module={$MODULE}&parenttab={$CATEGORY}">{$APP.$MODULE}</a></td>
 	{/if}




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 09:54:33 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 13:54:33 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9409 -
	/vtigercrm/trunk/Smarty/templates/RolePopup.tpl
Message-ID: <20060911135433.C053976D5EF@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep 11 07:54:26 2006
New Revision: 9409

Log:
Changed header from delete User to Assign Role --By Ahmed

Modified:
    vtigercrm/trunk/Smarty/templates/RolePopup.tpl

Modified: vtigercrm/trunk/Smarty/templates/RolePopup.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/RolePopup.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/RolePopup.tpl Mon Sep 11 07:54:26 2006
@@ -50,7 +50,7 @@
 			<td>
 				<table width="100%" border="0" cellpadding="0" cellspacing="0">
 				<tr>
-					<td class="moduleName" width="80%" style="padding-left:10px;">Delete User</td>
+					<td class="moduleName" width="80%" style="padding-left:10px;">{$CMOD.LBL_ASSIGN_ROLE}</td>
 					<td  width=30% nowrap class="componentName" align=right>{$APP.VTIGER}</td>
 				</tr>
 			</table>




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 09:56:27 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 13:56:27 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9410 -
	/vtigercrm/trunk/user_privileges/enable_backup.php
Message-ID: <20060911135627.ABF9D76D63B@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep 11 07:56:20 2006
New Revision: 9410

Log:
Fixed the logout issue due to a blank line -- By Ahmed

Modified:
    vtigercrm/trunk/user_privileges/enable_backup.php

Modified: vtigercrm/trunk/user_privileges/enable_backup.php
==============================================================================
--- vtigercrm/trunk/user_privileges/enable_backup.php (original)
+++ vtigercrm/trunk/user_privileges/enable_backup.php Mon Sep 11 07:56:20 2006
@@ -12,4 +12,3 @@
 $enable_backup = 'false';
 
 ?>
-




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 10:12:53 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 14:12:53 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9411 -
	/vtigercrm/trunk/install/populateSeedData.php
Message-ID: <20060911141253.4BFDA76D627@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep 11 08:12:45 2006
New Revision: 9411

Log:
RC Changed to 5

Modified:
    vtigercrm/trunk/install/populateSeedData.php

Modified: vtigercrm/trunk/install/populateSeedData.php
==============================================================================
--- vtigercrm/trunk/install/populateSeedData.php (original)
+++ vtigercrm/trunk/install/populateSeedData.php Mon Sep 11 08:12:45 2006
@@ -884,7 +884,7 @@
 
 //Populate Email Data
 
-$esubj_array =  array ("Vtiger RC Released", "Try vtigercrm!", "Hi There!!!", "Welcome to Open Source", "Help needed in customization of Vtiger");
+$esubj_array =  array ("Vtiger 5 Released", "Try vtigercrm!", "Hi There!!!", "Welcome to Open Source", "Help needed in customization of Vtiger");
 $startdate_array =  array ("2006-1-2","2003-3-4","2003-4-5","2001-2-1","2005-8-8");
 $filename_array = array ("vtiger5alpha.tar.gz", "zohowriter.zip", "hi.doc", "welcome.pps", "sos.doc");
 




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 10:13:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 14:13:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9412 -
	/vtigercrm/trunk/modules/Products/Product.js
Message-ID: <20060911141359.E4CFD76D645@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Mon Sep 11 08:13:50 2006
New Revision: 9412

Log:
Issue in Ajax edit while changing Product Name from HelpDesk DetailView has been fixed --Jeri.Fixes #2093,2163

Modified:
    vtigercrm/trunk/modules/Products/Product.js

Modified: vtigercrm/trunk/modules/Products/Product.js
==============================================================================
--- vtigercrm/trunk/modules/Products/Product.js (original)
+++ vtigercrm/trunk/modules/Products/Product.js Mon Sep 11 08:13:50 2006
@@ -45,14 +45,19 @@
 }
 function set_return_specific(product_id, product_name) {
         //getOpenerObj used for DetailView 
+
 	if(document.getElementById('from_link').value != '')
 	{
 		var fldName = window.opener.document.QcEditView.product_name;
 		var fldId = window.opener.document.QcEditView.product_id;
+	}else if(typeof(window.opener.document.DetailView) != 'undefined')
+	{
+	   var fldName = window.opener.document.DetailView.product_name;
+	   var fldId = window.opener.document.DetailView.product_id;
 	}else
-	{	
-		var fldName = window.opener.document.EditView.product_name;
-		var fldId = window.opener.document.EditView.product_id;
+	{
+	   var fldName = window.opener.document.EditView.product_name;
+	   var fldId = window.opener.document.EditView.product_id;
 	}
         fldName.value = product_name;
         fldId.value = product_id;




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 10:16:19 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 14:16:19 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9413 -
	/vtigercrm/trunk/install/4createConfigFile.php
Message-ID: <20060911141619.A7B1E76D645@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep 11 08:16:12 2006
New Revision: 9413

Log:
RC changed to 5.0.0 GA

Modified:
    vtigercrm/trunk/install/4createConfigFile.php

Modified: vtigercrm/trunk/install/4createConfigFile.php
==============================================================================
--- vtigercrm/trunk/install/4createConfigFile.php (original)
+++ vtigercrm/trunk/install/4createConfigFile.php Mon Sep 11 08:16:12 2006
@@ -45,8 +45,8 @@
 
 // vtiger CRM version number; do not edit!
 
-$vtiger_version = "5.0 Beta";
-$release_date = "31 March 2006";
+$vtiger_version = "5.0.0";
+$release_date = "14 September 2006";
 
 
 if (isset($_REQUEST['db_hostname']))




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 10:22:05 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 14:22:05 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9414 -
	/vtigercrm/trunk/themes/alphagrey/images/aboutUs.jpg
Message-ID: <20060911142205.BF4E376D64C@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep 11 08:21:56 2006
New Revision: 9414

Log:
updated to latest 5.0.0 GA

Added:
    vtigercrm/trunk/themes/alphagrey/images/aboutUs.jpg




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 10:23:13 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 14:23:13 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9415 -
 /vtigercrm/trunk/themes/bluelagoon/images/aboutUS.jpg
Message-ID: <20060911142313.9D0FA76D64C@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep 11 08:23:04 2006
New Revision: 9415

Log:
updated to latest 5.0.0 GA

Modified:
    vtigercrm/trunk/themes/bluelagoon/images/aboutUS.jpg

Modified: vtigercrm/trunk/themes/bluelagoon/images/aboutUS.jpg
==============================================================================
Binary files - no diff available.




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 10:24:00 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 14:24:00 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9416 -
	/vtigercrm/trunk/themes/woodspice/images/aboutUS.jpg
Message-ID: <20060911142400.4208276D64C@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep 11 08:23:48 2006
New Revision: 9416

Log:
updated to latest 5.0.0 GA

Modified:
    vtigercrm/trunk/themes/woodspice/images/aboutUS.jpg

Modified: vtigercrm/trunk/themes/woodspice/images/aboutUS.jpg
==============================================================================
Binary files - no diff available.




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 10:48:22 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 14:48:22 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9417 -
	/vtigercrm/trunk/Smarty/templates/ListView.tpl
Message-ID: <20060911144822.C0AE976D5D8@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Mon Sep 11 08:48:15 2006
New Revision: 9417

Log:
inconsistency in mass delete has been fixed --Jeri.Fixes #2162.

Modified:
    vtigercrm/trunk/Smarty/templates/ListView.tpl

Modified: vtigercrm/trunk/Smarty/templates/ListView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ListView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ListView.tpl Mon Sep 11 08:48:15 2006
@@ -329,7 +329,7 @@
 function ajaxChangeStatus(statusname)
 {
 	$("status").style.display="inline";
-	var viewid = document.massdelete.viewname.value;
+	var viewid = document.getElementById('viewname').options[document.getElementById('viewname').options.selectedIndex].value;
 	var idstring = document.getElementById('idlist').value;
 	if(statusname == 'status')
 	{




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 10:54:17 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 14:54:17 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9418 -
 /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php
Message-ID: <20060911145418.2BD6976D5D8@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep 11 08:54:10 2006
New Revision: 9418

Log:
Migration Fixes done

Modified:
    vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php

Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php
==============================================================================
--- vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php (original)
+++ vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php Mon Sep 11 08:54:10 2006
@@ -267,7 +267,7 @@
 */
 //commented the above array as that queries are wrong queries -- changed on 23-12-2005
 $insert_array1 = array(
-			"update vtiger_field set uitype='357' where tabid=10 and fieldname='parent_id' and tablename='seactivityrel'",
+			"update vtiger_field set uitype='357' where tabid=10 and fieldname='parent_id' and tablename='vtiger_seactivityrel'",
 			"update vtiger_field set sequence=1 where tabid=10 and fieldname in ('parent_id','subject','filename','description')",
 			"update vtiger_field set block=2 where tabid=10 and fieldname='parent_id'",
 			"update vtiger_field set block=3 where tabid=10 and fieldname='subject'",
@@ -1257,7 +1257,7 @@
 		"insert into vtiger_cvcolumnlist values ($cvid,2,'vtiger_contactdetails:title:title:Contacts_Title:V')",
 		"insert into vtiger_cvcolumnlist values ($cvid,3,'vtiger_account:accountname:accountname:Contacts_Account_Name:V')",
 		"insert into vtiger_cvcolumnlist values ($cvid,4,'vtiger_contactdetails:email:email:Contacts_Email:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,5,'vtiger_contactdetails:phone:phone:Contacts_Phone_Name:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,5,'vtiger_contactdetails:phone:phone:Contacts_Office_Phone:V')",
 		"insert into vtiger_cvcolumnlist values ($cvid,6,'vtiger_crmentity:smownerid:assigned_user_id:Contacts_Assigned_To:V')"
 			    );
 foreach($insert_query_array9 as $query)
@@ -1764,7 +1764,7 @@
 	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'actualroi','campaign',1,'1','actualroi','Actual ROI',1,0,0,100,20,76,1,'N~O',1,null,'BAS')",
 	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,15,76,2,'T~O',1,null,'BAS')",
 	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,16,76,2,'T~O',1,null,'BAS')",
-	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,78,1,'V~O',1,null,'BAS')"
+	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,82,1,'V~O',1,null,'BAS')"
 			     );
 foreach($insert_query_array24 as $query)
 {
@@ -3293,7 +3293,6 @@
 Execute("update vtiger_field set sequence=9, block=78 where tabid=26 and columnname='expectedroi' and fieldname='expectedroi'");
 Execute("update vtiger_field set sequence=10, block=78 where tabid=26 and columnname='actualroi' and fieldname='actualroi'");
 
-Execute("insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,82,1,'V~O',1,null,'BAS')");
 
 
 //Update query to set the fieldname in user detail/edit/create view
@@ -3655,6 +3654,34 @@
 //changes related to Incoming mail server settings
 Execute("alter table vtiger_mail_accounts drop column showbody");
 
+//change the Account relatedlist Activity label from Acivities to Activities
+Execute("update vtiger_relatedlists set label='Activities' where tabid=6 and relation_id=3");
+
+//change the fieldname from title to notes_title for notes and update in columnlist also
+Execute("update vtiger_field set fieldname='notes_title' where tabid=8 and fieldname='title'");
+Execute('update vtiger_cvcolumnlist set columnname="vtiger_notes:title:notes_title:Notes_Title:V" where columnname="vtiger_notes:title:title:Notes_Title:V"');
+
+//change the sequence of Billing and Shipping address details for Inventory modules
+Execute("update vtiger_field set sequence=5 where tabid in (20,21,22,23) and fieldname='bill_city'");
+Execute("update vtiger_field set sequence=6 where tabid in (20,21,22,23) and fieldname='ship_city'");
+Execute("update vtiger_field set sequence=7 where tabid in (20,21,22,23) and fieldname='bill_state'");
+Execute("update vtiger_field set sequence=8 where tabid in (20,21,22,23) and fieldname='ship_state'");
+Execute("update vtiger_field set sequence=9 where tabid in (20,21,22,23) and fieldname='bill_code'");
+Execute("update vtiger_field set sequence=10 where tabid in (20,21,22,23) and fieldname='ship_code'");
+Execute("update vtiger_field set sequence=11 where tabid in (20,21,22,23) and fieldname='bill_country'");
+Execute("update vtiger_field set sequence=12 where tabid in (20,21,22,23) and fieldname='ship_country'");
+
+//for vtiger_campaignleadrel  table
+Execute("alter table vtiger_campaignleadrel DROP PRIMARY KEY");
+Execute("alter table vtiger_campaignleadrel ADD PRIMARY KEY (campaignid,leadid)");
+
+//for  vtiger_campaigncontrel  table
+Execute("alter table vtiger_campaigncontrel DROP PRIMARY KEY");
+Execute("alter table vtiger_campaigncontrel ADD PRIMARY KEY (campaignid,contactid)");
+
+//for  vtiger_seactivityrel  table
+Execute("alter table vtiger_seactivityrel DROP PRIMARY KEY");
+Execute("alter table vtiger_seactivityrel ADD PRIMARY KEY (crmid,activityid)");
 
 
 




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 10:57:12 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 14:57:12 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9419 -
	/vtigercrm/trunk/Smarty/templates/GlobalListView.tpl
Message-ID: <20060911145712.DC6B276D5D8@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep 11 08:57:05 2006
New Revision: 9419

Log:
Removed reference to Conveyor.js -- by Mickie

Modified:
    vtigercrm/trunk/Smarty/templates/GlobalListView.tpl

Modified: vtigercrm/trunk/Smarty/templates/GlobalListView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/GlobalListView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/GlobalListView.tpl Mon Sep 11 08:57:05 2006
@@ -18,7 +18,6 @@
 {if $MODULE eq 'Contacts'}
 {$IMAGELISTS}
 <script language="JavaScript" type="text/javascript" src="include/js/thumbnail.js"></script>
-<script language="JavaScript" type="text/javascript" src="include/js/conveyor.js"></script>
 <div id="dynloadarea" style=float:left;position:absolute;left:350px;top:150px;></div>
 {/if}
 <script language="JavaScript" type="text/javascript" src="modules/{$MODULE}/{$SINGLE_MOD}.js"></script>




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 11:25:04 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 15:25:04 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9420 - in
 /vtigercrm/trunk/Smarty/templates: RelatedListNew.tpl RelatedLists.tpl
Message-ID: <20060911152504.F391376D5EC@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep 11 09:24:55 2006
New Revision: 9420

Log:
Fixed the Select One Issue in Campaign Related List

Modified:
    vtigercrm/trunk/Smarty/templates/RelatedListNew.tpl
    vtigercrm/trunk/Smarty/templates/RelatedLists.tpl

Modified: vtigercrm/trunk/Smarty/templates/RelatedListNew.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/RelatedListNew.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/RelatedListNew.tpl Mon Sep 11 09:24:55 2006
@@ -52,10 +52,20 @@
 
 function loadCvList(type,id) {ldelim}
 	if(type === 'Leads')
-		$("lead_list_button").innerHTML = '<input title="{$MOD.LBL_LOAD_LIST}" accessKey="" class="crmbutton small edit" value="{$MOD.LBL_LOAD_LIST}" type="button"  name="button" onclick="window.location.href=\'index.php?action=LoadList&module=Campaigns&return_action=DetailView&return_id='+id+'&list_type='+type+'&cvid='+$("lead_cv_list").value+'\'">';
+	{ldelim}
+		if($("lead_cv_list").value != 'None')
+		{ldelim}
+			$("lead_list_button").innerHTML = '<input title="{$MOD.LBL_LOAD_LIST}" accessKey="" class="crmbutton small edit" value="{$MOD.LBL_LOAD_LIST}" type="button"  name="button" onclick="window.location.href=\'index.php?action=LoadList&module=Campaigns&return_action=DetailView&return_id='+id+'&list_type='+type+'&cvid='+$("lead_cv_list").value+'\'">';
+		{rdelim}
+	{rdelim}
 
 	if(type === 'Contacts')
+	{ldelim}
+		if($("cont_cv_list").value != 'None')
+		{ldelim}
 		$("contact_list_button").innerHTML = '<input title="{$MOD.LBL_LOAD_LIST}" accessKey="" class="crmbutton small edit" value="{$MOD.LBL_LOAD_LIST}" type="button"  name="button" onclick="window.location.href=\'index.php?action=LoadList&module=Campaigns&return_action=DetailView&return_id='+id+'&list_type='+type+'&cvid='+$("cont_cv_list").value+'\'">';
+		{rdelim}
+	{rdelim}
 {rdelim}
 </script>
 

Modified: vtigercrm/trunk/Smarty/templates/RelatedLists.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/RelatedLists.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/RelatedLists.tpl Mon Sep 11 09:24:55 2006
@@ -52,10 +52,20 @@
 
 function loadCvList(type,id) {ldelim}
 	if(type === 'Leads')
-		$("lead_list_button").innerHTML = '<input title="{$MOD.LBL_LOAD_LIST}" accessKey="" class="crmbutton small edit" value="{$MOD.LBL_LOAD_LIST}" type="button"  name="button" onclick="window.location.href=\'index.php?action=LoadList&module=Campaigns&return_id='+id+'&list_type='+type+'&cvid='+$("lead_cv_list").value+'\'">';
+	{ldelim}
+		if($("lead_cv_list").value != 'None')
+		{ldelim}
+			$("lead_list_button").innerHTML = '<input title="{$MOD.LBL_LOAD_LIST}" accessKey="" class="crmbutton small edit" value="{$MOD.LBL_LOAD_LIST}" type="button"  name="button" onclick="window.location.href=\'index.php?action=LoadList&module=Campaigns&return_id='+id+'&list_type='+type+'&cvid='+$("lead_cv_list").value+'\'">';
+		{rdelim}
+	{rdelim}
 
 	if(type === 'Contacts')
-		$("contact_list_button").innerHTML = '<input title="{$MOD.LBL_LOAD_LIST}" accessKey="" class="crmbutton small edit" value="{$MOD.LBL_LOAD_LIST}" type="button"  name="button" onclick="window.location.href=\'index.php?action=LoadList&module=Campaigns&return_id='+id+'&list_type='+type+'&cvid='+$("cont_cv_list").value+'\'">';
+	{ldelim}
+		if($("cont_cv_list").value !='None')
+		{ldelim}
+			$("contact_list_button").innerHTML = '<input title="{$MOD.LBL_LOAD_LIST}" accessKey="" class="crmbutton small edit" value="{$MOD.LBL_LOAD_LIST}" type="button"  name="button" onclick="window.location.href=\'index.php?action=LoadList&module=Campaigns&return_id='+id+'&list_type='+type+'&cvid='+$("cont_cv_list").value+'\'">';
+		{rdelim}
+	{rdelim}
 {rdelim}
 </script>
 	{include file='Buttons_List1.tpl'}




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 11:27:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 15:27:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9421 - in
 /vtigercrm/trunk/modules/Campaigns: CallRelatedList.php DetailView.php
Message-ID: <20060911152730.C1DF576D5EC@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep 11 09:27:23 2006
New Revision: 9421

Log:
Fixed the Select One Issue in Campaign Related List

Modified:
    vtigercrm/trunk/modules/Campaigns/CallRelatedList.php
    vtigercrm/trunk/modules/Campaigns/DetailView.php

Modified: vtigercrm/trunk/modules/Campaigns/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Campaigns/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Campaigns/CallRelatedList.php Mon Sep 11 09:27:23 2006
@@ -51,11 +51,11 @@
 
 $cvObj = new CustomView("Contacts");
 $cvcombo = $cvObj->getCustomViewCombo();
-$smarty->assign("CONTCVCOMBO","<select id='cont_cv_list' onchange='loadCvList(\"Contacts\",".$_REQUEST["record"].");'><option>-- ".$mod_strings['Select One']." --</option>".$cvcombo."</select>");
+$smarty->assign("CONTCVCOMBO","<select id='cont_cv_list' onchange='loadCvList(\"Contacts\",".$_REQUEST["record"].");'><option value='None'>-- ".$mod_strings['Select One']." --</option>".$cvcombo."</select>");
 
 $cvObj = new CustomView("Leads");
 $cvcombo = $cvObj->getCustomViewCombo();
-$smarty->assign("LEADCVCOMBO","<select id='lead_cv_list' onchange='loadCvList(\"Leads\",".$_REQUEST["record"].");'> <option>-- ".$mod_strings['Select One']." --</option>".$cvcombo."</select>");
+$smarty->assign("LEADCVCOMBO","<select id='lead_cv_list' onchange='loadCvList(\"Leads\",".$_REQUEST["record"].");'> <option value='None'>-- ".$mod_strings['Select One']." --</option>".$cvcombo."</select>");
 
 $category = getParentTab();
 $smarty->assign("CATEGORY",$category);

Modified: vtigercrm/trunk/modules/Campaigns/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Campaigns/DetailView.php (original)
+++ vtigercrm/trunk/modules/Campaigns/DetailView.php Mon Sep 11 09:27:23 2006
@@ -77,11 +77,11 @@
 	$smarty->assign("RELATEDLISTS", $related_array);
 	$cvObj = new CustomView("Contacts");
 	$cvcombo = $cvObj->getCustomViewCombo();
-	$smarty->assign("CONTCVCOMBO","<select id='cont_cv_list' onchange='loadCvList(\"Contacts\",".$_REQUEST["record"].");'><option>-- ".$mod_strings['Select One']." --</option>".$cvcombo."</select>");
+	$smarty->assign("CONTCVCOMBO","<select id='cont_cv_list' onchange='loadCvList(\"Contacts\",".$_REQUEST["record"].");'><option value='None'>-- ".$mod_strings['Select One']." --</option>".$cvcombo."</select>");
 
 	$cvObj = new CustomView("Leads");
 	$cvcombo = $cvObj->getCustomViewCombo();
-	$smarty->assign("LEADCVCOMBO","<select id='lead_cv_list' onchange='loadCvList(\"Leads\",".$_REQUEST["record"].");'> <option>-- ".$mod_strings['Select One']." --</option>".$cvcombo."</select>");
+	$smarty->assign("LEADCVCOMBO","<select id='lead_cv_list' onchange='loadCvList(\"Leads\",".$_REQUEST["record"].");'> <option value='None'>-- ".$mod_strings['Select One']." --</option>".$cvcombo."</select>");
 }
 
 $smarty->assign("SinglePane_View", $singlepane_view);




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 11:31:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 15:31:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9422 -
	/vtigercrm/trunk/include/utils/DetailViewUtils.php
Message-ID: <20060911153126.CD3E976D608@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep 11 09:31:14 2006
New Revision: 9422

Log:
Fixed the Sales Profile Issue when viewing events

Modified:
    vtigercrm/trunk/include/utils/DetailViewUtils.php

Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/DetailViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/DetailViewUtils.php Mon Sep 11 09:31:14 2006
@@ -225,9 +225,9 @@
 			$label_fld["link"][] = "index.php?module=Users&action=GroupDetailView&groupId=".$groupid;
 		}
 		//Security Checks
-		if($fieldlabel == 'Assigned To' && $is_admin==false && $profileGlobalPermission[2] == 1 && ($defaultOrgSharingPermission[getTabid($module_name)] == 3 or $defaultOrgSharingPermission[getTabid($module_name)] == 0))
-		{
-			$result=get_current_user_access_groups($module_name);
+		if($fieldlabel == 'Assigned To' && $is_admin==false && $profileGlobalPermission[2] == 1 && ($defaultOrgSharingPermission[getTabid($module)] == 3 or $defaultOrgSharingPermission[getTabid($module)] == 0))
+		{
+			$result=get_current_user_access_groups($module);
 		}
 		else
 		{ 		
@@ -269,7 +269,7 @@
 			}	
 		}
 
-		if($fieldlabel == 'Assigned To' && $is_admin==false && $profileGlobalPermission[2] == 1 && ($defaultOrgSharingPermission[getTabid($module_name)] == 3 or $defaultOrgSharingPermission[getTabid($module_name)] == 0))
+		if($fieldlabel == 'Assigned To' && $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", $assigned_user_id,'private'), $assigned_user_id);
 		}




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 11:34:47 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 15:34:47 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9423 -
	/vtigercrm/trunk/modules/Calendar/Activity.php
Message-ID: <20060911153447.E3A9376D633@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep 11 09:34:41 2006
New Revision: 9423

Log:
Fixed the Sales Profile Issue when viewing events

Modified:
    vtigercrm/trunk/modules/Calendar/Activity.php

Modified: vtigercrm/trunk/modules/Calendar/Activity.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/Activity.php (original)
+++ vtigercrm/trunk/modules/Calendar/Activity.php Mon Sep 11 09:34:41 2006
@@ -160,7 +160,7 @@
 
 			$returnset = '&return_module=Calendar&return_action=CallRelatedList&activity_mode=Events&return_id='.$id;
 
-			$query = 'select vtiger_users.user_name,vtiger_contactdetails.accountid,vtiger_contactdetails.contactid, vtiger_contactdetails.firstname,vtiger_contactdetails.lastname, vtiger_contactdetails.department, vtiger_contactdetails.title, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_contactdetails inner join vtiger_cntactivityrel on vtiger_cntactivityrel.contactid=vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid where vtiger_cntactivityrel.activityid='.$id.' and vtiger_crmentity.deleted=0';
+			$query = 'select vtiger_users.user_name,vtiger_contactdetails.accountid,vtiger_contactdetails.contactid, vtiger_contactdetails.firstname,vtiger_contactdetails.lastname, vtiger_contactdetails.department, vtiger_contactdetails.title, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_contactdetails inner join vtiger_cntactivityrel on vtiger_cntactivityrel.contactid=vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_cntactivityrel.activityid = vtiger_activitygrouprelation.activityid left join vtiger_groups on vtiger_groups.groupname = vtiger_activitygrouprelation.groupname where vtiger_cntactivityrel.activityid='.$id.' and vtiger_crmentity.deleted=0';
 			$log->debug("Exiting get_contacts method ...");
 			return GetRelatedList('Calendar','Contacts',$focus,$query,$button,$returnset);
         }




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 11:41:17 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 15:41:17 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9424 -
	/vtigercrm/trunk/modules/Calendar/Calendar.php
Message-ID: <20060911154117.B466C76D633@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep 11 09:41:08 2006
New Revision: 9424

Log:
Fixed the 12pm issue in Calendar Hour view

Modified:
    vtigercrm/trunk/modules/Calendar/Calendar.php

Modified: vtigercrm/trunk/modules/Calendar/Calendar.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/Calendar.php (original)
+++ vtigercrm/trunk/modules/Calendar/Calendar.php Mon Sep 11 09:41:08 2006
@@ -198,7 +198,7 @@
 		}
 		else
 		{
-			$this->day_end_hour=24;
+			$this->day_end_hour=23;
 		}
 		if ( $this->view == 'week')
 		{




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 12:31:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 16:31:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9425 - in
 /wordintegration/trunk/resources/images: config.gif pluginOLGeneric.gif
 pluginOfficeAbout.gif
Message-ID: <20060911163155.AC3B576D648@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Mon Sep 11 10:31:30 2006
New Revision: 9425

Log:
Images added for WordPlugin --Jeri

Added:
    wordintegration/trunk/resources/images/pluginOLGeneric.gif   (with props)
    wordintegration/trunk/resources/images/pluginOfficeAbout.gif   (with props)
Modified:
    wordintegration/trunk/resources/images/config.gif

Modified: wordintegration/trunk/resources/images/config.gif
==============================================================================
Binary files - no diff available.




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 11 12:33:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 11 Sep 2006 16:33:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9426 - in
 /wordintegration/trunk/client/source: Connect.DCA frmAbout.frm frmAbout.frx
 frmConf.frx frmvtigerTempate.frm frmvtigerTempate.frx
 vtigerCRMWordPlugin.vbw
Message-ID: <20060911163302.E52BC74817F@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Mon Sep 11 10:32:33 2006
New Revision: 9426

Log:
New Images added for word plugin --Jeri

Modified:
    wordintegration/trunk/client/source/Connect.DCA
    wordintegration/trunk/client/source/frmAbout.frm
    wordintegration/trunk/client/source/frmAbout.frx
    wordintegration/trunk/client/source/frmConf.frx
    wordintegration/trunk/client/source/frmvtigerTempate.frm
    wordintegration/trunk/client/source/frmvtigerTempate.frx
    wordintegration/trunk/client/source/vtigerCRMWordPlugin.vbw

Modified: wordintegration/trunk/client/source/Connect.DCA
==============================================================================
Binary files - no diff available.

Modified: wordintegration/trunk/client/source/frmAbout.frm
==============================================================================
Binary files - no diff available.

Modified: wordintegration/trunk/client/source/frmAbout.frx
==============================================================================
Binary files - no diff available.

Modified: wordintegration/trunk/client/source/frmConf.frx
==============================================================================
Binary files - no diff available.

Modified: wordintegration/trunk/client/source/frmvtigerTempate.frm
==============================================================================
Binary files - no diff available.

Modified: wordintegration/trunk/client/source/frmvtigerTempate.frx
==============================================================================
Binary files - no diff available.

Modified: wordintegration/trunk/client/source/vtigerCRMWordPlugin.vbw
==============================================================================
Binary files - no diff available.




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 03:00:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 07:00:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9427 - in
 /vtigercrm/trunk/Smarty/templates: SetMenu.tpl Settings.tpl
Message-ID: <20060912070041.A5F476FDF42@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep 12 01:00:23 2006
New Revision: 9427

Log:
Moved the Default Module View from Users & Access Management to Other Settings --by Ahmed

Modified:
    vtigercrm/trunk/Smarty/templates/SetMenu.tpl
    vtigercrm/trunk/Smarty/templates/Settings.tpl

Modified: vtigercrm/trunk/Smarty/templates/SetMenu.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/SetMenu.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/SetMenu.tpl Tue Sep 12 01:00:23 2006
@@ -11,7 +11,6 @@
  ********************************************************************************/
 
 -->*}
-
 <table border=0 cellspacing=0 cellpadding=20 width=90% class="settingsUI">
 <tr>
 <td valign=top>
@@ -72,12 +71,7 @@
 		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=ListLoginHistory&parenttab=Settings">{$MOD.LBL_LOGIN_HISTORY_DETAILS}</a></td></tr>
 		{/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>
-		{else}
-		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=DefModuleView&parenttab=Settings">{$MOD.LBL_DEFAULT_MODULE_VIEW}</a></td></tr>
-		{/if}
-
+		
 		<tr><td class="settingsTabHeader" nowrap>{$MOD.LBL_STUDIO}</td></tr>
 		{if  $smarty.request.action eq 'CustomFieldList' || $smarty.request.action eq 'LeadCustomFieldMapping'}
 		<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Settings&action=CustomFieldList&parenttab=Settings">{$MOD.LBL_CUSTOM_FIELDS}</a></td></tr>
@@ -177,6 +171,12 @@
 		{else}
 		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=Announcements&parenttab=Settings">{$MOD.LBL_ANNOUNCEMENT}</a></td></tr>
 		{/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>
+		{else}
+		<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&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>
 		</table>

Modified: vtigercrm/trunk/Smarty/templates/Settings.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings.tpl Tue Sep 12 01:00:23 2006
@@ -10,7 +10,6 @@
  ********************************************************************************/
 -->*}
 
-
 	{include file="Buttons_List1.tpl"}
 <table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
 <tbody><tr>
@@ -158,7 +157,364 @@
 					</td>
 					<!-- Row 3 -->
 					<tr>
-					<td width=25% valign=top>
+					
+				</tr>
+				</table>
+
+
+				</td>
+			</tr>
+
+
+			<tr>
+				<td class="settingsTabHeader">
+
+				<!-- Studio  -->
+					{$MOD.LBL_STUDIO}	
+				</td>
+			</tr>
+			<tr>
+				<td class="settingsIconDisplay small">
+				<!-- Icons for Users & Access Management -->
+				
+				<table border=0 cellspacing=0 cellpadding=10 width=100%>
+				<tr>
+
+					<td width=25% valign=top>
+					<!-- icon 9-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=CustomFieldList&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}custom.gif" alt="{$MOD.LBL_CUSTOM_FIELDS}" title="{$MOD.LBL_CUSTOM_FIELDS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=CustomFieldList&parenttab=Settings">{$MOD.LBL_CUSTOM_FIELDS}</a></td>
+						</tr>
+						<tr>
+
+							<td class="small" valign=top>{$MOD.LBL_CUSTOM_FIELDS_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 10-->
+						<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>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_PICKLIST_DESCRIPTION}</td>	
+						</tr>
+						</table>
+					</td>
+
+					<td width=25% valign=top>
+					<!-- empty-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top>&nbsp;</td>
+							<td class=big valign=top>&nbsp;</td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>&nbsp;</td>
+
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- empty-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top>&nbsp;</td>
+							<td class=big valign=top>&nbsp;</td>
+
+						</tr>
+						<tr>
+							<td class="small" valign=top>&nbsp;</td>
+						</tr>
+						</table>
+					</td>
+				</tr>
+				</table>
+				
+				
+				</td>
+
+			</tr>
+			
+			
+			
+			<tr>
+				<td class="settingsTabHeader">
+				<!-- Communication Templates -->
+					{$MOD.LBL_COMMUNICATION_TEMPLATES}
+				</td>
+			</tr>
+			<tr>
+				<td class="settingsIconDisplay small">
+
+				<!-- Icons for Communication Templates -->
+				
+				<table border=0 cellspacing=0 cellpadding=10 width=100%>
+				<tr>
+					<td width=25% valign=top>
+					<!-- 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>
+
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_EMAIL_TEMPLATE_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 12-->
+
+						<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>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_MAIL_MERGE_DESCRIPTION}</td>
+						</tr>
+
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- 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>
+
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_NOTIF_SCHED_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 14-->
+
+						<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>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_INV_NOTIF_DESCRIPTION}</td>
+						</tr>
+
+						</table>
+					</td>
+				</tr>
+				<!-- Row 2 -->
+				<tr>
+					<td width=25% valign=top>
+					<!-- icon 15-->
+						<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>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_INV_TANDC_DESCRIPTION}</td>
+						</tr>
+						</table>
+
+					</td>
+					<td width=25% valign=top>
+					<!-- empty -->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top>&nbsp;</td>
+							<td class=big valign=top>&nbsp;</td>
+						</tr>
+						<tr>
+
+							<td class="small" valign=top>&nbsp;</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- empty-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top>&nbsp;</td>
+
+							<td class=big valign=top>&nbsp;</td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>&nbsp;</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- empty-->
+
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top>&nbsp;</td>
+							<td class=big valign=top>&nbsp;</td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>&nbsp;</td>
+						</tr>
+						</table>
+
+					</td>
+				</tr>
+				</table>
+				
+				
+				</td>
+			</tr>
+			<tr>
+				<td class="settingsTabHeader">
+				<!-- Other settings -->
+					{$MOD.LBL_OTHER_SETTINGS}
+				</td>
+
+			</tr>
+			<tr>
+				<td class="settingsIconDisplay small">
+				<!-- Icons for Other Settings-->
+				
+				<table border=0 cellspacing=0 cellpadding=10 width=100%>
+				<tr>
+					<td width=25% valign=top>
+					<!-- icon 16-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=OrganizationConfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}company.gif" alt="{$MOD.LBL_COMPANY_DETAILS}" title="{$MOD.LBL_COMPANY_DETAILS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=OrganizationConfig&parenttab=Settings">{$MOD.LBL_COMPANY_DETAILS}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_COMPANY_DESCRIPTION}</td>
+						</tr>
+						</table>
+
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 17-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=EmailConfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}ogmailserver.gif" alt="{$MOD.LBL_MAIL_SERVER_SETTINGS}" title="{$MOD.LBL_MAIL_SERVER_SETTINGS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=EmailConfig&parenttab=Settings">{$MOD.LBL_MAIL_SERVER_SETTINGS}</a></td>
+						</tr>
+
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_MAIL_SERVER_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 18-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=BackupServerConfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}backupserver.gif" alt="{$MOD.LBL_BACKUP_SERVER_SETTINGS}" title="{$MOD.LBL_BACKUP_SERVER_SETTINGS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=BackupServerConfig&parenttab=Settings">{$MOD.LBL_BACKUP_SERVER_SETTINGS}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_BACKUP_SERVER_DESCRIPTION}</td>
+						</tr>
+						</table>
+
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 7-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=ListModuleOwners&parenttab=Settings"><img src="{$IMAGE_PATH}assign.gif" alt="{$MOD.LBL_ASSIGN_MODULE_OWNERS}" width="48" height="48" border=0 title="{$MOD.LBL_ASSIGN_MODULE_OWNERS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=ListModuleOwners&parenttab=Settings">{$MOD.LBL_MODULE_OWNERS}</a></td>
+
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_MODULE_OWNERS_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+				</tr>
+				<!-- Row 2 -->
+				<tr>
+
+					<td width=25% valign=top>
+					<!-- icon 19-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=CurrencyListView&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}currency.gif" alt="{$MOD.LBL_CURRENCY_SETTINGS}" title="{$MOD.LBL_CURRENCY_SETTINGS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=CurrencyListView&parenttab=Settings">{$MOD.LBL_CURRENCY_SETTINGS}</a></td>
+						</tr>
+
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_CURRENCY_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+
+					<td width=25% valign=top>
+					<!-- icon 20-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=TaxConfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}taxConfiguration.gif" alt="{$MOD.LBL_TAX_SETTINGS}" title="{$MOD.LBL_TAX_SETTINGS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=TaxConfig&parenttab=Settings">{$MOD.LBL_TAX_SETTINGS}</a></td>
+						</tr>
+						<tr>
+
+							<td class="small" valign=top>{$MOD.LBL_TAX_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- empty -->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=System&action=listsysconfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}system.gif" alt="{$MOD.LBL_SYSTEM_INFO}" title="{$MOD.LBL_SYSTEM_INFO}"></a></td>
+							<td class=big valign=top><a href="index.php?module=System&action=listsysconfig&parenttab=Settings">{$MOD.LBL_SYSTEM_INFO}</a></td>
+
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_SYSTEM_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+
+					<!-- empty-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=ProxyServerConfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}proxy.gif" alt="{$MOD.LBL_PROXY_SETTINGS}" title="{$MOD.LBL_PROXY_SETTINGS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=ProxyServerConfig&parenttab=Settings">{$MOD.LBL_PROXY_SETTINGS}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_PROXY_DESCRIPTION}</td>
+						</tr>
+
+						</table>
+					</td>
+				</tr>
+				<tr>
+
+					<td width=25% valign=top>
+					<!-- empty-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Users&action=Announcements&parenttab=Settings"><img src="{$IMAGE_PATH}announ.gif" alt="{$MOD.LBL_ANNOUNCEMENT}" width="48" height="48" border=0 title="{$MOD.LBL_ANNOUNCEMENT}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Users&action=Announcements&parenttab=Settings">{$MOD.LBL_ANNOUNCEMENT}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_ANNOUNCEMENT_DESCRIPTION}</td>
+						</tr>
+
+						</table>
+					</td>
+<td width=25% valign=top>
 					<!-- icon 9-->	
 					<table border=0 cellspacing=0 cellpadding=5 width=100%>
 					<tr>
@@ -170,362 +526,6 @@
 					</tr>
 
 					</table>
-					</td>
-				</tr>
-				</table>
-
-
-				</td>
-			</tr>
-
-
-			<tr>
-				<td class="settingsTabHeader">
-
-				<!-- Studio  -->
-					{$MOD.LBL_STUDIO}	
-				</td>
-			</tr>
-			<tr>
-				<td class="settingsIconDisplay small">
-				<!-- Icons for Users & Access Management -->
-				
-				<table border=0 cellspacing=0 cellpadding=10 width=100%>
-				<tr>
-
-					<td width=25% valign=top>
-					<!-- icon 9-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=CustomFieldList&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}custom.gif" alt="{$MOD.LBL_CUSTOM_FIELDS}" title="{$MOD.LBL_CUSTOM_FIELDS}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Settings&action=CustomFieldList&parenttab=Settings">{$MOD.LBL_CUSTOM_FIELDS}</a></td>
-						</tr>
-						<tr>
-
-							<td class="small" valign=top>{$MOD.LBL_CUSTOM_FIELDS_DESCRIPTION}</td>
-						</tr>
-						</table>
-					</td>
-					<td width=25% valign=top>
-					<!-- icon 10-->
-						<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>
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_PICKLIST_DESCRIPTION}</td>	
-						</tr>
-						</table>
-					</td>
-
-					<td width=25% valign=top>
-					<!-- empty-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top>&nbsp;</td>
-							<td class=big valign=top>&nbsp;</td>
-						</tr>
-						<tr>
-							<td class="small" valign=top>&nbsp;</td>
-
-						</tr>
-						</table>
-					</td>
-					<td width=25% valign=top>
-					<!-- empty-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top>&nbsp;</td>
-							<td class=big valign=top>&nbsp;</td>
-
-						</tr>
-						<tr>
-							<td class="small" valign=top>&nbsp;</td>
-						</tr>
-						</table>
-					</td>
-				</tr>
-				</table>
-				
-				
-				</td>
-
-			</tr>
-			
-			
-			
-			<tr>
-				<td class="settingsTabHeader">
-				<!-- Communication Templates -->
-					{$MOD.LBL_COMMUNICATION_TEMPLATES}
-				</td>
-			</tr>
-			<tr>
-				<td class="settingsIconDisplay small">
-
-				<!-- Icons for Communication Templates -->
-				
-				<table border=0 cellspacing=0 cellpadding=10 width=100%>
-				<tr>
-					<td width=25% valign=top>
-					<!-- 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>
-
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_EMAIL_TEMPLATE_DESCRIPTION}</td>
-						</tr>
-						</table>
-					</td>
-					<td width=25% valign=top>
-					<!-- icon 12-->
-
-						<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>
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_MAIL_MERGE_DESCRIPTION}</td>
-						</tr>
-
-						</table>
-					</td>
-					<td width=25% valign=top>
-					<!-- 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>
-
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_NOTIF_SCHED_DESCRIPTION}</td>
-						</tr>
-						</table>
-					</td>
-					<td width=25% valign=top>
-					<!-- icon 14-->
-
-						<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>
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_INV_NOTIF_DESCRIPTION}</td>
-						</tr>
-
-						</table>
-					</td>
-				</tr>
-				<!-- Row 2 -->
-				<tr>
-					<td width=25% valign=top>
-					<!-- icon 15-->
-						<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>
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_INV_TANDC_DESCRIPTION}</td>
-						</tr>
-						</table>
-
-					</td>
-					<td width=25% valign=top>
-					<!-- empty -->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top>&nbsp;</td>
-							<td class=big valign=top>&nbsp;</td>
-						</tr>
-						<tr>
-
-							<td class="small" valign=top>&nbsp;</td>
-						</tr>
-						</table>
-					</td>
-					<td width=25% valign=top>
-					<!-- empty-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top>&nbsp;</td>
-
-							<td class=big valign=top>&nbsp;</td>
-						</tr>
-						<tr>
-							<td class="small" valign=top>&nbsp;</td>
-						</tr>
-						</table>
-					</td>
-					<td width=25% valign=top>
-					<!-- empty-->
-
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top>&nbsp;</td>
-							<td class=big valign=top>&nbsp;</td>
-						</tr>
-						<tr>
-							<td class="small" valign=top>&nbsp;</td>
-						</tr>
-						</table>
-
-					</td>
-				</tr>
-				</table>
-				
-				
-				</td>
-			</tr>
-			<tr>
-				<td class="settingsTabHeader">
-				<!-- Other settings -->
-					{$MOD.LBL_OTHER_SETTINGS}
-				</td>
-
-			</tr>
-			<tr>
-				<td class="settingsIconDisplay small">
-				<!-- Icons for Other Settings-->
-				
-				<table border=0 cellspacing=0 cellpadding=10 width=100%>
-				<tr>
-					<td width=25% valign=top>
-					<!-- icon 16-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=OrganizationConfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}company.gif" alt="{$MOD.LBL_COMPANY_DETAILS}" title="{$MOD.LBL_COMPANY_DETAILS}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Settings&action=OrganizationConfig&parenttab=Settings">{$MOD.LBL_COMPANY_DETAILS}</a></td>
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_COMPANY_DESCRIPTION}</td>
-						</tr>
-						</table>
-
-					</td>
-					<td width=25% valign=top>
-					<!-- icon 17-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=EmailConfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}ogmailserver.gif" alt="{$MOD.LBL_MAIL_SERVER_SETTINGS}" title="{$MOD.LBL_MAIL_SERVER_SETTINGS}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Settings&action=EmailConfig&parenttab=Settings">{$MOD.LBL_MAIL_SERVER_SETTINGS}</a></td>
-						</tr>
-
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_MAIL_SERVER_DESCRIPTION}</td>
-						</tr>
-						</table>
-					</td>
-					<td width=25% valign=top>
-					<!-- icon 18-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=BackupServerConfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}backupserver.gif" alt="{$MOD.LBL_BACKUP_SERVER_SETTINGS}" title="{$MOD.LBL_BACKUP_SERVER_SETTINGS}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Settings&action=BackupServerConfig&parenttab=Settings">{$MOD.LBL_BACKUP_SERVER_SETTINGS}</a></td>
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_BACKUP_SERVER_DESCRIPTION}</td>
-						</tr>
-						</table>
-
-					</td>
-					<td width=25% valign=top>
-					<!-- icon 7-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=ListModuleOwners&parenttab=Settings"><img src="{$IMAGE_PATH}assign.gif" alt="{$MOD.LBL_ASSIGN_MODULE_OWNERS}" width="48" height="48" border=0 title="{$MOD.LBL_ASSIGN_MODULE_OWNERS}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Settings&action=ListModuleOwners&parenttab=Settings">{$MOD.LBL_MODULE_OWNERS}</a></td>
-
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_MODULE_OWNERS_DESCRIPTION}</td>
-						</tr>
-						</table>
-					</td>
-				</tr>
-				<!-- Row 2 -->
-				<tr>
-
-					<td width=25% valign=top>
-					<!-- icon 19-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=CurrencyListView&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}currency.gif" alt="{$MOD.LBL_CURRENCY_SETTINGS}" title="{$MOD.LBL_CURRENCY_SETTINGS}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Settings&action=CurrencyListView&parenttab=Settings">{$MOD.LBL_CURRENCY_SETTINGS}</a></td>
-						</tr>
-
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_CURRENCY_DESCRIPTION}</td>
-						</tr>
-						</table>
-					</td>
-
-					<td width=25% valign=top>
-					<!-- icon 20-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=TaxConfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}taxConfiguration.gif" alt="{$MOD.LBL_TAX_SETTINGS}" title="{$MOD.LBL_TAX_SETTINGS}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Settings&action=TaxConfig&parenttab=Settings">{$MOD.LBL_TAX_SETTINGS}</a></td>
-						</tr>
-						<tr>
-
-							<td class="small" valign=top>{$MOD.LBL_TAX_DESCRIPTION}</td>
-						</tr>
-						</table>
-					</td>
-					<td width=25% valign=top>
-					<!-- empty -->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=System&action=listsysconfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}system.gif" alt="{$MOD.LBL_SYSTEM_INFO}" title="{$MOD.LBL_SYSTEM_INFO}"></a></td>
-							<td class=big valign=top><a href="index.php?module=System&action=listsysconfig&parenttab=Settings">{$MOD.LBL_SYSTEM_INFO}</a></td>
-
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_SYSTEM_DESCRIPTION}</td>
-						</tr>
-						</table>
-					</td>
-					<td width=25% valign=top>
-
-					<!-- empty-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=ProxyServerConfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}proxy.gif" alt="{$MOD.LBL_PROXY_SETTINGS}" title="{$MOD.LBL_PROXY_SETTINGS}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Settings&action=ProxyServerConfig&parenttab=Settings">{$MOD.LBL_PROXY_SETTINGS}</a></td>
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_PROXY_DESCRIPTION}</td>
-						</tr>
-
-						</table>
-					</td>
-				</tr>
-				<tr>
-
-					<td width=25% valign=top>
-					<!-- empty-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Users&action=Announcements&parenttab=Settings"><img src="{$IMAGE_PATH}announ.gif" alt="{$MOD.LBL_ANNOUNCEMENT}" width="48" height="48" border=0 title="{$MOD.LBL_ANNOUNCEMENT}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Users&action=Announcements&parenttab=Settings">{$MOD.LBL_ANNOUNCEMENT}</a></td>
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_ANNOUNCEMENT_DESCRIPTION}</td>
-						</tr>
-
-						</table>
 					</td>
 				  <td valign=top><table border=0 cellspacing=0 cellpadding=5 width=100%>
                     <tr>




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 04:14:10 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 08:14:10 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9428 -
 /vtigercrm/trunk/modules/CustomView/language/en_us.lang.php
Message-ID: <20060912081410.774716FDF54@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep 12 02:14:02 2006
New Revision: 9428

Log:
Modified Label for End Date --by Ahmed

Modified:
    vtigercrm/trunk/modules/CustomView/language/en_us.lang.php

Modified: vtigercrm/trunk/modules/CustomView/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/CustomView/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/CustomView/language/en_us.lang.php Tue Sep 12 02:14:02 2006
@@ -266,7 +266,7 @@
 'Select_Duration'=>'Select Duration', 
 'Simple_Time_Filter'=>'Simple Time Filter', 
 'Start_Date'=>'Start Date', 
-'End_Date'=>'End_Date', 
+'End_Date'=>'End Date', 
 'LBL_RULE'=>'RULE' 
 ); 
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 09:53:58 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 13:53:58 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9429 -
	/vtigercrm/trunk/themes/woodspice/images/aboutus.gif
Message-ID: <20060912135358.B5BFC76BF8A@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 07:53:45 2006
New Revision: 9429

Log:
unused image deleted --Jeri

Removed:
    vtigercrm/trunk/themes/woodspice/images/aboutus.gif




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 09:55:25 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 13:55:25 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9430 -
	/vtigercrm/trunk/themes/alphagrey/images/aboutus.gif
Message-ID: <20060912135525.51E3D76D5E9@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 07:55:18 2006
New Revision: 9430

Log:
unused image deleted --Jeri

Removed:
    vtigercrm/trunk/themes/alphagrey/images/aboutus.gif




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 09:55:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 13:55:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9431 -
 /vtigercrm/trunk/themes/bluelagoon/images/aboutus.gif
Message-ID: <20060912135537.8D9DD76D5FE@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 07:55:30 2006
New Revision: 9431

Log:
unused image deleted --Jeri

Removed:
    vtigercrm/trunk/themes/bluelagoon/images/aboutus.gif




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 09:56:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 13:56:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9432 - in
 /thunderbirdextn/trunk/chrome/vtiger/content/vtiger: addtovtiger.js
 addtovtiger.xul exportab.xul vtiger.js vtiger.xul vtigerab.js vtigerab.xul
Message-ID: <20060912135638.29BC076D5E9@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 07:56:17 2006
New Revision: 9432

Log:
Security implemented in thunderbird Plugin --Jeri

Modified:
    thunderbirdextn/trunk/chrome/vtiger/content/vtiger/addtovtiger.js
    thunderbirdextn/trunk/chrome/vtiger/content/vtiger/addtovtiger.xul
    thunderbirdextn/trunk/chrome/vtiger/content/vtiger/exportab.xul
    thunderbirdextn/trunk/chrome/vtiger/content/vtiger/vtiger.js
    thunderbirdextn/trunk/chrome/vtiger/content/vtiger/vtiger.xul
    thunderbirdextn/trunk/chrome/vtiger/content/vtiger/vtigerab.js
    thunderbirdextn/trunk/chrome/vtiger/content/vtiger/vtigerab.xul

Modified: thunderbirdextn/trunk/chrome/vtiger/content/vtiger/addtovtiger.js
==============================================================================
Binary files - no diff available.

Modified: thunderbirdextn/trunk/chrome/vtiger/content/vtiger/addtovtiger.xul
==============================================================================
Binary files - no diff available.

Modified: thunderbirdextn/trunk/chrome/vtiger/content/vtiger/exportab.xul
==============================================================================
Binary files - no diff available.

Modified: thunderbirdextn/trunk/chrome/vtiger/content/vtiger/vtiger.js
==============================================================================
Binary files - no diff available.

Modified: thunderbirdextn/trunk/chrome/vtiger/content/vtiger/vtiger.xul
==============================================================================
Binary files - no diff available.

Modified: thunderbirdextn/trunk/chrome/vtiger/content/vtiger/vtigerab.js
==============================================================================
Binary files - no diff available.

Modified: thunderbirdextn/trunk/chrome/vtiger/content/vtiger/vtigerab.xul
==============================================================================
Binary files - no diff available.




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 10:00:34 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 14:00:34 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9433 -
	/vtigercrm/trunk/soap/thunderbirdplugin.php
Message-ID: <20060912140034.CD36576D667@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 08:00:27 2006
New Revision: 9433

Log:
Security implemented in thunderbird Plugin --Jeri

Modified:
    vtigercrm/trunk/soap/thunderbirdplugin.php

Modified: vtigercrm/trunk/soap/thunderbirdplugin.php
==============================================================================
--- vtigercrm/trunk/soap/thunderbirdplugin.php (original)
+++ vtigercrm/trunk/soap/thunderbirdplugin.php Tue Sep 12 08:00:27 2006
@@ -46,6 +46,12 @@
     array('username'=>'xsd:string'),
     array('return'=>'tns:contactdetails'),
     $NAMESPACE);
+    
+$server->register(
+    'CheckContactPerm',array('user_name'=>'xsd:string'),array('return'=>'xsd:string'),$NAMESPACE);
+
+$server->register(
+    'CheckContactViewPerm',array('user_name'=>'xsd:string'),array('return'=>'xsd:string'),$NAMESPACE);
 
 $server->register(
 	  'AddContact',
@@ -382,7 +388,31 @@
 
 function create_session($user_name, $password)
 {
-        return "TempSessionID";
+  global $adb,$log;
+  $return_access = 'failure';
+  require_once('modules/Users/User.php');
+	$objuser = new User();
+  if($password != "" && $user_name != '')
+	{
+		$objuser->column_fields['user_name'] = $user_name;
+		$encrypted_password = $objuser->encrypt_password($password);
+		$query = "select id from vtiger_users where user_name='$user_name' and user_password='$encrypted_password'";
+		$result = $adb->query($query);
+		if($adb->num_rows($result) > 0)
+		{
+			$return_access = 'success';
+			$log->debug("Logged in sucessfully from thunderbirdplugin");
+		}else
+		{
+			$return_access = 'failure';
+			$log->debug("Logged in failure from thunderbirdplugin");
+		}
+	}else
+	{
+		$return_access = 'failure';
+		$log->debug("Logged in failure from thunderbirdplugin");
+  }
+	return $return_access;
 }
 
 function end_session($user_name)
@@ -390,6 +420,39 @@
         return "Success";       
 }
 
+function CheckContactPerm($user_name)
+{
+  global $current_user;
+	require_once('modules/Users/User.php');
+	$seed_user = new User();
+	$user_id = $seed_user->retrieve_user_id($user_name);
+	$current_user = $seed_user;
+	$current_user->retrieve_entity_info($user_id,"Users");
+	if(isPermitted("Contacts","EditView") == "yes")
+	{
+		return "allowed";
+	}else
+	{
+		return "denied";
+	}
+}
+
+function CheckContactViewPerm($user_name)
+{
+  global $current_user,$log;
+	require_once('modules/Users/User.php');
+	$seed_user = new User();
+	$user_id = $seed_user->retrieve_user_id($user_name);
+	$current_user = $seed_user;
+	$current_user->retrieve_entity_info($user_id,"Users");
+	if(isPermitted("Contacts","index") == "yes")
+	{
+		return "allowed";
+	}else
+	{
+		return "denied";
+	}
+}
 
 $server->service($HTTP_RAW_POST_DATA); 
 exit(); 




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 10:11:29 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 14:11:29 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9434 -
 /thunderbirdextn/trunk/chrome/vtiger/content/vtiger/vtiger.js
Message-ID: <20060912141129.E769C76CE1F@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 08:11:18 2006
New Revision: 9434

Log:
Security implemented in thunderbird Plugin --Jeri

Modified:
    thunderbirdextn/trunk/chrome/vtiger/content/vtiger/vtiger.js

Modified: thunderbirdextn/trunk/chrome/vtiger/content/vtiger/vtiger.js
==============================================================================
Binary files - no diff available.




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 10:18:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 14:18:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9435 -
 /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php
Message-ID: <20060912141809.B098176D667@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep 12 08:17:56 2006
New Revision: 9435

Log:
fixed the Migration Issues -- By Mickie

Modified:
    vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php

Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php
==============================================================================
--- vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php (original)
+++ vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php Tue Sep 12 08:17:56 2006
@@ -115,8 +115,8 @@
 {
 	$profile_id = $conn->query_result($res,$i,'profileid');
 
-	$sql1 = "insert into vtiger_profile2globalpermissions values ($profile_id,1,0)";
-	$sql2 = "insert into vtiger_profile2globalpermissions values ($profile_id,2,0)";
+	$sql1 = "insert into vtiger_profile2globalpermissions values ($profile_id,1,1)";
+	$sql2 = "insert into vtiger_profile2globalpermissions values ($profile_id,2,1)";
 
 	Execute($sql1);
 	Execute($sql2);
@@ -295,25 +295,25 @@
 
 //changes made to fix the bug in Address Information block of Accounts and Contacs module
 $update_array2 = Array(
-		"UPDATE vtiger_field SET fieldlabel='Billing City' WHERE tabid=6 and tablename='accountbillads' and fieldname='bill_city'",
-		"UPDATE vtiger_field SET fieldlabel='Billing State' WHERE tabid=6 and tablename='accountbillads' and fieldname='bill_state'",
-		"UPDATE vtiger_field SET fieldlabel='Billing Code' WHERE tabid=6 and tablename='accountbillads' and fieldname='bill_code'",
-		"UPDATE vtiger_field SET fieldlabel='Billing Country' WHERE tabid=6 and tablename='accountbillads' and fieldname='bill_country'",
-
-		"UPDATE vtiger_field SET fieldlabel='Shipping City' WHERE tabid=6 and tablename='accountshipads' and fieldname='ship_city'",
-		"UPDATE vtiger_field SET fieldlabel='Shipping Country' WHERE tabid=6 and tablename='accountshipads' and fieldname='ship_country'",
-		"UPDATE vtiger_field SET fieldlabel='Shipping State' WHERE tabid=6 and tablename='accountshipads' and fieldname='ship_state'",
-		"UPDATE vtiger_field SET fieldlabel='Shipping Code' WHERE tabid=6 and tablename='accountshipads' and fieldname='ship_code'",
-
-		"UPDATE vtiger_field SET fieldlabel='Mailing City' WHERE tabid=4 and tablename='contactaddress' and fieldname='mailingcity'",
-		"UPDATE vtiger_field SET fieldlabel='Mailing State' WHERE tabid=4 and tablename='contactaddress' and fieldname='mailingstate'",
-		"UPDATE vtiger_field SET fieldlabel='Mailing Zip' WHERE tabid=4 and tablename='contactaddress' and fieldname='mailingzip'",
-		"UPDATE vtiger_field SET fieldlabel='Mailing Country' WHERE tabid=4 and tablename='contactaddress' and fieldname='mailingcountry'",
-
-		"UPDATE vtiger_field SET fieldlabel='Other City' WHERE tabid=4 and tablename='contactaddress' and fieldname='othercity'",
-		"UPDATE vtiger_field SET fieldlabel='Other State' WHERE tabid=4 and tablename='contactaddress' and fieldname='otherstate'",
-		"UPDATE vtiger_field SET fieldlabel='Other Zip' WHERE tabid=4 and tablename='contactaddress' and fieldname='otherzip'",
-		"UPDATE vtiger_field SET fieldlabel='Other Country' WHERE tabid=4 and tablename='contactaddress' and fieldname='othercountry'",
+		"UPDATE vtiger_field SET fieldlabel='Billing City', sequence=5 WHERE tabid=6 and fieldname='bill_city'",
+		"UPDATE vtiger_field SET fieldlabel='Billing State', sequence=7 WHERE tabid=6 and fieldname='bill_state'",
+		"UPDATE vtiger_field SET fieldlabel='Billing Code', sequence=9 WHERE tabid=6 and fieldname='bill_code'",
+		"UPDATE vtiger_field SET fieldlabel='Billing Country', sequence=11 WHERE tabid=6 and fieldname='bill_country'",
+
+		"UPDATE vtiger_field SET fieldlabel='Shipping City', sequence=6 WHERE tabid=6 and fieldname='ship_city'",
+		"UPDATE vtiger_field SET fieldlabel='Shipping State', sequence=8 WHERE tabid=6 and fieldname='ship_state'",
+		"UPDATE vtiger_field SET fieldlabel='Shipping Code', sequence=10 WHERE tabid=6 and fieldname='ship_code'",
+		"UPDATE vtiger_field SET fieldlabel='Shipping Country', sequence=12 WHERE tabid=6 and fieldname='ship_country'",
+
+		"UPDATE vtiger_field SET fieldlabel='Mailing City', sequence=5 WHERE tabid=4 and fieldname='mailingcity'",
+		"UPDATE vtiger_field SET fieldlabel='Mailing State', sequence=7 WHERE tabid=4 and fieldname='mailingstate'",
+		"UPDATE vtiger_field SET fieldlabel='Mailing Zip', sequence=9 WHERE tabid=4 and fieldname='mailingzip'",
+		"UPDATE vtiger_field SET fieldlabel='Mailing Country', sequence=11 WHERE tabid=4 and fieldname='mailingcountry'",
+
+		"UPDATE vtiger_field SET fieldlabel='Other City', sequence=6 WHERE tabid=4 and fieldname='othercity'",
+		"UPDATE vtiger_field SET fieldlabel='Other State', sequence=8 WHERE tabid=4 and fieldname='otherstate'",
+		"UPDATE vtiger_field SET fieldlabel='Other Zip', sequence=10 WHERE tabid=4 and fieldname='otherzip'",
+		"UPDATE vtiger_field SET fieldlabel='Other Country', sequence=12 WHERE tabid=4 and fieldname='othercountry'",
 		);
 foreach($update_array2 as $query)
 {
@@ -3683,6 +3683,60 @@
 Execute("alter table vtiger_seactivityrel DROP PRIMARY KEY");
 Execute("alter table vtiger_seactivityrel ADD PRIMARY KEY (crmid,activityid)");
 
+//change the block for vendor address details
+Execute("update vtiger_field set fieldname='street' where tabid=18 and columnname='street'");
+Execute("update vtiger_field set block=46 where tabid=18 and fieldname in ('city','country','pobox','postalcode','state','street')");
+
+//change the calendar sharing access to private
+Execute("update vtiger_def_org_share set permission=3 where tabid=9");
+//Now sharing access is not available for Emails
+Execute("delete from vtiger_def_org_share where tabid=10");
+
+//we have to delete the entry from datashare_relatedmodules (Settings -> Sharing Access -> Add Privileges)
+Execute("delete from vtiger_datashare_relatedmodules where tabid=10");
+Execute("delete from vtiger_datashare_relatedmodules where relatedto_tabid=10");
+
+
+//change the share_action_name in vtiger_org_share_action_mapping table for entry Public:Read,Create/Edit 
+Execute('update vtiger_org_share_action_mapping set share_action_name="Public: Read, Create/Edit" where share_action_name="Public:Read,Create/Edit"');
+
+//add entries for Campaign and My Sites in profile2tab and profile2standardpermissions tables
+$res = $conn->query("select * from vtiger_profile");
+$noofprofiles = $conn->num_rows($res);
+
+for($i=0;$i<$noofprofiles;$i++)
+{
+	        $profile_id = $conn->query_result($res,$i,'profileid');
+		
+		Execute("insert into vtiger_profile2tab values($profile_id,26,0)");
+		Execute("insert into vtiger_profile2tab values($profile_id,27,0)");
+
+		Execute("insert into vtiger_profile2standardpermissions values ($profile_id,26,0,0)");
+		Execute("insert into vtiger_profile2standardpermissions values ($profile_id,26,1,0)");
+		Execute("insert into vtiger_profile2standardpermissions values ($profile_id,26,2,0)");
+		Execute("insert into vtiger_profile2standardpermissions values ($profile_id,26,3,0)");
+		Execute("insert into vtiger_profile2standardpermissions values ($profile_id,26,4,0)");
+}
+
+//add all field entries to def_org_field table for Campaigns
+$field_res = $conn->query("select fieldid from vtiger_field where tabid=26");
+for($i=0;$i<$conn->num_rows($field_res);$i++)
+{
+	$fieldid = $conn->query_result($field_res,$i,'fieldid');
+	
+	Execute("insert into vtiger_def_org_field values(26,$fieldid,0,1)");
+
+	//Also we have to add in profile2tab for all profiles
+	$profile_res = $conn->query("select * from vtiger_profile");
+	for($j=0;$j<$conn->num_rows($profile_res);$j++)
+	{
+		$profile_id = $conn->query_result($profile_res,$j,'profileid');
+
+		Execute("insert into vtiger_profile2field values($profile_id,26,$fieldid,0,1)");
+	}
+	
+}
+
 
 
 




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 10:22:47 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 14:22:47 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9436 -
	/vtigercrm/trunk/modules/Portal/Popup.php
Message-ID: <20060912142247.032D676D67E@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 08:22:39 2006
New Revision: 9436

Log:
Class applied for My Sites Popup --Jeri

Modified:
    vtigercrm/trunk/modules/Portal/Popup.php

Modified: vtigercrm/trunk/modules/Portal/Popup.php
==============================================================================
--- vtigercrm/trunk/modules/Portal/Popup.php (original)
+++ vtigercrm/trunk/modules/Portal/Popup.php Tue Sep 12 08:22:39 2006
@@ -1,57 +1,64 @@
-<?
-/*********************************************************************************
-** 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.
-*
-********************************************************************************/
-
-require_once('modules/Portal/Portal.php');
-global $app_strings;
-global $app_list_strings;
-global $mod_strings;
-global $adb;
-if(isset($_REQUEST['record']) && $_REQUEST['record'] !='')
-{
-	$portalid = $_REQUEST['record'];
-	$query="select * from vtiger_portal where portalid =$portalid";
-	$result=$adb->query($query);
-	$portalname = $adb->query_result($result,0,'portalname');
-        $portalurl = $adb->query_result($result,0,'portalurl');		
-}
-$portal_inputs='';
-$portal_inputs.='<div style="display:block;position:relative;" id="orgLay">
-		<table border="0" cellpadding="5" cellspacing="0" width="100%">
-		<tbody><tr>
-			<td class="genHeaderSmall" align="left" width="30%">' .$mod_strings['LBL_ADD'] .' '.$mod_strings['LBL_BOOKMARK'].'</td>
-			<td align="right" width="80%"><a href="javascript:fninvsh(\'orgLay\');"><img src="../themes/blue/images/close.gif" align="absmiddle" border="0"></a></td>
-		</tr>
-		<tr><td colspan="2"><hr></td></tr>
-		<tr>
-
-			<td align="right"><b>'.$mod_strings['LBL_BOOKMARK'].' ' .$mod_strings['LBL_URL'] .' </b></td>
-			<td align="left"><input name="portalurl" id="portalurl" class="txtBox" value="'.$portalurl.'" type="text"></td>
-		</tr>
-		<tr>
-			<td align="right"><b>'.$mod_strings['LBL_BOOKMARK'].' ' .$mod_strings['LBL_NAME'] .' </b></td>
-			<td align="left"><input name="portalname" id="portalname" value="'.$portalname.'" class="txtBox" type="text"></td>
-		</tr>
-		<tr><td style="border-bottom: 1px dashed rgb(204, 204, 204);" colspan="2">&nbsp;</td></tr>
-
-		<tr>
-			<td colspan="2" align="center">
-					<input name="save" value=" &nbsp;'.$app_strings['LBL_SAVE_BUTTON_LABEL'].'&nbsp; " class="crmbutton small save" onClick="SaveSite(\''.$portalid.'\')" type="button">&nbsp;&nbsp;
-					<input name="cancel" value=" '.$app_strings['LBL_CANCEL_BUTTON_LABEL'].' " class="crmbutton small cancel" onclick="fninvsh(\'orgLay\');" type="button">
-			</td>
-		</tr>
-		<tr><td colspan="2" style="border-top: 1px dashed rgb(204, 204, 204);">&nbsp;</td></tr>
-	</tbody></table>
-</div>';
-	
-echo $portal_inputs;
-
-
-?>
+<?
+/*********************************************************************************
+** 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.
+*
+********************************************************************************/
+
+require_once('modules/Portal/Portal.php');
+global $app_strings;
+global $app_list_strings;
+global $mod_strings;
+global $adb;
+if(isset($_REQUEST['record']) && $_REQUEST['record'] !='')
+{
+	$portalid = $_REQUEST['record'];
+	$query="select * from vtiger_portal where portalid =$portalid";
+	$result=$adb->query($query);
+	$portalname = $adb->query_result($result,0,'portalname');
+        $portalurl = $adb->query_result($result,0,'portalurl');		
+}
+$portal_inputs='';
+$portal_inputs.='<div style="display:block;position:relative;" id="orgLay" class="layerPopup">
+		<table border="0" cellpadding="3" cellspacing="0" width="100%" class="layerHeadingULine">
+		<tr>
+			<td class="layerPopupHeading" align="left" width="60%">' .$mod_strings['LBL_ADD'] .' '.$mod_strings['LBL_BOOKMARK'].'</td>
+			<td align="right" width="40%"><a href="javascript:fninvsh(\'orgLay\');"><img src="../themes/blue/images/close.gif" align="absmiddle" border="0"></a></td>
+		</tr>
+		</table>
+<table border="0" cellspacing="0" cellpadding="5" width="95%" align="center"> 
+	<tr>
+	<td class="small" >
+		<table border="0" celspacing="0" cellpadding="5" width="100%" align="center" bgcolor="white">
+		
+		<tr>
+
+			<td align="right" width="40%" ><b>'.$mod_strings['LBL_BOOKMARK'].' ' .$mod_strings['LBL_URL'] .' </b></td>
+			<td align="left" width="60%"><input name="portalurl" id="portalurl" class="txtBox" value="'.$portalurl.'" type="text"></td>
+		</tr>
+		<tr>
+			<td align="right" width="40%"> <b>'.$mod_strings['LBL_BOOKMARK'].' ' .$mod_strings['LBL_NAME'] .' </b></td>
+			<td align="left" width="60%"><input name="portalname" id="portalname" value="'.$portalname.'" class="txtBox" type="text"></td>
+		</tr>
+		</table>
+	</td>
+	</tr>
+</table>
+<table border="0" cellspacing="0" cellpadding="5" width="100%" class="layerPopupTransport">
+	<tr>
+	<td align="center">
+			<input name="save" value=" &nbsp;'.$app_strings['LBL_SAVE_BUTTON_LABEL'].'&nbsp; " class="crmbutton small save" onClick="SaveSite(\''.$portalid.'\')" type="button">&nbsp;&nbsp;
+			<input name="cancel" value=" '.$app_strings['LBL_CANCEL_BUTTON_LABEL'].' " class="crmbutton small cancel" onclick="fninvsh(\'orgLay\');" type="button">
+	</td>
+	</tr>
+</table>
+</div>';
+	
+echo $portal_inputs;
+
+
+?>




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 11:00:29 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 15:00:29 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9437 -
	/vtigercrm/trunk/themes/alphagrey/images/aboutUS.jpg
Message-ID: <20060912150029.865E266A7FD@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 09:00:22 2006
New Revision: 9437

Log:
aboutus images removed --Jeri

Removed:
    vtigercrm/trunk/themes/alphagrey/images/aboutUS.jpg




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 11:01:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 15:01:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9438 -
	/vtigercrm/trunk/themes/alphagrey/images/aboutUs.jpg
Message-ID: <20060912150150.9F09466A7FD@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 09:01:43 2006
New Revision: 9438

Log:
Class applied for My Sites Popup --Jeri

Removed:
    vtigercrm/trunk/themes/alphagrey/images/aboutUs.jpg




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 11:49:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 15:49:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9440 -
 /vtigercrm/trunk/themes/bluelagoon/images/aboutUS.jpg
Message-ID: <20060912154957.B1D9876CE1F@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep 12 09:49:50 2006
New Revision: 9440

Log:
un used files deleted --Jeri

Removed:
    vtigercrm/trunk/themes/bluelagoon/images/aboutUS.jpg




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 11:50:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 15:50:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9441 -
	/vtigercrm/trunk/themes/woodspice/images/aboutUS.jpg
Message-ID: <20060912155045.30A4C76CE1F@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep 12 09:50:37 2006
New Revision: 9441

Log:
un used files deleted --Jeri

Removed:
    vtigercrm/trunk/themes/woodspice/images/aboutUS.jpg




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 12:07:31 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 16:07:31 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9442 -
	/vtigercrm/trunk/themes/alphagrey/images/aboutUS.jpg
Message-ID: <20060912160731.6347C748304@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 10:07:20 2006
New Revision: 9442

Log:
Image for about us added --jeri

Added:
    vtigercrm/trunk/themes/alphagrey/images/aboutUS.jpg   (with props)




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 12:08:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 16:08:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9444 -
	/vtigercrm/trunk/themes/woodspice/images/aboutUS.jpg
Message-ID: <20060912160850.D08B576D689@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 10:08:40 2006
New Revision: 9444

Log:
Image for about us added --jeri

Added:
    vtigercrm/trunk/themes/woodspice/images/aboutUS.jpg   (with props)




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 12:13:54 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 16:13:54 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9445 -
	/vtigercrm/trunk/soap/thunderbirdplugin.php
Message-ID: <20060912161354.87F1476D687@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 10:13:46 2006
New Revision: 9445

Log:
First name missing while export has been fixed --Jeri

Modified:
    vtigercrm/trunk/soap/thunderbirdplugin.php

Modified: vtigercrm/trunk/soap/thunderbirdplugin.php
==============================================================================
--- vtigercrm/trunk/soap/thunderbirdplugin.php (original)
+++ vtigercrm/trunk/soap/thunderbirdplugin.php Tue Sep 12 10:13:46 2006
@@ -357,7 +357,7 @@
   }
 	
 	$contact = new Contact();
-	$contact->column_fields[firstname]=in_array('salutation',$permitted_lists) ? $first_name : "";
+	$contact->column_fields[firstname]=in_array('firstname',$permitted_lists) ? $first_name : "";
 	$contact->column_fields[lastname]=in_array('lastname',$permitted_lists) ? $last_name : "";
 	$contact->column_fields[birthday]=in_array('birthday',$permitted_lists) ? getDisplayDate("0000-00-00") : "";
 	$contact->column_fields[email]=in_array('email',$permitted_lists) ? $email_address : "";




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 12:27:44 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 16:27:44 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9446 -
	/vtigercrm/trunk/Smarty/templates/UserGroups.tpl
Message-ID: <20060912162744.5CE24709BB2@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 10:27:37 2006
New Revision: 9446

Log:
Issue in Group List from user detail view has been fixed --Jeri

Modified:
    vtigercrm/trunk/Smarty/templates/UserGroups.tpl

Modified: vtigercrm/trunk/Smarty/templates/UserGroups.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/UserGroups.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/UserGroups.tpl Tue Sep 12 10:27:37 2006
@@ -1,29 +1,29 @@
-{*<!--
-/*********************************************************************************
-  ** 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.
-  *
- ********************************************************************************/
--->*}
-<table class="listTable" border="0" cellpadding="5" cellspacing="0" width="100%">
-<tr>
-<td class="colHeader small" valign="top">#</td>
-<td class="colHeader small" valign="top">{$UMOD.LBL_GROUP_NAME}</td>
-<td class="colHeader small" valign="top">{$UMOD.LBL_DESCRIPTION}</td>
-</tr>
-{foreach name=groupiter key=id item=groupname from=$GROUPLIST}
-<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&record={$id}">{$groupname.1}</a></td>
-{else}
-<td class="listTableRow small" valign="top">{$groupname.1}</td>
-{/if}
-<td class="listTableRow small" valign="top" width="65%">{$groupname.2}</td>
-</tr>
-{/foreach}
-</table>
+{*<!--
+/*********************************************************************************
+  ** 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.
+  *
+ ********************************************************************************/
+-->*}
+<table class="listTable" border="0" cellpadding="5" cellspacing="0" width="100%">
+<tr>
+<td class="colHeader small" valign="top">#</td>
+<td class="colHeader small" valign="top">{$UMOD.LBL_GROUP_NAME}</td>
+<td class="colHeader small" valign="top">{$UMOD.LBL_DESCRIPTION}</td>
+</tr>
+{foreach name=groupiter key=id item=groupname from=$GROUPLIST}
+<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>
+{else}
+<td class="listTableRow small" valign="top">{$groupname.1}</td>
+{/if}
+<td class="listTableRow small" valign="top" width="65%">{$groupname.2}</td>
+</tr>
+{/foreach}
+</table>




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 12:08:21 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 16:08:21 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9443 -
 /vtigercrm/trunk/themes/bluelagoon/images/aboutUS.jpg
Message-ID: <20060912160821.7F1CF748304@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 10:08:11 2006
New Revision: 9443

Log:
Image for about us added --jeri

Added:
    vtigercrm/trunk/themes/bluelagoon/images/aboutUS.jpg   (with props)




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 13:12:33 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 17:12:33 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9447 - in
 /vtigercrm/trunk/modules: Accounts/ Campaigns/ Contacts/ HelpDesk/ Invoice/
 Leads/ Potentials/ PriceBooks/ Products/ PurchaseOrder/ Quotes/ SalesOrder/
 Vendors/
Message-ID: <20060912171233.A54C676D68B@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 11:11:57 2006
New Revision: 9447

Log:
header redirected to detailview at any case for singlepane view

Modified:
    vtigercrm/trunk/modules/Accounts/CallRelatedList.php
    vtigercrm/trunk/modules/Campaigns/CallRelatedList.php
    vtigercrm/trunk/modules/Contacts/CallRelatedList.php
    vtigercrm/trunk/modules/HelpDesk/CallRelatedList.php
    vtigercrm/trunk/modules/Invoice/CallRelatedList.php
    vtigercrm/trunk/modules/Leads/CallRelatedList.php
    vtigercrm/trunk/modules/Potentials/CallRelatedList.php
    vtigercrm/trunk/modules/PriceBooks/CallRelatedList.php
    vtigercrm/trunk/modules/Products/CallRelatedList.php
    vtigercrm/trunk/modules/PurchaseOrder/CallRelatedList.php
    vtigercrm/trunk/modules/Quotes/CallRelatedList.php
    vtigercrm/trunk/modules/SalesOrder/CallRelatedList.php
    vtigercrm/trunk/modules/Vendors/CallRelatedList.php

Modified: vtigercrm/trunk/modules/Accounts/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Accounts/CallRelatedList.php Tue Sep 12 11:11:57 2006
@@ -13,7 +13,15 @@
 require_once('Smarty_setup.php');
 require_once('modules/Accounts/Account.php');
 require_once('include/utils/utils.php');
-
+//Redirecting Header for single page layout
+require_once('user_privileges/default_module_view.php');
+global $singlepane_view;
+if($singlepane_view == 'true' && $_REQUEST['action'] == 'CallRelatedList' )
+{
+	header("Location:index.php?action=DetailView&module=".$_REQUEST['module']."&record=".$_REQUEST['record']."&parenttab=".$_REQUEST['parenttab']);
+}
+else
+{
 $focus = new Account();
 $currentmodule = $_REQUEST['module'];
 $RECORD = $_REQUEST['record'];
@@ -65,5 +73,5 @@
 $smarty->assign("CHECK", $check_button);
 
 $smarty->display("RelatedLists.tpl");
-
+}
 ?>

Modified: vtigercrm/trunk/modules/Campaigns/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Campaigns/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Campaigns/CallRelatedList.php Tue Sep 12 11:11:57 2006
@@ -14,7 +14,15 @@
 require_once('modules/Campaigns/Campaign.php');
 require_once('modules/CustomView/CustomView.php');
 require_once('include/utils/utils.php');
-
+//Redirecting Header for single page layout 
+require_once('user_privileges/default_module_view.php');
+global $singlepane_view;
+if($singlepane_view == 'true' && $_REQUEST['action'] == 'CallRelatedList' )
+{
+	header("Location:index.php?action=DetailView&module=".$_REQUEST['module']."&record=".$_REQUEST['record']."&parenttab=".$_REQUEST['parenttab']);
+}
+else
+{
 $focus = new Campaign();
 $currentmodule = $_REQUEST['module'];
 $RECORD = $_REQUEST['record'];
@@ -72,4 +80,5 @@
 $smarty->assign("CHECK", $check_button);
 
 $smarty->display("RelatedLists.tpl");
+}
 ?>

Modified: vtigercrm/trunk/modules/Contacts/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Contacts/CallRelatedList.php Tue Sep 12 11:11:57 2006
@@ -13,6 +13,15 @@
 require_once('modules/Contacts/Contact.php');
 require_once('include/utils/utils.php');
 
+//Redirecting Header for single page layout
+require_once('user_privileges/default_module_view.php');
+global $singlepane_view;
+if($singlepane_view == 'true' && $_REQUEST['action'] == 'CallRelatedList' )
+{
+	header("Location:index.php?action=DetailView&module=".$_REQUEST['module']."&record=".$_REQUEST['record']."&parenttab=".$_REQUEST['parenttab']);
+}
+else
+{
 $focus = new Contact();
 $currentmodule = $_REQUEST['module'];
 $RECORD = $_REQUEST['record'];
@@ -71,4 +80,5 @@
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
 $smarty->display("RelatedLists.tpl");
+}
 ?>

Modified: vtigercrm/trunk/modules/HelpDesk/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/CallRelatedList.php Tue Sep 12 11:11:57 2006
@@ -14,6 +14,15 @@
 require_once('modules/HelpDesk/HelpDesk.php');
 require_once('include/utils/utils.php');
 
+//Redirecting Header for single page layout
+require_once('user_privileges/default_module_view.php');
+global $singlepane_view;
+if($singlepane_view == 'true' && $_REQUEST['action'] == 'CallRelatedList' )
+{
+	header("Location:index.php?action=DetailView&module=".$_REQUEST['module']."&record=".$_REQUEST['record']."&parenttab=".$_REQUEST['parenttab']);
+}
+else
+{
 $focus = new HelpDesk();
 $currentmodule = $_REQUEST['module'];
 $RECORD = $_REQUEST['record'];
@@ -63,4 +72,5 @@
 $smarty->assign("CHECK", $check_button);
 
 $smarty->display("RelatedLists.tpl");
+}
 ?>

Modified: vtigercrm/trunk/modules/Invoice/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Invoice/CallRelatedList.php Tue Sep 12 11:11:57 2006
@@ -14,6 +14,15 @@
 require_once('modules/Invoice/Invoice.php');
 require_once('include/utils/utils.php');
 
+//Redirecting Header for single page layout
+require_once('user_privileges/default_module_view.php');
+global $singlepane_view;
+if($singlepane_view == 'true' && $_REQUEST['action'] == 'CallRelatedList' )
+{
+	header("Location:index.php?action=DetailView&module=".$_REQUEST['module']."&record=".$_REQUEST['record']."&parenttab=".$_REQUEST['parenttab']);
+}
+else
+{
 $focus = new Invoice();
 $currentmodule = $_REQUEST['module'];
 $RECORD = $_REQUEST['record'];
@@ -56,4 +65,5 @@
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
 $smarty->display("RelatedLists.tpl");
+}
 ?>

Modified: vtigercrm/trunk/modules/Leads/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Leads/CallRelatedList.php Tue Sep 12 11:11:57 2006
@@ -13,6 +13,15 @@
 require_once('Smarty_setup.php');
 require_once('modules/Leads/Lead.php');
 require_once('include/utils/utils.php');
+//Redirecting Header for single page layout 
+require_once('user_privileges/default_module_view.php');
+global $singlepane_view;
+if($singlepane_view == 'true' && $_REQUEST['action'] == 'CallRelatedList' )
+{
+	header("Location:index.php?action=DetailView&module=".$_REQUEST['module']."&record=".$_REQUEST['record']."&parenttab=".$_REQUEST['parenttab']);
+}
+else
+{
 $focus = new Lead();
 $MODULE = $_REQUEST['module'];
 $RECORD = $_REQUEST['record'];
@@ -71,5 +80,5 @@
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
 $smarty->display("RelatedLists.tpl");
-
+}
 ?>

Modified: vtigercrm/trunk/modules/Potentials/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Potentials/CallRelatedList.php Tue Sep 12 11:11:57 2006
@@ -12,6 +12,15 @@
 
 require_once('Smarty_setup.php');
 require_once('modules/Potentials/Opportunity.php');
+//Redirecting Header for single page layout
+require_once('user_privileges/default_module_view.php');
+global $singlepane_view;
+if($singlepane_view == 'true' && $_REQUEST['action'] == 'CallRelatedList' )
+{
+	header("Location:index.php?action=DetailView&module=".$_REQUEST['module']."&record=".$_REQUEST['record']."&parenttab=".$_REQUEST['parenttab']);
+}
+else
+{
 $focus = new Potential();
 $currentmodule = $_REQUEST['module'];
 $RECORD = $_REQUEST['record'];
@@ -57,5 +66,5 @@
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
 $smarty->display("RelatedLists.tpl");
-
+}
 ?>

Modified: vtigercrm/trunk/modules/PriceBooks/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/PriceBooks/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/PriceBooks/CallRelatedList.php Tue Sep 12 11:11:57 2006
@@ -11,7 +11,15 @@
 
 require_once('Smarty_setup.php');
 require_once('modules/PriceBooks/PriceBook.php');
-
+//Redirecting Header for single page layout
+require_once('user_privileges/default_module_view.php');
+global $singlepane_view;
+if($singlepane_view == 'true' && $_REQUEST['action'] == 'CallRelatedList' )
+{
+	header("Location:index.php?action=DetailView&module=".$_REQUEST['module']."&record=".$_REQUEST['record']."&parenttab=".$_REQUEST['parenttab']);
+}
+else
+{
 global $currentModule;
 
 $focus = new PriceBook();
@@ -66,5 +74,5 @@
 	$smarty->display("RelatedListContents.tpl");
 else
 	$smarty->display("RelatedLists.tpl");
-
+}
 ?>

Modified: vtigercrm/trunk/modules/Products/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Products/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Products/CallRelatedList.php Tue Sep 12 11:11:57 2006
@@ -12,6 +12,15 @@
 require_once('Smarty_setup.php');
 require_once('modules/Products/Product.php');
 
+//Redirecting Header for single page layout
+require_once('user_privileges/default_module_view.php');
+global $singlepane_view;
+if($singlepane_view == 'true' && $_REQUEST['action'] == 'CallRelatedList' )
+{
+	header("Location:index.php?action=DetailView&module=".$_REQUEST['module']."&record=".$_REQUEST['record']."&parenttab=".$_REQUEST['parenttab']);
+}
+else
+{
 $focus = new Product();
 $currentmodule = $_REQUEST['module'];
 $RECORD = $_REQUEST['record'];
@@ -58,5 +67,5 @@
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
 $smarty->display("RelatedLists.tpl");
-
+}
 ?>

Modified: vtigercrm/trunk/modules/PurchaseOrder/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/CallRelatedList.php Tue Sep 12 11:11:57 2006
@@ -12,6 +12,15 @@
 
 require_once('Smarty_setup.php');
 require_once('modules/PurchaseOrder/PurchaseOrder.php');
+//Redirecting Header for single page layout
+require_once('user_privileges/default_module_view.php');
+global $singlepane_view;
+if($singlepane_view == 'true' && $_REQUEST['action'] == 'CallRelatedList' )
+{
+	header("Location:index.php?action=DetailView&module=".$_REQUEST['module']."&record=".$_REQUEST['record']."&parenttab=".$_REQUEST['parenttab']);
+}
+else
+{
 $focus = new Order();
 $currentmodule = $_REQUEST['module'];
 $RECORD = $_REQUEST['record'];
@@ -52,4 +61,5 @@
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
 $smarty->display("RelatedLists.tpl");
+}
 ?>

Modified: vtigercrm/trunk/modules/Quotes/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Quotes/CallRelatedList.php Tue Sep 12 11:11:57 2006
@@ -12,6 +12,15 @@
 
 require_once('Smarty_setup.php');
 require_once('modules/Quotes/Quote.php');
+//Redirecting Header for single page layout
+require_once('user_privileges/default_module_view.php');
+global $singlepane_view;
+if($singlepane_view == 'true' && $_REQUEST['action'] == 'CallRelatedList' )
+{
+	header("Location:index.php?action=DetailView&module=".$_REQUEST['module']."&record=".$_REQUEST['record']."&parenttab=".$_REQUEST['parenttab']);
+}
+else
+{
 $focus = new Quote();
 $currentmodule = $_REQUEST['module'];
 $RECORD = $_REQUEST['record'];
@@ -52,4 +61,5 @@
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
 $smarty->display("RelatedLists.tpl");
+}
 ?>

Modified: vtigercrm/trunk/modules/SalesOrder/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/CallRelatedList.php Tue Sep 12 11:11:57 2006
@@ -11,6 +11,15 @@
 
 require_once('Smarty_setup.php');
 require_once('modules/SalesOrder/SalesOrder.php');
+//Redirecting Header for single page layout
+require_once('user_privileges/default_module_view.php');
+global $singlepane_view;
+if($singlepane_view == 'true' && $_REQUEST['action'] == 'CallRelatedList' )
+{
+	header("Location:index.php?action=DetailView&module=".$_REQUEST['module']."&record=".$_REQUEST['record']."&parenttab=".$_REQUEST['parenttab']);
+}
+else
+{
 $focus = new SalesOrder();
 $currentmodule = $_REQUEST['module'];
 $RECORD = $_REQUEST['record'];
@@ -51,4 +60,5 @@
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
 $smarty->display("RelatedLists.tpl");
+}
 ?>

Modified: vtigercrm/trunk/modules/Vendors/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Vendors/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Vendors/CallRelatedList.php Tue Sep 12 11:11:57 2006
@@ -11,7 +11,15 @@
 
 require_once('Smarty_setup.php');
 require_once('modules/Vendors/Vendor.php');
-
+//Redirecting Header for single page layout
+require_once('user_privileges/default_module_view.php');
+global $singlepane_view;
+if($singlepane_view == 'true' && $_REQUEST['action'] == 'CallRelatedList' )
+{
+	header("Location:index.php?action=DetailView&module=".$_REQUEST['module']."&record=".$_REQUEST['record']."&parenttab=".$_REQUEST['parenttab']);
+}
+else
+{
 global $currentModule;
 $focus = new Vendor();
 
@@ -63,5 +71,5 @@
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
 $smarty->display("RelatedLists.tpl");
-
+}
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 13:13:15 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 17:13:15 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9448 -
 /vtigercrm/trunk/modules/Settings/language/en_us.lang.php
Message-ID: <20060912171315.B6F3976D68B@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 11:13:08 2006
New Revision: 9448

Log:
language strings updated --Jeri

Modified:
    vtigercrm/trunk/modules/Settings/language/en_us.lang.php

Modified: vtigercrm/trunk/modules/Settings/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Settings/language/en_us.lang.php Tue Sep 12 11:13:08 2006
@@ -591,7 +591,7 @@
 'INVENTORYTERMSANDCONDITIONS'=>'Inventory : Terms & Conditions',//newly added for Inventory terms and conditions
 'LBL_INVENTORY_TERMSANDCONDITIONS'=>' - Edit Terms & Conditions',//newly added
 'LBL_TANDC_TEXT'=>'Terms & Conditions Text',
-'LBL_INVENTORY_TANDC'=>'Terms & Conditions',
+'LBL_INVENTORY_TANDC'=>'Inventory Terms & Conditions',
 
 'LBL_OTHER_SETTINGS'=>'Other Settings',
 'LBL_SCROLL'=>'[Scroll to Top]',




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 13:16:14 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 17:16:14 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9449 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060912171614.8101876D693@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 11:16:06 2006
New Revision: 9449

Log:
Inventort terms and conditions added in demo data and create/Edit Delete permissions removed from Emails module in Profiles--Jeri

Modified:
    vtigercrm/trunk/modules/Users/DefaultDataPopulator.php

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Tue Sep 12 11:16:06 2006
@@ -1090,13 +1090,6 @@
 		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",9,3,0)");
 		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",9,4,0)");
 
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",10,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",10,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",10,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",10,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",10,4,0)");
-
-		
 		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",13,0,0)");
 		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",13,1,0)");
 		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",13,2,0)");
@@ -1204,13 +1197,6 @@
 		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",9,2,0)");
 		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",9,3,0)");
 		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",9,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",10,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",10,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",10,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",10,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",10,4,0)");
-
 		
 		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",13,0,1)");
 		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",13,1,1)");
@@ -1318,13 +1304,6 @@
 		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",9,3,0)");
 		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",9,4,0)");
 
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",10,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",10,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",10,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",10,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",10,4,0)");
-
-		
 		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",13,0,0)");
 		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",13,1,0)");
 		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",13,2,0)");
@@ -1431,12 +1410,6 @@
 		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",9,3,0)");
 		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",9,4,0)");
 
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",10,0,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",10,1,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",10,2,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",10,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",10,4,0)");
-		
 		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",13,0,1)");
 		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",13,1,1)");
 		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",13,2,1)");
@@ -1913,6 +1886,15 @@
 		
                $this->db->query("insert into vtiger_inventorynotification(notificationid,notificationname,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("vtiger_inventorynotification").",'SalesOrderNotification','Sales Order generated for {PRODUCTNAME}','".$so_body." ','SalesOrderNotificationDescription')");
 
+//insert into inventory terms and conditions table
+
+	$inv_tandc_text='
+ - Unless otherwise agreed in writing by the supplier all invoices are payable within thirty (30) days of the date of invoice, in the currency of the invoice, drawn on a bank based in India or by such other method as is agreed in advance by the Supplier.
+
+ - All prices are not inclusive of VAT which shall be payable in addition by the Customer at the applicable rate.';
+
+	$this->db->query("insert into vtiger_inventory_tandc(id,type,tandc) values (".$this->db->getUniqueID("vtiger_inventory_tandc").", 'Inventory', '".$inv_tandc_text."')");	
+
 //insert into email template vtiger_table
 
 	$body='
@@ -2089,8 +2071,6 @@
 	       //Insert into vtiger_organizationdetails vtiger_table 
 	       $this->db->query("insert into vtiger_organizationdetails(organizationname,address,city,state,country,code,phone,fax,website,logoname) values ('vtiger',' 40-41-42, Sivasundar Apartments, Flat D-II, Shastri Street, Velachery','Chennai','Tamil Nadu','India','600 042','+91-44-5202-1990','+91-44-5202-1990','www.vtiger.com','vtiger-crm-logo.jpg')");
 
-  //Insert into vtiger_inventory_tandc vtiger_table
-               $this->db->query("insert into vtiger_inventory_tandc values('".$this->db->getUniqueID('vtiger_inventory_tandc')."','Inventory','')");
 
 	$this->db->query("insert into vtiger_actionmapping values(0,'Save',0)");
 	$this->db->query("insert into vtiger_actionmapping values(1,'EditView',0)");




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 14:57:08 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 18:57:08 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9450 -
 /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php
Message-ID: <20060912185708.AFE0176D667@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep 12 12:56:58 2006
New Revision: 9450

Log:
Migration Fixes Done -- By Mickie

Modified:
    vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php

Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php
==============================================================================
--- vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php (original)
+++ vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php Tue Sep 12 12:56:58 2006
@@ -2921,7 +2921,7 @@
 $sql_sec="select profileid from  vtiger_profile";
 $result_sec=$conn->query($sql_sec);
 $num_rows=$conn->num_rows($result_sec);
-for($i=0;$i<$num_row;$i++)
+for($i=0;$i<$num_rows;$i++)
 {
 	$prof_id=$conn->query_result($result_sec,$i,'profileid');
 	$sql1_sec="insert into vtiger_profile2utility values(".$prof_id.",13,8,0)";
@@ -3205,7 +3205,7 @@
 
 //Added for Tax and Inventory - Product details handling
 
-Execute("CREATE TABLE vtiger_inventoryproductrel (id int(19) NOT NULL, productid int(19) NOT NULL, sequence_no int(4) default NULL, quantity int(19) default NULL, listprice decimal(11,3) default NULL, discount_percent decimal(7,3) default NULL, discount_amount decimal(11,3) default NULL, comment varchar(100) default NULL, KEY inventoryproductrel_id_idx (id), KEY inventoryproductrel_productid_idx (productid) ) ENGINE=InnoDB");
+Execute("CREATE TABLE vtiger_inventoryproductrel (id int(19) NOT NULL, productid int(19) NOT NULL, sequence_no int(4) NOT NULL default 1, quantity int(19) default NULL, listprice decimal(11,3) default NULL, discount_percent decimal(7,3) default NULL, discount_amount decimal(11,3) default NULL, comment varchar(100) default NULL, KEY inventoryproductrel_id_idx (id), KEY inventoryproductrel_productid_idx (productid) ) ENGINE=InnoDB");
 
 //Execute("alter table vtiger_inventorytaxinfo add column deleted int(1) default 0");
 
@@ -3550,7 +3550,6 @@
 //Added after 5 rc release
 Execute("alter table vtiger_account modify siccode varchar(50)");
 Execute("update vtiger_field set typeofdata='V~O' where fieldname='siccode' and columnname='siccode' and tabid=6");
-Execute("alter table vtiger_inventoryproductrel add column sequence_no int(4) not null default 1 after productid");
 
 //changes made for CustomView and Reports - Activities changed to Calendar -- Starts
 //Added to change the entitytype from Activities to Calendar for customview
@@ -3627,7 +3626,7 @@
 	Execute($alterquery);
 }
 
-Execute("alter table vtiger_organizationdetails drop primary key");
+$conn->query("alter table vtiger_organizationdetails drop primary key");
 Execute("alter table vtiger_organizationdetails change column organizationame  organizationname varchar(60) NOT NULL");
 Execute("alter table vtiger_organizationdetails ADD PRIMARY KEY (organizationname)");
 
@@ -3645,7 +3644,6 @@
 Execute("alter table vtiger_activity change column visibility visibility varchar(50) NOT NULL default 'all'");
 
 Execute("delete from vtiger_field where tabid=14 and fieldname='currency'");
-Execute("insert into vtiger_field values(14, ".$conn->getUniqueID("vtiger_field").", 'imagename', 'vtiger_products', 1, 69, 'imagename', 'Product Image', 1, 0, 0, 100, 1, 35, 1, 'V~O', 1, NULL, 'ADV')");
 
 //Product related changes
 Execute('update vtiger_field set typeofdata="D~O~OTH~GE~sales_start_date~Sales Start Date" where tabid=14 and fieldname="sales_end_date"');
@@ -3700,6 +3698,8 @@
 //change the share_action_name in vtiger_org_share_action_mapping table for entry Public:Read,Create/Edit 
 Execute('update vtiger_org_share_action_mapping set share_action_name="Public: Read, Create/Edit" where share_action_name="Public:Read,Create/Edit"');
 
+//This has been already added (line 2939) where as that loop failed because given num_row instead of num_rows
+/*
 //add entries for Campaign and My Sites in profile2tab and profile2standardpermissions tables
 $res = $conn->query("select * from vtiger_profile");
 $noofprofiles = $conn->num_rows($res);
@@ -3717,25 +3717,22 @@
 		Execute("insert into vtiger_profile2standardpermissions values ($profile_id,26,3,0)");
 		Execute("insert into vtiger_profile2standardpermissions values ($profile_id,26,4,0)");
 }
-
-//add all field entries to def_org_field table for Campaigns
+*/
+
+//add all field entries to def_org_field and profile2field tables for Campaigns
 $field_res = $conn->query("select fieldid from vtiger_field where tabid=26");
 for($i=0;$i<$conn->num_rows($field_res);$i++)
 {
 	$fieldid = $conn->query_result($field_res,$i,'fieldid');
-	
-	Execute("insert into vtiger_def_org_field values(26,$fieldid,0,1)");
-
-	//Also we have to add in profile2tab for all profiles
-	$profile_res = $conn->query("select * from vtiger_profile");
-	for($j=0;$j<$conn->num_rows($profile_res);$j++)
-	{
-		$profile_id = $conn->query_result($profile_res,$j,'profileid');
-
-		Execute("insert into vtiger_profile2field values($profile_id,26,$fieldid,0,1)");
-	}
-	
-}
+
+	populateFieldForSecurity('26',$fieldid);
+}
+
+//delete the entries from vtiger_profile2standardpermissions table for Emails
+Execute("delete from vtiger_profile2standardpermissions where tabid=10");
+
+
+
 
 
 




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 15:17:20 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 19:17:20 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9451 -
	/vtigercrm/trunk/install/4createConfigFile.php
Message-ID: <20060912191720.C6C7176D69E@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep 12 13:17:13 2006
New Revision: 9451

Log:
made changes in default currency handling -- BY Philip

Modified:
    vtigercrm/trunk/install/4createConfigFile.php

Modified: vtigercrm/trunk/install/4createConfigFile.php
==============================================================================
--- vtigercrm/trunk/install/4createConfigFile.php (original)
+++ vtigercrm/trunk/install/4createConfigFile.php Tue Sep 12 13:17:13 2006
@@ -216,6 +216,9 @@
 						      	$buffer = str_replace( "_MAIL_PASSWORD_", $mail_server_password, $buffer);
 						      	$buffer = str_replace( "_DB_STAT_", "true", $buffer);
 				
+						      	/* replace the application unique key variable */
+				      			$buffer = str_replace( "_MASTER_CURRENCY_", $currency_name, $buffer);
+
 						      	/* replace the application unique key variable */
 					      		$buffer = str_replace( "_VT_APP_UNIQKEY_", md5($root_directory), $buffer);
 	
@@ -408,6 +411,8 @@
  	    $language_value .= ')';
  	}
  	$config .= "\$languages = $language_value;\n";
+	$config .= "// Master currency name\n";
+ 	$config .= "\$currency_name = '$currency_name';\n";
  	$config .= "// Default charset if the language specific character set is not found.\n";
  	$config .= "\$default_charset = 'ISO-8859-1';\n";
  	$config .= "// Default language in case all or part of the user's language pack is not available.\n";




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 15:22:28 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 19:22:28 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9452 -
	/vtigercrm/trunk/config.template.php
Message-ID: <20060912192228.AA07F76D69D@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep 12 13:22:21 2006
New Revision: 9452

Log:
made changes in default currency handling -- BY Philip

Modified:
    vtigercrm/trunk/config.template.php

Modified: vtigercrm/trunk/config.template.php
==============================================================================
--- vtigercrm/trunk/config.template.php (original)
+++ vtigercrm/trunk/config.template.php Tue Sep 12 13:22:21 2006
@@ -171,6 +171,9 @@
 // languages default value = en_us=>US English
 $languages = Array('en_us'=>'US English',);
 
+//Master currency name
+$currency_name = '_MASTER_CURRENCY_';
+
 // default charset
 // default charset default value = ISO-8859-1
 $default_charset = 'ISO-8859-1';




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 15:24:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 19:24:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9453 -
 /vtigercrm/trunk/modules/Settings/CurrencyEditView.php
Message-ID: <20060912192430.2895676D69D@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep 12 13:24:22 2006
New Revision: 9453

Log:
made changes in default currency handling -- BY Philip

Modified:
    vtigercrm/trunk/modules/Settings/CurrencyEditView.php

Modified: vtigercrm/trunk/modules/Settings/CurrencyEditView.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/CurrencyEditView.php (original)
+++ vtigercrm/trunk/modules/Settings/CurrencyEditView.php Tue Sep 12 13:24:22 2006
@@ -47,6 +47,7 @@
 $smarty->assign("MOD", $mod_strings);
 $smarty->assign("APP", $app_strings);
 $smarty->assign("PARENTTAB",$_REQUEST['parenttab']);
+$smarty->assign("MASTER_CURRENCY",$currency_name);
 $smarty->assign("IMAGE_PATH",$image_path);
 
 if(isset($_REQUEST['detailview']) && $_REQUEST['detailview'] != '')




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 15:30:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 19:30:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9454 -
 /vtigercrm/trunk/Smarty/templates/CurrencyEditView.tpl
Message-ID: <20060912193030.2356E76D693@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep 12 13:30:22 2006
New Revision: 9454

Log:
Modified Currency Label --By Philip

Modified:
    vtigercrm/trunk/Smarty/templates/CurrencyEditView.tpl

Modified: vtigercrm/trunk/Smarty/templates/CurrencyEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/CurrencyEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/CurrencyEditView.tpl Tue Sep 12 13:30:22 2006
@@ -77,7 +77,7 @@
                             <td class="small cellText"><input type="text" class="detailedViewTextBox small" value="{$CURRENCY_SYMBOL}" name="currency_symbol"></td>
                           </tr>
                           <tr valign="top">
-                            <td nowrap class="small cellLabel"><font color="red">*</font><strong>{$MOD.LBL_CURRENCY_CRATE}</strong><br>({$MOD.LBL_BASE_CURRENCY})</td>
+                            <td nowrap class="small cellLabel"><font color="red">*</font><strong>{$MOD.LBL_CURRENCY_CRATE}</strong><br>({$MOD.LBL_BASE_CURRENCY}{$MASTER_CURRENCY})</td>
 
                             <td class="small cellText"><input type="text" class="detailedViewTextBox small" value="{$CONVERSION_RATE}" name="conversion_rate"></td>
                           </tr>




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 15:33:27 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 19:33:27 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9455 -
 /vtigercrm/trunk/modules/Settings/language/en_us.lang.php
Message-ID: <20060912193327.76DC566AE0F@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep 12 13:33:20 2006
New Revision: 9455

Log:
Modified Currency Label --By Philip

Modified:
    vtigercrm/trunk/modules/Settings/language/en_us.lang.php

Modified: vtigercrm/trunk/modules/Settings/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Settings/language/en_us.lang.php Tue Sep 12 13:33:20 2006
@@ -703,7 +703,7 @@
 'LBL_PROXY_SERVER_DESC'=>'Configure proxies to access RSS feeds through Internet',
 
 'LBL_NEW_CURRENCTY'=>'New Currency',
-'LBL_BASE_CURRENCY'=>'Base Currency - US Dollar',
+'LBL_BASE_CURRENCY'=>'Base Currency - ',
 'LBL_DELETE_CURRENCY'=>'Delete Currency',
 
 //Added for singlepane view in modules 




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 16:43:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 20:43:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9456 - in /vtigercrm/trunk:
 Smarty/templates/HomePage.tpl install/5createTables.inc.php
 modules/Home/index.php modules/Users/DefaultDataPopulator.php
 modules/Users/User.php schema/DatabaseSchema.xml
Message-ID: <20060912204310.9945776D6B0@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 14:42:48 2006
New Revision: 9456

Log:
tagcloud from tagcloud.com website integration has been removed

Modified:
    vtigercrm/trunk/Smarty/templates/HomePage.tpl
    vtigercrm/trunk/install/5createTables.inc.php
    vtigercrm/trunk/modules/Home/index.php
    vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
    vtigercrm/trunk/modules/Users/User.php
    vtigercrm/trunk/schema/DatabaseSchema.xml

Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/HomePage.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/HomePage.tpl Tue Sep 12 14:42:48 2006
@@ -237,18 +237,6 @@
 
 <br>
 {/if}
-{if $TAGCLOUD_JS ne ''}
-<table width="100%" border=0>
-<tr>
-	<td>
-		<link href="{$TAGCLOUD_CSS}" rel="stylesheet" type="text/css">
-		<script language="JavaScript" type="text/javascript" src="{$TAGCLOUD_JS}"></script>
-	</td>
-</tr>
-</table>
-<br>
-{/if}
-
 
 <table border=0 cellspacing=0 cellpadding=0 width=100% class="tagCloud">
 <tr>

Modified: vtigercrm/trunk/install/5createTables.inc.php
==============================================================================
--- vtigercrm/trunk/install/5createTables.inc.php (original)
+++ vtigercrm/trunk/install/5createTables.inc.php Tue Sep 12 14:42:48 2006
@@ -82,9 +82,7 @@
 	$user->column_fields["hour_format"] = 'am/pm';
 	$user->column_fields["start_hour"] = '08:00';
 	$user->column_fields["end_hour"] = '23:00';
-	// added by jeri to populate default image and tagcloud for admin	
-	$user->column_fields["imagename"] = 'shanky.jpg';
-        $user->column_fields["tagcloud"] = '';	
+	$user->column_fields["imagename"] = '';
         $user->column_fields["activity_view"] = 'This Year';	
 	$user->column_fields["lead_view"] = 'Today';
 	$user->column_fields["defhomeview"] = 'home_metrics';
@@ -127,11 +125,9 @@
         $user->column_fields["namedays"] = '';
         $user->column_fields["currency_id"] = 1;
 	$user->column_fields["date_format"] = 'yyyy-mm-dd';
-	// added by jeri to populate default image and tagcloud for admin	
-	$user->column_fields["imagename"] = 'ela.jpg';
+	$user->column_fields["imagename"] = '';
         $user->column_fields["activity_view"] = 'This Year';	
 	$user->column_fields["lead_view"] = 'Today';
-        $user->column_fields["tagcloud"] = '';	
 	$user->column_fields["defhomeview"] = 'home_metrics';
         //added by philip for default default admin emailid
 	if($admin_email == '')

Modified: vtigercrm/trunk/modules/Home/index.php
==============================================================================
--- vtigercrm/trunk/modules/Home/index.php (original)
+++ vtigercrm/trunk/modules/Home/index.php Tue Sep 12 14:42:48 2006
@@ -172,11 +172,6 @@
 
 }
 
-$query="select tagcloud from vtiger_users where id=".$current_user->id;
-$result=$adb->query($query);
-$tagcloud_js=$adb->query_result($result,0,'tagcloud');
-$smarty->assign("TAGCLOUD_JS",$tagcloud_js);
-$smarty->assign("TAGCLOUD_CSS",ereg_replace('/js/','/css/',$tagcloud_js));
 global $current_language;
 $current_module_strings = return_module_language($current_language, 'Calendar');
 

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Tue Sep 12 14:42:48 2006
@@ -903,7 +903,6 @@
 $this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'yahoo_id','vtiger_users',1,'13','yahoo_id','Yahoo id',1,0,0,100,6,80,1,'E~O',1,null,'BAS')");
 $this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'phone_home','vtiger_users',1,'1','phone_home','Home Phone',1,0,0,50,9,80,1,'V~O',1,null,'BAS')");
 $this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'date_format','vtiger_users',1,'15','date_format','Date Format',1,0,0,30,12,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'tagcloud','vtiger_users',1,'103','tagcloud','Tag Cloud',1,0,0,250,15,80,1,'V~O',1,null,'BAS')");
 $this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'signature','vtiger_users',1,'21','signature','Signature',1,0,0,250,13,80,1,'V~O',1,null,'BAS')");
 $this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'description','vtiger_users',1,'21','description','Notes',1,0,0,250,14,80,1,'V~O',1,null,'BAS')");
 $this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'address_street','vtiger_users',1,'21','address_street','Street Address',1,0,0,250,1,81,1,'V~O',1,null,'BAS')");

Modified: vtigercrm/trunk/modules/Users/User.php
==============================================================================
--- vtigercrm/trunk/modules/Users/User.php (original)
+++ vtigercrm/trunk/modules/Users/User.php Tue Sep 12 14:42:48 2006
@@ -82,7 +82,6 @@
 	'phone_home' =>'',
 	'imagename' =>'',
 	'date_format' =>'',
-	'tagcloud' =>'',
 	'signature' =>'',
 	'description' =>'',
 	'address_street' =>'',

Modified: vtigercrm/trunk/schema/DatabaseSchema.xml
==============================================================================
--- vtigercrm/trunk/schema/DatabaseSchema.xml (original)
+++ vtigercrm/trunk/schema/DatabaseSchema.xml Tue Sep 12 14:42:48 2006
@@ -74,7 +74,6 @@
 		<field name="lead_view" type="C" size="25">
 			<default value="Today" />
 		</field>
-		<field name="tagcloud" type="C" size="250" />
 		<field name="imagename" type="C" size="250" />
 		<field name="deleted" type="I" size="1">
 			<notnull />




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 17:34:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 21:34:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9457 -
	/vtigercrm/trunk/modules/Reports/ReportRun.php
Message-ID: <20060912213459.630AD76D6B3@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep 12 15:34:44 2006
New Revision: 9457

Log:
Done Currency Support for Reports- Potentials Amount -- By Philip

Modified:
    vtigercrm/trunk/modules/Reports/ReportRun.php

Modified: vtigercrm/trunk/modules/Reports/ReportRun.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/ReportRun.php (original)
+++ vtigercrm/trunk/modules/Reports/ReportRun.php Tue Sep 12 15:34:44 2006
@@ -1397,7 +1397,7 @@
 
 	function GenerateReport($outputformat,$filterlist)
 	{
-		global $adb;
+		global $adb,$current_user;
 		global $modules;
 		global $mod_strings,$current_language;
 
@@ -1418,7 +1418,6 @@
 				$noofrows = $adb->num_rows($result);
 				$custom_field_values = $adb->fetch_array($result);
 				$groupslist = $this->getGroupingList($this->reportid);
-
 				do
 				{
 					$arraylists = Array();
@@ -1447,8 +1446,10 @@
 					for ($i=0; $i<$y; $i++)
 					{
 						$fld = $adb->field_name($result, $i);
-						$fieldvalue = $custom_field_values[$i];
-
+						if ($fld->name == "Potentials_Amount")
+							$fieldvalue = convertFromMasterCurrency($custom_field_values[$i],$current_user->conv_rate);
+						else
+							$fieldvalue = $custom_field_values[$i];
 						if($fieldvalue == "" )
 						{
 							$fieldvalue = "-";
@@ -1532,12 +1533,16 @@
 					for ($i=0; $i<$y; $i++)
 					{
 						$fld = $adb->field_name($result, $i);
-						$fieldvalue = $custom_field_values[$i];
+						if ($fld->name == "Potentials_Amount")
+							$fieldvalue = convertFromMasterCurrency($custom_field_values[$i],$current_user->conv_rate);
+						else
+							$fieldvalue = $custom_field_values[$i];
+
 						if($fieldvalue == "" )
 						{
 							$fieldvalue = "-";
 						}
-						$arraylists[str_replace($modules," ",$fld->name)] = $fieldvalue;
+						$arraylists[str_replace($modules," ",$this->getLstringforReportHeaders($fld->name))] = $fieldvalue;
 					}
 					$arr_val[] = $arraylists;
 				}while($custom_field_values = $adb->fetch_array($result));
@@ -1568,6 +1573,7 @@
 					{
 						$fld = $adb->field_name($result, $i);
 						$keyhdr[$fld->name] = $custom_field_values[$i];
+
 					}
 					foreach($totclmnflds as $key=>$value)
 					{
@@ -1576,7 +1582,7 @@
 						$arraykey = trim($value).'_SUM';
 						if(isset($keyhdr[$arraykey]))
 						{
-							$coltotalhtml .= '<td class="rptTotal">'.$keyhdr[$arraykey].'</td>';
+							$coltotalhtml .= '<td class="rptTotal">'.convertFromMasterCurrency($keyhdr[$arraykey],$current_user->conv_rate).'</td>';
 						}else
 						{
 							$coltotalhtml .= '<td class="rptTotal">&nbsp;</td>';
@@ -1585,7 +1591,7 @@
 						$arraykey = trim($value).'_AVG';
 						if(isset($keyhdr[$arraykey]))
 						{
-							$coltotalhtml .= '<td class="rptTotal">'.$keyhdr[$arraykey].'</td>';
+							$coltotalhtml .= '<td class="rptTotal">'.convertFromMasterCurrency($keyhdr[$arraykey],$current_user->conv_rate).'</td>';
 						}else
 						{
 							$coltotalhtml .= '<td class="rptTotal">&nbsp;</td>';
@@ -1594,7 +1600,7 @@
 						$arraykey = trim($value).'_MIN';
 						if(isset($keyhdr[$arraykey]))
 						{
-							$coltotalhtml .= '<td class="rptTotal">'.$keyhdr[$arraykey].'</td>';
+							$coltotalhtml .= '<td class="rptTotal">'.convertFromMasterCurrency($keyhdr[$arraykey],$current_user->conv_rate).'</td>';
 						}else
 						{
 							$coltotalhtml .= '<td class="rptTotal">&nbsp;</td>';
@@ -1603,7 +1609,7 @@
 						$arraykey = trim($value).'_MAX';
 						if(isset($keyhdr[$arraykey]))
 						{
-							$coltotalhtml .= '<td class="rptTotal">'.$keyhdr[$arraykey].'</td>';
+							$coltotalhtml .= '<td class="rptTotal">'.convertFromMasterCurrency($keyhdr[$arraykey],$current_user->conv_rate).'</td>';
 						}else
 						{
 							$coltotalhtml .= '<td class="rptTotal">&nbsp;</td>';
@@ -1662,7 +1668,10 @@
 					for ($i=0; $i<$y; $i++)
 					{
 						$fld = $adb->field_name($result, $i);
-						$fieldvalue = $custom_field_values[$i];
+						if ($fld->name == "Potentials_Amount")
+							$fieldvalue = convertFromMasterCurrency($custom_field_values[$i],$current_user->conv_rate);
+						else
+							$fieldvalue = $custom_field_values[$i];
 
 						if($fieldvalue == "" )
 						{
@@ -1744,6 +1753,7 @@
 					{
 						$fld = $adb->field_name($result, $i);
 						$keyhdr[$fld->name] = $custom_field_values[$i];
+
 					}
 					foreach($totclmnflds as $key=>$value)
 					{
@@ -1895,13 +1905,19 @@
 	 **/ 
 	function getLstringforReportHeaders($fldname)
 	{
-		global $modules,$current_language;
+		global $modules,$current_language,$current_user;
 		$rep_header = ltrim(str_replace($modules," ",$fldname));
 		$rep_header_temp = ereg_replace(" ","_",$rep_header);
 		$rep_module = ereg_replace('_'.$rep_header_temp,"",$fldname);
 		$temp_mod_strings = return_module_language($current_language,$rep_module);	
-		if($temp_mod_strings[$rep_header] != '')
-			$rep_header = $temp_mod_strings[$rep_header];
+		$curr_symb = "";
+                if($rep_header == 'Amount')
+                        $curr_symb = "(in ".$current_user->currency_symbol.")";
+                if($temp_mod_strings[$rep_header] != '')
+                {
+                        $rep_header = $temp_mod_strings[$rep_header];
+                        $rep_header .=$curr_symb;
+                }
 		return $rep_header;  
 	}
 




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 17:42:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 21:42:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9458 -
	/vtigercrm/trunk/include/utils/SearchUtils.php
Message-ID: <20060912214203.62D8276D6AB@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep 12 15:41:51 2006
New Revision: 9458

Log:
Handled Product Code renaming to Part No in Advanced Search

Modified:
    vtigercrm/trunk/include/utils/SearchUtils.php

Modified: vtigercrm/trunk/include/utils/SearchUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/SearchUtils.php (original)
+++ vtigercrm/trunk/include/utils/SearchUtils.php Tue Sep 12 15:41:51 2006
@@ -468,6 +468,8 @@
 		{
 			if ($i==0)
 				$OPTION_SET .= "<option value=\'".$fieldtablename.".".$fieldcolname."\' selected>".$fieldlabel."</option>";
+			elseif($fieldlabel == "Product Code")
+				$OPTION_SET .= "<option value=\'".$fieldtablename.".".$fieldcolname."\'>".$mod_strings[$fieldlabel]."</option>";
 			else
 				$OPTION_SET .= "<option value=\'".$fieldtablename.".".$fieldcolname."\'>".$fieldlabel."</option>";
 		}




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 17:45:19 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 21:45:19 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9459 -
	/vtigercrm/trunk/modules/CustomView/ListViewTop.php
Message-ID: <20060912214519.0C41376D6B3@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep 12 15:45:08 2006
New Revision: 9459

Log:
Security check for home page key metrics done

Modified:
    vtigercrm/trunk/modules/CustomView/ListViewTop.php

Modified: vtigercrm/trunk/modules/CustomView/ListViewTop.php
==============================================================================
--- vtigercrm/trunk/modules/CustomView/ListViewTop.php (original)
+++ vtigercrm/trunk/modules/CustomView/ListViewTop.php Tue Sep 12 15:45:08 2006
@@ -138,8 +138,8 @@
 		$metricslist['name'] = $cvrow['viewname'];
 		$metricslist['module'] = $cvrow['entitytype'];
 		$metricslist['count'] = '';
-
-		$metriclists[] = $metricslist;
+		if(isPermitted($cvrow['entitytype'],"index") == "yes")
+			$metriclists[] = $metricslist;
 	}
 
 	return $metriclists;




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 17:51:06 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 21:51:06 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9460 - in
 /vtigertoolbar/trunk/firefox/chrome/skin: Notes.gif Products.gif Site.gif
 rss.png vendor.gif
Message-ID: <20060912215106.CC03076D6AB@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 15:50:41 2006
New Revision: 9460

Log:
Images added for toobar icon --Jeri

Added:
    vtigertoolbar/trunk/firefox/chrome/skin/Notes.gif   (with props)
    vtigertoolbar/trunk/firefox/chrome/skin/Products.gif   (with props)
    vtigertoolbar/trunk/firefox/chrome/skin/Site.gif   (with props)
    vtigertoolbar/trunk/firefox/chrome/skin/rss.png   (with props)
    vtigertoolbar/trunk/firefox/chrome/skin/vendor.gif   (with props)




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 17:52:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 21:52:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9461 -
 /vtigertoolbar/trunk/firefox/chrome/skin/vtigercrm_overlay.css
Message-ID: <20060912215230.726C376D6B3@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 15:52:20 2006
New Revision: 9461

Log:
Images added for toobar icon --Jeri

Modified:
    vtigertoolbar/trunk/firefox/chrome/skin/vtigercrm_overlay.css

Modified: vtigertoolbar/trunk/firefox/chrome/skin/vtigercrm_overlay.css
==============================================================================
Binary files - no diff available.




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 17:52:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 21:52:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9462 -
	/vtigercrm/trunk/Smarty/templates/ListView.tpl
Message-ID: <20060912215249.7414876D6B3@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep 12 15:52:37 2006
New Revision: 9462

Log:
Fixed the Custom View handling in basic search --by philip

Modified:
    vtigercrm/trunk/Smarty/templates/ListView.tpl

Modified: vtigercrm/trunk/Smarty/templates/ListView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ListView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ListView.tpl Tue Sep 12 15:52:37 2006
@@ -30,7 +30,7 @@
         	getObj(data_td_id).className = 'searchAlph';
     	{rdelim}
     	gPopupAlphaSearchUrl = '';
-	search_fld_val= document.basicSearch.search_field[document.basicSearch.search_field.selectedIndex].value;
+	search_fld_val= $('bas_searchfield').options[$('bas_searchfield').selectedIndex].value;
         search_txt_val=document.basicSearch.search_text.value;
         var urlstring = '';
         if(searchtype == 'Basic')
@@ -151,10 +151,13 @@
 		</td>
 		<td class="small" nowrap align=right><b>{$APP.LBL_SEARCH_FOR}</b></td>
 		<td class="small"><input type="text"  class="txtBox" style="width:120px" name="search_text"></td>
-		<td class="small" nowrap><b>{$APP.LBL_IN}</b>&nbsp;
-			<select name ="search_field" class="txtBox" style="width:150px">
+		<td class="small" nowrap><b>{$APP.LBL_IN}</b>&nbsp;</td>
+		<td class="small" nowrap>
+			<div id="basicsearchcolumns_real">
+			<select name="search_field" id="bas_searchfield" class="txtBox" style="width:150px">
 			 {html_options  options=$SEARCHLISTHEADER }
 			</select>
+			</div>
                         <input type="hidden" name="searchtype" value="BasicSearch">
                         <input type="hidden" name="module" value="{$MODULE}">
                         <input type="hidden" name="parenttab" value="{$CATEGORY}">
@@ -169,7 +172,7 @@
 		<td class="small" valign="top" onMouseOver="this.style.cursor='pointer';" onclick="moveMe('searchAcc');searchshowhide('searchAcc','advSearch')">[x]</td>
 	</tr>
 	<tr>
-		<td colspan="6" align="center" class="small">
+		<td colspan="7" align="center" class="small">
 			<table border=0 cellspacing=0 cellpadding=0 width=100%>
 				<tr>
                                                 {$ALPHABETICAL}




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 17:54:16 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 21:54:16 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9463 -
 /vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl
Message-ID: <20060912215416.E8ED276D6AB@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep 12 15:54:07 2006
New Revision: 9463

Log:
Fixed the Custom View handling in basic search --by philip

Modified:
    vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl

Modified: vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl Tue Sep 12 15:54:07 2006
@@ -217,3 +217,4 @@
 
    </form>	
 {$SELECT_SCRIPT}
+<div id="basicsearchcolumns" style="display:none;"><select name="search_field" id="bas_searchfield" class="txtBox" style="width:150px">{html_options  options=$SEARCHLISTHEADER}</select></div>




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 17:55:36 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 21:55:36 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9464 -
	/vtigercrm/trunk/include/js/ListView.js
Message-ID: <20060912215536.3993A76D6B3@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep 12 15:55:27 2006
New Revision: 9464

Log:
Fixed the Custom View handling in basic search --by philip

Modified:
    vtigercrm/trunk/include/js/ListView.js

Modified: vtigercrm/trunk/include/js/ListView.js
==============================================================================
--- vtigercrm/trunk/include/js/ListView.js (original)
+++ vtigercrm/trunk/include/js/ListView.js Tue Sep 12 15:55:27 2006
@@ -113,6 +113,9 @@
                         $("ListViewContents").innerHTML= result[2];
                         if(result[1] != '')
                                	alert(result[1]);
+			$('basicsearchcolumns_real').innerHTML = $('basicsearchcolumns').innerHTML
+			$('basicsearchcolumns').innerHTML = '';
+			document.basicSearch.search_text.value = '';
                         }
                 }
 	);




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 17:57:51 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 21:57:51 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9465 -
	/vtigercrm/trunk/modules/Reports/SaveAndRun.php
Message-ID: <20060912215751.D5DA576D6AB@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep 12 15:57:44 2006
New Revision: 9465

Log:
Changed the width of the error message -- by philip

Modified:
    vtigercrm/trunk/modules/Reports/SaveAndRun.php

Modified: vtigercrm/trunk/modules/Reports/SaveAndRun.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/SaveAndRun.php (original)
+++ vtigercrm/trunk/modules/Reports/SaveAndRun.php Tue Sep 12 15:57:44 2006
@@ -94,7 +94,7 @@
 		include('themes/'.$theme.'/header.php');
 	}	
 	echo "<table border='0' cellpadding='5' cellspacing='0' width='100%' height='450px'><tr><td align='center'>";
-	echo "<div style='border: 3px solid rgb(153, 153, 153); background-color: rgb(255, 255, 255); width: 55%; position: relative; z-index: 10000000;'>
+	echo "<div style='border: 3px solid rgb(153, 153, 153); background-color: rgb(255, 255, 255); width: 80%; position: relative; z-index: 10000000;'>
 
 		<table border='0' cellpadding='5' cellspacing='0' width='98%'>
 		<tbody><tr>




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 18:00:34 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 22:00:34 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9466 -
 /wordintegration/trunk/client/bin/Language/finnish.ini
Message-ID: <20060912220034.D84FE76D6B3@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 16:00:27 2006
New Revision: 9466

Log:
finish language added --Jeri

Added:
    wordintegration/trunk/client/bin/Language/finnish.ini




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 18:02:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 22:02:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9467 -
 /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php
Message-ID: <20060912220251.8A15E76D6CD@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep 12 16:02:43 2006
New Revision: 9467

Log:
Migration Fixes Done -- By Mickie

Modified:
    vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php

Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php
==============================================================================
--- vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php (original)
+++ vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php Tue Sep 12 16:02:43 2006
@@ -3731,8 +3731,9 @@
 //delete the entries from vtiger_profile2standardpermissions table for Emails
 Execute("delete from vtiger_profile2standardpermissions where tabid=10");
 
-
-
+//delete the tagcloud entry from users
+Execute("delete from vtiger_field where tabid=29 and fieldname='tagcloud'");
+Execute("alter table vtiger_users drop column tagcloud");
 
 
 




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 18:03:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 22:03:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9468 - in
 /wordintegration/trunk/client/bin/Language: deutsch.ini finnish.ini
 french.ini german.ini portuguese.ini
Message-ID: <20060912220358.13BCA76D6B3@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 16:03:45 2006
New Revision: 9468

Log:
string Unable to connect vtigerCRM Server with the given username and password added for all languages --Jeri

Modified:
    wordintegration/trunk/client/bin/Language/deutsch.ini
    wordintegration/trunk/client/bin/Language/finnish.ini
    wordintegration/trunk/client/bin/Language/french.ini
    wordintegration/trunk/client/bin/Language/german.ini
    wordintegration/trunk/client/bin/Language/portuguese.ini

Modified: wordintegration/trunk/client/bin/Language/deutsch.ini
==============================================================================
--- wordintegration/trunk/client/bin/Language/deutsch.ini (original)
+++ wordintegration/trunk/client/bin/Language/deutsch.ini Tue Sep 12 16:03:45 2006
@@ -63,4 +63,4 @@
 Msg015=Proxy Benutzername
 Msg016=Proxy Passwort
 Msg017=Erzeugen Sie ein Dokument, um das Mischfeld einzuf?gen.
-
+Msg018=Unable to connect vtigerCRM Server with the given username and password

Modified: wordintegration/trunk/client/bin/Language/finnish.ini
==============================================================================
--- wordintegration/trunk/client/bin/Language/finnish.ini (original)
+++ wordintegration/trunk/client/bin/Language/finnish.ini Tue Sep 12 16:03:45 2006
@@ -63,3 +63,4 @@
 Msg015=Proxyn k?ytt?j?tunnus
 Msg016=Proxyn salasana
 Msg017=Luo dokumentti yhdist?m?ll? kentti?
+Msg018=Unable to connect vtigerCRM Server with the given username and password

Modified: wordintegration/trunk/client/bin/Language/french.ini
==============================================================================
--- wordintegration/trunk/client/bin/Language/french.ini (original)
+++ wordintegration/trunk/client/bin/Language/french.ini Tue Sep 12 16:03:45 2006
@@ -63,3 +63,4 @@
 Msg015=Nom d'utilisateur
 Msg016=Mot de passe
 Msg017=Cr?er un document pour ins?rer des champs de fusion
+Msg018=Unable to connect vtigerCRM Server with the given username and password

Modified: wordintegration/trunk/client/bin/Language/german.ini
==============================================================================
Binary files - no diff available.

Modified: wordintegration/trunk/client/bin/Language/portuguese.ini
==============================================================================
--- wordintegration/trunk/client/bin/Language/portuguese.ini (original)
+++ wordintegration/trunk/client/bin/Language/portuguese.ini Tue Sep 12 16:03:45 2006
@@ -63,3 +63,4 @@
 Msg015=Nome de utilizador do Proxy
 Msg016=Palava chave do proxy
 Msg017=Criar um documento para inserir o campo ligado
+Msg018=Unable to connect vtigerCRM Server with the given username and password




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 18:06:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 22:06:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9469 -
	/vtigercrm/trunk/include/utils/InventoryUtils.php
Message-ID: <20060912220626.399B776D6D4@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep 12 16:06:19 2006
New Revision: 9469

Log:
When saving the po if status is delivered then the product qty in stock will be updated -- By mickie

Modified:
    vtigercrm/trunk/include/utils/InventoryUtils.php

Modified: vtigercrm/trunk/include/utils/InventoryUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/InventoryUtils.php (original)
+++ vtigercrm/trunk/include/utils/InventoryUtils.php Tue Sep 12 16:06:19 2006
@@ -466,9 +466,10 @@
 /**	Function used to save the Inventory product details for the passed entity
  *	@param object reference $focus - object reference to which we want to save the product details from REQUEST values where as the entity will be Purchase Order, Sales Order, Quotes or Invoice
  *	@param string $module - module name
+ *	@param $update_prod_stock - true or false (default), if true we have to update the stock for PO only
  *	@return void
  */
-function saveInventoryProductDetails($focus, $module)
+function saveInventoryProductDetails($focus, $module, $update_prod_stock='false')
 {
 	global $log, $adb;
 	$log->debug("Entering into function saveInventoryProductDetails($focus, $module).");
@@ -502,11 +503,11 @@
 		if($_REQUEST["deleted".$i] == 1)
 			continue;
 
-		// DG 15 Aug 2006
-		// We want to retain the sequence that the products were added to the quote (etc)
-		// so that way the printed quote (etc) retains the products in the order they were added
-		// and salepeople can control the order than their quote (etc) items print out
-		// so we create a new field "sequence_no" and stick the value of $i into it
+		//we have to update the Product stock for PurchaseOrder if $update_prod_stock is true
+		if($module == 'PurchaseOrder' && $update_prod_stock == 'true')
+		{
+			addToProductStock($prod_id,$qty);
+		}
 
 		$query ="insert into vtiger_inventoryproductrel(id, productid, sequence_no, quantity, listprice, comment) values($focus->id, $prod_id , $prod_seq, $qty, $listprice, '$comment')";
 		$prod_seq++;




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 18:08:01 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 22:08:01 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9470 -
	/vtigercrm/trunk/themes/woodspice/images/status.gif
Message-ID: <20060912220801.7970E76D6D4@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 16:07:54 2006
New Revision: 9470

Log:
Status image for wood spice --Jeri

Modified:
    vtigercrm/trunk/themes/woodspice/images/status.gif

Modified: vtigercrm/trunk/themes/woodspice/images/status.gif
==============================================================================
Binary files - no diff available.




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 18:09:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 22:09:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9471 -
	/vtigercrm/trunk/themes/bluelagoon/images/status.gif
Message-ID: <20060912220949.3641076D6D2@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 16:09:36 2006
New Revision: 9471

Log:
Status image for bluelagoon --Jeri

Modified:
    vtigercrm/trunk/themes/bluelagoon/images/status.gif

Modified: vtigercrm/trunk/themes/bluelagoon/images/status.gif
==============================================================================
Binary files - no diff available.




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 18:15:56 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 22:15:56 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9472 -
	/vtigercrm/trunk/modules/PurchaseOrder/Save.php
Message-ID: <20060912221556.D458B76D6BE@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep 12 16:15:50 2006
New Revision: 9472

Log:
When saving the po if status is delivered then the product qty in stock will be updated -- By mickie

Modified:
    vtigercrm/trunk/modules/PurchaseOrder/Save.php

Modified: vtigercrm/trunk/modules/PurchaseOrder/Save.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/Save.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/Save.php Tue Sep 12 16:15:50 2006
@@ -36,7 +36,7 @@
 
 //Added code for auto product stock updation on receiving goods
 $update_prod_stock='';
-if($focus->column_fields['postatus'] == 'Received Shipment' && $focus->mode == 'edit')
+if($focus->column_fields['postatus'] == 'Delivered' && $focus->mode == 'edit')
 {
         $prev_postatus=getPoStatus($focus->id);
         if($focus->column_fields['postatus'] != $prev_postatus)
@@ -50,7 +50,7 @@
 
 
 //Based on the total Number of rows we will save the product relationship with this entity
-saveInventoryProductDetails(&$focus, 'PurchaseOrder');
+saveInventoryProductDetails(&$focus, 'PurchaseOrder', $update_prod_stock);
 
 
 $return_id = $focus->id;




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 18:57:16 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 22:57:16 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9473 - in
 /vtigercrm/trunk/modules/Users: DefaultFieldPermissions.php
 EditDefOrgFieldLevelAccess.php UpdateDefaultFieldLevelAccess.php
Message-ID: <20060912225716.CD42876D6D4@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 16:57:07 2006
New Revision: 9473

Log:
Faq added in default field access --Jeri

Modified:
    vtigercrm/trunk/modules/Users/DefaultFieldPermissions.php
    vtigercrm/trunk/modules/Users/EditDefOrgFieldLevelAccess.php
    vtigercrm/trunk/modules/Users/UpdateDefaultFieldLevelAccess.php

Modified: vtigercrm/trunk/modules/Users/DefaultFieldPermissions.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultFieldPermissions.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultFieldPermissions.php Tue Sep 12 16:57:07 2006
@@ -31,7 +31,7 @@
 $image_path=$theme_path."images/";
 require_once($theme_path.'layout_utils.php');
 
-$field_module = Array('Leads','Accounts','Contacts','Potentials','HelpDesk','Products','Notes','Calendar','Events','Vendors','PriceBooks','Quotes','PurchaseOrder','SalesOrder','Invoice','Campaigns');
+$field_module = Array('Leads','Accounts','Contacts','Potentials','HelpDesk','Products','Notes','Calendar','Events','Vendors','PriceBooks','Quotes','PurchaseOrder','SalesOrder','Invoice','Campaigns','Faq');
 $allfields=Array();
 foreach($field_module as $fld_module)
 {

Modified: vtigercrm/trunk/modules/Users/EditDefOrgFieldLevelAccess.php
==============================================================================
--- vtigercrm/trunk/modules/Users/EditDefOrgFieldLevelAccess.php (original)
+++ vtigercrm/trunk/modules/Users/EditDefOrgFieldLevelAccess.php Tue Sep 12 16:57:07 2006
@@ -27,7 +27,7 @@
 require_once($theme_path.'layout_utils.php');
 
 
-$field_module = Array('Leads','Accounts','Contacts','Potentials','HelpDesk','Products','Notes','Emails','Calendar','Events','Vendors','PriceBooks','Quotes','PurchaseOrder','SalesOrder','Invoice','Campaigns');
+$field_module = Array('Leads','Accounts','Contacts','Potentials','HelpDesk','Products','Notes','Emails','Calendar','Events','Vendors','PriceBooks','Quotes','PurchaseOrder','SalesOrder','Invoice','Campaigns','Faq');
 $allfields=Array();
 foreach($field_module as $fld_module)
 {
@@ -58,7 +58,7 @@
 		$uitype = $adb->query_result($fieldListResult,$i,"uitype");
                 $mandatory = '';
 		$readonly = '';
-                if($uitype == 2 || $uitype == 6 || $uitype == 22 || $uitype == 73 || $uitype == 24 || $uitype == 81 || $uitype == 50 || $uitype == 23 || $uitype == 16)
+                if($uitype == 2 || $uitype == 6 || $uitype == 22 || $uitype == 73 || $uitype == 24 || $uitype == 81 || $uitype == 50 || $uitype == 23 || $uitype == 16 || $uitype == 20)
                 {
                         $mandatory = '<font color="red">*</font>';
 						$readonly = 'disabled';

Modified: vtigercrm/trunk/modules/Users/UpdateDefaultFieldLevelAccess.php
==============================================================================
--- vtigercrm/trunk/modules/Users/UpdateDefaultFieldLevelAccess.php (original)
+++ vtigercrm/trunk/modules/Users/UpdateDefaultFieldLevelAccess.php Tue Sep 12 16:57:07 2006
@@ -14,7 +14,7 @@
 require_once('include/utils/utils.php');
 global $adb;
 
-$field_module = Array('Leads','Accounts','Contacts','Potentials','HelpDesk','Products','Notes','Emails','Calendar','Events','Vendors','PriceBooks','Quotes','PurchaseOrder','SalesOrder','Invoice','Campaigns');
+$field_module = Array('Leads','Accounts','Contacts','Potentials','HelpDesk','Products','Notes','Emails','Calendar','Events','Vendors','PriceBooks','Quotes','PurchaseOrder','SalesOrder','Invoice','Campaigns','Faq');
 foreach($field_module as $fld_module)
 {
 	$fieldListResult = getDefOrgFieldList($fld_module);




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 19:00:58 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 23:00:58 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9474 -
	/vtigercrm/trunk/modules/Users/SaveProfile.php
Message-ID: <20060912230058.58D8D76D6DD@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 17:00:30 2006
New Revision: 9474

Log:
Seperate handling for Faq module removed as it comes under common code --Jeri

Modified:
    vtigercrm/trunk/modules/Users/SaveProfile.php

Modified: vtigercrm/trunk/modules/Users/SaveProfile.php
==============================================================================
--- vtigercrm/trunk/modules/Users/SaveProfile.php (original)
+++ vtigercrm/trunk/modules/Users/SaveProfile.php Tue Sep 12 17:00:30 2006
@@ -55,7 +55,7 @@
 	{
 		$tab_id = $adb->query_result($tab_perr_result,$i,"tabid");
 		$request_var = $tab_id.'_tab';
-		if($tab_id != 3 && $tab_id != 16 && $tab_id != 15)
+		if($tab_id != 3 && $tab_id != 16)
 		{
 			$permission = $_REQUEST[$request_var];
 			if($permission == 'on')
@@ -74,16 +74,6 @@
 				$sql4="insert into vtiger_profile2tab values(".$profileid.",16, ".$permission_value.")";
                         	$adb->query($sql4);	
 			}
-		}
-		elseif($tab_id == 13)
-		{
-			$sql4="insert into vtiger_profile2tab values(".$profileid.",13,0)";
-                        $adb->query($sql4);
-		}
-		elseif($tab_id == 15)
-		{
-			$sql4="insert into vtiger_profile2tab values(".$profileid.",15,0)";
-                        $adb->query($sql4);
 		}
 	}
 	
@@ -92,7 +82,7 @@
 	{
 		$tab_id = $adb->query_result($act_perr_result,$i,"tabid");
 		$action_id = $adb->query_result($act_perr_result,$i,"operation");
-		if($tab_id != 16 && $tab_id != 15)
+		if($tab_id != 16)
 		{
 			$action_name = getActionname($action_id);
 			if($action_name == 'EditView' || $action_name == 'Delete' || $action_name == 'DetailView')
@@ -129,12 +119,6 @@
 
 
 
-		}
-		elseif($tab_id == 15)
-		{
-			
-                          $sql7="insert into vtiger_profile2standardpermissions values(".$profileid.", 15, ".$action_id.",0)";
-                          $adb->query($sql7);
 		}
 	}
 




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 19:04:05 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 23:04:05 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9475 -
	/vtigercrm/trunk/include/utils/UserInfoUtil.php
Message-ID: <20060912230405.7F51B76D6DE@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 17:03:58 2006
New Revision: 9475

Log:
Faq module added in profile security --jeri

Modified:
    vtigercrm/trunk/include/utils/UserInfoUtil.php

Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php
==============================================================================
--- vtigercrm/trunk/include/utils/UserInfoUtil.php (original)
+++ vtigercrm/trunk/include/utils/UserInfoUtil.php Tue Sep 12 17:03:58 2006
@@ -4620,7 +4620,8 @@
                 'PurchaseOrder'=>'LBL_PO_FIELD_ACCESS',
                 'SalesOrder'=>'LBL_SO_FIELD_ACCESS',
                 'Invoice'=>'LBL_INVOICE_FIELD_ACCESS',
-                'Campaigns'=>'LBL_CAMPAIGN_FIELD_ACCESS'
+                'Campaigns'=>'LBL_CAMPAIGN_FIELD_ACCESS',
+		'Faq'=>'LBL_FAQ_FIELD_ACCESS'
               );
 
 	$log->debug("Exiting getFieldModuleAccessArray method ...");




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 19:04:43 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 23:04:43 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9476 -
 /vtigercrm/trunk/modules/Settings/language/en_us.lang.php
Message-ID: <20060912230443.228ED76D6DD@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 17:04:36 2006
New Revision: 9476

Log:
language strings updated --Jeri

Modified:
    vtigercrm/trunk/modules/Settings/language/en_us.lang.php

Modified: vtigercrm/trunk/modules/Settings/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Settings/language/en_us.lang.php Tue Sep 12 17:04:36 2006
@@ -720,7 +720,7 @@
 'LBL_WITH'=>'with',
 'LBL_TYPEALERT_2'=>'data type. Kindly map the same data types.',
 'LBL_ENABLE'=>'Enable',
-
+'LBL_FAQ_FIELD_ACCESS'=>'Faq Field Access',
 );
 
 




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 19:13:20 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 23:13:20 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9477 -
	/vtigercrm/branches/4.2/modules/Leads/Lead.php
Message-ID: <20060912231320.5EFD466A7FD@vtiger.fosslabs.com>

Author: allanbush
Date: Tue Sep 12 17:13:17 2006
New Revision: 9477

Log:
Search only non-converted leads.  Closes #2182.

Modified:
    vtigercrm/branches/4.2/modules/Leads/Lead.php

Modified: vtigercrm/branches/4.2/modules/Leads/Lead.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Leads/Lead.php (original)
+++ vtigercrm/branches/4.2/modules/Leads/Lead.php Tue Sep 12 17:13:17 2006
@@ -185,7 +185,7 @@
 			$the_where .= $clause;
 		}
 		
-		return $the_where;
+		return 'leaddetails.converted = 0 AND ('.$the_where.')';
 	}
 	
 //method added to construct the query to fetch the custom fields 




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 19:18:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 23:18:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9478 -
	/vtigercrm/trunk/include/utils/utils.php
Message-ID: <20060912231838.493BA66A7FD@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 17:18:31 2006
New Revision: 9478

Log:
Users module from profile2field table and def_org_field removed during installation --Jeri

Modified:
    vtigercrm/trunk/include/utils/utils.php

Modified: vtigercrm/trunk/include/utils/utils.php
==============================================================================
--- vtigercrm/trunk/include/utils/utils.php (original)
+++ vtigercrm/trunk/include/utils/utils.php Tue Sep 12 17:18:31 2006
@@ -1176,7 +1176,7 @@
 
 	global $adb;
 	$adb->database->SetFetchMode(ADODB_FETCH_ASSOC); 
-	$fld_result = $adb->query("select * from vtiger_field where generatedtype=1 and displaytype in (1,2)");
+	$fld_result = $adb->query("select * from vtiger_field where generatedtype=1 and displaytype in (1,2) and tabid != 29");
         $num_rows = $adb->num_rows($fld_result);
         for($i=0; $i<$num_rows; $i++)
         {
@@ -1196,7 +1196,7 @@
 	$log->debug("Entering insert_def_org_field() method ...");
 	global $adb;
 	$adb->database->SetFetchMode(ADODB_FETCH_ASSOC); 
-	$fld_result = $adb->query("select * from vtiger_field where generatedtype=1 and displaytype in (1,2)");
+	$fld_result = $adb->query("select * from vtiger_field where generatedtype=1 and displaytype in (1,2) and tabid != 29");
         $num_rows = $adb->num_rows($fld_result);
         for($i=0; $i<$num_rows; $i++)
         {




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 12 19:39:10 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 12 Sep 2006 23:39:10 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9479 -
	/vtigercrm/trunk/include/utils/CommonUtils.php
Message-ID: <20060912233911.13F5266A7FD@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Tue Sep 12 17:39:04 2006
New Revision: 9479

Log:
vtiger prefixed for users table --Jeri

Modified:
    vtigercrm/trunk/include/utils/CommonUtils.php

Modified: vtigercrm/trunk/include/utils/CommonUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/CommonUtils.php (original)
+++ vtigercrm/trunk/include/utils/CommonUtils.php Tue Sep 12 17:39:04 2006
@@ -2457,7 +2457,7 @@
 			if(is_array($fields["users"]))
 			{
 				$columnfields = implode(',',$fields["users"]);
-				$query = 'select '.$columnfields.' from users where id='.$id;
+				$query = 'select '.$columnfields.' from vtiger_users where id='.$id;
 				$result = $adb->query($query);
 				foreach($fields["users"] as $columnname)
 				{




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 02:34:10 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 06:34:10 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9480 -
	/vtigercrm/branches/4.2/modules/uploads/add2db.php
Message-ID: <20060913063411.11A4866A7FD@vtiger.fosslabs.com>

Author: allanbush
Date: Wed Sep 13 00:34:08 2006
New Revision: 9480

Log:
Reduced memory used during upload by base 64 encoding the uploaded file in 1MB cunks and closing file handles when we're finished with them.  Refs #61.

Modified:
    vtigercrm/branches/4.2/modules/uploads/add2db.php

Modified: vtigercrm/branches/4.2/modules/uploads/add2db.php
==============================================================================
--- vtigercrm/branches/4.2/modules/uploads/add2db.php (original)
+++ vtigercrm/branches/4.2/modules/uploads/add2db.php Wed Sep 13 00:34:08 2006
@@ -46,8 +46,11 @@
 		$filenameBase64 = $filename.".base64";
 		$rfh = fopen($uploaddir.$filename, "r");
 		$wfh = fopen($uploaddir.$filenameBase64, "w");
-		//FIXME: find a way to stream data to base64_encode() to reduce memory usage -mikefedyk
-		fwrite($wfh,base64_encode(fread($rfh, $filesize)));
+		while(!feof($rfh)) {
+			fwrite($wfh,base64_encode(fread($rfh, 1024*1024)));
+		}
+		fclose($rfh);
+		fclose($wfh);
 		deleteFile($uploaddir,$filename);
 		
 		$query = "insert into crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values('";




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 06:27:08 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 10:27:08 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9481 - in
 /wordintegration/trunk/client/source: modLang.bas vtigerCRMWordPlugin.vbw
Message-ID: <20060913102708.CE92B66A5D4@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Wed Sep 13 04:26:40 2006
New Revision: 9481

Log:
Finnish Language added --Jeri

Modified:
    wordintegration/trunk/client/source/modLang.bas
    wordintegration/trunk/client/source/vtigerCRMWordPlugin.vbw

Modified: wordintegration/trunk/client/source/modLang.bas
==============================================================================
Binary files - no diff available.

Modified: wordintegration/trunk/client/source/vtigerCRMWordPlugin.vbw
==============================================================================
Binary files - no diff available.




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 06:49:14 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 10:49:14 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9482 -
	/customerportal/trunk/login.php
Message-ID: <20060913104914.A90F66C5946@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Wed Sep 13 04:49:05 2006
New Revision: 9482

Log:
Rc image removed in the login page --Mickie

Modified:
    customerportal/trunk/login.php

Modified: customerportal/trunk/login.php
==============================================================================
--- customerportal/trunk/login.php (original)
+++ customerportal/trunk/login.php Wed Sep 13 04:49:05 2006
@@ -50,7 +50,7 @@
 			   <tr>
 				<th align="left"><img src="images/loginVtigerCRM.gif" width="169" height="49"></th>
 				<th>&nbsp;</th>
-				<th align="right"><img src="images/loginAlpha.gif"></th>
+				<th align="right">&nbsp;</th>
 			   </tr>
 			   <tr class="tableTop"><td colspan="3"></td></tr>
 			   <tr>




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 06:49:36 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 10:49:36 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9483 -
	/customerportal/trunk/images/loginAlpha.gif
Message-ID: <20060913104936.29A3B66A5D4@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Wed Sep 13 04:49:28 2006
New Revision: 9483

Log:
Alpha Image removed --Jeri

Removed:
    customerportal/trunk/images/loginAlpha.gif




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 07:12:04 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 11:12:04 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9484 -
	/vtigercrm/trunk/modules/Leads/ListViewTop.php
Message-ID: <20060913111204.595726D302C@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Wed Sep 13 05:11:56 2006
New Revision: 9484

Log:
Home Page My New Leads issue has been fixed --Jeri

Modified:
    vtigercrm/trunk/modules/Leads/ListViewTop.php

Modified: vtigercrm/trunk/modules/Leads/ListViewTop.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/ListViewTop.php (original)
+++ vtigercrm/trunk/modules/Leads/ListViewTop.php Wed Sep 13 05:11:56 2006
@@ -74,7 +74,7 @@
 	$noofrows = $adb->num_rows($list_result);
 	$open_lead_list =array();
 	if ($noofrows > 0)
-		for($i=0;$i<$noofrows,$i<5;$i++) 
+		for($i=0;$i<$noofrows && $i<5;$i++) 
 		{
 			$open_lead_list[] = Array('leadname' => $adb->query_result($list_result,$i,'firstname').' '.$adb->query_result($list_result,$i,'lastname'),
 					'company' => $adb->query_result($list_result,$i,'company'),




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 07:20:28 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 11:20:28 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9485 - in
 /vtigercrm/trunk/modules/Calendar: Appointment.php CalendarCommon.php
 EditView.php addEventUI.php calendarLayout.php script.js
Message-ID: <20060913112028.53D136D302D@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 05:20:10 2006
New Revision: 9485

Log:
Fixes for Calendar Security Done -- Minnie

Modified:
    vtigercrm/trunk/modules/Calendar/Appointment.php
    vtigercrm/trunk/modules/Calendar/CalendarCommon.php
    vtigercrm/trunk/modules/Calendar/EditView.php
    vtigercrm/trunk/modules/Calendar/addEventUI.php
    vtigercrm/trunk/modules/Calendar/calendarLayout.php
    vtigercrm/trunk/modules/Calendar/script.js

Modified: vtigercrm/trunk/modules/Calendar/Appointment.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/Appointment.php (original)
+++ vtigercrm/trunk/modules/Calendar/Appointment.php Wed Sep 13 05:20:10 2006
@@ -10,6 +10,7 @@
  ********************************************************************************/
 require_once('modules/Calendar/CalendarCommon.php');
 require_once('include/utils/CommonUtils.php');
+require_once('include/utils/UserInfoUtil.php');
 require_once('include/database/PearDatabase.php');
 require_once('modules/Calendar/Activity.php');
 class Appointment
@@ -56,24 +57,18 @@
 	function readAppointment($userid, &$from_datetime, &$to_datetime, $view)
 	{
 		global $current_user,$adb;
-		$shared_ids = getSharedCalendarId($current_user->id);		
-		if(empty($shared_ids))
-			$shared_ids = $current_user->id;
-                $q= "select vtiger_activity.*, vtiger_crmentity.*, vtiger_activitygrouprelation.groupname FROM vtiger_activity inner join vtiger_crmentity on vtiger_activity.activityid = vtiger_crmentity.crmid left join vtiger_recurringevents on vtiger_activity.activityid=vtiger_recurringevents.activityid left outer join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid WHERE vtiger_activity.activitytype in ('Call','Meeting') AND ";
-
-                if(!is_admin($current_user))
-                {
-                        $q .= " ( ";
-                }
-
-                $q.=" ((vtiger_activity.date_start < '". $to_datetime->get_formatted_date() ."' AND vtiger_activity.date_start >= '". $from_datetime->get_formatted_date()."')";
-                if(!is_admin($current_user))
-                {
-                        $q .= "  ) AND ((vtiger_crmentity.smownerid ='".$current_user->id."' or vtiger_salesmanactivityrel.smid = '".$current_user->id."') or (vtiger_crmentity.smownerid in (".$shared_ids.") or vtiger_salesmanactivityrel.smid in (".$shared_ids.")))";
-                }
-                $q .= " AND vtiger_crmentity.deleted = 0) AND vtiger_recurringevents.activityid is NULL ";
+		require('user_privileges/user_privileges_'.$current_user->id.'.php');
+		require('user_privileges/sharing_privileges_'.$current_user->id.'.php');
+		$shared_ids = getSharedCalendarId($current_user->id);
+                $q= "select vtiger_activity.*, vtiger_crmentity.*, vtiger_activitygrouprelation.groupname FROM vtiger_activity inner join vtiger_crmentity on vtiger_activity.activityid = vtiger_crmentity.crmid left join vtiger_recurringevents on vtiger_activity.activityid=vtiger_recurringevents.activityid left outer join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid left join vtiger_groups on vtiger_groups.groupname = vtiger_activitygrouprelation.groupname inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid WHERE vtiger_crmentity.deleted = 0 and vtiger_activity.activitytype in ('Call','Meeting') AND (vtiger_activity.date_start < '". $to_datetime->get_formatted_date() ."' AND vtiger_activity.date_start >= '". $from_datetime->get_formatted_date()."') ";
+		if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[16] == 3)
+		{
+			$sec_parameter=getListViewSecurityParameter('Calendar');
+			$q .= $sec_parameter;
+		}
+									
+                $q .= " AND vtiger_recurringevents.activityid is NULL ";
                 $q .= " group by vtiger_activity.activityid ORDER by vtiger_activity.date_start,vtiger_activity.time_start";
-		//echo $q;
 		$r = $adb->query($q);
                 $n = $adb->getRowCount($r);
                 $a = 0;
@@ -88,20 +83,16 @@
                         unset($obj);
                 }
 		//Get Recurring events
-		$q = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.activitytype, vtiger_crmentity.description, vtiger_activity.time_start,vtiger_activity.time_end, vtiger_activity.duration_hours, vtiger_activity.duration_minutes,vtiger_activity.due_date, vtiger_activity.priority, vtiger_activity.location,vtiger_activity.eventstatus, vtiger_crmentity.*, vtiger_recurringevents.recurringid, vtiger_recurringevents.recurringdate as date_start ,vtiger_recurringevents.recurringtype,vtiger_activitygrouprelation.groupname from vtiger_activity inner join vtiger_crmentity on vtiger_activity.activityid = vtiger_crmentity.crmid inner join vtiger_recurringevents on vtiger_activity.activityid=vtiger_recurringevents.activityid left outer join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid";
-
-                $q.=" where ( vtiger_activity.activitytype in ('Call','Meeting') AND ";
-                if(!is_admin($current_user))
-                {
-                        $q .= " ( ";
-                }
-                $q .= "  (recurringdate < '".$to_datetime->get_formatted_date()."' AND recurringdate >= '".$from_datetime->get_formatted_date(). "') ";
-                if(!is_admin($current_user))
-                {
-			$q .= " ) AND ((vtiger_crmentity.smownerid ='".$current_user->id."' or vtiger_salesmanactivityrel.smid = '".$current_user->id."' ) or (vtiger_crmentity.smownerid in (".$shared_ids.") or vtiger_salesmanactivityrel.smid in (".$shared_ids.")))";
-                }
-
-                $q .= " AND vtiger_crmentity.deleted = 0 )" ;
+		$q = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.activitytype, vtiger_crmentity.description, vtiger_activity.time_start,vtiger_activity.time_end, vtiger_activity.duration_hours, vtiger_activity.duration_minutes,vtiger_activity.due_date, vtiger_activity.priority, vtiger_activity.location,vtiger_activity.eventstatus, vtiger_crmentity.*, vtiger_recurringevents.recurringid, vtiger_recurringevents.recurringdate as date_start ,vtiger_recurringevents.recurringtype,vtiger_activitygrouprelation.groupname from vtiger_activity inner join vtiger_crmentity on vtiger_activity.activityid = vtiger_crmentity.crmid inner join vtiger_recurringevents on vtiger_activity.activityid=vtiger_recurringevents.activityid left outer join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid left join vtiger_groups on vtiger_groups.groupname = vtiger_activitygrouprelation.groupname inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid";
+
+                $q.=" where vtiger_crmentity.deleted = 0 and vtiger_activity.activitytype in ('Call','Meeting') AND (recurringdate < '".$to_datetime->get_formatted_date()."' AND recurringdate >= '".$from_datetime->get_formatted_date(). "') ";
+
+		if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[16] == 3)
+		{
+			$sec_parameter=getListViewSecurityParameter('Calendar');
+			$q .= $sec_parameter;
+		}
+													
                 $q .= " ORDER by recurringid";
                 $r = $adb->query($q);
                 $n = $adb->getRowCount($r);

Modified: vtigercrm/trunk/modules/Calendar/CalendarCommon.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/CalendarCommon.php (original)
+++ vtigercrm/trunk/modules/Calendar/CalendarCommon.php Wed Sep 13 05:20:10 2006
@@ -9,14 +9,6 @@
 *
  ********************************************************************************/
 //Code Added by Minnie -Starts
-require_once('include/database/PearDatabase.php');
-
-global $mod_strings,$current_user;
-global $theme;
-$theme_path="themes/".$theme."/";
-$image_path=$theme_path."images/";
-require('user_privileges/sharing_privileges_'.$current_user->id.'.php');
-require('user_privileges/user_privileges_'.$current_user->id.'.php');
 /**
  * To get the lists of sharedids 
  * @param $id -- The user id :: Type integer
@@ -64,19 +56,35 @@
  */
 function getOtherUserName($id,$check)
 {
-	global $adb;
+	global $adb,$current_user;
+	require('user_privileges/user_privileges_'.$current_user->id.'.php');
+	require('user_privileges/sharing_privileges_'.$current_user->id.'.php');
+	$user_details=Array();
 	if($check)
+	{
 		$query="select * from vtiger_users where deleted=0 and status='Active' and id!=".$id;
+		$result = $adb->query($query);
+		$num_rows=$adb->num_rows($result);
+		for($i=0;$i<$num_rows;$i++)
+		{
+			$userid=$adb->query_result($result,$i,'id');
+			$username=$adb->query_result($result,$i,'user_name');
+			$user_details[$userid]=$username;
+		}
+
+	}
 	else
-		$query="select * from vtiger_users where deleted=0 and status='Active' and is_admin='off' and id!=".$id;
-	$result = $adb->query($query);
-	$num_rows=$adb->num_rows($result);
-	$user_details=Array();
-	for($i=0;$i<$num_rows;$i++)
-	{
-		$userid=$adb->query_result($result,$i,'id');
-		$username=$adb->query_result($result,$i,'user_name');
- 		$user_details[$userid]=$username;
+	{
+		if($is_admin==false && $profileGlobalPermission[2] == 1 && ($defaultOrgSharingPermission[getTabid('Calendar')] == 3 or $defaultOrgSharingPermission[getTabid('Calendar')] == 0))
+		{
+			$user_details = get_user_array(FALSE, "Active", $id, 'private');
+			unset($user_details[$id]);
+		}
+		else
+		{
+			$user_details = get_user_array(FALSE, "Active", $id);
+			unset($user_details[$id]);
+		}
 	}
 	return $user_details;
 }
@@ -200,7 +208,7 @@
 			$combo .= '<option value="'.$hrvalue.'" "'.$hrsel.'">'.$hrtext.'</option>';
 		}
 		$combo .= '</select>&nbsp;';
-		$combo .= '<select name="'.$bimode.'min" id="'.$bimode.'min" class=small value="'.$min.'">';
+		$combo .= '<select name="'.$bimode.'min" id="'.$bimode.'min" class=small>';
 		for($i=0;$i<12;$i++)
 		{
 			$minvalue = 5;
@@ -209,7 +217,7 @@
 			{
 				$value= '0'.$value;
 			}
-			else $value= $value;
+			else $value = $value;
 			if($min == $value)
 				$minsel = 'selected';
 			else
@@ -217,7 +225,7 @@
 				$combo .= '<option value="'.$value.'" "'.$minsel.'">'.$value.'</option>';
 		}
 		$combo .= '</select>&nbsp;';
-		$combo .= '<select name="'.$bimode.'fmt" id="'.$bimode.'fmt" value="'.$fmt.'" class=small>';
+		$combo .= '<select name="'.$bimode.'fmt" id="'.$bimode.'fmt" class=small>';
 		if($fmt == 'am')
 		{
 			$amselected = 'selected';
@@ -234,7 +242,7 @@
 		}
 		else
 		{
-			$combo .= '<select name="'.$bimode.'hr" id="'.$bimode.'hr" class=small value="'.$hour.'">';
+			$combo .= '<select name="'.$bimode.'hr" id="'.$bimode.'hr" class=small>';
 			for($i=0;$i<=23;$i++)
 			{
 				if($i <= 9 && strlen(trim($i)) < 2)
@@ -249,7 +257,7 @@
 				$combo .= '<option value="'.$hrvalue.'" "'.$hrsel.'">'.$hrvalue.'</option>';
 			}
 			$combo .= '</select>Hr&nbsp;';
-			$combo .= '<select name="'.$bimode.'min" id="'.$bimode.'min" class=small value="'.$min.'">';
+			$combo .= '<select name="'.$bimode.'min" id="'.$bimode.'min" class=small>';
 			for($i=0;$i<12;$i++)
 			{
 				$minvalue = 5;
@@ -265,7 +273,7 @@
 					$minsel = '';
 				$combo .= '<option value="'.$value.'" "'.$minsel.'">'.$value.'</option>';
 			}
-			$combo .= '</select>&nbsp;min<input type="hidden" name="'.$bimode.'fmt" id="'.$bimode.'fmt" value="'.$fmt.'">';
+			$combo .= '</select>&nbsp;min<input type="hidden" name="'.$bimode.'fmt" id="'.$bimode.'fmt">';
 		}
 		return $combo;
 }
@@ -300,11 +308,13 @@
 /*Fuction to get value for Assigned To field
  *returns values of Assigned To field in array format
 */
-function getAssignedTo()
+function getAssignedTo($tabid)
 {
 	global $current_user,$noof_group_rows,$adb;
 	$assigned_user_id = $current_user->id;
-	if($is_admin==false && $profileGlobalPermission[2] == 1 && ($defaultOrgSharingPermission[getTabid('Calendar')] == 3 or $defaultOrgSharingPermission[getTabid('Calendar')] == 0))
+	require('user_privileges/sharing_privileges_'.$current_user->id.'.php');
+	require('user_privileges/user_privileges_'.$current_user->id.'.php');
+	if($is_admin==false && $profileGlobalPermission[2] == 1 && ($defaultOrgSharingPermission[$tabid] == 3 or $defaultOrgSharingPermission[$tabid] == 0))
 	{
 		$result=get_current_user_access_groups('Calendar');
 	}
@@ -313,8 +323,8 @@
 		$result = get_group_options();
 	}
 	$nameArray = $adb->fetch_array($result);
-	global $current_user;
-	if($is_admin==false && $profileGlobalPermission[2] == 1 && ($defaultOrgSharingPermission[getTabid($module_name)] == 3 or $defaultOrgSharingPermission[getTabid($module_name)] == 0))
+	
+	if($is_admin==false && $profileGlobalPermission[2] == 1 && ($defaultOrgSharingPermission[$tabid] == 3 or $defaultOrgSharingPermission[$tabid] == 0))
 	{
 		$users_combo = get_select_options_array(get_user_array(FALSE, "Active", $assigned_user_id,'private'), $assigned_user_id);
 	}

Modified: vtigercrm/trunk/modules/Calendar/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/EditView.php (original)
+++ vtigercrm/trunk/modules/Calendar/EditView.php Wed Sep 13 05:20:10 2006
@@ -130,6 +130,7 @@
 $userDetails=getOtherUserName($current_user->id,true);
 //echo '<pre>';print_r($userDetails);echo '</pre>';
 $to_email = getUserEmailId('id',$current_user->id);
+$smarty->assign("CURRENTUSERID",$current_user->id);
 
 $disp_view = getView($focus->mode);
 if($disp_view == 'edit_view')

Modified: vtigercrm/trunk/modules/Calendar/addEventUI.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/addEventUI.php (original)
+++ vtigercrm/trunk/modules/Calendar/addEventUI.php Wed Sep 13 05:20:10 2006
@@ -24,7 +24,8 @@
  //echo '<pre>';print_r($userDetails);echo '</pre>';
  $to_email = getUserEmailId('id',$current_user->id);
  $date_format = parse_calendardate($app_strings['NTC_DATE_FORMAT']);
- $assignedto = getAssignedTo();
+ $taskassignedto = getAssignedTo(9);
+ $eventassignedto = getAssignedTo(16);
 $mysel= $_GET['view'];
 $calendar_arr = Array();
 $calendar_arr['IMAGE_PATH'] = $image_path;
@@ -79,6 +80,7 @@
 	$calendar_arr['calendar']->hour_format = 'am/pm';
 else
 	$calendar_arr['calendar']->hour_format = $current_user->hour_format;
+ 
 /** Function to construct HTML code for Assigned To field
  *  @param $assignedto  -- Assigned To values :: Type array
  *  @param $toggletype  -- String to different event and task  :: Type string
@@ -223,35 +225,57 @@
 			</tr>
 			<tr>
 				<td nowrap align="right"><b><?php echo $mod_strings['LBL_EVENTNAME']?></b></td>
-				<td align="left"><input name="subject" type="text" class="textbox" value="" style="width:50%">&nbsp;&nbsp;&nbsp; <input name="visibility" value="Public" type="checkbox"><?php echo $mod_strings['LBL_PUBLIC']; ?></td>
+				<td align="left"><input name="subject" type="text" class="textbox" value="" style="width:50%">&nbsp;&nbsp;&nbsp; 
+			<?php if(getFieldVisibilityPermission('Events',$current_user->id,'visibility') == '0') { ?>	
+			<input name="visibility" value="Public" type="checkbox"><?php echo $mod_strings['LBL_PUBLIC']; ?>
+			<?php } ?>	
+			</td>
 			</tr>
+			<?php if(getFieldVisibilityPermission('Events',$current_user->id,'description') == '0') { ?>
 			<tr>
 				<td valign="top" align="right"><b><?php echo $mod_strings['Description']?></b></td>
 				<td align="left"><textarea style = "width:100%; height : 60px;" name="description"></textarea></td>
 			</tr>
+			<?php } ?>
+			<?php if(getFieldVisibilityPermission('Events',$current_user->id,'location') == '0') { ?>
 			<tr>
 				<td nowrap align="right"><b><?php echo $mod_strings['Location']?></b></td>
 				<td align="left"><input name="location" type="text" class="textbox" value="" style="width:50%"></td>
 			</tr>
+		        <?php } ?>
 			<tr>
 				<td colspan=2 width=80% align="center">
 					<table border=0 cellspacing=0 cellpadding=3 width=80%>
 					<tr>
+						<?php if(getFieldVisibilityPermission('Events',$current_user->id,'eventstatus') == '0')	{ ?>
 						<td ><b><?php echo $mod_strings['Status'] ; ?></b></td>
+						<?php } ?>
+						<?php if(getFieldVisibilityPermission('Events',$current_user->id,'assigned_user_id') == '0') { ?>
 						<td ><b><?php echo $mod_strings['Assigned To']; ?></b></td>
+						<?php } ?>
 					</tr>
 					<tr>
+						<?php if(getFieldVisibilityPermission('Events',$current_user->id,'eventstatus') == '0') { ?>
 						<td valign=top><?php echo getActFieldCombo('eventstatus','vtiger_eventstatus'); ?></td>
+						<?php } ?>	
 						<td valign=top rowspan=2>
-							<?php echo getAssignedToHTML($assignedto,'event'); ?>
-							<br><input type="checkbox" name="sendnotification" >&nbsp;<?php echo $mod_strings['LBL_SENDNOTIFICATION'] ?>
+							<?php if(getFieldVisibilityPermission('Events',$current_user->id,'assigned_user_id') == '0') { ?>
+							<?php echo getAssignedToHTML($eventassignedto,'event'); ?>
+							<br><?php }else{
+								?><input name="assigned_user_id" value="<?php echo $current_user->id ?>" type="hidden">
+							<?php } ?>
+								<?php if(getFieldVisibilityPermission('Events',$current_user->id,'sendnotification') == '0') { ?>
+							<input type="checkbox" name="sendnotification" >&nbsp;<?php echo $mod_strings['LBL_SENDNOTIFICATION'] ?>
+							<?php } ?>
 						</td>
 					</tr>
+					<?php if(getFieldVisibilityPermission('Events',$current_user->id,'taskpriority') == '0') { ?>
 					<tr>
 						<td valign=top><b><?php echo $mod_strings['Priority'] ; ?></b>
 							<br><?php echo getActFieldCombo('taskpriority','vtiger_taskpriority'); ?>
 						</td>
 					</tr>
+				        <?php } ?>
 					</table>
 				</td>
 			</tr>		
@@ -269,7 +293,7 @@
 						<?php echo  getTimeCombo($calendar_arr['calendar']->hour_format,'start');?>
 					</td></tr>
                                         <tr><td>
-					<input type="text" name="date_start" id="jscal_field_date_start" class="textbox" style="width:90px" value="<?php echo $calendar_arr['calendar']->date_time->get_formatted_date() ?>"></td><td width=50%><img border=0 src="<?echo $image_path?>btnL3Calendar.gif" alt="Set date.." title="Set date.." id="jscal_trigger_date_start">
+					<input type="text" name="date_start" id="jscal_field_date_start" class="textbox" style="width:90px" value="<?php echo getDisplayDate($calendar_arr['calendar']->date_time->get_formatted_date()) ?>"></td><td width=50%><img border=0 src="<?echo $image_path?>btnL3Calendar.gif" alt="Set date.." title="Set date.." id="jscal_trigger_date_start">
 						<script type="text/javascript">
                 					Calendar.setup ({
 								inputField : "jscal_field_date_start", ifFormat : "<?php  echo $date_format; ?>", showsTime : false, button : "jscal_trigger_date_start", singleClick : true, step : 1
@@ -285,7 +309,7 @@
                                                 <?php echo getTimeCombo($calendar_arr['calendar']->hour_format,'end');?>
 					</td></tr>
 				        <tr><td>
-					<input type="text" name="due_date" id="jscal_field_due_date" class="textbox" style="width:90px" value="<?php echo $calendar_arr['calendar']->date_time->get_formatted_date() ?>"></td><td width=100%><img border=0 src="<?php echo $image_path?>btnL3Calendar.gif" alt="Set date.." title="Set date.." id="jscal_trigger_due_date">
+					<input type="text" name="due_date" id="jscal_field_due_date" class="textbox" style="width:90px" value="<?php echo getDisplayDate($calendar_arr['calendar']->date_time->get_formatted_date()) ?>"></td><td width=100%><img border=0 src="<?php echo $image_path?>btnL3Calendar.gif" alt="Set date.." title="Set date.." id="jscal_trigger_due_date">
 					<script type="text/javascript">
                                                         Calendar.setup ({
                                                                 inputField : "jscal_field_due_date", ifFormat : "<?php echo $date_format; ?>", showsTime : false, button : "jscal_trigger_due_date", singleClick : true, step : 1
@@ -377,6 +401,7 @@
 			
 			<!-- Reminder UI -->
 				<DIV id="addEventAlarmUI" style="display:none;width:100%">
+				<?php if(getFieldVisibilityPermission('Events',$current_user->id,'reminder_time') == '0') { ?>
 				<table bgcolor="#FFFFFF">
 					<tr><td><?php echo $mod_strings['LBL_SENDREMINDER']?></td>
 						<td>
@@ -435,14 +460,16 @@
 					<?php echo $mod_strings['LBL_SDRMD'] ?> :
 					</td>
 					<td >
-					<input type=text name="toemail" class=textbox style="width:90%" value="<?php echo $to_email ?>">
+					<input type=text name="toemail" readonly="readonly" class=textbox style="width:90%" value="<?php echo $to_email ?>">
 					</td>
 				</tr>
 				</table>
+				<?php } ?>
 				</DIV>
 				</DIV>
 			<!-- Repeat UI -->
 				<div id="addEventRepeatUI" style="display:none;width:100%">
+			<?php if(getFieldVisibilityPermission('Events',$current_user->id,'recurringtype') == '0') {  ?>
 				<table border=0 cellspacing=0 cellpadding=2  width=100% bgcolor="#FFFFFF">
 				<tr>
 					<td nowrap align=right width=20% valign=top>
@@ -537,9 +564,11 @@
 					</td>
 				</tr>
 				</table>
+				<?php } ?>
 				</div>
 				<div id="addEventRelatedtoUI" style="display:none;width:100%">
 					<table width="100%" cellpadding="5" cellspacing="0" border="0" bgcolor="#FFFFFF">
+				<?php if(getFieldVisibilityPermission('Events',$current_user->id,'parent_id') == '0') {  ?>
 						<tr>
 							<td><b><?php echo $mod_strings['LBL_RELATEDTO']?></b></td>
 							<td>
@@ -558,6 +587,7 @@
 								</div>
 							</td>
 						</tr>
+					<?php } ?>
 						<tr>
 						<td><b><?php echo $app_strings['Contacts'] ?></b></td>
 							<td colspan="2">
@@ -649,22 +679,50 @@
                         <td width="20%" align="right"><b><?php echo $mod_strings['LBL_TODONAME'] ?></b></td>
                         <td width="80%" align="left"><input name="task_subject" type="text" value="" class="textbox" style="width:70%"></td>
                 </tr>
+		<?php if(getFieldVisibilityPermission('Calendar',$current_user->id,'description') == '0') { ?>
 		<tr>
 			<td align="right"><b><?php echo $mod_strings['Description'] ?></b></td>
 			<td align="left"><textarea style="width: 100%; height: 60px;" name="task_description"></textarea></td>
 		</tr>
+		<?php } ?>
 		<tr>
 			<td colspan="2" align="center" width="80%">
 				<table border="0" cellpadding="3" cellspacing="0" width="80%">
 					<tr>
-						<td align="left"><b><?php echo $mod_strings['Status']; ?></b></td>
-						<td align="left"><b><?php echo $mod_strings['Priority']; ?></b></td>
-						<td align="left"><b><?php echo $mod_strings['Assigned To']; ?></b></td>
+						<td align="left">
+							<?php if(getFieldVisibilityPermission('Calendar',$current_user->id,'taskstatus') == '0') { ?>
+							<b><?php echo $mod_strings['Status']; ?></b>
+							<?php } ?>
+						</td>
+						<td align="left">
+							<?php if(getFieldVisibilityPermission('Calendar',$current_user->id,'taskpriority') == '0') { ?>
+							<b><?php echo $mod_strings['Priority']; ?></b>
+							<?php } ?>
+						</td>
+						<td align="left">
+							<?php if(getFieldVisibilityPermission('Calendar',$current_user->id,'assigned_user_id') == '0') { ?>
+							<b><?php echo $mod_strings['Assigned To']; ?></b>
+							<?php } ?>
+						</td>
 					</tr>
 					<tr>
-						<td align="left" valign="top"><?php echo getActFieldCombo('taskstatus','vtiger_taskstatus'); ?></td>
-						<td align="left" valign="top"><?php echo getActFieldCombo('taskpriority','vtiger_taskpriority'); ?></td>
-						<td align="left" valign="top"><?php echo getAssignedToHTML($assignedto,'task'); ?></td>
+						<td align="left" valign="top">
+							<?php if(getFieldVisibilityPermission('Calendar',$current_user->id,'taskstatus') == '0') { ?>
+							<?php echo getActFieldCombo('taskstatus','vtiger_taskstatus'); ?>
+							<?php } ?>	
+						</td>
+						<td align="left" valign="top">
+							<?php if(getFieldVisibilityPermission('Calendar',$current_user->id,'taskpriority') == '0') { ?>
+							<?php echo getActFieldCombo('taskpriority','vtiger_taskpriority'); ?>
+							<?php } ?>
+						</td>
+						<td align="left" valign="top">
+							<?php if(getFieldVisibilityPermission('Calendar',$current_user->id,'assigned_user_id') == '0') { ?>
+							<?php echo getAssignedToHTML($taskassignedto,'task'); ?>
+							<?php }else{
+						       	?><input name="task_assigned_user_id" value="<?php echo $current_user->id ?>" type="hidden">
+							<?php } ?>
+						</td>
 					</tr>
 				</table>
 			</td>
@@ -679,10 +737,10 @@
 						<tr><td colspan=3 ><b><?php echo $mod_strings['LBL_TODODATETIME'] ?></b></td></tr>
 						<tr><td colspan=3><?php echo getTimeCombo($calendar_arr['calendar']->hour_format,'start'); ?></td></tr>
 						<tr><td>
-							<input type="text" name="task_date_start" id="task_date_start" class="textbox" style="width:90px" value="<?php echo $calendar_arr['calendar']->date_time->get_formatted_date() ?>" ></td><td width=100%><img border=0 src="<?php echo $image_path ?>btnL3Calendar.gif" alt="Set date.." title="Set date.." id="jscal_trigger_date_start">
+							<input type="text" name="task_date_start" id="task_date_start" class="textbox" style="width:90px" value="<?php echo getDisplayDate($calendar_arr['calendar']->date_time->get_formatted_date()) ?>" ></td><td width=100%><img border=0 src="<?php echo $image_path ?>btnL3Calendar.gif" alt="Set date.." title="Set date.." id="jscal_trigger_task_date_start">
 						<script type="text/javascript">
 						Calendar.setup ({
-							inputField : "task_date_start", ifFormat : "<?php  echo $date_format; ?>", showsTime : false, button : "jscal_trigger_date_start", singleClick : true, step : 1
+							inputField : "task_date_start", ifFormat : "<?php  echo $date_format; ?>", showsTime : false, button : "jscal_trigger_task_date_start", singleClick : true, step : 1
 						})
 						</script>
 						</td></tr>
@@ -691,10 +749,10 @@
 						<table border="0" cellpadding="2" cellspacing="0" width="95%" align=center>
 							<tr><td colspan=3><b><?php echo $mod_strings['Due Date'] ?></b></td></tr>
 							<tr><td>
-								<input type="text" name="task_due_date" id="task_due_date" class="textbox" style="width:90px" value="<?php echo $calendar_arr['calendar']->date_time->get_formatted_date() ?>" ></td><td width=100%><img border=0 src="<?php echo $image_path ?>btnL3Calendar.gif" alt="Set date.." title="Set date.." id="jscal_trigger_due_date">
+								<input type="text" name="task_due_date" id="task_due_date" class="textbox" style="width:90px" value="<?php echo getDisplayDate($calendar_arr['calendar']->date_time->get_formatted_date()) ?>" ></td><td width=100%><img border=0 src="<?php echo $image_path ?>btnL3Calendar.gif" alt="Set date.." title="Set date.." id="jscal_trigger_task_due_date">
 						<script type="text/javascript">
 						Calendar.setup ({
-							inputField : "task_due_date", ifFormat : "<?php  echo $date_format; ?>", showsTime : false, button : "jscal_trigger_due_date", singleClick : true, step : 1
+							inputField : "task_due_date", ifFormat : "<?php  echo $date_format; ?>", showsTime : false, button : "jscal_trigger_task_due_date", singleClick : true, step : 1
 						})
 						</script>
 						</td></tr>
@@ -710,9 +768,9 @@
 				<table border=0 cellspacing=0 cellpadding=3 width=100%>
 					<tr>
 						<td class="dvtTabCache" style="width:10px" nowrap>&nbsp;</td>
-						<td id="cellTabNotification" class="dvtSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabNotification','on');switchClass('cellTabtodoRelatedto','off');gshow('addTaskAlarmUI','todo',document.createTodo.task_date_start.value,'',document.createTodo.starthr.value,document.createTodo.startmin.value,document.createTodo.startfmt.value,'','','',document.createTodo.viewOption.value,document.createTodo.subtab.value);ghide('addTaskRelatedtoUI');"><?php echo $mod_strings['LBL_NOTIFICATION']?></a></td>
+						<td id="cellTabNotification" class="dvtSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabNotification','on');switchClass('cellTabtodoRelatedto','off');gshow('addTaskAlarmUI','todo',document.createTodo.task_date_start.value,document.createTodo.task_due_date.value,document.createTodo.starthr.value,document.createTodo.startmin.value,document.createTodo.startfmt.value,'','','',document.createTodo.viewOption.value,document.createTodo.subtab.value);ghide('addTaskRelatedtoUI');"><?php echo $mod_strings['LBL_NOTIFICATION']?></a></td>
 						<td class="dvtTabCache" style="width: 10px;" nowrap="nowrap">
-						<td id="cellTabtodoRelatedto" class="dvtUnSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabtodoRelatedto','on'); switchClass('cellTabNotification','off');gshow('addTaskRelatedtoUI','todo',document.createTodo.task_date_start.value,'',document.createTodo.starthr.value,document.createTodo.startmin.value,document.createTodo.startfmt.value,'','','',document.createTodo.viewOption.value,document.createTodo.subtab.value);ghide('addTaskAlarmUI');"><?php echo $mod_strings['LBL_RELATEDTO']?></a></td>					
+						<td id="cellTabtodoRelatedto" class="dvtUnSelectedCell" align=center nowrap><a href="javascript:doNothing()" onClick="switchClass('cellTabtodoRelatedto','on'); switchClass('cellTabNotification','off');gshow('addTaskRelatedtoUI','todo',document.createTodo.task_date_start.value,document.createTodo.task_due_date.value,document.createTodo.starthr.value,document.createTodo.startmin.value,document.createTodo.startfmt.value,'','','',document.createTodo.viewOption.value,document.createTodo.subtab.value);ghide('addTaskAlarmUI');"><?php echo $mod_strings['LBL_RELATEDTO']?></a></td>					
 						<td class="dvtTabCache" style="width: 100%;">&nbsp;</td>
 					</tr>
 				</table>
@@ -722,14 +780,17 @@
 			<td width=100% valign=top align=left class="dvtContentSpace" style="padding:10px;height:120px">
 		<!-- Reminder UI -->
 		<DIV id="addTaskAlarmUI" style="display:block;width:100%">
+		<?php if(getFieldVisibilityPermission('Calendar',$current_user->id,'sendnotification') == '0') { ?>
                 <table>
 			<tr><td><?php echo $mod_strings['LBL_SENDNOTIFICATION'] ?></td><td>
 				<input name="task_sendnotification" type="checkbox">
 			</td></tr>
                 </table>
+		<?php } ?>
 		</DIV>
 		<div id="addTaskRelatedtoUI" style="display:none;width:100%">
 			<table width="100%" cellpadding="5" cellspacing="0" border="0">
+			<?php if(getFieldVisibilityPermission('Calendar',$current_user->id,'parent_id') == '0') { ?>
 			<tr>
 				<td><b><?php echo $mod_strings['LBL_RELATEDTO']?></b></td>
 				<td>
@@ -753,6 +814,8 @@
 					</div>
 				</td>
 			</tr>
+			<?php } ?>
+			<?php if(getFieldVisibilityPermission('Calendar',$current_user->id,'contact_id') == '0') { ?>	
 			<tr>
 			<td><b><?php echo $mod_strings['LBL_CONTACT_NAME'] ?></b></td>
 			<td colspan="2">
@@ -760,6 +823,7 @@
 				<input type="button" onclick="return window.open('index.php?module=Contacts&action=Popup&html=Popup_picker&popuptype=specific&form=EditView','test','width=640,height=602,resizable=0,scrollbars=0');" class="crmButton small edit" name="selectcnt" value="<?php echo $mod_strings['LBL_SELECT_CONTACT'] ; ?>">
 			</td>
 			  </tr>
+			<?php } ?>
 			                  </table>
 					                  </div>
 		</td></tr>

Modified: vtigercrm/trunk/modules/Calendar/calendarLayout.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/calendarLayout.php (original)
+++ vtigercrm/trunk/modules/Calendar/calendarLayout.php Wed Sep 13 05:20:10 2006
@@ -1308,10 +1308,10 @@
 	$Entries = Array();
 	$category = getParentTab();
 	global $adb,$current_user,$mod_strings,$cal_log;
+	require('user_privileges/user_privileges_'.$current_user->id.'.php');
+        require('user_privileges/sharing_privileges_'.$current_user->id.'.php');
 	$cal_log->debug("Entering getEventList() method...");
 	$shared_ids = getSharedCalendarId($current_user->id);
-	if(empty($shared_ids))
-		$shared_ids = $current_user->id;
 	$query = "SELECT vtiger_groups.groupname, vtiger_users.user_name,
        		vtiger_activity.* FROM vtiger_activity
 		INNER JOIN vtiger_crmentity
@@ -1330,26 +1330,30 @@
 				OR vtiger_recurringevents.recurringdate BETWEEN '".$start_date."' AND '".$end_date."') ";
 	if($info != '')
 	{
-		$pending_query = $query." AND (vtiger_activity.eventstatus = 'Planned')
-			AND vtiger_crmentity.smownerid = ".$current_user->id." 
-		GROUP BY vtiger_activity.activityid 
-		ORDER BY vtiger_activity.date_start,vtiger_activity.time_start ASC";
+		$com_q = " AND vtiger_crmentity.smownerid = ".$current_user->id."
+			GROUP BY vtiger_activity.activityid";
+		$pending_query = $query." AND (vtiger_activity.eventstatus = 'Planned')".$com_q;
+		$total_q =  $query."".$com_q;
+		$total_res = $adb->query($total_q);
+		$total = $adb->num_rows($total_res);
 		$res = $adb->query($pending_query);
 		$pending_rows = $adb->num_rows($res);
-	}
-	if(!is_admin($current_user))
-		$query .= " AND vtiger_crmentity.smownerid in (".$shared_ids.") ";
+		$cal_log->debug("Exiting getEventList() method...");
+		return Array('totalevent'=>$total,'pendingevent'=>$pending_rows);
+	}
+	if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[16] == 3)
+	{
+		$sec_parameter=getListViewSecurityParameter('Calendar');
+		$query .= $sec_parameter;
+	}
+	/*if(!is_admin($current_user))
+		$query .= " AND vtiger_crmentity.smownerid in (".$shared_ids.") ";*/
 		
 	$query .= "GROUP BY vtiger_activity.activityid ORDER BY vtiger_activity.date_start,vtiger_activity.time_start ASC";
  	if( $adb->dbType == "pgsql")
  	    $query = fixPostgresQuery( $query, $log, 0);
 	$result = $adb->query($query);
 	$rows = $adb->num_rows($result);
-	if($info != '')
-        {
-		$cal_log->debug("Exiting getEventList() method...");
-		return Array('totalevent'=>$rows,'pendingevent'=>$pending_rows);
-        }
 	for($i=0;$i<$rows;$i++)
 	{
 		$element = Array();
@@ -1429,8 +1433,8 @@
 	global $adb,$current_user,$mod_strings,$cal_log;
 	$cal_log->debug("Entering getTodoList() method...");
 	$shared_ids = getSharedCalendarId($current_user->id);
-	if(empty($shared_ids))
-		$shared_ids = $current_user->id;
+	require('user_privileges/user_privileges_'.$current_user->id.'.php');
+	require('user_privileges/sharing_privileges_'.$current_user->id.'.php');
         $query = "SELECT vtiger_groups.groupname, vtiger_users.user_name, vtiger_cntactivityrel.contactid, 
 		vtiger_activity.* FROM vtiger_activity
                 INNER JOIN vtiger_crmentity
@@ -1448,28 +1452,36 @@
                         AND (vtiger_activity.date_start BETWEEN '".$start_date."' AND '".$end_date."')";
         if($info != '')
         {
-                $pending_query = $query." AND (vtiger_activity.status != 'Completed')
-                        AND vtiger_crmentity.smownerid = ".$current_user->id."
-                ORDER BY vtiger_activity.date_start,vtiger_activity.time_start ASC";
+		$com_q = " AND vtiger_crmentity.smownerid = ".$current_user->id;
+                $pending_query = $query." AND (vtiger_activity.status != 'Completed')".$com_q;
+		$total_q =  $query."".$com_q;
 		if( $adb->dbType == "pgsql")
+		{
  		    $pending_query = fixPostgresQuery( $pending_query, $log, 0);
+		    $total_q = fixPostgresQuery( $total_q, $log, 0);
+		}
+		$total_res = $adb->query($total_q);
+		$total = $adb->num_rows($total_res);
                 $res = $adb->query($pending_query);
                 $pending_rows = $adb->num_rows($res);
+		$cal_log->debug("Exiting getTodoList() method...");
+		return Array('totaltodo'=>$total,'pendingtodo'=>$pending_rows);
         }
 	
-	if(!is_admin($current_user))
-                $query .= " AND vtiger_crmentity.smownerid in (".$shared_ids.")";
+	if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[9] == 3)
+	{
+		$sec_parameter=getListViewSecurityParameter('Calendar');
+		$query .= $sec_parameter;
+	}
+								
+	/*if(!is_admin($current_user))
+                $query .= " AND vtiger_crmentity.smownerid in (".$shared_ids.")";*/
         $query .= " ORDER BY vtiger_activity.date_start,vtiger_activity.time_start ASC";
 	if( $adb->dbType == "pgsql")
  	    $query = fixPostgresQuery( $query, $log, 0);
 
         $result = $adb->query($query);
         $rows = $adb->num_rows($result);
-        if($info != '')
-        {
-		$cal_log->debug("Exiting getTodoList() method...");
-                return Array('totaltodo'=>$rows,'pendingtodo'=>$pending_rows);
-        }
 	for($i=0;$i<$rows;$i++)
         {
                 $element = Array();

Modified: vtigercrm/trunk/modules/Calendar/script.js
==============================================================================
--- vtigercrm/trunk/modules/Calendar/script.js (original)
+++ vtigercrm/trunk/modules/Calendar/script.js Wed Sep 13 05:20:10 2006
@@ -94,8 +94,6 @@
 {
 	var y=document.getElementById(argg1).style;
 	
-	if (y.display=="none") 
-	{
 		if(type == 'call' || type == 'meeting')
 		{
 			if(type == 'call')
@@ -117,12 +115,15 @@
 		if(type == 'todo')
 		{
 			document.createTodo.task_date_start.value = startdate;
+			document.createTodo.task_due_date.value = enddate;
 			document.createTodo.starthr.value = starthr;
                         document.createTodo.startmin.value = startmin;
                         document.createTodo.startfmt.value = startfmt;
 			document.createTodo.viewOption.value = viewOption;
                         document.createTodo.subtab.value = subtab;
 		}
+	if (y.display=="none")
+        {
 		y.display="block";
 	}
 }
@@ -302,10 +303,6 @@
         }
         else
         {
-		if(document.EditView.recurringcheck.checked == false)
-		{
-			document.EditView.recurringtype.value = '--None--';
-		}
 		if(document.EditView.record.value != '')
                 {
                         document.EditView.mode.value = 'edit';
@@ -418,6 +415,10 @@
 			return false;
 		document.EditView.time_start.value = starthour+':'+startmin;
 		document.EditView.time_end.value = endhour+':'+endmin;
+		if(document.EditView.recurringcheck.checked == false)
+                {
+                        document.EditView.recurringtype.value = '--None--';
+                }
                 return true;
         }
 }




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 07:25:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 11:25:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9486 -
	/vtigercrm/trunk/modules/Accounts/Account.js
Message-ID: <20060913112559.248ED6D3033@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 05:25:48 2006
New Revision: 9486

Log:
Google Map issues fixed on change of label --By Minnie

Modified:
    vtigercrm/trunk/modules/Accounts/Account.js

Modified: vtigercrm/trunk/modules/Accounts/Account.js
==============================================================================
--- vtigercrm/trunk/modules/Accounts/Account.js (original)
+++ vtigercrm/trunk/modules/Accounts/Account.js Wed Sep 13 05:25:48 2006
@@ -85,21 +85,33 @@
         var mapParameter = '';
         if (addressType == 'Main')
         {
-                mapParameter = document.getElementById('dtlview_Billing Address').innerHTML+' '
-                           +document.getElementById("dtlview_Billing Po Box").innerHTML+' '
-                           +document.getElementById("dtlview_Billing City").innerHTML+' '
-                           +document.getElementById("dtlview_Billing State").innerHTML+' '
-                           +document.getElementById("dtlview_Billing Country").innerHTML+' '
-                           +document.getElementById("dtlview_Billing Code").innerHTML
+		if(fieldname.indexOf('bill_street') > -1)
+                        mapParameter = document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('bill_street')]).innerHTML+' ';
+                if(fieldname.indexOf('bill_pobox') > -1)
+                        mapParameter = mapParameter + document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('bill_pobox')]).innerHTML+' ';
+                if(fieldname.indexOf('bill_city') > -1)
+                        mapParameter = mapParameter + document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('bill_city')]).innerHTML+' ';
+		if(fieldname.indexOf('bill_state') > -1)
+                        mapParameter = mapParameter + document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('bill_state')]).innerHTML+' ';
+                if(fieldname.indexOf('bill_country') > -1)
+                        mapParameter = mapParameter + document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('bill_country')]).innerHTML+' ';
+                if(fieldname.indexOf('bill_code') > -1)
+                        mapParameter = mapParameter + document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('bill_code')]).innerHTML+' ';
         }
         else if (addressType == 'Other')
         {
-                mapParameter = document.getElementById("dtlview_Shipping Address").innerHTML+' '
-                           +document.getElementById("dtlview_Shipping Po Box").innerHTML+' '
-                           +document.getElementById("dtlview_Shipping City").innerHTML+' '
-                           +document.getElementById("dtlview_Shipping State").innerHTML+' '
-                           +document.getElementById("dtlview_Shipping Country").innerHTML+' '
-                           +document.getElementById("dtlview_Shipping Code").innerHTML
+		if(fieldname.indexOf('ship_street') > -1)
+                        mapParameter = document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('ship_street')]).innerHTML+' ';
+                if(fieldname.indexOf('ship_pobox') > -1)
+                        mapParameter = mapParameter + document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('ship_pobox')]).innerHTML+' ';
+                if(fieldname.indexOf('ship_city') > -1)
+                        mapParameter = mapParameter + document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('ship_city')]).innerHTML+' ';
+                if(fieldname.indexOf('ship_state') > -1)
+                        mapParameter = mapParameter + document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('ship_state')]).innerHTML+' ';
+		if(fieldname.indexOf('ship_country') > -1)
+                        mapParameter = mapParameter + document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('ship_country')]).innerHTML+' ';
+                if(fieldname.indexOf('bill_code') > -1)                                                                                            mapParameter = mapParameter + document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('ship_code')]).innerHTML+' ';
+
         }
 	 window.open('http://maps.google.com/maps?q='+mapParameter,'goolemap','height=450,width=700,resizable=no,titlebar,location,top=200,left=250');
 }




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 07:27:58 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 11:27:58 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9487 -
	/vtigercrm/trunk/modules/Contacts/Contact.js
Message-ID: <20060913112758.21FE26D302A@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 05:27:41 2006
New Revision: 9487

Log:
Google Map issues fixed on change of label --By Minnie

Modified:
    vtigercrm/trunk/modules/Contacts/Contact.js

Modified: vtigercrm/trunk/modules/Contacts/Contact.js
==============================================================================
--- vtigercrm/trunk/modules/Contacts/Contact.js (original)
+++ vtigercrm/trunk/modules/Contacts/Contact.js Wed Sep 13 05:27:41 2006
@@ -105,21 +105,31 @@
         var mapParameter = '';
         if (addressType == 'Main')
         {
-                mapParameter = document.getElementById("dtlview_Mailing Street").innerHTML+' '
-                           +document.getElementById("dtlview_Mailing Po Box").innerHTML+' '
-                           +document.getElementById("dtlview_Mailing City").innerHTML+' '
-                           +document.getElementById("dtlview_Mailing State").innerHTML+' '
-                           +document.getElementById("dtlview_Mailing Country").innerHTML+' '
-                           +document.getElementById("dtlview_Mailing Zip").innerHTML
+		if(fieldname.indexOf('mailingstreet') > -1)
+			mapParameter = document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('mailingstreet')]).innerHTML+' ';
+		if(fieldname.indexOf('mailingpobox') > -1)
+			mapParameter = mapParameter + document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('mailingpobox')]).innerHTML+' ';
+		if(fieldname.indexOf('mailingcity') > -1)
+			mapParameter = mapParameter + document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('mailingcity')]).innerHTML+' ';
+		if(fieldname.indexOf('mailingstate') > -1)
+                        mapParameter = mapParameter + document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('mailingstate')]).innerHTML+' ';
+		if(fieldname.indexOf('mailingcountry') > -1)
+			mapParameter = mapParameter + document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('mailingcountry')]).innerHTML+' ';
+		if(fieldname.indexOf('mailingzip') > -1)
+			mapParameter = mapParameter + document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('mailingzip')]).innerHTML;
         }
         else if (addressType == 'Other')
         {
-                mapParameter = document.getElementById("dtlview_Other Street").innerHTML+' '
-                           +document.getElementById("dtlview_Other Po Box").innerHTML+' '
-                           +document.getElementById("dtlview_Other City").innerHTML+' '
-                           +document.getElementById("dtlview_Other State").innerHTML+' '
-                           +document.getElementById("dtlview_Other Country").innerHTML+' '
-                           +document.getElementById("dtlview_Other Zip").innerHTML
+		if(fieldname.indexOf('otherstreet') > -1)
+			mapParameter = document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('otherstreet')]).innerHTML+' ';
+		if(fieldname.indexOf('otherpobox') > -1)
+			mapParameter = mapParameter + document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('otherpobox')]).innerHTML+' ';
+		if(fieldname.indexOf('otherstate') > -1)
+                        mapParameter = mapParameter + document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('otherstate')]).innerHTML+' ';
+                if(fieldname.indexOf('othercountry') > -1)
+			mapParameter = mapParameter + document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('othercountry')]).innerHTML+' ';
+                if(fieldname.indexOf('otherzip') > -1)
+                        mapParameter = mapParameter + document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('otherzip')]).innerHTML;
         }
          window.open('http://maps.google.com/maps?q='+mapParameter,'goolemap','height=450,width=700,resizable=no,titlebar,location,top=200,left=250');
 }




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 07:30:00 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 11:30:00 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9488 -
	/vtigercrm/trunk/modules/Leads/Lead.js
Message-ID: <20060913113000.F1CCD6D302A@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 05:29:38 2006
New Revision: 9488

Log:
Google Map issues fixed on change of label --By Minnie

Modified:
    vtigercrm/trunk/modules/Leads/Lead.js

Modified: vtigercrm/trunk/modules/Leads/Lead.js
==============================================================================
--- vtigercrm/trunk/modules/Leads/Lead.js (original)
+++ vtigercrm/trunk/modules/Leads/Lead.js Wed Sep 13 05:29:38 2006
@@ -98,12 +98,18 @@
         var mapParameter = '';
         if (addressType == 'Main')
         {
-                mapParameter = document.getElementById("dtlview_Street").innerHTML+' '
-                           +document.getElementById("dtlview_Po Box").innerHTML+' '
-                           +document.getElementById("dtlview_City").innerHTML+' '
-                           +document.getElementById("dtlview_State").innerHTML+' '
-                           +document.getElementById("dtlview_Country").innerHTML+' '
-                           +document.getElementById("dtlview_Postal Code").innerHTML
+		if(fieldname.indexOf('lane') > -1)
+                        mapParameter = document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('lane')]).innerHTML+' ';
+		if(fieldname.indexOf('pobox') > -1)
+			mapParameter = mapParameter + document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('pobox')]).innerHTML+' ';
+		if(fieldname.indexOf('city') > -1)
+			mapParameter = mapParameter + document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('city')]).innerHTML+' ';
+		if(fieldname.indexOf('state') > -1)
+			mapParameter = mapParameter + document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('state')]).innerHTML+' ';
+		if(fieldname.indexOf('country') > -1)
+			mapParameter = mapParameter + document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('country')]).innerHTML+' ';
+		if(fieldname.indexOf('code') > -1)
+                        mapParameter = mapParameter + document.getElementById("dtlview_"+fieldlabel[fieldname.indexOf('code')]).innerHTML+' ';
         }
         window.open('http://maps.google.com/maps?q='+mapParameter,'goolemap','height=450,width=700,resizable=no,titlebar,location,top=200,left=250');
 }




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 07:34:23 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 11:34:23 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9489 - in
 /vtigercrm/trunk/Smarty/templates: ActivityDetailView.tpl
 ActivityEditView.tpl
Message-ID: <20060913113423.C4BD06D3041@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 05:34:08 2006
New Revision: 9489

Log:
Security Support Done- Field Level --By Minnie

Modified:
    vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl
    vtigercrm/trunk/Smarty/templates/ActivityEditView.tpl

Modified: vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl Wed Sep 13 05:34:08 2006
@@ -113,36 +113,50 @@
 							 <!-- display of fields starts -->
 						     <table border=0 cellspacing=0 cellpadding=5 width=100% >
                						 <tr>
+								{if $LABEL.activitytype neq ''}
 								<td class="cellLabel" width="20%" align="right"><b>{$MOD.LBL_EVENTTYPE}</b></td>
 								<td class="cellInfo" width="30%"align="left">{$ACTIVITYDATA.activitytype}</td>
+								{/if}
+								{if $LABEL.visibility neq ''}
 								<td class="cellLabel" width="20%" align="right"><b>{$LABEL.visibility}</b></td>
                                                                 <td class="cellInfo" width="30%" align="left" >{$ACTIVITYDATA.visibility}</td>
+								{/if}
 							 </tr>
 							 <tr>
                         					<td class="cellLabel" align="right"><b>{$MOD.LBL_EVENTNAME}</b></td>
 					                        <td class="cellInfo" colspan=3 align="left" >{$ACTIVITYDATA.subject}</td>
              						 </tr>
+							 {if $LABEL.description neq ''}
 							 <tr>
 								<td class="cellLabel" align="right" nowrap valign="top"><b>{$LABEL.description}</b></td>
 								<td class="cellInfo" valign="top" align="left" colspan="3" height="60px">{$ACTIVITYDATA.description}</td>
 							 </tr>
+							{/if}
 							 <tr>
+								{if $LABEL.eventstatus neq ''}
 								<td class="cellLabel" align="right" nowrap valign="top"><b>{$LABEL.eventstatus}</b></td>
 								<td class="cellInfo" align="left" nowrap valign="top">{$ACTIVITYDATA.eventstatus}</td>
+								{/if}
+								{if $LABEL.assigned_user_id neq ''}
 								<td class="cellLabel" align="right" nowrap valign="top"><b>{$LABEL.assigned_user_id}</b></td>
 								<td class="cellInfo" align="left" nowrap valign="top">{$ACTIVITYDATA.assigned_user_id}</td>
+								{/if}
                                                          </tr>
 							 <tr>
+								{if $LABEL.taskpriority neq ''}
                                                                 <td class="cellLabel" align="right" nowrap valign="top"><b>{$LABEL.taskpriority}</b></td>
                                                                 <td class="cellInfo" align="left" nowrap valign="top">{$ACTIVITYDATA.taskpriority}</td>
+								{/if}
+								{if $LABEL.sendnotification neq ''}
                                                                 <td class="cellLabel" align="right" nowrap valign="top"><b>{$LABEL.sendnotification}</b></td>
                                                                 <td class="cellInfo" align="left" nowrap valign="top">{$ACTIVITYDATA.sendnotification}</td>
+								{/if}
                                                          </tr>
                                                          <tr>
-                                                                <td class="cellLabel" align="right" nowrap valign="top"align="right"><b>{$LABEL.createdtime}</b></td>
-                                                                <td class="cellInfo" align="left" nowrap valign="top">{$ACTIVITYDATA.createdtime}</td>
-                                                                <td class="cellLabel" align="right" nowrap valign="top"align="right"><b>{$LABEL.modifiedtime}</b></td>
-                                                                <td class="cellInfo" align="left" nowrap valign="top">{$ACTIVITYDATA.modifiedtime}</td>
+                                                                <td class="cellLabel" align="right" nowrap valign="top"align="right">{if $LABEL.createdtime neq ''}<b>{$LABEL.createdtime}</b>{/if}</td>
+                                                                <td class="cellInfo" align="left" nowrap valign="top">{if $LABEL.createdtime neq ''}{$ACTIVITYDATA.createdtime}{/if}</td>
+                                                                <td class="cellLabel" align="right" nowrap valign="top"align="right">{if $LABEL.modifiedtime neq ''}<b>{$LABEL.modifiedtime}</b>{/if}</td>
+                                                                <td class="cellInfo" align="left" nowrap valign="top">{if $LABEL.modifiedtime neq ''}{$ACTIVITYDATA.modifiedtime}{/if}</td>
                                                          </tr>
 						     </table>
 						     <table border=0 cellspacing=1 cellpadding=0 width=100%>
@@ -197,6 +211,7 @@
 									</DIV>
 									<!-- Reminder UI -->
 					                                <DIV id="addEventAlarmUI" style="display:none;width:100%">
+									{if $LABEL.reminder_time != ''}
 									<table width="100%" cellpadding="5" cellspacing="0" border="0">
                                                                                 <tr>
                                                                                         <td width="30%" align=right><b>{$MOD.LBL_SENDREMINDER}</b></td>
@@ -209,9 +224,11 @@
 										</tr>
 										{/if}
                                                                         </table>
+									{/if}
 									</DIV>
 									<!-- Repeat UI -->
                                 					<div id="addEventRepeatUI" style="display:none;width:100%">
+									{if $LABEL.recurringtype neq ''}
 									<table width="100%" cellpadding="5" cellspacing="0" border="0">
 										<tr>
                                                                                         <td width="30%" align=right><b>{$MOD.LBL_ENABLE_REPEAT}</b></td>
@@ -228,14 +245,17 @@
                                                                                 </tr>
 										{/if}
 									</table>
+									{/if}
 									</div>
 									<!-- Relatedto UI -->
 									<div id="addEventRelatedtoUI" style="display:none;width:100%">
 									<table width="100%" cellpadding="5" cellspacing="0" border="0">
+										{if $LABEL.parent_id neq ''}
 										<tr>
 											<td width="30%" align=right valign="top"><b>{$LABEL.parent_id}</b></td>
 											<td width="70%" align=left valign="top">{$ACTIVITYDATA.parent_name}</td>
 										</tr>
+										{/if}
 										<tr>
 											<td width="30%" valign="top" align=right><b>{$MOD.LBL_CONTACT_NAME}</b></td>	
 											<td width="70%" valign="top" align=left>
@@ -255,22 +275,24 @@
 								<td class="cellLabel" width="20%" align="right"><b>{$MOD.LBL_TODO}</b></td>
 								<td class="cellInfo" width="80%" align="left">{$ACTIVITYDATA.subject}</td>
 							</tr>
+							{if $LABEL.description neq ''}
 							<tr>
 								<td class="cellLabel" align="right" valign="top"><b>{$LABEL.description}</b></td>
                                                                 <td class="cellInfo" align="left" colspan="3" valign="top" height="60px">{$ACTIVITYDATA.description}</td>
                 					</tr>
+							{/if}
 							<tr>
                         					<td colspan="2" align="center" style="padding:0px">
                                 				<table border="0" cellpadding="5" cellspacing="1" width="100%" >
                                        					<tr>
-                                                				<td class="cellLabel" width=33% align="left"><b>{$LABEL.taskstatus}</b></td>
-										<td class="cellLabel" width=33% align="left"><b>{$LABEL.taskpriority}</b></td>
-										<td class="cellLabel" width=34% align="left"><b>{$LABEL.assigned_user_id}</b></td>
+                                                				<td class="cellLabel" width=33% align="left">{if $LABEL.taskstatus neq ''}<b>{$LABEL.taskstatus}</b>{/if}</td>
+										<td class="cellLabel" width=33% align="left">{if $LABEL.taskpriority neq ''}<b>{$LABEL.taskpriority}</b>{/if}</td>
+										<td class="cellLabel" width=34% align="left">{if $LABEL.assigned_user_id neq ''}<b>{$LABEL.assigned_user_id}</b>{/if}</td>
 									</tr>
 									<tr>
-                                                				<td class="cellInfo" align="left" valign="top">{$ACTIVITYDATA.taskstatus}</td>
-										<td class="cellInfo" align="left" valign="top">{$ACTIVITYDATA.taskpriority}</td>
-										<td class="cellInfo" align="left" valign="top">{$ACTIVITYDATA.assigned_user_id}</td>
+                                                				<td class="cellInfo" align="left" valign="top">{if $LABEL.taskstatus neq ''}{$ACTIVITYDATA.taskstatus}{/if}</td>
+										<td class="cellInfo" align="left" valign="top">{if $LABEL.taskpriority neq ''}{$ACTIVITYDATA.taskpriority}{/if}</td>
+										<td class="cellInfo" align="left" valign="top">{if $LABEL.taskpriority neq ''}{$ACTIVITYDATA.assigned_user_id}{/if}</td>
 									</tr>
 								</table>
 								</td>
@@ -294,10 +316,10 @@
 						     </table>
 						     <table border=0 cellspacing=0 cellpadding=5 width=100% >
 							<tr>
-								<td class="cellLabel" align=right nowrap width=20%><b>{$LABEL.createdtime}</b></td>
-                                                                <td class="cellInfo" align=left nowrap width=30%>{$ACTIVITYDATA.createdtime}</td>
-                                                                <td class="cellLabel" align=right nowrap width=20%><b>{$LABEL.modifiedtime}</b></td>
-                                                                <td class="cellInfo" align=left  nowrap width=30%>{$ACTIVITYDATA.modifiedtime}</td>
+								<td class="cellLabel" align=right nowrap width=20%>{if $LABEL.createdtime neq ''}<b>{$LABEL.createdtime}</b>{/if}</td>
+                                                                <td class="cellInfo" align=left nowrap width=30%>{if $LABEL.createdtime neq ''}{$ACTIVITYDATA.createdtime}{/if}</td>
+                                                                <td class="cellLabel" align=right nowrap width=20%>{if $LABEL.modifiedtime neq ''}<b>{$LABEL.modifiedtime}</b>{/if}</td>
+                                                                <td class="cellInfo" align=left  nowrap width=30%>{if $LABEL.modifiedtime neq ''}{$ACTIVITYDATA.modifiedtime}{/if}</td>
                                                         </tr>
                                                      </table>
 						     <br>
@@ -320,14 +342,17 @@
 								<td width=100% valign=top align=left class="dvtContentSpace" style="padding:10px;height:120px">
                                                                 <!-- Notification UI -->
                                                                         <DIV id="addTaskAlarmUI" style="display:block;width:100%">
+									{if $LABEL.sendnotification neq ''}
                                                                         <table width="100%" cellpadding="5" cellspacing="0" border="0">
                                                                                 <tr>
                                                                                         <td width="30%" align=right><b>{$MOD.LBL_SENDNOTIFICATION}</b></td>
                                                                                         <td width="70%" align=left>{$ACTIVITYDATA.sendnotification}</td>
                                                                                 </tr>
                                                                         </table>
+									{/if}
                                                                         </DIV>
 									<div id="addTaskRelatedtoUI" style="display:none;width:100%">
+									{if $LABEL.parent_id neq ''}
                                                                         <table width="100%" cellpadding="5" cellspacing="0" border="0">
                                                                                 <tr>
                                                                                         <td width="30%" align=right><b>{$LABEL.parent_id}</b></td>
@@ -338,6 +363,7 @@
                                                                                         <td align=left>{$ACTIVITYDATA.contact_id}</td>
                                                                                 </tr>
                                                                         </table>
+									{/if}
                                                                         </div>
 								</td>
 							</tr>

Modified: vtigercrm/trunk/Smarty/templates/ActivityEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ActivityEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ActivityEditView.tpl Wed Sep 13 05:34:08 2006
@@ -89,6 +89,7 @@
 							<input type="hidden" name="duration_hours" value="0">
 							<input type="hidden" name="duration_minutes" value="0">
 						     <table border=0 cellspacing=0 cellpadding=5 width=100% >
+							{if $LABEL.activitytype neq ''}
 							<tr>
 								<td class="cellLabel" nowrap  width=20% align="right"><b>{$MOD.LBL_EVENTTYPE}</b></td>
 								<td class="cellInfo" width=80% align="left">
@@ -111,9 +112,11 @@
 									</table>
 								</td>
 							</tr>
+							{/if}
 							<tr>
 								<td class="cellLabel" nowrap align="right"><b>{$MOD.LBL_EVENTNAME}</b></td>
 								<td class="cellInfo" align="left"><input name="subject" type="text" class="textbox" value="{$ACTIVITYDATA.subject}" style="width:50%">&nbsp;&nbsp;&nbsp;
+								{if $LABEL.visibility neq ''}
 								{foreach key=key_one item=arr from=$ACTIVITYDATA.visibility}
                                                                         {foreach key=sel_value item=value from=$arr}
                                                                         {if $value eq 'selected' && $sel_value eq 'Public'}
@@ -124,21 +127,27 @@
                                                                         {/foreach}
                                                                         {/foreach}
                                                                         <input name="visibility" value="Public" type="checkbox" {$visiblecheck}>{$MOD.LBL_PUBLIC}
+								{/if}
 								</td>
 							</tr>
+							{if $LABEL.description neq ''}
 							<tr>
                         					<td class="cellLabel" valign="top" nowrap align="right"><b>{$LABEL.description}</b></td>
 								<td class="cellInfo" align="left"><textarea style="width:100%; height : 60px;" name="description">{$ACTIVITYDATA.description}</textarea></td>
                 					</tr>
+							{/if}
 							<tr>
 								<td colspan=2 width=80% align="center">
 								<table border=0 cellspacing=0 cellpadding=3 width=80%>
 									<tr>
-										<td ><b>{$LABEL.eventstatus}</b></td>
-                                                                                <td ><b>{$LABEL.assigned_user_id}</b></td>
+										<td >{if $LABEL.eventstatus neq ''}<b>{$LABEL.eventstatus}</b>{/if}</td>
+                                                                                <td >{if $LABEL.assigned_user_id != ''}<b>
+											{$LABEL.assigned_user_id}</b>
+											{/if}</td>
 									</tr>
 									<tr>
 										<td valign=top>
+										{if $LABEL.eventstatus neq ''}
                                                                                 <select name="eventstatus" id="eventstatus" class=small>
                                                                                         {foreach item=arr from=$ACTIVITYDATA.eventstatus}
                                                                                         {foreach key=sel_value item=value from=$arr}
@@ -152,8 +161,10 @@
                                                                                         {/foreach}
                                                                                         {/foreach}
                                                                                 </select>
+										{/if}
                                                                         	</td>
 										<td valign=top rowspan=2>
+											{if $ACTIVITYDATA.assigned_user_id != ''}
 											{assign var=check value=1}
                                         						{foreach key=key_one item=arr from=$ACTIVITYDATA.assigned_user_id}
                                                 					{foreach key=sel_value item=value from=$arr}
@@ -199,9 +210,13 @@
                                                         					</select>
                                                 					</span>
                                         						{/if}
-											<br><input type="checkbox" name="sendnotification" >&nbsp;{$LABEL.sendnotification}
+											{else}
+											<input name="assigned_user_id" value="{$CURRENTUSERID}" type="hidden">
+											{/if}
+											<br>{if $LABEL.sendnotification neq ''}<input type="checkbox" name="sendnotification" >&nbsp;{$LABEL.sendnotification}{/if}
 										</td>
 									</tr>
+									{if $LABEL.taskpriority neq ''}
 									<tr>
 										<td valign=top><b>{$LABEL.taskpriority}</b>
 										<br>
@@ -221,6 +236,7 @@
 										</td> 
 										
 									</tr>
+									{/if}
 								</table>
 							</td></tr>
 						     </table>
@@ -344,6 +360,7 @@
 									</DIV>
 									<!-- Reminder UI -->	
 									<DIV id="addEventAlarmUI" style="display:none;width:100%">
+									{if $LABEL.reminder_time neq ''}
 										<table>
 											{assign var=secondval value=$secondvalue.reminder_time}
 											{assign var=check value=$secondval[0]}
@@ -396,15 +413,16 @@
 													{$MOD.LBL_SDRMD}
 												</td>
 												<td >
-													<input type=text name="toemail" class=textbox style="width:90%" value="{$USEREMAILID}">
+													<input type=text name="toemail" readonly="readonly" class=textbox style="width:90%" value="{$USEREMAILID}">
 												</td>
 											</tr>
 										</table>
+									{/if}
 									</DIV>
 									</DIV>
 									<!-- Repeat UI -->
 									<div id="addEventRepeatUI" style="display:none;width:100%">
-
+									{if $LABEL.recurringtype neq ''}
 									<table border=0 cellspacing=0 cellpadding=2  width=100%>
 										<tr>
 											<td nowrap align=right width=20% valign=top>
@@ -517,9 +535,11 @@
 								</td>
 							</tr>
 						</table>
+						{/if}
 						</div>
 						<div id="addEventRelatedtoUI" style="display:none;width:100%">
 						<table width="100%" cellpadding="5" cellspacing="0" border="0">
+							{if $LABEL.parent_id neq ''}	
 							<tr>
 								<td><b>{$MOD.LBL_RELATEDTO}</b></td>
 								<td>
@@ -537,6 +557,7 @@
 									</div>
 								</td>
 							</tr>
+							{/if}
 							<tr>
 								<td><b>{$APP.Contacts}</b></td>
 								<td colspan="2">
@@ -559,19 +580,30 @@
                         	<td class="cellLabel" width="20%" align="right"><b>{$MOD.LBL_TODO}</b></td>
                         	<td class="cellInfo" width="80%" align="left"><input name="subject" value="{$ACTIVITYDATA.subject}" class="textbox" style="width: 70%;" type="text"></td>
            		</tr>
+			
 			<tr>
+				{if $LABEL.description != ''}
 				<td class="cellLabel" align="right"><b>{$LABEL.description}</b></td>
 				<td class="cellInfo" align="left"><textarea style="width: 90%; height: 60px;" name="description">{$ACTIVITYDATA.description}</textarea>
+				{/if}
+				
 			</tr>
 			<tr>
 		    		<td colspan="2" align="center" width="100%" style="padding:0px">
 					<table border="0" cellpadding="5" cellspacing="1" width="100%">
             					<tr>
-							<td class="cellLabel" width=33% align="left"><b>{$LABEL.taskstatus}</td>
+							{if $LABEL.taskstatus != ''}
+							<td class="cellLabel" width=33% align="left"><b>{$LABEL.taskstatus}</b></td>
+							{/if}
+							{if $LABEL.taskpriority != ''}
               						<td class="cellLabel" width=33% align="left"><b>{$LABEL.taskpriority}</b></td>
-              						<td class="cellLabel" width=34% align="left"><b>{$LABEL.assigned_user_id}</b></td>
+							{/if}
+              						{if $LABEL.assigned_user_id != ''}
+							<td class="cellLabel" width=34% align="left"><b>{$LABEL.assigned_user_id}</b></td>
+							{/if}
 						</tr>
 						<tr>
+							{if $LABEL.taskstatus != ''}
 							<td align="left" valign="top">
 								<select name="taskstatus" id="taskstatus" class=small>
                                         			{foreach item=arr from=$ACTIVITYDATA.taskstatus}
@@ -587,6 +619,8 @@
                                         			{/foreach}
                                 				</select>
 							</td>
+							{/if}
+							{if $LABEL.taskpriority != ''}
 							<td align="left" valign="top">
 								<select name="taskpriority" id="taskpriority" class=small>
         			                                {foreach item=arr from=$ACTIVITYDATA.taskpriority}
@@ -602,6 +636,8 @@
                                         			{/foreach}
                                 				</select>
 							</td>
+							{/if}
+							{if $LABEL.assigned_user_id != ''}
 							<td align="left" valign="top">
 								{assign var=check value=1}
                                         			{foreach key=key_one item=arr from=$ACTIVITYDATA.assigned_user_id}
@@ -647,6 +683,9 @@
 				                                </span>
                                 				{/if}	
 							</td>
+							{else}
+								<input name="assigned_user_id" value="{$CURRENTUSERID}" type="hidden">
+							{/if}
 						</tr>
 					</table>
 				</td>
@@ -687,7 +726,7 @@
                                         			{/foreach}
 				      				<script type="text/javascript">
 								Calendar.setup ({ldelim}
-	                                        			inputField : "date_start", ifFormat : "{$date_vl}", showsTime : false, button : "jscal_trigger_due_date", singleClick : true, step : 1
+	                                        			inputField : "due_date", ifFormat : "{$date_vl}", showsTime : false, button : "jscal_trigger_due_date", singleClick : true, step : 1
 					   			{rdelim})
 								</script>
         						</td></tr>
@@ -714,6 +753,7 @@
 				<td class="dvtContentSpace" style="padding: 10px; height: 120px;" align="left" valign="top" width="100%">
 			<!-- Reminder UI -->
 			<div id="addTaskAlarmUI" style="display: block; width: 100%;">
+			{if $LABEL.sendnotification != ''}
                 	<table>
 				<tr><td>{$LABEL.sendnotification}</td>
 					{if $ACTIVITYDATA.sendnotification eq 1}
@@ -727,9 +767,11 @@
                                 	{/if}
 				</tr>
 			</table>
+			{/if}
 			</div>
 			<div id="addTaskRelatedtoUI" style="display:none;width:100%">
            		     <table width="100%" cellpadding="5" cellspacing="0" border="0">
+			     {if $LABEL.parent_id neq ''}
                 	     <tr>
                         	     <td><b>{$MOD.LBL_RELATEDTO}</b></td>
                                      <td>
@@ -747,6 +789,8 @@
 					 </div>
                                      </td>
 			     </tr>
+			     {/if}
+			     {if $LABEL.contact_id neq ''}	
 			     <tr>
                                      <td><b>{$LABEL.contact_id}</b></td>
 				     <td colspan="2">
@@ -754,6 +798,7 @@
 						<input type="button" onclick="return window.open('index.php?module=Contacts&action=Popup&html=Popup_picker&popuptype=specific&form=EditView','test','width=640,height=602,resizable=0,scrollbars=0');" class="crmButton small edit" name="selectcnt" value="Select Contact">
 				     </td>
                              </tr>
+			     {/if}
 		</table>
               	</div>
                 </td></tr></table>




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 07:35:25 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 11:35:25 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9490 -
	/vtigercrm/trunk/include/install/images/loading.gif
Message-ID: <20060913113525.DD5FA6D3042@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Wed Sep 13 05:35:15 2006
New Revision: 9490

Log:
Loading image changed --Jeri

Modified:
    vtigercrm/trunk/include/install/images/loading.gif

Modified: vtigercrm/trunk/include/install/images/loading.gif
==============================================================================
Binary files - no diff available.




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 07:36:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 11:36:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9491 -
 /vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php
Message-ID: <20060913113650.57E756D303C@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 05:36:41 2006
New Revision: 9491

Log:
Fixed the Contact Potential Not getting added issue

Modified:
    vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php

Modified: vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php (original)
+++ vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php Wed Sep 13 05:36:41 2006
@@ -320,7 +320,7 @@
 
 //Saving Contact - starts
 $crmcontactid = $adb->getUniqueID("vtiger_crmentity");
-$sql_crmentity1 = "insert into vtiger_crmentity(crmid,smcreatorid,smownerid,setype,presence,deleted,description,createdtime) values(".$crmcontactid.",".$current_user_id.",".$assigned_user_id.",'Contacts',0,0,'".$row['description']."','".$date_entered."')";
+$sql_crmentity1 = "insert into vtiger_crmentity(crmid,smcreatorid,smownerid,setype,presence,deleted,description,createdtime) values(".$crmcontactid.",".$current_user_id.",".$assigned_user_id.",'Contacts',0,0,'".$row['description']."',".$date_entered.")";
 
 $adb->query($sql_crmentity1);
 
@@ -382,7 +382,7 @@
   
 
 	$oppid = $adb->getUniqueID("vtiger_crmentity");
-	$sql_crmentity = "insert into vtiger_crmentity(crmid,smcreatorid,smownerid,setype,presence,deleted,createdtime,description) values(".$oppid.",".$current_user_id.",".$assigned_user_id.",'Potentials',0,0,'".$date_entered."','".$row['description']."')";
+	$sql_crmentity = "insert into vtiger_crmentity(crmid,smcreatorid,smownerid,setype,presence,deleted,createdtime,description) values(".$oppid.",".$current_user_id.",".$assigned_user_id.",'Potentials',0,0,".$date_entered.",'".$row['description']."')";
   
 	$adb->query($sql_crmentity);
 




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 07:38:58 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 11:38:58 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9492 -
	/vtigercrm/trunk/include/FormValidationUtil.php
Message-ID: <20060913113858.34AC36D303C@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 05:38:49 2006
New Revision: 9492

Log:
i18n support for validation --By minnie

Modified:
    vtigercrm/trunk/include/FormValidationUtil.php

Modified: vtigercrm/trunk/include/FormValidationUtil.php
==============================================================================
--- vtigercrm/trunk/include/FormValidationUtil.php (original)
+++ vtigercrm/trunk/include/FormValidationUtil.php Wed Sep 13 05:38:49 2006
@@ -28,7 +28,7 @@
   $sql = '';
   $tab_con = "";
   $numValues = count($tablearray);
-  global $adb;
+  global $adb,$mod_strings;
 
   if($tabid!='') $tab_con = ' and tabid='.$tabid;
 	
@@ -63,7 +63,7 @@
   $fieldName_array = Array();
   for($i=0;$i<$noofrows;$i++)
   {
-    $fieldlabel = $adb->query_result($result,$i,'fieldlabel');
+    $fieldlabel = $mod_strings[$adb->query_result($result,$i,'fieldlabel')];
     $fieldname = $adb->query_result($result,$i,'fieldname');
     $typeofdata = $adb->query_result($result,$i,'typeofdata');
    //echo '<br> '.$fieldlabel.'....'.$fieldname.'....'.$typeofdata;




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 07:43:16 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 11:43:16 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9493 -
	/vtigercrm/trunk/include/utils/UserInfoUtil.php
Message-ID: <20060913114316.58CB56C5946@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 05:43:08 2006
New Revision: 9493

Log:
Fix for Calendar Security Done

Modified:
    vtigercrm/trunk/include/utils/UserInfoUtil.php

Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php
==============================================================================
--- vtigercrm/trunk/include/utils/UserInfoUtil.php (original)
+++ vtigercrm/trunk/include/utils/UserInfoUtil.php Wed Sep 13 05:43:08 2006
@@ -1534,7 +1534,21 @@
 		if($actionid == 1 || $actionid == 0)
 		{
 
-			$permission = isReadWritePermittedBySharing($module,$tabid,$actionid,$record_id);
+			if($module == 'Calendar')
+			{
+				if($recOwnType == 'Users')
+				{
+					$permission = isCalendarPermittedBySharing($record_id);
+				}
+				else
+				{
+					$permission='no'; 
+				}		
+			}
+			else
+			{
+				$permission = isReadWritePermittedBySharing($module,$tabid,$actionid,$record_id);
+			}		
 			$log->debug("Exiting isPermitted method ...");
 			return $permission;	
 		}
@@ -1578,13 +1592,41 @@
 		
 		if($actionid == 3 || $actionid == 4)
 		{
-			$permission = isReadPermittedBySharing($module,$tabid,$actionid,$record_id);
+			if($module == 'Calendar')
+			{
+				if($recOwnType == 'Users')
+				{
+					$permission = isCalendarPermittedBySharing($record_id);
+				}
+				else
+				{
+					$permission='no'; 
+				}		
+			}
+			else
+			{
+				$permission = isReadPermittedBySharing($module,$tabid,$actionid,$record_id);
+			}	
 			$log->debug("Exiting isPermitted method ...");
 			return $permission;	
 		}
 		elseif($actionid ==0 || $actionid ==1)
 		{
-			$permission = isReadWritePermittedBySharing($module,$tabid,$actionid,$record_id);
+			if($module == 'Calendar')
+			{
+				if($recOwnType == 'Users')
+				{
+					$permission = isCalendarPermittedBySharing($record_id);
+				}
+				else
+				{
+					$permission='no'; 
+				}		
+			}
+			else
+			{
+				$permission = isReadWritePermittedBySharing($module,$tabid,$actionid,$record_id);
+			}	
 			$log->debug("Exiting isPermitted method ...");
 			return $permission;	
 		}
@@ -1635,7 +1677,6 @@
 		return $sharePer;
 	}
 
-	
 	$recordOwnerArr=getRecordOwnerId($record_id);
 	foreach($recordOwnerArr as $type=>$id)
 	{
@@ -4368,7 +4409,13 @@
 	}
 	elseif($module == 'Calendar')
 	{
-		$sec_query .= "and (vtiger_crmentity.smownerid in($current_user->id) or vtiger_crmentity.smownerid in(select vtiger_user2role.userid from vtiger_user2role inner join vtiger_users on vtiger_users.id=vtiger_user2role.userid inner join vtiger_role on vtiger_role.roleid=vtiger_user2role.roleid where vtiger_role.parentrole like '".$current_user_parent_role_seq."::%')";
+		require_once('modules/Calendar/CalendarCommon.php');
+		$shared_ids = getSharedCalendarId($current_user->id);
+		if(isset($shared_ids) && $shared_ids != '')
+			$condition = " or (vtiger_crmentity.smownerid in($shared_ids) and vtiger_activity.visibility = 'Public')";
+		else
+			$condition = null;
+		$sec_query .= "and (vtiger_crmentity.smownerid in($current_user->id) $condition or vtiger_crmentity.smownerid in(select vtiger_user2role.userid from vtiger_user2role inner join vtiger_users on vtiger_users.id=vtiger_user2role.userid inner join vtiger_role on vtiger_role.roleid=vtiger_user2role.roleid where vtiger_role.parentrole like '".$current_user_parent_role_seq."::%')";
 
 		if(sizeof($current_user_groups) > 0)
 		{
@@ -4756,6 +4803,19 @@
 }
 
 
+function isCalendarPermittedBySharing($recordId)
+{
+	global $adb;
+	global $current_user;
+	$permission = 'no';
+	$query = "select * from vtiger_sharedcalendar where userid in(select smownerid from vtiger_activity inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid where activityid=".$recordId." and visibility='Public' and smownerid !=0) and sharedid=".$current_user->id;
+	$result=$adb->query($query);
+	if($adb->num_rows($result) >0)
+	{
+		$permission = 'yes';
+	}
+	return $permission;	
+}	
 
 //end					   
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 07:45:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 11:45:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9494 -
	/vtigercrm/trunk/include/images/vtigercrm_icon.ico
Message-ID: <20060913114545.56F806C5946@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Wed Sep 13 05:45:04 2006
New Revision: 9494

Log:
fav icon deleted--Jeri

Removed:
    vtigercrm/trunk/include/images/vtigercrm_icon.ico




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 07:46:54 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 11:46:54 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9495 -
	/vtigercrm/trunk/include/images/vtigercrm_icon.ico
Message-ID: <20060913114654.E47BF6C5946@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Wed Sep 13 05:46:12 2006
New Revision: 9495

Log:
fav icon image added --Jeri

Added:
    vtigercrm/trunk/include/images/vtigercrm_icon.ico   (with props)




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 07:47:24 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 11:47:24 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9496 -
	/vtigercrm/trunk/log4php.properties
Message-ID: <20060913114724.4F64D6D3049@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 05:46:57 2006
New Revision: 9496

Log:
Modified log level from debug to fatal

Modified:
    vtigercrm/trunk/log4php.properties

Modified: vtigercrm/trunk/log4php.properties
==============================================================================
--- vtigercrm/trunk/log4php.properties (original)
+++ vtigercrm/trunk/log4php.properties Wed Sep 13 05:46:57 2006
@@ -25,7 +25,7 @@
 log4php.appender.A1.layout.DateFormat="%c"
 log4php.appender.A1.File=logs/vtigercrm.log
 
-log4php.logger.MIGRATION=DEBUG,A4
+log4php.logger.MIGRATION=FATAL,A4
 log4php.appender.A4=LoggerAppenderRollingFile
 log4php.appender.A4.MaxFileSize=3MB
 log4php.appender.A4.MaxBackupIndex=10
@@ -35,7 +35,7 @@
 log4php.appender.A4.File=logs/migration.log
 
 
-log4php.logger.SOAP=DEBUG,A5
+log4php.logger.SOAP=FATAL,A5
 log4php.appender.A5=LoggerAppenderRollingFile
 log4php.appender.A5.MaxFileSize=3MB
 log4php.appender.A5.MaxBackupIndex=10




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 07:49:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 11:49:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9497 -
	/vtigercrm/trunk/getCompanyProfile.php
Message-ID: <20060913114939.6958966A5D4@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 05:49:18 2006
New Revision: 9497

Log:
Fixed the Ticker Symbol Issue --By Minnie

Modified:
    vtigercrm/trunk/getCompanyProfile.php

Modified: vtigercrm/trunk/getCompanyProfile.php
==============================================================================
--- vtigercrm/trunk/getCompanyProfile.php (original)
+++ vtigercrm/trunk/getCompanyProfile.php Wed Sep 13 05:49:18 2006
@@ -34,9 +34,16 @@
         	{
 			$desc=$msft_stats[0];
 			$data=getQuoteData($variable);
-			foreach($data as $key=>$value)
-				array_push($desc,$value);
-			return $desc;
+			if(is_array($data))
+			{
+				foreach($data as $key=>$value)
+					array_push($desc,$value);
+				return $desc;
+			}
+			else
+			{
+				die;
+			}
 		}
 		else
 		        return "Information on ".$variable." is not available or '".$variable."' is not a valid ticker symbol.";
@@ -45,7 +52,7 @@
 	{
 		$headlines = array();
 		$news = http::table_into_array($h->body, 'HEADLINES',0, null);
-		if($news != '')
+		if(is_array($news))
 		{
 			$headlines[] = $news[35];
 			$headlines[] = $news[37];
@@ -75,13 +82,17 @@
         }
 	$res_arr=array();
 	$quote_data = http::table_into_array($h->body, 'Delayed quote data', 0, null);
-        if($quote_data[0][0] == '')
+        if(is_array($quote_data))
         {
                 array_shift($quote_data);
                 array_shift($quote_data);
                 if($quote_data[0][0]!= 'Last Trade:')
                         array_shift($quote_data);
         }
+	else
+	{
+		die;
+	}
         for($i=0;$i<16;$i++)
         {
                 if($quote_data !='')




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 08:11:44 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 12:11:44 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9498 - in
 /wordintegration/trunk/client/bin/Language: deutsch.ini english.ini
 finnish.ini french.ini german.ini
Message-ID: <20060913121144.6CC556D305D@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Wed Sep 13 06:11:22 2006
New Revision: 9498

Log:
Copyright year changed --Jeri

Modified:
    wordintegration/trunk/client/bin/Language/deutsch.ini
    wordintegration/trunk/client/bin/Language/english.ini
    wordintegration/trunk/client/bin/Language/finnish.ini
    wordintegration/trunk/client/bin/Language/french.ini
    wordintegration/trunk/client/bin/Language/german.ini

Modified: wordintegration/trunk/client/bin/Language/deutsch.ini
==============================================================================
--- wordintegration/trunk/client/bin/Language/deutsch.ini (original)
+++ wordintegration/trunk/client/bin/Language/deutsch.ini Wed Sep 13 06:11:22 2006
@@ -7,7 +7,7 @@
 
 [vtigerCRM_frmAbout]
 FormName=?ber
-Label2=Copyright ? 2003-2005 vtiger.com. Alle Rechte vorbehalten.
+Label2=Copyright ? 2003-2006 vtiger.com. Alle Rechte vorbehalten.
 Label3=
 Button1=OK
 

Modified: wordintegration/trunk/client/bin/Language/english.ini
==============================================================================
Binary files - no diff available.

Modified: wordintegration/trunk/client/bin/Language/finnish.ini
==============================================================================
--- wordintegration/trunk/client/bin/Language/finnish.ini (original)
+++ wordintegration/trunk/client/bin/Language/finnish.ini Wed Sep 13 06:11:22 2006
@@ -7,7 +7,7 @@
 
 [vtigerCRM_frmAbout]
 FormName=About
-Label2=Copyright ? 2003-2005 vtiger.com. All rights reserverd.
+Label2=Copyright ? 2003-2006 vtiger.com. All rights reserverd.
 Label3=
 Button1=Hyv?ksy
 
@@ -36,7 +36,7 @@
 Frame1_Label1=vtiger K?ytt?j?tunnus:
 Frame1_Label2=vtiger Salasana:
 Frame1_Label3=vtiger URL:
-Frame1_Label4=(Esim. http://localhost/)
+Frame1_Label4=(Esim. http://en.vtiger.com/)
 Frame2=M??rittele Proxyn asetukset yhteytt? varten.
 Frame2_Label1=Osoite:
 Frame2_Label2=Portti:

Modified: wordintegration/trunk/client/bin/Language/french.ini
==============================================================================
--- wordintegration/trunk/client/bin/Language/french.ini (original)
+++ wordintegration/trunk/client/bin/Language/french.ini Wed Sep 13 06:11:22 2006
@@ -7,7 +7,7 @@
 
 [vtigerCRM_frmAbout]
 FormName=A propos
-Label2=Copyright ? 2003-2005 vtiger.com. Tous droits r?serv?s.
+Label2=Copyright ? 2003-2006 vtiger.com. Tous droits r?serv?s.
 Label3=French by Abos : contact at abonlinesolutions.com
 Button1=OK
 

Modified: wordintegration/trunk/client/bin/Language/german.ini
==============================================================================
Binary files - no diff available.




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 08:14:46 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 12:14:46 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9499 -
	/wordintegration/trunk/resources/images/vtiger.ico
Message-ID: <20060913121446.379226D3060@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Wed Sep 13 06:14:22 2006
New Revision: 9499

Log:
fav icon changed --Jeri

Modified:
    wordintegration/trunk/resources/images/vtiger.ico

Modified: wordintegration/trunk/resources/images/vtiger.ico
==============================================================================
Binary files - no diff available.




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 08:17:08 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 12:17:08 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9500 - in
 /wordintegration/trunk/client/source: frmAbout.frm frmAbout.frx frmConf.frm
 frmConf.frx frmvtigerLogin.frx frmvtigerTempate.frm frmvtigerTempate.frx
 vtigerCRMWordPlugin.vbw
Message-ID: <20060913121708.7CDF06D3060@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Wed Sep 13 06:16:44 2006
New Revision: 9500

Log:
fav icon modified --Jeri

Modified:
    wordintegration/trunk/client/source/frmAbout.frm
    wordintegration/trunk/client/source/frmAbout.frx
    wordintegration/trunk/client/source/frmConf.frm
    wordintegration/trunk/client/source/frmConf.frx
    wordintegration/trunk/client/source/frmvtigerLogin.frx
    wordintegration/trunk/client/source/frmvtigerTempate.frm
    wordintegration/trunk/client/source/frmvtigerTempate.frx
    wordintegration/trunk/client/source/vtigerCRMWordPlugin.vbw

Modified: wordintegration/trunk/client/source/frmAbout.frm
==============================================================================
Binary files - no diff available.

Modified: wordintegration/trunk/client/source/frmAbout.frx
==============================================================================
Binary files - no diff available.

Modified: wordintegration/trunk/client/source/frmConf.frm
==============================================================================
Binary files - no diff available.

Modified: wordintegration/trunk/client/source/frmConf.frx
==============================================================================
Binary files - no diff available.

Modified: wordintegration/trunk/client/source/frmvtigerLogin.frx
==============================================================================
Binary files - no diff available.

Modified: wordintegration/trunk/client/source/frmvtigerTempate.frm
==============================================================================
Binary files - no diff available.

Modified: wordintegration/trunk/client/source/frmvtigerTempate.frx
==============================================================================
Binary files - no diff available.

Modified: wordintegration/trunk/client/source/vtigerCRMWordPlugin.vbw
==============================================================================
Binary files - no diff available.




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 09:00:42 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 13:00:42 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9501 -
	/vtigertoolbar/trunk/firefox/chrome/skin/Site.gif
Message-ID: <20060913130042.E9F966D3087@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Wed Sep 13 07:00:20 2006
New Revision: 9501

Log:
Site Image Changed --Jeri

Modified:
    vtigertoolbar/trunk/firefox/chrome/skin/Site.gif

Modified: vtigertoolbar/trunk/firefox/chrome/skin/Site.gif
==============================================================================
Binary files - no diff available.




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 09:11:18 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 13:11:18 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9502 -
	/vtigercrm/trunk/modules/Users/User.php
Message-ID: <20060913131118.B589B6D3055@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Wed Sep 13 07:11:08 2006
New Revision: 9502

Log:
Typo error has been fixed --Jeri

Modified:
    vtigercrm/trunk/modules/Users/User.php

Modified: vtigercrm/trunk/modules/Users/User.php
==============================================================================
--- vtigercrm/trunk/modules/Users/User.php (original)
+++ vtigercrm/trunk/modules/Users/User.php Wed Sep 13 07:11:08 2006
@@ -921,7 +921,7 @@
 		{
 
 			$sql1 = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values(".$current_id.",".$current_user->id.",".$ownerid.",'".$module." Attachment','".$this->column_fields['description']."',".$this->db->formatString("vtiger_crmentity","createdtime",$date_var).",".$this->db->formatString("vtiger_crmentity","modifiedtime",$date_var).")";
-- 			$this->db->query($sql1);
+ 			$this->db->query($sql1);
 
 			$sql2="insert into vtiger_attachments(attachmentsid, name, description, type, path) values(".$current_id.",'".$filename."','".$this->column_fields['description']."','".$filetype."','".$upload_file_path."')";
 			$result=$this->db->query($sql2);




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 10:11:43 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 14:11:43 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9503 -
	/vtigercrm/trunk/themes/bluelagoon/style.css
Message-ID: <20060913141143.9CD436D3099@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Wed Sep 13 08:11:36 2006
New Revision: 9503

Log:
Tagcloud Css modified for blue lagoon --Jeri

Modified:
    vtigercrm/trunk/themes/bluelagoon/style.css

Modified: vtigercrm/trunk/themes/bluelagoon/style.css
==============================================================================
--- vtigercrm/trunk/themes/bluelagoon/style.css (original)
+++ vtigercrm/trunk/themes/bluelagoon/style.css Wed Sep 13 08:11:36 2006
@@ -2690,7 +2690,7 @@
 
 
 .tagCloud {
-    border:1px solid #737373;
+    border:1px solid #aaf;
 }
 
    
@@ -2700,7 +2700,7 @@
 }
 
 .tagCloudDisplay {
-    background-color:#e5e5e5;
+    background-color:#fff;
     padding:10px;
     font-family: Arial, Helvetica, sans-serif;
     font-size: 11px;
@@ -2761,7 +2761,7 @@
 }
 
 .tagCloudDisplay {
-	background-color:#e5e5e5;
+	background-color:#fff;
 	padding:5px;
 }
 	




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 10:12:22 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 14:12:22 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9504 - in
 /vtigercrm/trunk/themes/bluelagoon/images: tagCloudBg.gif tagCloudName.gif
Message-ID: <20060913141222.6B1646D3096@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Wed Sep 13 08:12:12 2006
New Revision: 9504

Log:
Tagcloud modified for blue lagoon --Jeri

Modified:
    vtigercrm/trunk/themes/bluelagoon/images/tagCloudBg.gif
    vtigercrm/trunk/themes/bluelagoon/images/tagCloudName.gif

Modified: vtigercrm/trunk/themes/bluelagoon/images/tagCloudBg.gif
==============================================================================
Binary files - no diff available.

Modified: vtigercrm/trunk/themes/bluelagoon/images/tagCloudName.gif
==============================================================================
Binary files - no diff available.




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 10:35:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 14:35:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9505 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060913143555.C76F76D3096@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 08:35:48 2006
New Revision: 9505

Log:
Fixed the default group population issue --by Don

Modified:
    vtigercrm/trunk/modules/Users/DefaultDataPopulator.php

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Wed Sep 13 08:35:48 2006
@@ -44,10 +44,6 @@
 		$profile2_id = $this->db->getUniqueID("vtiger_profile");
 		$profile3_id = $this->db->getUniqueID("vtiger_profile");
 		$profile4_id = $this->db->getUniqueID("vtiger_profile");
-
-		$group1_id = $this->db->getUniqueID("vtiger_groups");
-		$group2_id = $this->db->getUniqueID("vtiger_groups");
-		$group3_id = $this->db->getUniqueID("vtiger_groups");
 
                 $this->db->query("insert into vtiger_role values('H".$role1_id."','Organisation','H".$role1_id."',0)");
                 $this->db->query("insert into vtiger_role values('H".$role2_id."','CEO','H".$role1_id."::H".$role2_id."',1)");
@@ -920,21 +916,21 @@
                 // Insert End
 		
 		//Inserting into vtiger_groups table
+		$group1_id = $this->db->getUniqueID("vtiger_groups");
+ 		$group2_id = $this->db->getUniqueID("vtiger_groups");
+ 		$group3_id = $this->db->getUniqueID("vtiger_groups");
+		
 		$this->db->query("insert into vtiger_groups values ('".$group1_id."','Team Selling','Group Related to Sales')");	
 		$this->db->query("insert into vtiger_group2role values ('".$group1_id."','H".$role4_id."')");	
 		$this->db->query("insert into vtiger_group2rs values ('".$group1_id."','H".$role5_id."')");	
-		$this->db->query("insert into vtiger_users2group values ('".$group1_id."',2)");	
 
 		$this->db->query("insert into vtiger_groups values ('".$group2_id."','Marketing Group','Group Related to Marketing Activities')");	
 		$this->db->query("insert into vtiger_group2role values ('".$group2_id."','H".$role2_id."')");	
 		$this->db->query("insert into vtiger_group2rs values ('".$group2_id."','H".$role3_id."')");	
-		$this->db->query("insert into vtiger_users2group values ('".$group2_id."',1)");	
-		$this->db->query("insert into vtiger_users2group values ('".$group2_id."',2)");	
 
 		$this->db->query("insert into vtiger_groups values ('".$group3_id."','Support Group','Group Related to providing Support to Customers')");
 		$this->db->query("insert into vtiger_group2role values ('".$group3_id."','H".$role3_id."')");
 		$this->db->query("insert into vtiger_group2rs values ('".$group3_id."','H".$role3_id."')");
-		$this->db->query("insert into vtiger_users2group values ('".$group3_id."',2)");	
 
 		//New Security Start
 		//Inserting into vtiger_profile vtiger_table




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 10:40:33 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 14:40:33 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9506 -
	/vtigercrm/trunk/modules/Portal/Popup.php
Message-ID: <20060913144033.497526D305A@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Wed Sep 13 08:40:26 2006
New Revision: 9506

Log:
Theme path assigned to the close image in MySite Popup --Jeri

Modified:
    vtigercrm/trunk/modules/Portal/Popup.php

Modified: vtigercrm/trunk/modules/Portal/Popup.php
==============================================================================
--- vtigercrm/trunk/modules/Portal/Popup.php (original)
+++ vtigercrm/trunk/modules/Portal/Popup.php Wed Sep 13 08:40:26 2006
@@ -14,6 +14,10 @@
 global $app_list_strings;
 global $mod_strings;
 global $adb;
+
+global $theme;
+$theme_path="themes/".$theme."/";
+$image_path=$theme_path."images/";
 if(isset($_REQUEST['record']) && $_REQUEST['record'] !='')
 {
 	$portalid = $_REQUEST['record'];
@@ -27,7 +31,7 @@
 		<table border="0" cellpadding="3" cellspacing="0" width="100%" class="layerHeadingULine">
 		<tr>
 			<td class="layerPopupHeading" align="left" width="60%">' .$mod_strings['LBL_ADD'] .' '.$mod_strings['LBL_BOOKMARK'].'</td>
-			<td align="right" width="40%"><a href="javascript:fninvsh(\'orgLay\');"><img src="../themes/blue/images/close.gif" align="absmiddle" border="0"></a></td>
+			<td align="right" width="40%"><a href="javascript:fninvsh(\'orgLay\');"><img src="'.$image_path.'close.gif" align="absmiddle" border="0"></a></td>
 		</tr>
 		</table>
 <table border="0" cellspacing="0" cellpadding="5" width="95%" align="center"> 




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 10:47:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 14:47:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9507 -
 /vtigercrm/trunk/themes/woodspice/images/vtiger-crm.gif
Message-ID: <20060913144750.33AD56D4949@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Wed Sep 13 08:47:39 2006
New Revision: 9507

Log:
Vtiger Paw image icon changed --Jeri

Modified:
    vtigercrm/trunk/themes/woodspice/images/vtiger-crm.gif

Modified: vtigercrm/trunk/themes/woodspice/images/vtiger-crm.gif
==============================================================================
Binary files - no diff available.




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 10:49:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 14:49:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9508 -
 /vtigercrm/trunk/themes/images/loginTopHeaderName.gif
Message-ID: <20060913144902.AEE636D494C@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Wed Sep 13 08:48:54 2006
New Revision: 9508

Log:
Vtiger Paw image icon changed --Jeri

Modified:
    vtigercrm/trunk/themes/images/loginTopHeaderName.gif

Modified: vtigercrm/trunk/themes/images/loginTopHeaderName.gif
==============================================================================
Binary files - no diff available.




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 11:02:13 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 15:02:13 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9509 -
	/vtigercrm/trunk/install/5createTables.inc.php
Message-ID: <20060913150213.DC1736D3056@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 09:02:06 2006
New Revision: 9509

Log:
Fixed the default group population issue --by Don

Modified:
    vtigercrm/trunk/install/5createTables.inc.php

Modified: vtigercrm/trunk/install/5createTables.inc.php
==============================================================================
--- vtigercrm/trunk/install/5createTables.inc.php (original)
+++ vtigercrm/trunk/install/5createTables.inc.php Wed Sep 13 09:02:06 2006
@@ -100,6 +100,16 @@
 
         $user->save("Users");
 
+	//Inserting Entries into vtiger_groups table
+	$result = $db->query("select groupid from vtiger_groups where groupname='Team Selling';");
+ 	$group1_id = $db->query_result($result,0,"groupid");
+ 	$result = $db->query("select groupid from vtiger_groups where groupname='Marketing Group';");
+ 	$group2_id = $db->query_result($result,0,"groupid");
+ 	$result = $db->query("select groupid from vtiger_groups where groupname='Support Group';");
+ 	$group3_id = $db->query_result($result,0,"groupid");
+
+ 	$db->query("insert into vtiger_users2group values ('".$group2_id."',".$user->id.")");
+
         // we need to change the admin user to a fixed id of 1.
         //$query = "update vtiger_users set id='1' where user_name='$user->user_name'";
         //$result = $db->query($query, true, "Error updating admin user ID: ");
@@ -145,6 +155,10 @@
 	//Creating the flat vtiger_files
 	createUserPrivilegesfile($user->id);
         createUserSharingPrivilegesfile($user->id);
+
+	$db->query("insert into vtiger_users2group values ('".$group1_id."',".$user->id.")");
+ 	$db->query("insert into vtiger_users2group values ('".$group2_id."',".$user->id.")");
+ 	$db->query("insert into vtiger_users2group values ('".$group3_id."',".$user->id.")");
 
 }
 




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 11:04:54 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 15:04:54 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9510 -
 /vtigercrm/trunk/modules/Migration/MigrationCheck.php
Message-ID: <20060913150454.728886D3056@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 09:04:47 2006
New Revision: 9510

Log:
Modified the Migration Message -- By Mickie

Modified:
    vtigercrm/trunk/modules/Migration/MigrationCheck.php

Modified: vtigercrm/trunk/modules/Migration/MigrationCheck.php
==============================================================================
--- vtigercrm/trunk/modules/Migration/MigrationCheck.php (original)
+++ vtigercrm/trunk/modules/Migration/MigrationCheck.php Wed Sep 13 09:04:47 2006
@@ -395,7 +395,23 @@
 {
 	//Return to the MigrationStep1
 	include("modules/Migration/MigrationStep1.php");
-}
-
+	exit;
+}
 
 ?>
+	<script>
+		function displayMigrationSuccess()
+		{
+			document.getElementById("migration_image").style.display = "block";
+			document.getElementById("migration_message1").innerHTML = "Migration has been completed";
+			document.getElementById("migration_message2").innerHTML = "Your old data is now moved into new vtigerCRM";
+		}
+	</script>
+	<script>
+		displayMigrationSuccess();
+	</script>
+
+<?php
+
+
+?>




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 11:14:32 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 15:14:32 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9512 -
	/vtigercrm/trunk/modules/PurchaseOrder/Save.php
Message-ID: <20060913151432.678296D4954@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 09:14:24 2006
New Revision: 9512

Log:
Changed the status from delivered to received shipment when updating the stock -- BY Mickie

Modified:
    vtigercrm/trunk/modules/PurchaseOrder/Save.php

Modified: vtigercrm/trunk/modules/PurchaseOrder/Save.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/Save.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/Save.php Wed Sep 13 09:14:24 2006
@@ -36,7 +36,7 @@
 
 //Added code for auto product stock updation on receiving goods
 $update_prod_stock='';
-if($focus->column_fields['postatus'] == 'Delivered' && $focus->mode == 'edit')
+if($focus->column_fields['postatus'] == 'Received Shipment' && $focus->mode == 'edit')
 {
         $prev_postatus=getPoStatus($focus->id);
         if($focus->column_fields['postatus'] != $prev_postatus)




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 14:19:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 18:19:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9513 -
	/vtigercrm/trunk/install/2setConfig.php
Message-ID: <20060913181909.E475E6D306F@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 12:19:02 2006
New Revision: 9513

Log:
Fixed the Currency issue during installation -- By Philip

Modified:
    vtigercrm/trunk/install/2setConfig.php

Modified: vtigercrm/trunk/install/2setConfig.php
==============================================================================
--- vtigercrm/trunk/install/2setConfig.php (original)
+++ vtigercrm/trunk/install/2setConfig.php Wed Sep 13 12:19:02 2006
@@ -132,7 +132,9 @@
 	$admin_password = $_REQUEST['admin_password'];
 	
 	if (isset($_REQUEST['currency_name']))
-	$currency_name = $_REQUEST['currency_name'];
+		$currency_name = $_REQUEST['currency_name'];
+	else
+		$currency_name = '';
 	
 	if (isset($_REQUEST['currency_symbol']))
 	$currency_symbol = $_REQUEST['currency_symbol'];




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 14:30:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 18:30:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9514 -
	/customerportal/trunk/header.html
Message-ID: <20060913183057.4DD526D3049@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 12:30:50 2006
New Revision: 9514

Log:
added nowrap -- by mickie

Modified:
    customerportal/trunk/header.html

Modified: customerportal/trunk/header.html
==============================================================================
--- customerportal/trunk/header.html (original)
+++ customerportal/trunk/header.html Wed Sep 13 12:30:50 2006
@@ -31,7 +31,7 @@
    <tr>
     <th align="left"><img src="images/loginVtigerCRM.gif" width="169" height="49"></th>
     <th>&nbsp;</th>
-    <th align="right" style="padding-right:15px;">
+    <th align="right" style="padding-right:15px;" nowrap>
 	<span onclick="fnMySettings();" class="MySettingsHdr">My Settings</span>&nbsp;|&nbsp;
 	<a href="index.php?logout=true" class="hdr">Log Out</a></th>
    </tr>




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 14:35:17 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 18:35:17 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9515 -
	/vtigercrm/trunk/Smarty/templates/salesEditView.tpl
Message-ID: <20060913183517.E14876D306F@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 12:35:10 2006
New Revision: 9515

Log:
HardCoded Style removed and class added

Modified:
    vtigercrm/trunk/Smarty/templates/salesEditView.tpl

Modified: vtigercrm/trunk/Smarty/templates/salesEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/salesEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/salesEditView.tpl Wed Sep 13 12:35:10 2006
@@ -118,12 +118,12 @@
 							{if $header eq 'Comments' || $header eq 'Comment Information'}
 							   <tr><td>&nbsp;</td></tr>
 							   <tr>
-								<td colspan=4 style="border-bottom:1px solid #999999;padding:5px;" bgcolor="#e5e5e5">
-						        	<b>{$MOD.LBL_COMMENT_INFORMATION}</b>
+								<td colspan=4 class="dvInnerHeader">
+							        	<b>{$MOD.LBL_COMMENT_INFORMATION}</b>
 								</td>
 							   </tr>
 							   <tr>
-							   			<td colspan=4 class="dvtCellInfo">{$COMMENT_BLOCK}</td>
+								<td colspan=4 class="dvtCellInfo">{$COMMENT_BLOCK}</td>
 							   </tr>
 							   <tr><td>&nbsp;</td></tr>
 							{/if}




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 16:38:32 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 20:38:32 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9516 -
	/vtigercrm/trunk/log4php.properties
Message-ID: <20060913203833.15BE06D3049@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 14:38:26 2006
New Revision: 9516

Log:
Modified the logger level for installation and migration to debug from fatal -- By Don

Modified:
    vtigercrm/trunk/log4php.properties

Modified: vtigercrm/trunk/log4php.properties
==============================================================================
--- vtigercrm/trunk/log4php.properties (original)
+++ vtigercrm/trunk/log4php.properties Wed Sep 13 14:38:26 2006
@@ -7,7 +7,7 @@
 log4php.appender.A2.layout.DateFormat="%c"
 log4php.appender.A2.File=logs/security.log
 
-log4php.logger.INSTALL=FATAL,A3
+log4php.logger.INSTALL=DEBUG,A3
 log4php.appender.A3=LoggerAppenderRollingFile
 log4php.appender.A3.MaxFileSize=3MB
 log4php.appender.A3.MaxBackupIndex=10
@@ -25,7 +25,7 @@
 log4php.appender.A1.layout.DateFormat="%c"
 log4php.appender.A1.File=logs/vtigercrm.log
 
-log4php.logger.MIGRATION=FATAL,A4
+log4php.logger.MIGRATION=DEBUG,A4
 log4php.appender.A4=LoggerAppenderRollingFile
 log4php.appender.A4.MaxFileSize=3MB
 log4php.appender.A4.MaxBackupIndex=10




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 16:40:06 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 20:40:06 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9517 -
	/vtigercrm/trunk/soap/firefoxtoolbar.php
Message-ID: <20060913204007.659E16D3049@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 14:39:59 2006
New Revision: 9517

Log:
Title field renamed to notes_title -- By Don

Modified:
    vtigercrm/trunk/soap/firefoxtoolbar.php

Modified: vtigercrm/trunk/soap/firefoxtoolbar.php
==============================================================================
--- vtigercrm/trunk/soap/firefoxtoolbar.php (original)
+++ vtigercrm/trunk/soap/firefoxtoolbar.php Wed Sep 13 14:39:59 2006
@@ -447,7 +447,7 @@
 	$focus = new Note();
 	if(isPermitted("Notes","EditView") == "yes")
 	{
-		$focus->column_fields['title'] = $subject;
+		$focus->column_fields['notes_title'] = $subject;
 		$focus->column_fields['notecontent'] = $desc;
 
 		$focus->save("Notes");




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 17:22:24 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 21:22:24 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9518 -
	/vtigercrm/trunk/soap/vtigerolservice.php
Message-ID: <20060913212224.DBFA576D5F9@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 15:22:17 2006
New Revision: 9518

Log:
Removed the call for htmlentities. It is handled in crmentity save itself. -- By Jeri

Modified:
    vtigercrm/trunk/soap/vtigerolservice.php

Modified: vtigercrm/trunk/soap/vtigerolservice.php
==============================================================================
--- vtigercrm/trunk/soap/vtigerolservice.php (original)
+++ vtigercrm/trunk/soap/vtigerolservice.php Wed Sep 13 15:22:17 2006
@@ -327,7 +327,7 @@
         $email->column_fields[subject] = $email_subject;
         $email->column_fields[assigned_user_id] = $user_id;
         $email->column_fields[date_start] = $date_sent;
-        $email->column_fields[description]  = htmlentities($email_body);
+        $email->column_fields[description]  = $email_body;
         $email->column_fields[activitytype] = 'Emails'; 
         $email->plugin_save = true; 
         $email->save("Emails");




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 17:26:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 21:26:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9519 -
 /vtigertoolbar/trunk/firefox/chrome/content/vtiger_loginconfig.xul
Message-ID: <20060913212637.3F1466C87F3@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 15:26:30 2006
New Revision: 9519

Log:
Modified the Demo URL

Modified:
    vtigertoolbar/trunk/firefox/chrome/content/vtiger_loginconfig.xul

Modified: vtigertoolbar/trunk/firefox/chrome/content/vtiger_loginconfig.xul
==============================================================================
Binary files - no diff available.




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 17:31:10 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 21:31:10 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9520 -
	/thunderbirdextn/trunk/install.rdf
Message-ID: <20060913213110.1B04D6C87F3@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 15:31:02 2006
New Revision: 9520

Log:
version changed to 5.0.0 --Jeri

Modified:
    thunderbirdextn/trunk/install.rdf

Modified: thunderbirdextn/trunk/install.rdf
==============================================================================
Binary files - no diff available.




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 18:39:03 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 22:39:03 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9521 -
	/vtigercrm/trunk/Release_Notes.html
Message-ID: <20060913223903.9E9E366AE3F@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 16:38:55 2006
New Revision: 9521

Log:
Release Notes added for 5.0 GA

Modified:
    vtigercrm/trunk/Release_Notes.html

Modified: vtigercrm/trunk/Release_Notes.html
==============================================================================
--- vtigercrm/trunk/Release_Notes.html (original)
+++ vtigercrm/trunk/Release_Notes.html Wed Sep 13 16:38:55 2006
@@ -18,11 +18,90 @@
 	color: #FF0000;
 	font-weight: bold;
 }
+  .style2 {
+	color: #0000FF;
+	font-weight: bold;
+}
   </style>
 </head>
 
 <body class="background">
-<p><img src="themes/images/vtiger.jpg" height="48" width="112"> </p>
+<p><img src="themes/images/vtiger.jpg" height="48" width="112"></p>
+<h1>vtiger CRM 5.0: Release Notes</h1>
+<p><b>Date: Sep 14, 2006</b></p>
+<p>Welcome to vtiger CRM!</p>
+<p>vtiger CRM is an enterprise-ready open source CRM solution for managing sales, marketing, customer support and order management functions effectively. Before version 5 release, vtiger CRM has passed through more than 10 development cycles.  </p>
+<p>&nbsp;</p>
+<p><b><i>Appeal to Developers, Testers, Analysts, Writers, and real end users! </i> </b></p>
+<p>Jump-start to the vtiger Public Discussions and post your valuable suggestions &amp; comments to help us deliver a world class open source CRM for you in another few weeks time. It is very simple to start working with vtiger CRM 5,</p>
+<p><b><font size="3">Step 1:</font></b> Browse through <a href="http://en.vtiger.com"><b>Live Demo</b></a></p>
+<p><b><font size="3">Step 2:</font></b> Download product from the <a href="http://vtiger.com/index.php?option=com_content&amp;task=view&amp;id=70&amp;Itemid=109"><b>vtiger.com</b></a> and install in your favorite OS.</p>
+<p><b><font size="3">Step 3:</font></b> Post your suggestions &amp; comments at vtiger Discussions under : <a href="http://forums.vtiger.com/index.php?c=10"><b>vtiger CRM 5.x</b></a> category</p>
+<p><b><a name="TOC3" id="TOC3"></a>Table of Contents</b></p>
+<ol>
+  <li><a href="#Summary5-v5">Summary</a></li>
+  <li><a href="#Features5-v5">Features</a></li>
+  <li><a href="#v5_Bug_Fixes-v5">Bug Fixes</a></li>
+  <li><a href="#KI5-v5">Known Issues </a></li>
+</ol>
+<h3><a name="Summary5-v5" id="Summary5-v5"></a>1. Summary</h3>
+<table border="1" cellpadding="5" cellspacing="0" width="73%">
+  <tbody>
+    <tr bgcolor="#ccccff">
+      <td width="5%"><b><font color="#990000">S. No</font></b></td>
+      <td width="40%"><b><font color="#990000">Item</font></b></td>
+      <td width="55%"><b><font color="#990000">Status</font></b></td>
+    </tr>
+    <tr>
+      <td width="5%">1 </td>
+      <td width="40%">Features</td>
+      <td width="55%">
+        <p>10</p></td>
+    </tr>
+    <tr>
+      <td width="5%">3</td>
+      <td width="40%">Product Size</td>
+      <td width="55%">Platform Independent - <b>6.1 MB<br />
+        </b>Windows (EXE) - <b>26 MB</b><br />
+        Linux (BIN) - <b>40 MB</b></td>
+    </tr>
+    <tr>
+      <td width="5%">4</td>
+      <td width="40%">Database Migration</td>
+      <td width="55%"><span class="style2">Available for migrating data from 4.2.3 , 4.2.4, or 5.0 RC to v5.0</span></td>
+    </tr>
+    <tr>
+      <td width="5%">5</td>
+      <td width="40%">vtiger CRM - PHP Documentation</td>
+      <td width="55%"> URL: <a href="http://api.vtiger.com/index.php">Click Here</a></td>
+    </tr>
+    <tr>
+      <td width="5%">6</td>
+      <td width="40%">Product Documentation</td>
+      <td width="55%"><p>Available at the <a href="http://wiki.vtiger.com/index.php">Wiki</a></p></td>
+    </tr>
+  </tbody>
+</table>
+<h3><a name="Features5-v5" id="Features5-v5"></a>2. Features</h3>
+<ul>
+  <li>AJAX based User Interface</li>
+  <li>Color Schemes</li>
+  <li> Enterprise-grade Security Management</li>
+  <li>Calendaring</li>
+  <li>Email Client</li>
+  <li> Customization</li>
+  <li>Reports &amp; Dashboard </li>
+  <li>Order Management </li>
+  <li> Marketing Automation </li>
+</ul>
+<p>For more details refer to: <a href="http://www.vtiger.com/products/crm/v5-release-notes.pdf">http://www.vtiger.com/products/crm/v5-release-notes.pdf</a></p>
+<h3><a name="v5_Bug_Fixes-v5" id="v5_Bug_Fixes-v5"></a>Bug Fixes</h3>
+<p>We have fixed about 200 issues after v5 RC release. For more details, kindly refer to the vtiger CRM Bug Tracker:</p>
+<p><a href="http://vtiger.fosslabs.com/cgi-bin/trac.cgi/query?status=closed&amp;group=owner&amp;version=5.0.0&amp;order=priority%20">http://vtiger.fosslabs.com/cgi-bin/trac.cgi/query?status=closed&amp;group=owner&amp;version=5.0.0&amp;order=priority </a></p>
+<h3><a name="KI5-v5" id="KI5-v5"></a>4. Known Issues</h3>
+<p>As on Sep 14, 2006 there are about 240 open issues. For more details, kindly refer to the vtiger CRM Bug Tracker:</p>
+<p><a href="http://vtiger.fosslabs.com/cgi-bin/trac.cgi/query?status=new&status=assigned&status=reopened&milestone=5.0.1&milestone=&order=priority">http://vtiger.fosslabs.com/cgi-bin/trac.cgi/query?status=new&amp;status=assigned&amp;status=reopened&amp;milestone=5.0.1&amp;milestone=&amp;order=priority</a></p>
+<hr />
 <h1>vtiger CRM 5.0 RC1: Release Notes</h1>
 <p><b>Date: Aug 14, 2006</b></p>
 <p> vtiger CRM 5.0 RC1, is ready for the last-round of validation before GA release!</p>




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 19:03:06 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 23:03:06 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9522 -
 /thunderbirdextn/trunk/chrome/vtiger/content/vtiger/vtiger.js
Message-ID: <20060913230306.0F20276CEC5@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 17:02:58 2006
New Revision: 9522

Log:
Fixed issue while adding email to vtiger -- By Jeri

Modified:
    thunderbirdextn/trunk/chrome/vtiger/content/vtiger/vtiger.js

Modified: thunderbirdextn/trunk/chrome/vtiger/content/vtiger/vtiger.js
==============================================================================
Binary files - no diff available.




From vtigercrm-commits at vtiger.fosslabs.com  Wed Sep 13 19:16:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 13 Sep 2006 23:16:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9523 -
	/vtigercrm/trunk/Release_Notes.html
Message-ID: <20060913231640.1F19676E197@vtiger.fosslabs.com>

Author: richie
Date: Wed Sep 13 17:16:32 2006
New Revision: 9523

Log:
Issues in Release Notes Fixed --By gopal

Modified:
    vtigercrm/trunk/Release_Notes.html

Modified: vtigercrm/trunk/Release_Notes.html
==============================================================================
--- vtigercrm/trunk/Release_Notes.html (original)
+++ vtigercrm/trunk/Release_Notes.html Wed Sep 13 17:16:32 2006
@@ -27,16 +27,10 @@
 
 <body class="background">
 <p><img src="themes/images/vtiger.jpg" height="48" width="112"></p>
-<h1>vtiger CRM 5.0: Release Notes</h1>
+<h1>vtiger CRM 5.0.0: Release Notes</h1>
 <p><b>Date: Sep 14, 2006</b></p>
 <p>Welcome to vtiger CRM!</p>
-<p>vtiger CRM is an enterprise-ready open source CRM solution for managing sales, marketing, customer support and order management functions effectively. Before version 5 release, vtiger CRM has passed through more than 10 development cycles.  </p>
-<p>&nbsp;</p>
-<p><b><i>Appeal to Developers, Testers, Analysts, Writers, and real end users! </i> </b></p>
-<p>Jump-start to the vtiger Public Discussions and post your valuable suggestions &amp; comments to help us deliver a world class open source CRM for you in another few weeks time. It is very simple to start working with vtiger CRM 5,</p>
-<p><b><font size="3">Step 1:</font></b> Browse through <a href="http://en.vtiger.com"><b>Live Demo</b></a></p>
-<p><b><font size="3">Step 2:</font></b> Download product from the <a href="http://vtiger.com/index.php?option=com_content&amp;task=view&amp;id=70&amp;Itemid=109"><b>vtiger.com</b></a> and install in your favorite OS.</p>
-<p><b><font size="3">Step 3:</font></b> Post your suggestions &amp; comments at vtiger Discussions under : <a href="http://forums.vtiger.com/index.php?c=10"><b>vtiger CRM 5.x</b></a> category</p>
+<p>vtiger CRM is an enterprise-ready open source CRM solution for managing sales, marketing, customer support and order management functions effectively. Before version 5 release, vtiger CRM has passed through more than 10 development cycles. </p>
 <p><b><a name="TOC3" id="TOC3"></a>Table of Contents</b></p>
 <ol>
   <li><a href="#Summary5-v5">Summary</a></li>
@@ -71,14 +65,19 @@
       <td width="55%"><span class="style2">Available for migrating data from 4.2.3 , 4.2.4, or 5.0 RC to v5.0</span></td>
     </tr>
     <tr>
-      <td width="5%">5</td>
+      <td>5</td>
+      <td>Product Download </td>
+      <td><a href="http://www.vtiger.com/index.php?option=com_content&task=view&id=30&Itemid=57" target="_blank">Click Here</a></td>
+    </tr>
+    <tr>
+      <td width="5%">6</td>
       <td width="40%">vtiger CRM - PHP Documentation</td>
-      <td width="55%"> URL: <a href="http://api.vtiger.com/index.php">Click Here</a></td>
-    </tr>
-    <tr>
-      <td width="5%">6</td>
+      <td width="55%"> URL: <a href="http://api.vtiger.com/index.php" target="_blank">Click Here</a></td>
+    </tr>
+    <tr>
+      <td width="5%">7</td>
       <td width="40%">Product Documentation</td>
-      <td width="55%"><p>Available at the <a href="http://wiki.vtiger.com/index.php">Wiki</a></p></td>
+      <td width="55%"><p>Available at the <a href="http://wiki.vtiger.com/index.php" target="_blank">Wiki</a></p></td>
     </tr>
   </tbody>
 </table>
@@ -94,13 +93,11 @@
   <li>Order Management </li>
   <li> Marketing Automation </li>
 </ul>
-<p>For more details refer to: <a href="http://www.vtiger.com/products/crm/v5-release-notes.pdf">http://www.vtiger.com/products/crm/v5-release-notes.pdf</a></p>
+<p>For more details refer to: <a href="http://www.vtiger.com/products/crm/vtigercrm-5-release-notes.pdf">http://www.vtiger.com/products/crm/v5-release-notes.pdf</a></p>
 <h3><a name="v5_Bug_Fixes-v5" id="v5_Bug_Fixes-v5"></a>Bug Fixes</h3>
-<p>We have fixed about 200 issues after v5 RC release. For more details, kindly refer to the vtiger CRM Bug Tracker:</p>
-<p><a href="http://vtiger.fosslabs.com/cgi-bin/trac.cgi/query?status=closed&amp;group=owner&amp;version=5.0.0&amp;order=priority%20">http://vtiger.fosslabs.com/cgi-bin/trac.cgi/query?status=closed&amp;group=owner&amp;version=5.0.0&amp;order=priority </a></p>
+<p>We have fixed about 200 issues after v5 RC release. For more details, kindly refer to the <strong><a href="http://vtiger.fosslabs.com/cgi-bin/trac.cgi/query?status=closed&group=owner&version=5.0.0&order=priority%20" target="_blank">vtiger CRM Bug Tracker</a>.</strong></p>
 <h3><a name="KI5-v5" id="KI5-v5"></a>4. Known Issues</h3>
-<p>As on Sep 14, 2006 there are about 240 open issues. For more details, kindly refer to the vtiger CRM Bug Tracker:</p>
-<p><a href="http://vtiger.fosslabs.com/cgi-bin/trac.cgi/query?status=new&status=assigned&status=reopened&milestone=5.0.1&milestone=&order=priority">http://vtiger.fosslabs.com/cgi-bin/trac.cgi/query?status=new&amp;status=assigned&amp;status=reopened&amp;milestone=5.0.1&amp;milestone=&amp;order=priority</a></p>
+<p>As on Sep 14, 2006 there are about 178 open issues. For more details, kindly refer to the<a href="http://vtiger.fosslabs.com/cgi-bin/trac.cgi/query?status=new&status=assigned&status=reopened&milestone=5.0.1&milestone=&type=defect&order=priority" target="_blank"><strong> vtiger CRM Bug Tracker</strong></a>:</p>
 <hr />
 <h1>vtiger CRM 5.0 RC1: Release Notes</h1>
 <p><b>Date: Aug 14, 2006</b></p>




From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep 14 02:35:28 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 14 Sep 2006 06:35:28 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9524 -
	/vtigercrm/trunk/modules/Home/index.php
Message-ID: <20060914063528.EDB3E76F91E@vtiger.fosslabs.com>

Author: richie
Date: Thu Sep 14 00:35:13 2006
New Revision: 9524

Log:
My Group Allocation link in home page fixed

Modified:
    vtigercrm/trunk/modules/Home/index.php

Modified: vtigercrm/trunk/modules/Home/index.php
==============================================================================
--- vtigercrm/trunk/modules/Home/index.php (original)
+++ vtigercrm/trunk/modules/Home/index.php Thu Sep 14 00:35:13 2006
@@ -280,8 +280,9 @@
 					$list = '<a href=index.php?module=HelpDesk';
 					$list .= '&action=DetailView&record='.$row["id"].'>'.$row["name"].'</a>';
 				}
-				elseif($row["type"] == "Calendar")
+				elseif($row["type"] == "Activities")
 				{
+					$row["type"] = 'Calendar';
 					$acti_type = getActivityType($row["id"]);
 					$list = '<a href=index.php?module='.$row["type"];
 					if($acti_type == 'Task')




From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep 14 03:52:17 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 14 Sep 2006 07:52:17 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9525 -
	/vtigercrm/trunk/modules/Quotes/CreatePDF.php
Message-ID: <20060914075217.22F5076F934@vtiger.fosslabs.com>

Author: richie
Date: Thu Sep 14 01:52:08 2006
New Revision: 9525

Log:
Create PDF issue in windows machine has been fixed --By Jeri

Modified:
    vtigercrm/trunk/modules/Quotes/CreatePDF.php

Modified: vtigercrm/trunk/modules/Quotes/CreatePDF.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/CreatePDF.php (original)
+++ vtigercrm/trunk/modules/Quotes/CreatePDF.php Thu Sep 14 01:52:08 2006
@@ -229,5 +229,5 @@
 
 
 $pdf->Output('Quotes.pdf','D'); //added file name to make it work in IE, also forces the download giving the user the option to save
-
+exit();
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep 14 03:53:24 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 14 Sep 2006 07:53:24 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9526 -
	/vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php
Message-ID: <20060914075324.286F276F932@vtiger.fosslabs.com>

Author: richie
Date: Thu Sep 14 01:53:14 2006
New Revision: 9526

Log:
Create PDF issue in windows machine has been fixed --By Jeri

Modified:
    vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php

Modified: vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php Thu Sep 14 01:53:14 2006
@@ -228,5 +228,5 @@
 
 
 $pdf->Output('PurchaseOrder.pdf','D'); //added file name to make it work in IE, also forces the download giving the user the option to save
-
+exit();
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep 14 04:01:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 14 Sep 2006 08:01:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9527 -
	/vtigercrm/trunk/modules/Invoice/EditView.php
Message-ID: <20060914080157.7C82B76F932@vtiger.fosslabs.com>

Author: richie
Date: Thu Sep 14 02:01:26 2006
New Revision: 9527

Log:
Fixed the Sales Order Handling -- By Mickie

Modified:
    vtigercrm/trunk/modules/Invoice/EditView.php

Modified: vtigercrm/trunk/modules/Invoice/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/EditView.php (original)
+++ vtigercrm/trunk/modules/Invoice/EditView.php Thu Sep 14 02:01:26 2006
@@ -111,6 +111,18 @@
         $focus->mode = 'edit';
         $focus->name=$focus->column_fields['subject'];
 
+	/*
+	//Added to display the SO's associated products -- when we select SO in Edit Invoice page
+	if(isset($_REQUEST['salesorder_id']) && $_REQUEST['salesorder_id'] !='')
+	{
+		$associated_prod = getAssociatedProducts("SalesOrder",$so_focus,$focus->column_fields['salesorder_id']);
+	}
+
+	$smarty->assign("SALESORDER_ID", $focus->column_fields['salesorder_id']);
+	$smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
+	$smarty->assign("MODE", $so_focus->mode);
+	$smarty->assign("AVAILABLE_PRODUCTS", 'true');
+	*/
     }		
     else
     {	
@@ -146,6 +158,17 @@
 		$so_focus->id = $soid;
 		$so_focus->retrieve_entity_info($soid,"SalesOrder");
 		$focus = getConvertSoToInvoice($focus,$so_focus,$soid);
+
+		//Added to display the SO's associated products -- when we select SO in New Invoice page
+		if(isset($_REQUEST['salesorder_id']) && $_REQUEST['salesorder_id'] !='')
+		{
+			$associated_prod = getAssociatedProducts("SalesOrder",$so_focus,$focus->column_fields['salesorder_id']);
+		}
+
+		$smarty->assign("SALESORDER_ID", $focus->column_fields['salesorder_id']);
+		$smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
+		$smarty->assign("MODE", $so_focus->mode);
+		$smarty->assign("AVAILABLE_PRODUCTS", 'true');
 
 	}
 }
@@ -240,6 +263,13 @@
 {
 	$smarty->assign("MODE", $focus->mode);
 	$se_array=getProductDetailsBlockInfo($focus->mode,"SalesOrder",$so_focus);
+
+	$txtTax = (($so_focus->column_fields['txtTax'] != '')?$so_focus->column_fields['txtTax']:'0.000');
+	$txtAdj = (($so_focus->column_fields['txtAdjustment'] != '')?$so_focus->column_fields['txtAdjustment']:'0.000');
+	
+	$associated_prod = getAssociatedProducts("SalesOrder",$so_focus);
+	$smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
+	$smarty->assign("MODE", $focus->mode);
 }
 elseif($focus->mode == 'edit')
 {




From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep 14 04:05:35 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 14 Sep 2006 08:05:35 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9528 -
	/vtigercrm/trunk/Release_Notes.html
Message-ID: <20060914080536.210586FDF50@vtiger.fosslabs.com>

Author: richie
Date: Thu Sep 14 02:05:27 2006
New Revision: 9528

Log:
Fixed issues --By philip

Modified:
    vtigercrm/trunk/Release_Notes.html

Modified: vtigercrm/trunk/Release_Notes.html
==============================================================================
--- vtigercrm/trunk/Release_Notes.html (original)
+++ vtigercrm/trunk/Release_Notes.html Thu Sep 14 02:05:27 2006
@@ -50,32 +50,32 @@
       <td width="5%">1 </td>
       <td width="40%">Features</td>
       <td width="55%">
-        <p>10</p></td>
-    </tr>
-    <tr>
-      <td width="5%">3</td>
+        &nbsp;</td>
+    </tr>
+    <tr>
+	    <td width="5%">2</td>
       <td width="40%">Product Size</td>
       <td width="55%">Platform Independent - <b>6.1 MB<br />
         </b>Windows (EXE) - <b>26 MB</b><br />
         Linux (BIN) - <b>40 MB</b></td>
     </tr>
     <tr>
-      <td width="5%">4</td>
+	    <td width="5%">3</td>
       <td width="40%">Database Migration</td>
       <td width="55%"><span class="style2">Available for migrating data from 4.2.3 , 4.2.4, or 5.0 RC to v5.0</span></td>
     </tr>
     <tr>
-      <td>5</td>
+	    <td>4</td>
       <td>Product Download </td>
       <td><a href="http://www.vtiger.com/index.php?option=com_content&task=view&id=30&Itemid=57" target="_blank">Click Here</a></td>
     </tr>
     <tr>
-      <td width="5%">6</td>
+	    <td width="5%">5</td>
       <td width="40%">vtiger CRM - PHP Documentation</td>
       <td width="55%"> URL: <a href="http://api.vtiger.com/index.php" target="_blank">Click Here</a></td>
     </tr>
     <tr>
-      <td width="5%">7</td>
+	    <td width="5%">6</td>
       <td width="40%">Product Documentation</td>
       <td width="55%"><p>Available at the <a href="http://wiki.vtiger.com/index.php" target="_blank">Wiki</a></p></td>
     </tr>
@@ -94,7 +94,7 @@
   <li> Marketing Automation </li>
 </ul>
 <p>For more details refer to: <a href="http://www.vtiger.com/products/crm/vtigercrm-5-release-notes.pdf">http://www.vtiger.com/products/crm/v5-release-notes.pdf</a></p>
-<h3><a name="v5_Bug_Fixes-v5" id="v5_Bug_Fixes-v5"></a>Bug Fixes</h3>
+<h3><a name="v5_Bug_Fixes-v5" id="v5_Bug_Fixes-v5"></a>3. Bug Fixes</h3>
 <p>We have fixed about 200 issues after v5 RC release. For more details, kindly refer to the <strong><a href="http://vtiger.fosslabs.com/cgi-bin/trac.cgi/query?status=closed&group=owner&version=5.0.0&order=priority%20" target="_blank">vtiger CRM Bug Tracker</a>.</strong></p>
 <h3><a name="KI5-v5" id="KI5-v5"></a>4. Known Issues</h3>
 <p>As on Sep 14, 2006 there are about 178 open issues. For more details, kindly refer to the<a href="http://vtiger.fosslabs.com/cgi-bin/trac.cgi/query?status=new&status=assigned&status=reopened&milestone=5.0.1&milestone=&type=defect&order=priority" target="_blank"><strong> vtiger CRM Bug Tracker</strong></a>:</p>




From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep 14 07:37:58 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 14 Sep 2006 11:37:58 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9529 -
	/vtigercrm/tags/vtigercrm-5.0.0/
Message-ID: <20060914113758.3D59376F949@vtiger.fosslabs.com>

Author: richie
Date: Thu Sep 14 05:37:04 2006
New Revision: 9529

Log:
made a copy

Added:
    vtigercrm/tags/vtigercrm-5.0.0/
      - copied from r9528, vtigercrm/trunk/




From vtigercrm-commits at vtiger.fosslabs.com  Fri Sep 15 07:33:17 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 15 Sep 2006 11:33:17 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9530 -
	/vtigercrm/tags/vtigercrm-outlook-plugin-5.0.0/
Message-ID: <20060915113317.6713666A734@vtiger.fosslabs.com>

Author: richie
Date: Fri Sep 15 05:33:03 2006
New Revision: 9530

Log:
Tagging the v5 Outlook Plugin source

Added:
    vtigercrm/tags/vtigercrm-outlook-plugin-5.0.0/
      - copied from r9529, vtigercrmoutlook/trunk/




From vtigercrm-commits at vtiger.fosslabs.com  Fri Sep 15 07:38:04 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 15 Sep 2006 11:38:04 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9531 -
	/vtigercrm/tags/vtigercrm-office-plugin-5.0.0/
Message-ID: <20060915113804.19EF7748327@vtiger.fosslabs.com>

Author: richie
Date: Fri Sep 15 05:37:50 2006
New Revision: 9531

Log:
Tagging the v5 Office Plugin source

Added:
    vtigercrm/tags/vtigercrm-office-plugin-5.0.0/
      - copied from r9530, wordintegration/trunk/




From vtigercrm-commits at vtiger.fosslabs.com  Fri Sep 15 07:41:05 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 15 Sep 2006 11:41:05 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9532 -
	/vtigercrm/tags/vtigercrm-tbird-plugin-5.0.0/
Message-ID: <20060915114105.63D096D3073@vtiger.fosslabs.com>

Author: richie
Date: Fri Sep 15 05:40:46 2006
New Revision: 9532

Log:
Tagging the v5 ThunderBird Plugin source

Added:
    vtigercrm/tags/vtigercrm-tbird-plugin-5.0.0/
      - copied from r9531, thunderbirdextn/trunk/




From vtigercrm-commits at vtiger.fosslabs.com  Fri Sep 15 07:46:14 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 15 Sep 2006 11:46:14 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9533 -
	/vtigercrm/tags/vtigercrm-fxtoolbar-5.0.0/
Message-ID: <20060915114614.192F376FE98@vtiger.fosslabs.com>

Author: richie
Date: Fri Sep 15 05:45:53 2006
New Revision: 9533

Log:
Tagging the v5 FireFox ToolBar source

Added:
    vtigercrm/tags/vtigercrm-fxtoolbar-5.0.0/
      - copied from r9532, vtigertoolbar/trunk/




From vtigercrm-commits at vtiger.fosslabs.com  Fri Sep 15 07:56:25 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 15 Sep 2006 11:56:25 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9534 -
	/vtigercrm/tags/vtigercrm-customerportal-5.0.0/
Message-ID: <20060915115625.A32ED76FE9D@vtiger.fosslabs.com>

Author: richie
Date: Fri Sep 15 05:55:55 2006
New Revision: 9534

Log:
Tagging the v5 Customer Portal source

Added:
    vtigercrm/tags/vtigercrm-customerportal-5.0.0/
      - copied from r9533, customerportal/trunk/




From vtigercrm-commits at vtiger.fosslabs.com  Fri Sep 15 08:13:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 15 Sep 2006 12:13:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9535 -
	/vtigercrm/tags/vtigercrm-webforms-5.0.0/
Message-ID: <20060915121337.56CF176FE9F@vtiger.fosslabs.com>

Author: richie
Date: Fri Sep 15 06:13:03 2006
New Revision: 9535

Log:
Tagging the v5 web forms source

Added:
    vtigercrm/tags/vtigercrm-webforms-5.0.0/
      - copied from r9534, vtiger_webforms/trunk/




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 19 07:53:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 19 Sep 2006 11:53:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9536 -
	/vtigercrm/branches/5.0.1/
Message-ID: <20060919115338.364FB76FEA6@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep 19 05:53:16 2006
New Revision: 9536

Log:
Creating a branch for 5.0.1

Added:
    vtigercrm/branches/5.0.1/
      - copied from r9529, vtigercrm/trunk/




From vtigercrm-commits at vtiger.fosslabs.com  Tue Sep 19 07:56:15 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 19 Sep 2006 11:56:15 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9537 -
	/vtigercrm/branches/5.1/
Message-ID: <20060919115615.4A74076FEE9@vtiger.fosslabs.com>

Author: richie
Date: Tue Sep 19 05:56:02 2006
New Revision: 9537

Log:
Creating a branch for 5.1 release

Added:
    vtigercrm/branches/5.1/
      - copied from r9529, vtigercrm/trunk/




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 25 05:44:58 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 25 Sep 2006 09:44:58 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9538 -
	/vtigercrm/branches/5.0.1/jscalendar/calendar.js
Message-ID: <20060925094458.9514B76FF14@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep 25 03:44:35 2006
New Revision: 9538

Log:
Year selection fix in IE - contribution by brian

Modified:
    vtigercrm/branches/5.0.1/jscalendar/calendar.js

Modified: vtigercrm/branches/5.0.1/jscalendar/calendar.js
==============================================================================
--- vtigercrm/branches/5.0.1/jscalendar/calendar.js (original)
+++ vtigercrm/branches/5.0.1/jscalendar/calendar.js Mon Sep 25 03:44:35 2006
@@ -1703,7 +1703,9 @@
 	return str;
 };
 
+if ( Date.prototype.__msh_oldSetFullYear == null ) {
 Date.prototype.__msh_oldSetFullYear = Date.prototype.setFullYear;
+}
 Date.prototype.setFullYear = function(y) {
 	var d = new Date(this);
 	d.__msh_oldSetFullYear(y);




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 25 06:52:16 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 25 Sep 2006 10:52:16 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9539 -
	/vtigercrm/branches/5.0.1/include/utils/utils.php
Message-ID: <20060925105216.BA2C077049B@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep 25 04:52:10 2006
New Revision: 9539

Log:
Quick fix for Firefox toolbar - contribution by Devis

Modified:
    vtigercrm/branches/5.0.1/include/utils/utils.php

Modified: vtigercrm/branches/5.0.1/include/utils/utils.php
==============================================================================
--- vtigercrm/branches/5.0.1/include/utils/utils.php (original)
+++ vtigercrm/branches/5.0.1/include/utils/utils.php Mon Sep 25 04:52:10 2006
@@ -837,7 +837,8 @@
 	$log->debug("Entering to_html(".$string.",".$encode.") method ...");
         global $toHtml;
         if($encode && is_string($string)){//$string = htmlentities($string, ENT_QUOTES);
-        $string = str_replace(array_keys($toHtml), array_values($toHtml), $string);
+		if (is_array($toHtml))
+        		$string = str_replace(array_keys($toHtml), array_values($toHtml), $string);
         }
 	$log->debug("Exiting to_html method ...");
         return $string;




From vtigercrm-commits at vtiger.fosslabs.com  Mon Sep 25 09:06:23 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 25 Sep 2006 13:06:23 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9540 - in
 /vtigercrm/branches/5.0.1/themes: alphagrey/style.css bluelagoon/style.css
 woodspice/style.css
Message-ID: <20060925130623.E45737704A7@vtiger.fosslabs.com>

Author: richie
Date: Mon Sep 25 07:06:16 2006
New Revision: 9540

Log:
AllMenu div problem - contribution by brian

Modified:
    vtigercrm/branches/5.0.1/themes/alphagrey/style.css
    vtigercrm/branches/5.0.1/themes/bluelagoon/style.css
    vtigercrm/branches/5.0.1/themes/woodspice/style.css

Modified: vtigercrm/branches/5.0.1/themes/alphagrey/style.css
==============================================================================
--- vtigercrm/branches/5.0.1/themes/alphagrey/style.css (original)
+++ vtigercrm/branches/5.0.1/themes/alphagrey/style.css Mon Sep 25 07:06:16 2006
@@ -2090,7 +2090,7 @@
     left:200px;
     top:100px;
     position:absolute;
-    z-index:1000001;
+    z-index:10000001;
     display:none;
     padding:10px;
     background:#ffffff url(images/layerPopUpBg.gif);

Modified: vtigercrm/branches/5.0.1/themes/bluelagoon/style.css
==============================================================================
--- vtigercrm/branches/5.0.1/themes/bluelagoon/style.css (original)
+++ vtigercrm/branches/5.0.1/themes/bluelagoon/style.css Mon Sep 25 07:06:16 2006
@@ -2091,7 +2091,7 @@
     left:300px;
     top:100px;
     position:absolute;
-    z-index:1000001;
+    z-index:10000001;
     display:none;
     padding:10px;
     background:#ffffff url(images/layerPopUpBg.gif);

Modified: vtigercrm/branches/5.0.1/themes/woodspice/style.css
==============================================================================
--- vtigercrm/branches/5.0.1/themes/woodspice/style.css (original)
+++ vtigercrm/branches/5.0.1/themes/woodspice/style.css Mon Sep 25 07:06:16 2006
@@ -2125,7 +2125,7 @@
     left:300px;
     top:100px;
     position:absolute;
-    z-index:1000001;
+    z-index:10000001;
     display:none;
     padding:10px;
     background:#ffffff url(images/layerPopUpBg.gif);




From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep 28 08:15:00 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 28 Sep 2006 12:15:00 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9541 -
 /vtigercrm/branches/5.0.1/Smarty/templates/ListEmailTemplates.tpl
Message-ID: <20060928121500.ABDFA78768B@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Thu Sep 28 06:14:52 2006
New Revision: 9541

Log:
If Email Selected then hide the Add button --By Vashini

Modified:
    vtigercrm/branches/5.0.1/Smarty/templates/ListEmailTemplates.tpl

Modified: vtigercrm/branches/5.0.1/Smarty/templates/ListEmailTemplates.tpl
==============================================================================
--- vtigercrm/branches/5.0.1/Smarty/templates/ListEmailTemplates.tpl (original)
+++ vtigercrm/branches/5.0.1/Smarty/templates/ListEmailTemplates.tpl Thu Sep 28 06:14:52 2006
@@ -9,10 +9,43 @@
   *
  ********************************************************************************/
 -->*}
+
 <script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
 <script>
+function ifselected()
+{ldelim}
+  
+      
+      var sel =document.massdelete.selected_id.length;
+      var returnval=false;
+      
+     for(i=0; i < sel; i++)
+     {ldelim}
+     
+      if(document.massdelete.selected_id[i].checked == true)
+        {ldelim}
+            returnval=true;
+            break;
+        {rdelim}
+        
+      {rdelim}
+      
+      
+          if(returnval==true)
+           {ldelim}
+               document.getElementById("myProfile").style.display="none";
+           {rdelim}
+          else
+           {ldelim}
+              document.getElementById("myProfile").style.display="block";
+          {rdelim}
+    	
+{rdelim}
+
+
 function massDelete()
 {ldelim}
+        
         x = document.massdelete.selected_id.length;
         idstring = "";
 
@@ -22,11 +55,15 @@
                 if (document.massdelete.selected_id.checked)
                {ldelim}
                         document.massdelete.idlist.value=document.massdelete.selected_id.value+';';
+                          
+                        
 			xx=1;
                 {rdelim}
                 else
                 {ldelim}
+                         document.massdelete.profile.style.display="none";
                         alert("Please select at least one entity");
+                        
                         return false;
                 {rdelim}
         {rdelim}
@@ -103,7 +140,7 @@
 					<table border=0 cellspacing=0 cellpadding=5 width=100% class="listTableTopButtons">
 					<tr>
 						<td class=small><input type="submit" value="{$UMOD.LBL_DELETE}" onclick="return massDelete();" class="crmButton delete small"></td>
-						<td class=small align=right><input class="crmButton create small" type="submit" value="{$UMOD.LBL_NEW_TEMPLATE}" name="profile"  class="classBtn" onclick="this.form.action.value='createemailtemplate';this.form.parenttab.value='Settings';"></td>
+						<td class=small align=right id="new_template"><div id = "myProfile"><input class="crmButton create small" type="submit" value="{$UMOD.LBL_NEW_TEMPLATE}" name="profile"  class="classBtn" onclick="this.form.action.value='createemailtemplate';this.form.parenttab.value='Settings';"></div></td>
 					</tr>
 					</table>
 					<table border="0" cellspacing="0" cellpadding="5" width="100%" class="listTable">
@@ -117,7 +154,7 @@
 					{foreach name=emailtemplate item=template from=$TEMPLATES}
 					<tr>
 						<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=toggleSelectAll(this.name,"selectall") class=small></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>
 						</td>




From vtigercrm-commits at vtiger.fosslabs.com  Thu Sep 28 08:17:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 28 Sep 2006 12:17:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9542 -
 /vtigercrm/branches/5.0.1/themes/bluelagoon/style.css
Message-ID: <20060928121727.A4AAE787B74@vtiger.fosslabs.com>

Author: jerrydgeorge
Date: Thu Sep 28 06:17:09 2006
New Revision: 9542

Log:
Css Trimed --By Vashini

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

Modified: vtigercrm/branches/5.0.1/themes/bluelagoon/style.css
==============================================================================
--- vtigercrm/branches/5.0.1/themes/bluelagoon/style.css (original)
+++ vtigercrm/branches/5.0.1/themes/bluelagoon/style.css Thu Sep 28 06:17:09 2006
@@ -166,13 +166,6 @@
 	padding-top:5px;
 	padding-bottom:5px;
 }
-
-
-.tabLiner {
-	background:#9abffc url(images/moduleSelectorBg.gif) bottom repeat-x;
-	padding:0px;
-}
-
 .sep1 {
 	background:#999999;
 }
@@ -184,15 +177,10 @@
 a {
 	text-decoration:none;
 	color:#3344bb;
-	
-	
-	
 }
 
 a:hover {
 	text-decoration:underline;
-	
-	
 }
 
 .hdrLink {
@@ -240,8 +228,6 @@
 }
 
 .lvtBg {
-	
-
 }
 
 .lvtHeaderText {
@@ -321,15 +307,6 @@
 	padding-left:0px;
 }
 
-.rightAddInfo {
-	border-left:1px solid #a2a2a2;
-	border-right:1px solid #dddddd;
-	border-bottom:1px solid #dddddd;
-	border-top:1px solid #a2a2a2;
-	background-color:#fafafa;
-	padding:5px;
-}
-
 .dvtCellLabel, .cellLabel {
 	background-color:#f5f5ff;
 	padding-right:10px;
@@ -364,22 +341,10 @@
 
 }
 
-.rightUpcomingActivitiesHeader{
-	border-bottom:1px solid #ddddcc;
-	padding:5px;
-	background-color:#ffffdd;
-}
-
-.rightUpcomingActivitiesContent {
-	padding:5px;
-	background-color:#ffffef;
-}
-
 .detailedViewHeader{
 	border-bottom:2px solid #4F94CD;
 	padding:5px; 
 	background-color:#afdbff;
-
 }
 
 .detailedViewTextBox {
@@ -392,16 +357,6 @@
 	background-color:#ffffff;
 }
 
-.detailedViewProdTextBox {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	color: #000000;
-	border:1px solid #bababa;
-	padding-left:5px;
-	width:85%;
-	background-color:#ffffff;
-}
-
 .detailedViewTextBoxOn {
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 11px;
@@ -410,32 +365,6 @@
 	padding-left:5px;
 	width:90%;
 	background-color:#ffffdd;
-}
-
-.detailedViewTextArea {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	color: #000000;
-	border:1px solid #bababa;
-	padding-left:5px;
-	width:95%;
-	height:100px;
-	background-color:#ffffff;
-	text-align:left;
-}
-
-
-/* Detailed View classes ends  ------------------------------------------- */
-
-.moduleSearch {
-	border:1px solid #dddddd;
-	background-color:#ffffef;
-
-}
-
-.searchHdrBox {
-
-	border-bottom:1px dashed #dddddd;
 }
 
 .advSearch {
@@ -464,29 +393,6 @@
 	width:10px
 
 }
-.searchNotFound {
-	border:2px solid #ff3333;
-	background-color:#fafafa;
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #ff0000;
-	height:50px;
-	width:640px;
-}
-
-
-.loginTopBg {
-	background:url(images/loginTopBg.gif) repeat-x;
-}
-
-.loginTopShade {
-	background:url(images/loginTopShade.gif) repeat-x;
-}
-
-.loginBg{
-	background:#448cEB url(images/loginBg.gif) repeat-x;
-}
-
 .textbox {
 	border:1px solid #999999;
 	background-color:#ffffff;
@@ -497,28 +403,8 @@
 
 }
 
-.loginBottomBg {
-	background:url(images/loginBottomBg.gif) repeat-x;
-}
-
-.loginSignin {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 18px;
-	color: #448ceb;
-	font-weight:bold;
-}
-
-.loginBillBoard {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	color:#ffffff;
-}
 
 .mx {
-}
-
-.calTopBg {
-	background:url(images/calBg.gif) repeat-x;
 }
 
 .calListTable td{
@@ -530,52 +416,13 @@
 	border:1px solid #999999;
 	
 }
-.calDisplay {
-	border-left:1px solid #d0d0d0;
-	border-right:1px solid #d0d0d0;
-}
-.calBottomBg {
-	background:url(images/calBottomBg.gif) repeat-x;
-}
-
-.calDayHourCell {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 18px;
-}
+
 .calDayHour {
 	border-top:1px solid #c5d5ff;
 	border-left:1px solid #c5d5ff;
 	border-bottom:1px solid #c5d5ff;
 	border-right:1px solid #c5d5ff;
 	background-color:#eae7da;
-}
-.calDiv {
-	overflow:auto; width:95%;height:200px;padding:0px;background-color:#fefefe;
-	border-top: 1px solid #bababa;
-	border-bottom: 1px solid #bababa;
-}
-.calColHdr{
-	border-top:1px solid #fefefa;
-	border-left:1px solid #fefefa;
-	
-	border-right:1px solid #a8a591;
-	background-color:#eae7da;
-}
-.calHourCol {
-	border-top: 1px solid #fefefa; 
-	border-left: 1px solid #fefefa; 
-	border-right: 1px solid #a8a591; 
-	border-bottom: 1px solid #a8a591; 
-	background-color: #eae7da; 
-	height: 30px;
-
-}
-.calHourOccupied {
-	background-color:#ffffbb;
-
-}
-.calListViewRow {
-	border-bottom:1px solid eae3d1;
 }
 
 .calAddEvent {
@@ -586,108 +433,17 @@
 	top:150px;
 	background-color:#ffffff;
 }
-
-.addEventHeader{
-	border-bottom:2px dotted #cccccc;
-}
-
-.addEventFooter{
-	border-top:2px dotted #cccccc;
-	height:40px;
-}
-
 .addEventInnerBox {
 	border:1px dotted #dadada;
 
 }
 
-.cellScheduled {
-	background-color:#ffffef;
-	color:#7a7a7a;
-}
-
-.cellSchHover {
-	border-bottom:1px solid #999999;
-	border-right:1px solid #999999;
-	border-left:1px solid #dadada;
-	border-top:1px solid #dadada;
-	background-color:#ffffef;	
-	color:#7a7a7a;	
-}
-
-.cellSch{
-	border:0px;
-	background-color:#ffffef;
-	color:#7a7a7a;
-}
-
-.cellNormalHover {
-	border-bottom:1px solid #999999;
-	border-right:1px solid #999999;
-	border-left:1px solid #dadada;
-	border-top:1px solid #dadada;
-	background-color:#ffffff;	
-	color:#7a7a7a;	
-}
 
 .cellNormal {
 	border:0px;
 	background-color:#ffffff;
 }
 
-.calEventNormal {
-        border:1px solid #999999;
-        background-color:#99ffcc;
-
-}
-
-.calEventCritical {
-        border:1px solid #999999;
-        background-color:#FFCC33;
-}
-.tblPro1 {
-
-border:2px solid #dadada;
-       background-color:white;
-
-}
-
-.tblPro1IconCell {
-    border-right:1px solid #dadada;
-}
-
-.tblPro1HeadingCell {
-    font-weight:bold;
-color:#4a4a4a;
-}
-
-.tblPro1ColHeader {
-    background-color:#dadada;
-    border-left:1px solid white;
-    border-right:1px solid #999999;
-    font-size: 11px;
-    line-height: 14px;
-    background-image:url(images/tblPro1ColBg.gif);
-}
-
-.tblPro1DataCell {
-    border-bottom:1px solid #f5f5f5;
-    color:#5a5a5a;
-    font-size: 11px;
-    line-height: 14px;
-
-}
-
-.divEventToDo {
-overflow:auto;
-height:150px;
-border:1px solid #dadada;
-
-}
-
-.EventToDo{
-
-}
 
 .thumbnail{
     background-color:#ffffff;
@@ -698,117 +454,6 @@
 	   margin-bottom: 15px;
 }
 
-.thumbnailcaption
-{ font-size: 0.9em; padding-top: 0.2em ;	}
-
-/* For Settings */
-
-.lftMnuTab{
-    font-family:Verdana, Arial, Helvetica, sans-serif;
-    font-size:12px;
-    color:#FFFFFF;
-    background-color:#BBBBBB;
-    border-left:1px solid #666666;
-    border-right:1px solid #666666;
-    border-top:0px solid #666666;
-    border-collapse:collapse;
-    text-align:right;
-    padding-top:0px;
-    padding-left:5px;
-    padding-right:5px;
-    vertical-align:top;
-}
-
-.lftMnuHdr{
-    font-family:Arial, Helvetica, sans-serif;
-    font-size:12px;
-    font-weight:bold;
-    color:white;
-    background-color:#DDDDDD;
-    border-bottom:1px solid #BBBBBB;
-    text-decoration:none;
-    width:99%;
-}
-
-.lftMnuHdr tr td{
-    font-family:Arial, Helvetica, sans-serif;
-    font-size:12px;
-    font-weight:bold;
-    color:white;
-    background-color:#DDDDDD;
-    border-bottom:1px solid #BBBBBB;
-    text-align:left;
-    text-decoration:none;
-    height:25px;
-    padding-right:0px;
-    padding-left:0px;
-}
-
-a.lftMnuHdr{
-    font-family:Arial, Helvetica, sans-serif;
-    font-size:12px;
-    font-weight:bold;
-    color:white;
-    background-color:#666666;
-    border-top:1px solid #BBBBBB;
-    border-bottom:1px solid #999999;
-    text-align:left;
-    text-decoration:none;
-    height:25px;
-    padding-left:5px;
-    width:100%;
-    display:block;
-    vertical-align:middle;
-}
-
-a.lftMnuHdr:Hover{
-    font-family:Arial, Helvetica, sans-serif;
-    font-size:12px;
-    font-weight:bold;
-    color:white;
-    background-color:#666666;
-    border-top:1px solid #BBBBBB;
-    border-bottom:1px solid #999999;
-    text-align:left;
-    text-decoration:none;
-    height:25px;
-    padding-left:5px;
-    width:100%;
-    display:block;
-}
-
-a.lftSubMnu{
-    font-family:Arial, Helvetica, sans-serif;
-    font-size:11px;
-    font-weight:normal;
-    display:block;
-    color:#666666;
-    height:20px;
-    width:93%;
-    text-align:left;
-    padding-left:15px;
-    text-decoration:none;
-    border-bottom:1px solid #BBBBBB;
-    padding-top:2px;
-    white-space:nowrap;
-}
-
-a.lftSubMnu:Hover{
-    font-family:Arial, Helvetica, sans-serif;
-    font-size:11px;
-    font-weight:normal;
-    display:block;
-    color:#666666;
-    height:20px;
-    width:93%;
-    text-align:left;
-    padding-left:15px;
-    text-decoration:none;
-    border-bottom:1px solid #BBBBBB;
-    padding-top:2px;
-    white-space:nowrap;
-    background-color:#CCCCCC;
-}
 
 .padTab{
     padding-top:0px;
@@ -818,26 +463,6 @@
     vertical-align:top;
 
 }
-
-.controlTab{
-    font-family:Arial, Helvetica, sans-serif;
-    font-size:12px;
-    text-align:center;
-    font-weight:bold;
-    text-decoration:none;
-    width:100%;
-    border:0px;
-}   
-
-.controlTab tr td{
-    font-family:Arial, Helvetica, sans-serif;
-    font-size:12px;
-    text-align:center;
-    font-weight:bold;
-    text-decoration:none;
-    vertical-align:bottom;
-}
-
 #company{
     position:relative;
     width:100%;
@@ -851,32 +476,11 @@
                                
 
 #user{position:relative;left:0px;top:0px;width:100%;display:block;}
-#studio{position:relative;left:0px;top:0px;width:100%;display:block;}
+/*#studio{position:relative;left:0px;top:0px;width:100%;display:block;}*/
 #communication{position:relative;left:0px;top:0px;width:100%;display:block;}
 #config{position:relative;left:0px;top:0px;width:100%;display:block;}
 
 #userTab{position:relative;left:0px;top:0px;width:100%;display:none;}
-#studioTab{position:relative;left:0px;top:0px;width:100%;display:none;}
-
-#scrollTab{
-	position:relative;
-	width:100%;
-	height:350px;
-	overflow:auto;
-	border:0px solid #CCCCCC;
-	display:block;
-}
-
-.dock{
-	vertical-align:middle;
-	text-align:left;
-	padding-left:0px;
-}
-.imgDoc{
-	cursor:pointer;
-	border:0px;
-}
-
 #one{
 	position:relative;
 	display:block;
@@ -910,9 +514,6 @@
 
 /* End of Settings */
 
-.bggray{
-	background-color: #dfdfdf;
-}
 .bgwhite{
 	background-color: #FFFFFF;
 }
@@ -937,82 +538,11 @@
 
 /*Added for Advance Seearch*/
 
-#scrollTab{
-	position:relative;
-	width:100%;
-	height:350px;
-	overflow:auto;
-	border:0px solid #CCCCCC;
-	display:block;
-}
-
-.dock{
-	vertical-align:middle;
-	text-align:left;
-	padding-left:0px;
-}
-
-.imgDoc{
-	cursor:pointer;
-	border:0px;
-}
-#slideMnu{
-	background-color:#BBBBBB;
-	vertical-align:top;
-}
 
 #one{
 	position:relative;
 	display:block;
 	width:245px;
-}
-
-.prdTab{
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:11px;
-	text-align:left;
-	width:100%;
-	border-left:0px solid #CCCCCC;
-	border-right:0px solid #CCCCCC;
-	border-collapse:collapse;
-}
-
-.prdTab tr th{
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:11px;
-	text-align:left;
-	border-right:1px solid #CCCCCC;
-	border-left:1px solid #CCCCCC;
-	padding-left:5px;
-	background-color:#E5E5E5;
-	height:20px;
-	color:#000000;
-	font-weight:bold;
-	text-decoration:none;
-	border-bottom:1px solid #CCCCCC;
-}
-
-.prdTab tr td{
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:11px;
-	text-align:left;
-	border-right:1px solid #CCCCCC;
-	border-left:1px solid #CCCCCC;
-	border-bottom:1px solid #CCCCCC;
-	padding-left:5px;
-	color:#000000;
-	text-decoration:none;
-	font-weight:normal;
-	height:20px;
-}
-
-.delTxt{
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:11px;
-	text-decoration:underline;
-	font-weight:normal;
-	color:#000099;
-	cursor:pointer;
 }
 
 /* Dashboard CSS */
@@ -1022,15 +552,12 @@
 	vertical-align:middle;
 	margin-top:10px;
 }
-
-
 .dashHeading {
 	font-family:Arial, Helvetica, sans-serif;
 	font-size:24px;
 	font-weight:bold;
 	color:#fff;
 }
-
 .dashSelectBg{
 	background-image:url(images/dashSelectBg.gif);
 	background-repeat:repeat-x;
@@ -1047,11 +574,6 @@
 	padding:5px;
 }
 
-.dash_shadow{
-	background-image:url(images/dash_top_shadow.jpg);
-	background-repeat:repeat-x;
-	height:10px;
-}
 
 .dash_white{
 	background-color:#FFFFFF;
@@ -1069,15 +591,6 @@
 	color:#000000;
 	padding-left:10px;padding-right:10px;	
 }
-.dashMatrixSeperator{
-	border-left:2px dashed #dadada;
-
-}
-.dashMatrixBottomLiner{
-	border-bottom:2px dashed #dadada;
-
-}
-
 .dash_switch{
 	cursor:pointer;
 	width:26px;
@@ -1127,108 +640,6 @@
 	position:top;
 }
 
-.dash_sel_top{
-	background-image:url(images/dash_sel_top.jpg);
-	background-repeat:repeat-x;
-	height:5px;
-	background-position:left top;
-	font-size:0px;
-}
-
-.dash_sel_btm{
-	background-image:url(images/dash_sel_btm.jpg);
-	background-repeat:repeat-x;
-	height:4px;
-	background-position:left top;
-	font-size:0px;
-}
-
-.dash_sel_left{
-	background-color:#F9F7C9;
-	border-left:1px solid #000000;
-	border-top:1px solid #000000;
-	border-bottom:1px solid #000000;
-	width:200px;
-	text-align:left;
-	padding-left:5px;
-	font-size:11px;
-	font-weight:bold;
-	color:#000000;
-}
-
-.dash_sel_right{
-	background-color:#F9F7C9;
-	border-right:1px solid #000000;
-	border-top:1px solid #000000;
-	border-bottom:1px solid #000000;
-	width:25px;
-	padding-left:5px;	
-	cursor:pointer;
-}
-
-/*  menu */
-
-#mnuSlide{
-	position:absolute;
-	left:0px;
-	top:100px;
-/*	width:110px;*/
-}
-
-/* a.submenu{
-	font-family:Verdana, Arial, Helvetica, sans-serif;
-	font-size:11px;
-	padding-top:5px;
-	padding-bottom:5px;
-	padding-left:10px;
-	border-bottom:1px solid #CCCCCC;
-	background-color:#ECECEC;
-	color:#000000;
-	text-align:left;
-	text-decoration:none;
-	display:block;
-}
-
-a.submenu:Hover{
-	background-color:#DDDDDD;
-	font-family:Verdana, Arial, Helvetica, sans-serif;
-	font-size:11px;
-	padding-top:5px;
-	padding-bottom:5px;
-	padding-left:10px;
-	border-bottom:1px solid #CCCCCC;
-	color:#000000;
-	text-align:left;
-	text-decoration:none;
-	display:block;
-} */
-
-#mnuKey{
-	font-family:Verdana, Arial, Helvetica, sans-serif;
-	font-size:11px;
-	background-color:#666666;
-	color:#FFFFFF;
-	text-decoration:none;
-	padding:5px;
-	font-weight:bold;
-	width:8px;
-	cursor:pointer;
-	vertical-align:top;
-	height:100px;
-	position:relative;
-	top:0px;
-	left:0px;
-}
-
-#slidemenu{
-	height:525px;
-	vertical-align:top;
-	width:100px;
-	background-color:#CCCCCC;
-	border-right:1px solid #CCCCCC;
-	opacity:.9;
-	display:none;
-}
 
 /* clock */
 
@@ -1309,11 +720,6 @@
 
 
 /* Calculator */
-.calcBg {
-	/*background-color: #666;*//*BFC1B7*/
-	background: url(images/cal_bg.gif);
-	border: 1px solid #009900;
-}
 .calcResult {
 	width: 100%;
 	height: 25px;
@@ -1367,6 +773,7 @@
 	width:25px;
 	/*background-color: #CCC;*/
 }
+
 #calc{
 	position:absolute;
 	left:100px;
@@ -1443,20 +850,6 @@
 	
 }
 
-.frameHdr{
-	height:32px;
-	background-image:url(images/rssframeHdr.gif);
-	background-repeat:repeat-x;
-	background-position:top left;
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:12px;
-	font-weight:bold;
-	text-align:left;
-	padding-left:5px;
-	color:#FFFF00;
-	vertical-align:middle;
-	border:0px solid #000000;
-}
 
 .forwardBg{
 	font-family:Arial, Helvetica, sans-serif;
@@ -1474,45 +867,6 @@
 
 /*  New Styles */
 
-.hometop{
-	font-family:Verdana, Arial, Helvetica, sans-serif;
-	font-size:14px;
-	color:white;
-	text-decoration:none;
-	text-align:left;
-	padding-left:10px;
-	background-image:url(../images/hometop.gif);
-	background-position:top left;
-	background-repeat:repeat-x;
-	height:35px;
-	vertical-align:middle;
-}
-
-.homeBtm{
-	background-image:url(../images/HomeBtm.gif);
-	background-position:top left;
-	background-repeat:repeat-x;
-	height:29px;
-}
-
-.imageTab{
-	background-color:#F5F5F5;
-	border:0px solid #EBEBEB;
-	width:30px;
-	height:30px;
-	position:relative;
-	visibility:visible;
-}
-
-a.imageTab:Hover{
-	background-color:#BFBFFF;
-	border:0px solid #EBEBEB;
-	width:30px;
-	height:30px;
-	display:block;
-	opacity:.5;
-}
-
 .mnuTab{
 	font-family:Verdana, Arial, Helvetica, sans-serif;
 	font-size:12px;
@@ -1527,106 +881,6 @@
 	vertical-align:middle;
 }
 
-.mnuSel td{
-	font-family:Verdana, Arial, Helvetica, sans-serif;
-	font-size:11px;
-	color:#000000;
-	padding-left:5px;
-	background-color:#EBEBEB;
-	height:30px;
-	text-decoration:none;
-	padding-top:5px;
-	cursor:pointer;
-	padding-top:5px;
-}
-	
-.mnuSel td:Hover{
-	font-family:Verdana, Arial, Helvetica, sans-serif;
-	font-size:11px;
-	color:#000000;
-	padding-left:5px;
-	height:30px;
-	text-decoration:underline;
-	padding-top:5px;
-	cursor:pointer;
-	padding-top:5px;
-	background-color:#EBEBEB;
-}
-
-.mnuUnSel td{
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:11px;
-	color:#00487F;
-	padding-left:5px;
-	background-color:#D7D7D7;
-	height:30px;
-	text-decoration:none;
-	padding-top:5px;
-	cursor:pointer;
-	padding-top:5px;
-}
-	
-.mnuUnSel td:Hover{
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:11px;
-	color:#00487F;
-	padding-left:5px;
-	height:30px;
-	text-decoration:underline;
-	padding-top:5px;
-	cursor:pointer;
-	padding-top:5px;
-	background-color:#D7D7D7;
-}		
-
-.tabRht{
-	background-image:url(../images/tabRht.gif);
-	background-position:top left;
-	background-repeat:repeat-y;
-	width:31px;
-}
-
-
-.frmSelect{
-	font-family:Verdana, Arial, Helvetica, sans-serif;
-	font-size:11px;
-	border:1px #EBEBEB;
-}
-
-#mnuSlide{
-	position:absolute;
-	left:0px;
-	top:100px;
-	width:110px;
-}
-
-
-#mnuKey{
-	font-family:Verdana, Arial, Helvetica, sans-serif;
-	font-size:11px;
-	background-color:#666666;
-	color:#FFFFFF;
-	text-decoration:none;
-	padding:5px;
-	font-weight:bold;
-	width:8px;
-	cursor:pointer;
-	vertical-align:top;
-	height:100px;
-	position:relative;
-	top:0px;
-	left:0px;
-}
-
-#slidemenu{
-	height:525px;
-	vertical-align:top;
-	width:100px;
-	background-color:#ECECEC;
-	border-right:1px solid #CCCCCC;
-	opacity:.8;
-}
-
 /* profile */
 
 .prvPrfBigText {
@@ -1646,56 +900,13 @@
 	border:1px solid #ebebeb;
 }
 
-.prvPrfSelectedTab {
-	background:url(images/prvPrfSelectedTab.gif) repeat-x;
-	cursor:pointer;
-
-}
-
-.prvPrfUnSelectedTab {
-	background:url(images/prvPrfUnSelectedTab.gif) repeat-x;
-	cursor:pointer;
-}
-
 .prvPrfTexture {
 	background:url(images/prvPrfTexture1.gif);
 
 }
-.prvPrfBgOn{
-	background-color:#33ee33;
-}
-.prvPrfBgOff{
-	background-color:#cccccc;
-}
-
 .prvPrfHoverOn {
 	background-color:#ffffef;
 	
-}
-.prvPrfHoverOut {
-	background-color:#ffffff;
-}
-
-.prvPrfBgImgGlobal {
-	background:url(images/prvPrfBgImgGlobal.jpg) top right no-repeat;
-}
-.prvPrfBgImgTab {
-	background:url(images/prvPrfBgImgTab.jpg) top right no-repeat;
-}
-.prvPrfBgImgStandard {
-	background:url(images/prvPrfBgImgStandard.jpg) top right no-repeat;
-}
-.prvPrfBgImgUtils {
-	background:url(images/prvPrfBgImgUtils.jpg) top right no-repeat;
-}
-.prvPrfBgImgField {
-	background:url(images/prvPrfBgImgField.jpg) top right no-repeat;
-}
-
-.prvPrfTabSample {
-	border-top:1px solid #ababab;
-	border-left:1px solid #ababab;
-	border-right:1px solid #a1a1a1;
 }
 
 /*  Organization */
@@ -1731,55 +942,6 @@
 	border-right:1px solid #CCCCCC;
 }
 
-.globTab{
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:11px;
-	font-weight:normal;
-	color:#000000;
-	border:1px solid #999999;
-	border-collapse:collapse;
-	width:100%;
-}
-
-.globTab tr th{
-	text-align:right;
-	background-color:#CCCCCC;
-	border-bottom:1px solid #999999;
-	border-right:2px solid #999999;
-	color:#000000;
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:12px;
-	text-decoration:none;
-	font-weight:bold;
-	height:20px;
-	padding-right:5px;
-	
-}
-
-.globTab tr td{
-	text-align:left;
-	border:1px solid #CCCCCC;
-	color:#666666;
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:11px;
-	text-decoration:none;
-	font-weight:normal;
-	padding-left:5px;
-	height:20px;
-}
-
-
-/* Groups */
-
-.groupul{
-	margin:0px;
-	font-family:Arial, Helvetica, sans-serif;
-	font-weight:bold;
-	font-size:12px;
-	color:#000000;
-	text-decoration:underline;
-	text-align:left;
-}
 
 .groupli{
 	margin-left:20px;
@@ -1838,35 +1000,6 @@
 	padding-bottom:3px;
 }
 
-.classBtnSmall{
-	font-family:Verdana, Arial, Helvetica, sans-serif;
-	text-decoration:none;
-	font-weight:normal;
-	font-size:9px;
-	background-color:#DBDBDB;
-	border-bottom:2px solid #999999;
-	border-right:2px solid #999999;
-	border-top:2px solid #F5F5F5;
-	border-left:2px solid #F5F5F5;
-	color:#000000;
-	text-align:center;
-}
-
-.classBtnDisable{
-	font-family:Verdana, Arial, Helvetica, sans-serif;
-	text-decoration:none;
-	font-weight:normal;
-	font-size:10px;
-	background-color:#DBDBDB;
-	border-bottom:2px solid #CCCCCC;
-	border-right:2px solid #CCCCCC;
-	border-top:2px solid #F5F5F5;
-	border-left:2px solid #F5F5F5;
-	color:#666666;
-	text-align:center;
-	padding-top:3px;
-	padding-bottom:3px;
-}
 
 .txtBox{
 	width:85%;
@@ -1909,13 +1042,6 @@
 	font-size:11px;
 }
 
-#imLead{
-	width:100%;
-	overflow:auto;
-	position:relative;
-	border:1px solid #666666;
-	height:175px;
-}
 
 .txtGreen{
 	color:green;
@@ -1928,14 +1054,6 @@
 }
 /* MY PREFERENCES */		
 
-#chPhoto{
-	position:relative;
-	display:none;
-	top:20px;
-	width:100%;
-	border:1px dashed #666666;
-	background-color:#FFFFEC;
-}
 
 /* CSS FOR REPORTS */
 
@@ -1972,7 +1090,7 @@
 }
 
 
-/* a.reportMnu{
+a.reportMnu{
 	font-size:11px;
 	color:#0070BA;
 	text-decoration:none;
@@ -1994,37 +1112,17 @@
 	border-bottom:1px solid #E1E1E1;
 	padding-left:20px;
 	padding-top:3px;
-}	*/
-
-.reportGenarateTable{
-	border-bottom:1px solid #6D6D6D;
-	border-left:1px solid #6D6D6D;
-	border-right:1px solid #6D6D6D;
-	border-top:0px solid #6D6D6D;
-	background-image:url(../images/report_bg.gif);
-	background-repeat:repeat-x;
-}
-
-.reportGenarateTable tr td{
-	padding:5px;
-}
+}	
+
 #Generate{
 	position:relative;
 	width:100%;
 	text-align:center;
 	display:none;
 }
-
-.lvtSel{
-	font-weight:bold;
-}
-	
 /* END OF REPORT */
-
-
-
 /* WEB MAIL */
-/* a.webMnu{
+a.webMnu{
 	font-size:11px;
 	color:#0070BA;
 	text-decoration:underline;
@@ -2033,14 +1131,14 @@
 	font-size:11px;
 	color:#0070BA;
 	text-decoration:underline;
-} */
+} 
 
 
 /*  END OF WEB MAIL */
 
 /* POPUP */
 
-/* a.alpha{
+ a.alpha{
 	font-size:11px;
 	color:gray;
 	text-decoration:none;
@@ -2058,7 +1156,7 @@
 	padding-right:5px;
 	border:1px dotted #CCCCCC;
 	background-color:#FFFFCC;
-} */
+} 
 
 /* Home Page */
 .MatrixLayer{
@@ -2091,7 +1189,7 @@
     left:300px;
     top:100px;
     position:absolute;
-    z-index:10000001;
+    z-index:1000001;
     display:none;
     padding:10px;
     background:#ffffff url(images/layerPopUpBg.gif);
@@ -2189,12 +1287,6 @@
 
 }
 
-.calSelTabMask {
-	background-color:#D6D2AB;
-	height:5px;
-
-}
-
 .calInnerBorder {
 	border-left:2px solid #A5B5EE;
 	border-right:2px solid #A5B5EE;
@@ -2208,15 +1300,9 @@
 	background:#fefefe url(images/layerPopupBg.gif);
 
 }
-.calTopLeft {
-	border-left: 1px solid #A5B5EE; 
-}
-
 .calTopRight {
 	border-right: 1px solid #A5B5EE; 
 }
-
-
 .calUnSel{
 	color:#000000;
 	font-weight:normal;
@@ -2224,32 +1310,6 @@
 	width:8%;
 }
 
-.calTitle{
-	background-position:right top;
-	background-repeat:no-repeat;
-	background-image:url(images/cal_title.jpg);
-	width:150px;
-}
-
-.tabBorder{
-	background-color:#EBEBEB;
-	border-bottom:1px solid #666666;
-	border-left:1px solid #666666;
-	border-right:1px solid #666666;
-	padding:10px;
-}
-
-.eventLay{
-	background-color:#DBF3FD;
-	position:relative;
-	left:0px;
-	top:0px;
-	width:100%;
-	visibility:visible;
-	padding:5px 5px 5px 5px;
-	display:block;
-	z-index:1000;
-}
 
 a.calMnu{
 	font-size:11px;
@@ -2271,9 +1331,6 @@
 	padding-top:3px;
 }
 
-.bggray{
-	background-color: #dfdfdf;
-}
 .bgwhite{
 	background-color: #FFFFFF;
 }
@@ -2296,16 +1353,6 @@
 }
 .style1 {color: #FF0000}
 
-#hrViewContent{
-	width:100%;
-	height:150px;
-	overflow:auto;
-	position:relative;
-	border-top:1px solid #CCCCCC;
-	border-bottom:0px solid white;
-	border-left:0px solid white;
-	border-right:0px solid white;
-}
 
 .event{
 	background-color:#D3EAF0;
@@ -2323,9 +1370,6 @@
 	display:block;
 }
 
-#lstView{
-	display:none;
-}	
 
 .calendarNav{
 	font-size:12px;
@@ -2369,15 +1413,6 @@
 	background-color:#ffffff;
 }
 
-#cal_popup{
-	width:600px;
-	border:3px solid #CCCCCC;
-	background-color:#FFFFFF;
-	padding:5px;
-	position:absolute;
-	left:100px;
-	top:100px;
-}
 
 .outer{
 	border-bottom:1px solid #CCCCCC;
@@ -2385,18 +1420,6 @@
 	border-right:1px solid #CCCCCC;
 }
 
-.outerBorder{
-	border:1px solid #CCCCCC;
-	width:95%;
-}
-
-.fieldHead{
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:12px;
-	font-weight:bold;
-	border:0px solid #CCCCCC;
-	padding:2px 5px 2px 5px;
-}
 
 .calTxt{
 	width:50%;
@@ -2419,39 +1442,6 @@
 /* End of Calendar */
 
 /* Cal Year View */
-.month_table{
-	border:2px solid #CCCCCC;
-	width:100%;
-	background-color:white;
-}
-
-.month_table tr th{
-	background-color:#E9E9E9;
-	color:#000000;
-	text-align:center;
-	border:1px dotted #CCCCCC;
-	height:20px;
-	width:14%;
-	font-weight:normal;
-}
-
-.month_table tr td{
-	border:1px dotted #CCCCCC;
-	color:#000000;
-	text-align:center;
-	height:20px;
-}
-
-.cal_Hdr{
-	background-image:url(images/cal_Hdr.gif);
-	background-repeat:repeat-x;
-	background-position:left top;
-	font-weight:bold;
-	color:#000000;
-	text-align:left;
-	border:0px solid #000000;
-}
-
 .eventDay{
 	background-color:#FF9966;
 	font-weight:bold;
@@ -2534,12 +1524,6 @@
 	padding: 4px;
     border-right: 1px solid #DDDDDD;
     border-bottom: 1px solid #DDDDDD;
-}
-.rptTitle {
-    border-right: 1px solid #333;
-    border-bottom: 1px solid #333;
-	background: #2C527C;
-	color: #FFF;
 }
 .rptGrpHead {
 	background: #FFF;
@@ -2591,31 +1575,6 @@
 
 /* Css for quick Create */
 
-.qcWindow {
-	    background-color:white;
-            border:2px solid #999999;
-}
-
-.qcHeader{
-	    background:url(images/qcBg.gif) repeat-x;
-	    background-color:gray;
-	    color:black;
-	    font-family: Arial, Helvetica, sans-serif;
-	    font-size: 12px;
-	    line-height: 19px;
-	    padding-left:10px;
-}
-.qcTextBox{
-        border:1px solid #999999;
-	    width:90%;
-}
-.qcTextArea{
-	    border:1px solid #999999;
-	    width:90%;
-	    height:70px;
-	    font-family: Arial, Helvetica, sans-serif;
-	    font-size: 11px;
-}
 .qcTransport{
 	    background-color:#d5d6ff;
 
@@ -2640,50 +1599,6 @@
 								    
 /* MY SITES */
 
-.SiteSel{
-	font-family:Arial, Helvetica, sans-serif;
-	background-image:url(images/site_sel.jpg);
-	background-position:left bottom;
-	background-repeat:no-repeat;
-	height:33px;
-	width:194px;
-	text-align:center;
-	vertical-align:middle;
-	color:#000000;
-	font-weight:bold;
-	font-size:11px;
-	text-decoration:none;
-}
-
-.SiteUnSel{
-	font-family:Arial, Helvetica, sans-serif;
-	background-image:url(images/site_unsel.jpg);
-	background-position:left bottom;
-	background-repeat:no-repeat;
-	height:33px;
-	width:194px;
-	text-align:center;
-	vertical-align:middle;
-	color:#000000;
-	font-weight:normal;
-	font-size:11px;
-	text-decoration:none;
-	cursor:pointer;
-}
-
-.SiteHdr{
-	font-family:Arial, Helvetica, sans-serif;
-	background-image:url(images/site_hdr.jpg);
-	background-position:right bottom;
-	background-repeat:no-repeat;
-	height:33px;
-	text-align:center;
-	vertical-align:middle;
-	color:#000000;
-	font-weight:normal;
-	font-size:11px;
-	text-decoration:none;
-}
 .unread_email {
 	font-weight:bold;
 }
@@ -2708,12 +1623,6 @@
     color: #000000;
 
 }
-.adProgressBar {
-	border-style:solid;
-	border-width:2px;
-	border-color:blue;
-
-}
 
 .h2 {
 
@@ -2727,17 +1636,6 @@
 	color:gray;
 }
 
-.hdeskComments {
-
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	line-height: 14px;
-	color: #999999;
-	border:0px;
-	background-color:#ffffef;
-	width:100%;
-
-}
 
 ul {
 	list-style:circle;
@@ -2747,14 +1645,6 @@
 	font-weight:normal;
 
 }
-
-	
-.branch {
-	list-style-image: url("secAdd.gif");
-}	
-
-
-
 .tagCloudTopBg {
 	background-image: url(images/tagCloudBg.gif);
 	background-repeat: repeat-x;	
@@ -2764,16 +1654,6 @@
 	background-color:#fff;
 	padding:5px;
 }
-	
-	
-	
-.heading1 {
-	font-family:  Arial, Helvetica, sans-serif;
-	font-size: 19px;
-	line-height: 14px;
-	color: #000000;
-}
-
 .heading2 {
 	font-family:  Arial, Helvetica, sans-serif;
 	font-size: 16px;
@@ -2781,30 +1661,13 @@
 	font-weight:bold;
 	color: #000000;
 }
-
-.heading3 {
-	font-family:  Arial, Helvetica, sans-serif;
-	font-size: 14px;
-	line-height: 14px;
-	color: #999999;
-}
-
-.heading4 {
-	font-family:  Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	line-height: 14px;
-	color: #999999;
-}
-
 .settingsUI {
 	
 	text-align:left;
 	background-color:#fff;
 	background-image:url(images/layerPopupBg.gif);
 	border:2px solid #aaaaff;
-
-}
-
+}
 
 .settingsTabHeader {
 	text-align:left;
@@ -2881,7 +1744,7 @@
 	font-weight:bold;
 
 }
-/*.cellLabel {
+.cellLabel {
 	background-color:#eaebd9;
 	border-top:1px solid #efefef;
 	border-bottom:1px solid #dadada;
@@ -2891,7 +1754,7 @@
 .cellText {
 	color:#333333;
 	border-bottom:1px solid #dadada;
-} */
+}
 
 .listTable{
 	border-left:1px solid #cccccc;
@@ -2992,55 +1855,16 @@
 	border:1px solid #ebebeb;
 }
 
-.prvPrfSelectedTab {
-	background:url(images/prvPrfSelectedTab.gif) repeat-x;
-
-}
-
-.prvPrfUnSelectedTab {
-	background:url(images/prvPrfUnSelectedTab.gif) repeat-x;
-
-}
+
 
 .prvPrfTexture {
 	background:url(images/prvPrfTexture1.gif);
 
-}
-.prvPrfBgOn{
-	background-color:#33ee33;
-}
-.prvPrfBgOff{
-	background-color:#cccccc;
 }
 
 .prvPrfHoverOn {
 	background-color:#ffffef;
 	
-}
-.prvPrfHoverOut {
-	background-color:#ffffff;
-}
-
-.prvPrfBgImgGlobal {
-	background:url(images/prvPrfBgImgGlobal.jpg) top right no-repeat;
-}
-.prvPrfBgImgTab {
-	background:url(images/prvPrfBgImgTab.jpg) top right no-repeat;
-}
-.prvPrfBgImgStandard {
-	background:url(images/prvPrfBgImgStandard.jpg) top right no-repeat;
-}
-.prvPrfBgImgUtils {
-	background:url(images/prvPrfBgImgUtils.jpg) top right no-repeat;
-}
-.prvPrfBgImgField {
-	background:url(images/prvPrfBgImgField.jpg) top right no-repeat;
-}
-
-.prvPrfTabSample {
-	border-top:1px solid #ababab;
-	border-left:1px solid #ababab;
-	border-right:1px solid #a1a1a1;
 }
 
 .cellBottomDotLine {
@@ -3061,14 +1885,8 @@
 	border-bottom-color: #CCCCCC;
 	
 }
-.crmFormDropDown {
-border-width:1px;
-}
 .thickBorder {
 	border: 2px solid #999999;
-}
-.trackerBorder {
-	background-color:#ffffff;
 }
 .trackerHeading {
 	background-color:#efefef;
@@ -3085,21 +1903,10 @@
 .crmTable {
 	border:1px solid #dadada;
 }
-.crmTableColHeading {
-	background-color:#CCCCCC;
-	border-left:1px solid #eaeaea;
-	border-top:1px solid #eaeaea;
-	border-right:1px solid #999999;
-	border-bottom:1px solid #999999;
-}
 .crmTableRow {
 	border-bottom:1px dotted #dadada;
 	border-right:1px dotted #dadada
 }
-
-
-
-
 /* Inventory */
 
 .lineOnTop {
@@ -3130,9 +1937,9 @@
 
 
 /* styles for RSS Display starts */
-.rssDisplay{
+/*.rssDisplay{
 	background-color:#e8e3ca;
-}
+}*/
 
 
 /* styles for RSS Display ends */
@@ -3165,10 +1972,6 @@
 .mailSubHeader {
 	background:#b4b8ff url(images/mailSubHeaderBg.gif) repeat-x;
 	padding:4px;
-}
-.mailDetailsHeader {
-	border-top:2px dotted #999;
-	border-bottom:1px solid #ddd;
 }
 
 .mailClientWriteEmailHeader {




From vtigercrm-commits at vtiger.fosslabs.com  Fri Sep 29 02:35:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 29 Sep 2006 06:35:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9543 -
 /vtigercrm/branches/5.0.1/include/utils/CommonUtils.php
Message-ID: <20060929063545.5E2E1787DC7@vtiger.fosslabs.com>

Author: richie
Date: Fri Sep 29 00:35:30 2006
New Revision: 9543

Log:
Fixed the send enail not working when the salutationtype field is added in contacts

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

Modified: vtigercrm/branches/5.0.1/include/utils/CommonUtils.php
==============================================================================
--- vtigercrm/branches/5.0.1/include/utils/CommonUtils.php (original)
+++ vtigercrm/branches/5.0.1/include/utils/CommonUtils.php Fri Sep 29 00:35:30 2006
@@ -2430,6 +2430,13 @@
 		case 'Contacts':
 			if(is_array($fields["contacts"]))
 			{
+				//Checking for salutation type and checking the table column to be queried
+				$key = array_search('salutationtype',$fields["contacts"]);
+				if(isset($key) && $key !='')
+				{
+					$fields["contacts"][$key]='salutation';
+				}	
+				
 				$columnfields = implode(',',$fields["contacts"]);
 				$query = 'select '.$columnfields.' from vtiger_contactdetails where contactid='.$id;
 				$result = $adb->query($query);
@@ -2443,6 +2450,12 @@
 		case 'Leads':	
 			if(is_array($fields["leads"]))
 			{
+				//Checking for salutation type and checking the table column to be queried
+				$key = array_search('salutationtype',$fields["contacts"]);
+				if(isset($key) && $key !='')
+				{
+					$fields["contacts"][$key]='salutation';
+				}
 				$columnfields = implode(',',$fields["leads"]);
 				$query = 'select '.$columnfields.' from vtiger_leaddetails where leadid='.$id;
 				$result = $adb->query($query);




From vtigercrm-commits at vtiger.fosslabs.com  Fri Sep 29 02:37:31 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 29 Sep 2006 06:37:31 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9544 -
 /vtigercrm/branches/5.0.1/Smarty/templates/CreateEmailTemplate.tpl
Message-ID: <20060929063731.F179E787DCC@vtiger.fosslabs.com>

Author: richie
Date: Fri Sep 29 00:37:24 2006
New Revision: 9544

Log:
The field name for leads salutation is changed to salutation type

Modified:
    vtigercrm/branches/5.0.1/Smarty/templates/CreateEmailTemplate.tpl

Modified: vtigercrm/branches/5.0.1/Smarty/templates/CreateEmailTemplate.tpl
==============================================================================
--- vtigercrm/branches/5.0.1/Smarty/templates/CreateEmailTemplate.tpl (original)
+++ vtigercrm/branches/5.0.1/Smarty/templates/CreateEmailTemplate.tpl Fri Sep 29 00:37:24 2006
@@ -86,7 +86,7 @@
                 options[8] = new Option('Lead: Email', '$leads-email$'); 
                 options[9] = new Option('Lead: Annual Revenue', '$leads-annualrevenue$'); 
                 options[10] = new Option('Lead: Title', '$leads-designation$'); 
-                options[11] = new Option('Lead: Salutation', '$leads-salutation$'); 
+                options[11] = new Option('Lead: Salutation', '$leads-salutationtype$'); 
             
 	        allOpts[3] = options;
 




From vtigercrm-commits at vtiger.fosslabs.com  Fri Sep 29 13:58:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 29 Sep 2006 17:58:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9545 -
 /vtigercrm/branches/5.0.1/Smarty/templates/Settings/PickList.tpl
Message-ID: <20060929175855.EDA75787DC7@vtiger.fosslabs.com>

Author: richie
Date: Fri Sep 29 11:58:43 2006
New Revision: 9545

Log:
Duplicate validation done for the picklist entries -- By Don

Modified:
    vtigercrm/branches/5.0.1/Smarty/templates/Settings/PickList.tpl

Modified: vtigercrm/branches/5.0.1/Smarty/templates/Settings/PickList.tpl
==============================================================================
--- vtigercrm/branches/5.0.1/Smarty/templates/Settings/PickList.tpl (original)
+++ vtigercrm/branches/5.0.1/Smarty/templates/Settings/PickList.tpl Fri Sep 29 11:58:43 2006
@@ -217,8 +217,33 @@
                 }
         );
 }
+
 function picklist_validate(mode,fieldname,module,uitype)
 {
+	
+	//alert(trim($("picklist_values").value));
+	
+	var pick_arr=new Array();
+	pick_arr=trim($("picklist_values").value).split('\n');	
+	var len=pick_arr.length;
+	for(i=0;i<len;i++)
+	{
+		var valone;
+		curr_iter = i;
+		valone=pick_arr[curr_iter];
+		for(j=curr_iter+1;j<len;j++)
+		{
+			var valnext;
+			valnext=pick_arr[j];
+			if(trim(valone) == trim(valnext))
+			{
+				alert("Duplicate entries found for the value '"+valone+"'");
+				return false;
+			}
+		}
+		i = curr_iter		
+
+	}
 	if(mode == 'edit')
 	{
 		if(trim($("picklist_values").value) == '')