[Vtigercrm-commits] [vtiger-commits] r11123 - in /vtigercrm/branches/5.0.3: include/utils/EditViewUtils.php modules/Calendar/calendarLayout.php modules/Calendar/calendar_share.php modules/Calendar/language/en_us.lang.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: richie
Date: Tue May 29 06:12:49 2007
New Revision: 11123

Log:
fix for calendar related issue and contact/product image duplication. --minnie

Modified:
    vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php
    vtigercrm/branches/5.0.3/modules/Calendar/calendarLayout.php
    vtigercrm/branches/5.0.3/modules/Calendar/calendar_share.php
    vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php

Modified: vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php (original)
+++ vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php Tue May 29 06:12:49 2007
@@ -99,7 +99,7 @@
 			}
 			else
 			{
-				$curr_time = date('H:i');
+				$curr_time = date('H:i',(time() + (5 * 60)));
 			}
 		}
 		if($module_name == 'Events' && $uitype == 23)
@@ -110,7 +110,7 @@
 			}
 			else
 			{
-				$endtime = time() + (5 * 60);
+				$endtime = time() + (10 * 60);
 				$curr_time = date('H:i',$endtime);
 			}
 		}
@@ -535,8 +535,7 @@
 	elseif($uitype == 69)
   	{
   		$editview_label[]=$mod_strings[$fieldlabel];
- 
- 		if( $col_fields['record_id'] != "") 
+ 		if( $col_fields['record_id'] != "" && $_REQUEST["isDuplicate"] != true) 
   		{
  		    //This query is for Products only
  		    if($module_name == 'Products')

Modified: vtigercrm/branches/5.0.3/modules/Calendar/calendarLayout.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Calendar/calendarLayout.php (original)
+++ vtigercrm/branches/5.0.3/modules/Calendar/calendarLayout.php Tue May 29 06:12:49 2007
@@ -263,7 +263,7 @@
 	global $current_user,$app_strings;
         $date_format = $current_user->date_format;
 	$format = $cal_arr['calendar']->hour_format;
-	$hour_startat = timeString(array('hour'=>date('H:i'),'minute'=>0),'24');
+	$hour_startat = timeString(array('hour'=>date('H:i',(time()+(5*60))),'minute'=>0),'24');
         $hour_endat = timeString(array('hour'=>date('H:i',(time() + (60 * 60))),'minute'=>0),'24');	
 	$time_arr = getaddEventPopupTime($hour_startat,$hour_endat,$format);
 	$temp_ts = $cal_arr['calendar']->date_time->ts;

Modified: vtigercrm/branches/5.0.3/modules/Calendar/calendar_share.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Calendar/calendar_share.php (original)
+++ vtigercrm/branches/5.0.3/modules/Calendar/calendar_share.php Tue May 29 06:12:49 2007
@@ -102,7 +102,7 @@
                                                 <tr>
                                                         <td colspan=3>
                                                                 <ul style="padding-left:20px">
-                                                                <li><?php echo $mod_strings['LBL_INVITE_INST1']?>
+                                                                <li><?php echo $mod_strings['LBL_INVITE_SHARE']?>
                                                                 <li><?php echo $mod_strings['LBL_INVITE_INST2']?>
                                                                 </ul>
                                                         </td>

Modified: vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php Tue May 29 06:12:49 2007
@@ -213,8 +213,9 @@
 'LBL_YEAR'=>'Year',
 'LBL_NONE_SCHEDULED'=>'None Scheduled',
 
-'LBL_INVITE_INST1'=>'To share, select the users from the "Available Users" list and click the "Add" button.',
-'LBL_INVITE_INST2'=>'To remove, select the users in the "Selected Users" list and the click "Remove" button.',
+'LBL_INVITE_INST1'=>'To invite, select the users from the "Available Users" list and click the "Add" button.',
+'LBL_INVITE_SHARE'=>'To share, select the users from the "Available Users" list and click the "Add" button.',
+'LBL_INVITE_INST2'=>'To remove, select the users from the "Selected Users" list and the click "Remove" button.',
 'LBL_SELUSR_INFO'=>' Selected users will receive an email about the Event.',
 'LBL_CALSHAREMESSAGE'=>'Share my calendar with the following selected users',
 'LBL_CALSHARE'=>'Calendar Sharing',