From vtiger-tickets at vtiger.fosslabs.com Sun Apr 2 01:01:51 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sun, 02 Apr 2006 09:01:51 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2376=3A_A?= =?utf-8?q?ccounts_-_Input_field_tab_order?= Message-ID: <076.8d85c2213e2306a8bab8f1b045c0ea05@vtiger.fosslabs.com> #76: Accounts - Input field tab order -----------------------------------+---------------------------------------- Reporter: eberle.d at 4net.ch | Owner: developer Type: defect | Status: new Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: Input field tab order | -----------------------------------+---------------------------------------- When entering account details for address information the cursor jumps from billing adress to shipping address, billing p.o. box to shipping p.o. box and so on. This isn't practical. It should be that it jumps from field to field one adress aerea. That means from field to field within billing address and than from field to field within shipping address. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Apr 2 01:05:00 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sun, 02 Apr 2006 09:05:00 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2376=3A_A?= =?utf-8?q?ccounts_-_Input_field_tab_order?= In-Reply-To: <076.8d85c2213e2306a8bab8f1b045c0ea05@vtiger.fosslabs.com> References: <076.8d85c2213e2306a8bab8f1b045c0ea05@vtiger.fosslabs.com> Message-ID: <085.28967a9ac45dc0d832f912f04e508aba@vtiger.fosslabs.com> #76: Accounts - Input field tab order -------------------------------+-------------------------------------------- Reporter: eberle.d at 4net.ch | Owner: developer Type: defect | Status: new Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Input field tab order -------------------------------+-------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Apr 2 01:11:03 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sun, 02 Apr 2006 09:11:03 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2377=3A_A?= =?utf-8?q?dd_accounts_doesn=27t_work_in_detail_view?= Message-ID: <076.d541c69836d3e93fc412dae2f6fd0dd8@vtiger.fosslabs.com> #77: Add accounts doesn't work in detail view ------------------------------+--------------------------------------------- Reporter: eberle.d at 4net.ch | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | ------------------------------+--------------------------------------------- In detail view of an account the button 'Add contacts' doesn't work. To add an account you have to go back to list view :-( -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Apr 2 01:12:09 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sun, 02 Apr 2006 09:12:09 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2377=3A_A?= =?utf-8?q?dd_accounts_doesn=27t_work_in_detail_view?= In-Reply-To: <076.d541c69836d3e93fc412dae2f6fd0dd8@vtiger.fosslabs.com> References: <076.d541c69836d3e93fc412dae2f6fd0dd8@vtiger.fosslabs.com> Message-ID: <085.d88a420fa32749c3a7eec7f3a154b23a@vtiger.fosslabs.com> #77: Add accounts doesn't work in detail view -------------------------------+-------------------------------------------- Reporter: eberle.d at 4net.ch | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: -------------------------------+-------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Apr 2 01:22:07 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sun, 02 Apr 2006 09:22:07 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2378=3A_I?= =?utf-8?q?nput_tab_field_order_for_contacts?= Message-ID: <076.29f680660699a95123ad31091918c40c@vtiger.fosslabs.com> #78: Input tab field order for contacts -----------------------+---------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- Unlogical order. Cursor jumps from firstname to officephone, to lastname, to mobile etc. Should jump from name fields to phone fields an so on. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Apr 2 01:24:03 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sun, 02 Apr 2006 09:24:03 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2378=3A_I?= =?utf-8?q?nput_tab_field_order_for_contacts?= In-Reply-To: <076.29f680660699a95123ad31091918c40c@vtiger.fosslabs.com> References: <076.29f680660699a95123ad31091918c40c@vtiger.fosslabs.com> Message-ID: <085.c4f84d6068924713989ff1d761220b69@vtiger.fosslabs.com> #78: Input tab field order for contacts ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Apr 2 01:24:19 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sun, 02 Apr 2006 09:24:19 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2378=3A_I?= =?utf-8?q?nput_tab_field_order_for_contacts?= In-Reply-To: <076.29f680660699a95123ad31091918c40c@vtiger.fosslabs.com> References: <076.29f680660699a95123ad31091918c40c@vtiger.fosslabs.com> Message-ID: <085.eaf28d49ea454103468c4604ad192da0@vtiger.fosslabs.com> #78: Input tab field order for contacts ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Apr 2 01:27:59 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sun, 02 Apr 2006 09:27:59 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2379=3A_A?= =?utf-8?q?ddress_inheritance?= Message-ID: <076.cc7367ebe2ccb8423599b01e9c951b5c@vtiger.fosslabs.com> #79: Address inheritance ------------------------------+--------------------------------------------- Reporter: eberle.d at 4net.ch | Owner: developer Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | ------------------------------+--------------------------------------------- Address inheritance doesn't work! I created an account and some contacts for this account. Than I changed the adress (billing street) in the account. But in contacts nothing has changed. Changes in accounts must change contact information also. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Apr 2 01:30:35 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sun, 02 Apr 2006 09:30:35 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2380=3A_B?= =?utf-8?q?lock_=27Custom_information=27_for_accounts?= Message-ID: <076.a9588a24eea5812b218bd55fd917354f@vtiger.fosslabs.com> #80: Block 'Custom information' for accounts ------------------------------+--------------------------------------------- Reporter: eberle.d at 4net.ch | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | ------------------------------+--------------------------------------------- The block 'Custom Information' isn't shown when I create a new account. Only after it was created I can edit the entry again an then the block 'Custom information' will be shown. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Apr 2 01:45:10 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sun, 02 Apr 2006 09:45:10 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2381=3A_?= =?utf-8?q?=22Available_Merge_Fields=22_does_not_work_in_the_email_templat?= =?utf-8?q?es_=28adding_a_merge_field_to_a_template_does_not_result_in_tha?= =?utf-8?q?t_field_being_merged=29?= Message-ID: <076.247dfccd0d5a7f69c4c5016ef5f5c24b@vtiger.fosslabs.com> #81: "Available Merge Fields" does not work in the email templates (adding a merge field to a template does not result in that field being merged) ----------------------------------------------------------+----------------- Reporter: scott at crazycolour.com | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: merge fields not available in email template | ----------------------------------------------------------+----------------- Alpha 4 release (not an option in the 'version' field below??) When I created a template (called Roundtree) in the demo_5alpha sample on the vtiger web site. I used the following: Hi $contacts_firstname or $leads_firstname This is a list of fields: $contacts_lastname $contacts_salutationtype $contacts_email That was a test! When I selected an email template these fields were not filled in despite most of these being available. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Apr 2 03:10:07 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sun, 02 Apr 2006 10:10:07 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2382=3A_T?= =?utf-8?q?icket-Activity-Relation?= Message-ID: <076.6df10c0ea64c5d95a412b52a9cface15@vtiger.fosslabs.com> #82: Ticket-Activity-Relation ------------------------------+--------------------------------------------- Reporter: eberle.d at 4net.ch | Owner: developer Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | ------------------------------+--------------------------------------------- The relation of a task to a ticket isn't shown. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Apr 2 03:13:31 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sun, 02 Apr 2006 10:13:31 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2382=3A_T?= =?utf-8?q?icket-Activity-Relation?= In-Reply-To: <076.6df10c0ea64c5d95a412b52a9cface15@vtiger.fosslabs.com> References: <076.6df10c0ea64c5d95a412b52a9cface15@vtiger.fosslabs.com> Message-ID: <085.79befd7a1aec929fb7ad80ef51001db2@vtiger.fosslabs.com> #82: Ticket-Activity-Relation -------------------------------+-------------------------------------------- Reporter: eberle.d at 4net.ch | Owner: developer Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: -------------------------------+-------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Apr 2 03:28:38 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sun, 02 Apr 2006 10:28:38 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2383=3A_L?= =?utf-8?q?ist_views?= Message-ID: <076.064dd25ff4712e59a1e226505f0b11ec@vtiger.fosslabs.com> #83: List views -----------------------+---------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: new Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- In list views there is a line 'Showing 1-12 from 12' but in fact the list vies only shows 10 entries an I can't use the arrows to select the next list view page. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Apr 2 03:34:48 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sun, 02 Apr 2006 10:34:48 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2384=3A_T?= =?utf-8?q?itle_of_notes_in_listview_/_Edit_not_possible?= Message-ID: <076.c9721036e7f48c5c7365768ca6672367@vtiger.fosslabs.com> #84: Title of notes in listview / Edit not possible ------------------------------+--------------------------------------------- Reporter: eberle.d at 4net.ch | Owner: developer Type: defect | Status: new Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | ------------------------------+--------------------------------------------- The subject of a note isn't visible in the related list views. Instead the note itself is displayed under subject. Description remains empty. It is not possible to click on the note to go to the detailview nor is it possible to edit the note. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Apr 2 03:39:33 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sun, 02 Apr 2006 10:39:33 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2385=3A_U?= =?utf-8?q?nneccesary_information_in_related_list_view_under_accounts?= Message-ID: <076.b10358da8d6986cc94695bfc2a2ffb24@vtiger.fosslabs.com> #85: Unneccesary information in related list view under accounts ------------------------------+--------------------------------------------- Reporter: eberle.d at 4net.ch | Owner: developer Type: defect | Status: new Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | ------------------------------+--------------------------------------------- Under accounts the realted list view for contacts shows the column 'Accounts' -> unneccesary. Please show function or department instead. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 04:52:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 03 Apr 2006 11:52:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4828 - in /vtigercrm/trunk/modules: Settings/ Settings/language/ Users/ Message-ID: <20060403115234.E781A5BA31B@vtiger.fosslabs.com> Author: don Date: Mon Apr 3 05:52:19 2006 New Revision: 4828 Log: new UI integrated for settings Modified: vtigercrm/trunk/modules/Settings/BackupServerConfig.php vtigercrm/trunk/modules/Settings/EditCompanyDetails.php vtigercrm/trunk/modules/Settings/EmailConfig.php vtigercrm/trunk/modules/Settings/OrganizationConfig.php vtigercrm/trunk/modules/Settings/Save.php vtigercrm/trunk/modules/Settings/add2db.php vtigercrm/trunk/modules/Settings/language/en_us.lang.php vtigercrm/trunk/modules/Users/Announcements.php vtigercrm/trunk/modules/Users/OrganizationTermsandConditions.php vtigercrm/trunk/modules/Users/UsersAjax.php Modified: vtigercrm/trunk/modules/Settings/BackupServerConfig.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/Settings/EditCompanyDetails.php ============================================================================== --- vtigercrm/trunk/modules/Settings/EditCompanyDetails.php (original) +++ vtigercrm/trunk/modules/Settings/EditCompanyDetails.php Mon Apr 3 05:52:19 2006 @@ -9,37 +9,40 @@ * ********************************************************************************/ -require_once('XTemplate/xtpl.php'); +require_once('Smarty_setup.php'); global $mod_strings; global $app_strings; global $app_list_strings; -$filetype=$_REQUEST['file_type']; -$filesize=$_REQUEST['file_size']; -$logo_value=$_REQUEST['logo_value']; - -echo get_module_title($mod_strings['LBL_MODULE_NAME'], $mod_strings['LBL_SETTINGS'].' : '. $mod_strings['LBL_COMPANY_INFO'], true); -echo '

'; +$smarty = new vtigerCRM_Smarty; //error handling -$flag = $_REQUEST['flag']; -if($flag ==1)echo " Logo has to be an Image of type jpeg/png"; - -if($flag == 3)echo "Sorry, the uploaded file exceeds the maximum filesize limit. Please try a file smaller than 800000 bytes
"; - -if($flag == 4 )echo "Problems in file upload. Please try again!
"; - -if($flag == 2)echo "Error Message
  • Invalid file OR
  • File has no data
"; - +if(isset($_REQUEST['flag']) && $_REQUEST['flag'] != '') +{ + $flag = $_REQUEST['flag']; + switch($flag) + { + case 1: + $smarty->assign("ERRORFLAG"," Logo has to be an Image of type jpeg/png"); + break; + case 2: + $smarty->assign("ERRORFLAG","Error Message
  • Invalid file OR
  • File has no data
"); + break; + case 3: + $smarty->assign("ERRORFLAG","Sorry, the uploaded file exceeds the maximum filesize limit. Please try a file smaller than 800000 bytes"); + break; + case 4: + $smarty->assign("ERRORFLAG","Problems in file upload. Please try again!
"); + break; + default: + $smarty->assign("ERRORFLAG",""); + + } +} global $adb; global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); - -$xtpl=new XTemplate ('modules/Settings/EditCompanyDetails.html'); -//$xtpl=new XTemplate ('modules/Settings/add2db'); -$xtpl->assign("MOD", $mod_strings); -$xtpl->assign("APP", $app_strings); $sql="select * from organizationdetails"; $result = $adb->query($sql); @@ -55,40 +58,33 @@ $organization_logoname = $adb->query_result($result,0,'logoname'); -$xtpl->assign("RETURN_MODULE","Settings"); -$xtpl->assign("RETURN_ACTION","index"); - -$xtpl->assign("FILE_NAME",$filename); -$xtpl->assign("FILE_TYPE",$filetype); -$xtpl->assign("FILE_SIZE",$filesize); -$xtpl->assign("LOGO_VALUE",$logo_value); - if (isset($organization_name)) - $xtpl->assign("ORGANIZATIONNAME",$organization_name); + $smarty->assign("ORGANIZATIONNAME",$organization_name); if (isset($organization_address)) - $xtpl->assign("ORGANIZATIONADDRESS",$organization_address); + $smarty->assign("ORGANIZATIONADDRESS",$organization_address); if (isset($organization_city)) - $xtpl->assign("ORGANIZATIONCITY",$organization_city); + $smarty->assign("ORGANIZATIONCITY",$organization_city); if (isset($organization_state)) - $xtpl->assign("ORGANIZATIONSTATE",$organization_state); + $smarty->assign("ORGANIZATIONSTATE",$organization_state); if (isset($organization_code)) - $xtpl->assign("ORGANIZATIONCODE",$organization_code); + $smarty->assign("ORGANIZATIONCODE",$organization_code); if (isset($organization_country)) - $xtpl->assign("ORGANIZATIONCOUNTRY",$organization_country); + $smarty->assign("ORGANIZATIONCOUNTRY",$organization_country); if (isset($organization_phone)) - $xtpl->assign("ORGANIZATIONPHONE",$organization_phone); + $smarty->assign("ORGANIZATIONPHONE",$organization_phone); if (isset($organization_fax)) - $xtpl->assign("ORGANIZATIONFAX",$organization_fax); + $smarty->assign("ORGANIZATIONFAX",$organization_fax); if (isset($organization_website)) - $xtpl->assign("ORGANIZATIONWEBSITE",$organization_website); + $smarty->assign("ORGANIZATIONWEBSITE",$organization_website); if ($organization_logoname == '') $organization_logoname = $_REQUEST['prev_name']; if (isset($organization_logoname)) - $xtpl->assign("ORGANIZATIONLOGONAME",$organization_logoname); + $smarty->assign("ORGANIZATIONLOGONAME",$organization_logoname); -$xtpl->parse("main"); -$xtpl->out("main"); - - +$smarty->assign("MOD", return_module_language($current_language,'Settings')); +$smarty->assign("IMAGE_PATH",$image_path); +$smarty->assign("APP", $app_strings); +$smarty->assign("CMOD", $mod_strings); +$smarty->display('Settings/EditCompanyInfo.tpl'); ?> Modified: vtigercrm/trunk/modules/Settings/EmailConfig.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/Settings/OrganizationConfig.php ============================================================================== --- vtigercrm/trunk/modules/Settings/OrganizationConfig.php (original) +++ vtigercrm/trunk/modules/Settings/OrganizationConfig.php Mon Apr 3 05:52:19 2006 @@ -10,28 +10,30 @@ ********************************************************************************/ -require_once('XTemplate/xtpl.php'); +require_once('Smarty_setup.php'); + global $mod_strings; global $app_strings; global $app_list_strings; - - -echo get_module_title($mod_strings['LBL_MODULE_NAME'], $mod_strings['LBL_SETTINGS'].' : '. $mod_strings['LBL_COMPANY_INFO'], true); -echo '

'; global $adb; global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); -$xtpl=new XTemplate('modules/Settings/OrganizationConfig.html'); -$xtpl->assign("MOD", $mod_strings); -$xtpl->assign("APP", $app_strings); +global $mod_strings; +global $app_strings; +global $app_list_strings; - $xtpl->assign("EDITCOMPANYDETAILS",""); - - $xtpl->assign("CANCELCOMPANYDETAILS",""); +global $adb; +global $theme; +$theme_path="themes/".$theme."/"; +$image_path=$theme_path."images/"; +require_once($theme_path.'layout_utils.php'); + + +$smarty = new vtigerCRM_Smarty; $sql="select * from organizationdetails"; $result = $adb->query($sql); @@ -47,30 +49,26 @@ $organization_logo = $adb->query_result($result,0,'logo'); $organization_logoname = $adb->query_result($result,0,'logoname'); -$xtpl->assign("RETURN_MODULE","Settings"); -$xtpl->assign("RETURN_ACTION","index"); - - if (isset($organization_name)) - $xtpl->assign("ORGANIZATIONNAME",$organization_name); + $smarty->assign("ORGANIZATIONNAME",$organization_name); if (isset($organization_address)) - $xtpl->assign("ORGANIZATIONADDRESS",$organization_address); + $smarty->assign("ORGANIZATIONADDRESS",$organization_address); if (isset($organization_city)) - $xtpl->assign("ORGANIZATIONCITY",$organization_city); + $smarty->assign("ORGANIZATIONCITY",$organization_city); if (isset($organization_state)) - $xtpl->assign("ORGANIZATIONSTATE",$organization_state); + $smarty->assign("ORGANIZATIONSTATE",$organization_state); if (isset($organization_code)) - $xtpl->assign("ORGANIZATIONCODE",$organization_code); + $smarty->assign("ORGANIZATIONCODE",$organization_code); if (isset($organization_country)) - $xtpl->assign("ORGANIZATIONCOUNTRY",$organization_country); + $smarty->assign("ORGANIZATIONCOUNTRY",$organization_country); if (isset($organization_phone)) - $xtpl->assign("ORGANIZATIONPHONE",$organization_phone); + $smarty->assign("ORGANIZATIONPHONE",$organization_phone); if (isset($organization_fax)) - $xtpl->assign("ORGANIZATIONFAX",$organization_fax); + $smarty->assign("ORGANIZATIONFAX",$organization_fax); if (isset($organization_website)) - $xtpl->assign("ORGANIZATIONWEBSITE",$organization_website); + $smarty->assign("ORGANIZATIONWEBSITE",$organization_website); if (isset($organization_logo)) - $xtpl->assign("ORGANIZATIONLOGO",$organization_logo); + $smarty->assign("ORGANIZATIONLOGO",$organization_logo); $path = "test/logo"; $dir_handle = @opendir($path) or die("Unable to open directory $path"); @@ -95,12 +93,14 @@ if (isset($organization_logopath)) - $xtpl->assign("ORGANIZATIONLOGOPATH",$path); + $smarty->assign("ORGANIZATIONLOGOPATH",$path); if (isset($organization_logoname)) - $xtpl->assign("ORGANIZATIONLOGONAME",$logo_name); + $smarty->assign("ORGANIZATIONLOGONAME",$logo_name); closedir($dir_handle); -$xtpl->parse("main"); -$xtpl->out("main"); - +$smarty->assign("MOD", return_module_language($current_language,'Settings')); +$smarty->assign("IMAGE_PATH",$image_path); +$smarty->assign("APP", $app_strings); +$smarty->assign("CMOD", $mod_strings); +$smarty->display('Settings/CompanyInfo.tpl'); ?> Modified: vtigercrm/trunk/modules/Settings/Save.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/Settings/add2db.php ============================================================================== --- vtigercrm/trunk/modules/Settings/add2db.php (original) +++ vtigercrm/trunk/modules/Settings/add2db.php Mon Apr 3 05:52:19 2006 @@ -36,7 +36,6 @@ { $savelogo="false"; $error_flag ="1"; - //$errormessage = " Logo has to be an Image of type jpeg/png"; } else if($result!=false) { @@ -47,7 +46,6 @@ { $savelogo="false"; $error_flag ="1"; - //$errormessage = " Logo has to be an Image of type jpeg/png"; } } @@ -56,10 +54,6 @@ $savelogo="false"; if($filename != "") $error_flag ="2"; - //$errormessage = "Error Message
    - //
  • Invalid file OR - //
  • File has no data - //
" ; } $errorCode = $_FILES['binFile']['error']; @@ -73,14 +67,12 @@ else if($errorCode == 2) { $error_flag ="3"; - //$errormessage = "Sorry, the uploaded file exceeds the maximum filesize limit. Please try a file smaller than 800000 bytes
"; $savelogo="false"; $nologo_specified="false"; } else if($errorCode == 3 ) { $error_flag ="4"; - //$errormessage = "Problems in file upload. Please try again!
"; $savelogo="false"; $nologo_specified="false"; } 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 Mon Apr 3 05:52:19 2006 @@ -539,7 +539,8 @@ //Added fields after 5.0 Alpha 'LBL_REQUIRE_SMTP_AUTHENTICATION'=>'Require SMTP Authentication?', 'LBL_ANNOUNCEMENT'=>'Announcements', -'LBL_SETTING_ANNOUNCEMENT'=>'Announcements', +'LBL_SETTING_ANNOUNCEMENT'=>'Announcement', +'LBL_ANNOUNCEMENT_INFO'=>'Type the announcement text below, and click the save button.', ); Modified: vtigercrm/trunk/modules/Users/Announcements.php ============================================================================== --- vtigercrm/trunk/modules/Users/Announcements.php (original) +++ vtigercrm/trunk/modules/Users/Announcements.php Mon Apr 3 05:52:19 2006 @@ -9,6 +9,7 @@ * ********************************************************************************/ +require_once('XTemplate/xtpl.php'); global $adb; global $current_user; global $theme; @@ -19,46 +20,13 @@ $announcement=$adb->query_result($result,0,'announcement'); $title_prev=$adb->query_result($result,0,'title'); $id=$adb->query_result($result,0,'creatorid'); -if($id != $current_user->id) - $announcement=''; - $html=' -

- - - - - - - - - - - - -
Announcements
Title
- Create Announcement -
 
-
- - -
-
'; - echo $html; +$smarty->assign("ANNOUNCE",$announcement); +$smarty->assign("MOD", return_module_language($current_language,'Settings')); +$smarty->assign("IMAGE_PATH",$image_path); +$smarty->assign("APP", $app_strings); +$smarty->assign("CMOD", $mod_strings); + +$smarty->display("Settings/Announcements.tpl"); + ?> Modified: vtigercrm/trunk/modules/Users/OrganizationTermsandConditions.php ============================================================================== --- vtigercrm/trunk/modules/Users/OrganizationTermsandConditions.php (original) +++ vtigercrm/trunk/modules/Users/OrganizationTermsandConditions.php Mon Apr 3 05:52:19 2006 @@ -10,54 +10,36 @@ ********************************************************************************/ -require_once('XTemplate/xtpl.php'); -//require_once('data/Tracker.php'); -//require_once('include/utils/UserInfoUtil.php'); require_once('include/database/PearDatabase.php'); +require_once('Smarty_setup.php'); global $mod_strings; global $app_strings; global $app_list_strings; -echo get_module_title($mod_strings['LBL_MODULE_NAME'],$mod_strings['INV_TERMSANDCONDITIONS'],true); -echo '

'; global $adb; global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); -$xtpl=new XTemplate('modules/Users/OrganizationTermsandConditions.html'); -$xtpl->assign("MOD", $mod_strings); -$xtpl->assign("APP", $app_strings); - - +$smarty = new vtigerCRM_Smarty; $sql="select * from inventory_tandc"; $result = $adb->query($sql); -//$inventoryResult = $adb->fetch_array($result); $inventory_id = $adb->query_result($result,0,'id'); $inventory_type = $adb->query_result($result,0,'type'); $inventory_tandc = $adb->query_result($result,0,'tandc'); -if(isset($inventory_id)) - $xtpl->assign("INVENTORYID",$inventory_id); -if (isset($inventory_type)) - $xtpl->assign("INVENTORYTYPE",$inventory_type); if (isset($inventory_tandc)) - $xtpl->assign("INV_TERMSANDCONDITIONS",$inventory_tandc); - - -/* - $xtpl->assign("INVENTORYID",$inventoryResult["id"]); -//if (isset($inventory_type)) - $xtpl->assign("INVENTORYTYPE",$inventoryResult["type"]); -//if (isset($inventory_tandc)) - $xtpl->assign("INV_TERMSANDCONDITIONS",$inventoryResult["tandc"]);*/ - - -$xtpl->parse("main"); -$xtpl->out("main"); - + $smarty->assign("INV_TERMSANDCONDITIONS",$inventory_tandc); +if(isset($_REQUEST['inv_terms_mode']) && $_REQUEST['inv_terms_mode'] != '') + $smarty->assign("INV_TERMS_MODE",$_REQUEST['inv_terms_mode']); +else + $smarty->assign("INV_TERMS_MODE",'view'); + +$smarty->assign("MOD", return_module_language($current_language,'Settings')); +$smarty->assign("IMAGE_PATH",$image_path); +$smarty->assign("APP", $app_strings); +$smarty->assign("CMOD", $mod_strings); +$smarty->display("Settings/InventoryTerms.tpl"); ?> - - Modified: vtigercrm/trunk/modules/Users/UsersAjax.php ============================================================================== --- vtigercrm/trunk/modules/Users/UsersAjax.php (original) +++ vtigercrm/trunk/modules/Users/UsersAjax.php Mon Apr 3 05:52:19 2006 @@ -41,9 +41,9 @@ $sql="select * from announcement where creatorid=".$current_user->id; $is_announce=$adb->query($sql); if($adb->num_rows($is_announce) > 0) - $query="update announcement set announcement=".$adb->formatString("announcement","announcement",$announcement).",time=".$adb->formatString("announcement","time",$date_var).",title=".$adb->formatString("announcement","title",$title)." where creatorid=".$current_user->id; + $query="update announcement set announcement=".$adb->formatString("announcement","announcement",$announcement).",time=".$adb->formatString("announcement","time",$date_var).",title='announcement' where creatorid=".$current_user->id; else - $query="insert into announcement values (".$current_user->id.",".$adb->formatString("announcement","announcement",$announcement).",".$adb->formatString("announcement","time",$date_var).",'".$date_var."')"; + $query="insert into announcement values (".$current_user->id.",".$adb->formatString("announcement","announcement",$announcement).",'announcement','".$date_var."')"; $result=$adb->query($query); echo $announcement; } From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 04:55:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 03 Apr 2006 11:55:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4829 - /vtigercrm/trunk/themes/blue/style.css Message-ID: <20060403115520.7951E5BA327@vtiger.fosslabs.com> Author: don Date: Mon Apr 3 05:55:15 2006 New Revision: 4829 Log: style for button has been added Modified: vtigercrm/trunk/themes/blue/style.css Modified: vtigercrm/trunk/themes/blue/style.css ============================================================================== --- vtigercrm/trunk/themes/blue/style.css (original) +++ vtigercrm/trunk/themes/blue/style.css Mon Apr 3 05:55:15 2006 @@ -1509,6 +1509,13 @@ border:1px solid #666666; text-align:center; } +.txtBox{ + width:85%; + border:1px solid #666666; + font-family:Arial, Helvetica, sans-serif; + font-size:11px; +} + /*cloud css*/ .statechange From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 05:02:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 03 Apr 2006 12:02:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4830 - /vtigercrm/trunk/modules/Users/savetermsandconditions.php Message-ID: <20060403120222.3E3A85BA336@vtiger.fosslabs.com> Author: don Date: Mon Apr 3 06:02:17 2006 New Revision: 4830 Log: changes made to integrate new UI Modified: vtigercrm/trunk/modules/Users/savetermsandconditions.php Modified: vtigercrm/trunk/modules/Users/savetermsandconditions.php ============================================================================== --- vtigercrm/trunk/modules/Users/savetermsandconditions.php (original) +++ vtigercrm/trunk/modules/Users/savetermsandconditions.php Mon Apr 3 06:02:17 2006 @@ -11,7 +11,7 @@ require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); -$inv_type=$_REQUEST['inventory_type']; +$inv_type='Inventory'; $inv_tandc=$_REQUEST['inventory_tandc']; $sql="select * from inventory_tandc where type='".$inv_type."'"; From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 05:04:39 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 03 Apr 2006 12:04:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4831 - in /vtigercrm/trunk: Smarty/templates/Settings/ include/images/ Message-ID: <20060403120439.E78715BA336@vtiger.fosslabs.com> Author: don Date: Mon Apr 3 06:04:26 2006 New Revision: 4831 Log: new files added to integrate new UI Added: vtigercrm/trunk/Smarty/templates/Settings/ vtigercrm/trunk/Smarty/templates/Settings/Announcements.tpl (with props) vtigercrm/trunk/Smarty/templates/Settings/BackupServer.tpl (with props) vtigercrm/trunk/Smarty/templates/Settings/CompanyInfo.tpl (with props) vtigercrm/trunk/Smarty/templates/Settings/EditCompanyInfo.tpl (with props) vtigercrm/trunk/Smarty/templates/Settings/EmailConfig.tpl (with props) vtigercrm/trunk/Smarty/templates/Settings/InventoryTerms.tpl (with props) vtigercrm/trunk/include/images/announ.gif (with props) vtigercrm/trunk/include/images/noimage.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 05:07:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 03 Apr 2006 12:07:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4832 - in /vtigercrm/trunk/modules: Settings/ Users/ Message-ID: <20060403120750.788F55BA344@vtiger.fosslabs.com> Author: don Date: Mon Apr 3 06:07:41 2006 New Revision: 4832 Log: files removed as the settings smartified for the new UI Removed: vtigercrm/trunk/modules/Settings/BackupServerConfig.html vtigercrm/trunk/modules/Settings/EditCompanyDetails.html vtigercrm/trunk/modules/Settings/EmailConfig.html vtigercrm/trunk/modules/Settings/OrganizationConfig.html vtigercrm/trunk/modules/Users/EditTermsandConditions.html vtigercrm/trunk/modules/Users/EditTermsandConditions.php vtigercrm/trunk/modules/Users/OrganizationTermsandConditions.html From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 05:40:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 03 Apr 2006 12:40:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4833 - /vtigercrm/trunk/schema/DatabaseSchema.xml Message-ID: <20060403124034.6F7DB59E1F6@vtiger.fosslabs.com> Author: don Date: Mon Apr 3 06:40:28 2006 New Revision: 4833 Log: Fixed indexing issues in reporddatefilter,reportmodules,reportsortcol,reportsummary Modified: vtigercrm/trunk/schema/DatabaseSchema.xml Modified: vtigercrm/trunk/schema/DatabaseSchema.xml ============================================================================== --- vtigercrm/trunk/schema/DatabaseSchema.xml (original) +++ vtigercrm/trunk/schema/DatabaseSchema.xml Mon Apr 3 06:40:28 2006 @@ -5657,14 +5657,11 @@ - - reportmodulesid - Type=InnoDB - ADD CONSTRAINT reportmodules_FK1 FOREIGN KEY (REPORTMODULESID) REFERENCES report (REPORTID) ON DELETE CASCADE + ADD CONSTRAINT reportmodules_FK1 FOREIGN KEY (reportmodulesid) REFERENCES report(reportid) ON DELETE CASCADEType=InnoDB
@@ -5672,13 +5669,9 @@ - - - - @@ -5686,14 +5679,11 @@ - - reportid - Type=InnoDB
- ADD CONSTRAINT reportsortcol_FK1 FOREIGN KEY (REPORTID) REFERENCES report (REPORTID) ON DELETE CASCADE + ADD CONSTRAINT FK1_reportsortcol FOREIGN KEY (reportid) REFERENCES report(reportid) ON DELETE CASCADEType=InnoDB
@@ -5701,8 +5691,6 @@ - - @@ -5716,14 +5704,11 @@ - - datefilterid - Type=InnoDB
- ADD CONSTRAINT reportdatefilter_FK1 FOREIGN KEY (DATEFILTERID) REFERENCES report (REPORTID) ON DELETE CASCADE + ADD CONSTRAINT FK1_reportdatefilter FOREIGN KEY (datefilterid) REFERENCES report(reportid) ON DELETE CASCADEType=InnoDB
@@ -5731,26 +5716,19 @@ - - - - - - reportsummaryid - Type=InnoDB
- ADD CONSTRAINT reportsummary_FK1 FOREIGN KEY (REPORTSUMMARYID) REFERENCES report (REPORTID) ON DELETE CASCADE + ADD CONSTRAINT reportsummary_FK1 FOREIGN KEY (reportsummaryid) REFERENCES report(reportid) ON DELETE CASCADEType=InnoDB
From vtiger-tickets at vtiger.fosslabs.com Mon Apr 3 09:28:28 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 03 Apr 2006 16:28:28 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2317=3A_A?= =?utf-8?q?dd_postgresql_support_to_4=2E2_branch?= In-Reply-To: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> References: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> Message-ID: <085.c3a432300001f662f66fc6b3a4b92bea@vtiger.fosslabs.com> #17: Add postgresql support to 4.2 branch ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Resolution: | Keywords: database postgresql ------------------------+--------------------------------------------------- Comment (by allanbush): (In [4834]) Fetching id for ticketcomments before inserting into database. Refs #17. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 09:28:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 03 Apr 2006 16:28:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4834 - in /vtigercrm/branches/4.2_postgresql_integration: data/CRMEntity.php install/5createTables.inc.php Message-ID: <20060403162829.102A959E806@vtiger.fosslabs.com> Author: allanbush Date: Mon Apr 3 10:28:25 2006 New Revision: 4834 Log: Fetching id for ticketcomments before inserting into database. Refs #17. Modified: vtigercrm/branches/4.2_postgresql_integration/data/CRMEntity.php vtigercrm/branches/4.2_postgresql_integration/install/5createTables.inc.php Modified: vtigercrm/branches/4.2_postgresql_integration/data/CRMEntity.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/data/CRMEntity.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/data/CRMEntity.php Mon Apr 3 10:28:25 2006 @@ -740,8 +740,9 @@ else $ownertype = 'customer'; - $comment = addslashes($_REQUEST['comments']); - $sql = "insert into ticketcomments values('',".$this->id.",'".$comment."','".$current_user->id."','".$ownertype."','".$current_time."')"; + $comment = $adb->quote($_REQUEST['comments']); + $id = $adb->getUniqueID("ticketcomments_commentid"); + $sql = "insert into ticketcomments values(".$id.",".$this->id.",".$comment.",'".$current_user->id."','".$ownertype."','".$current_time."')"; $adb->query($sql); } function insertIntoFAQCommentTable($table_name, $module) Modified: vtigercrm/branches/4.2_postgresql_integration/install/5createTables.inc.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/install/5createTables.inc.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/install/5createTables.inc.php Mon Apr 3 10:28:25 2006 @@ -248,6 +248,7 @@ $db->getUniqueID("rss"); $db->getUniqueID("selectquery"); $db->getUniqueID("systems"); +$db->getUniqueID("ticketcomments_commentid"); $db->getUniqueID("wordtemplates"); From vtiger-tickets at vtiger.fosslabs.com Mon Apr 3 09:52:35 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 03 Apr 2006 16:52:35 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2317=3A_A?= =?utf-8?q?dd_postgresql_support_to_4=2E2_branch?= In-Reply-To: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> References: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> Message-ID: <085.642b2e5ad04b47873cd36c21dd349c7e@vtiger.fosslabs.com> #17: Add postgresql support to 4.2 branch ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Resolution: | Keywords: database postgresql ------------------------+--------------------------------------------------- Comment (by allanbush): (In [4835]) Fixed date formatting on attachment creation. Refs #17. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 09:52:36 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 03 Apr 2006 16:52:36 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4835 - /vtigercrm/branches/4.2_postgresql_integration/modules/uploads/add2db.php Message-ID: <20060403165236.7C04459F66F@vtiger.fosslabs.com> Author: allanbush Date: Mon Apr 3 10:52:33 2006 New Revision: 4835 Log: Fixed date formatting on attachment creation. Refs #17. Modified: vtigercrm/branches/4.2_postgresql_integration/modules/uploads/add2db.php Modified: vtigercrm/branches/4.2_postgresql_integration/modules/uploads/add2db.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/modules/uploads/add2db.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/modules/uploads/add2db.php Mon Apr 3 10:52:33 2006 @@ -40,7 +40,7 @@ $current_id = $adb->getUniqueID("crmentity"); $desc = $_REQUEST['txtDescription']; $description = addslashes($desc); - $date_var = date('YmdHis'); + $date_var = $adb->database->DBTimeStamp(date('YmdHis')); //$data = addslashes(fread(fopen($uploaddir.$binFile, "r"), $filesize)); $filenameBase64 = $filename.".base64"; @@ -50,8 +50,8 @@ fwrite($wfh,base64_encode(fread($rfh, $filesize))); deleteFile($uploaddir,$filename); - $query = "insert into 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 = "insert into crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values('"; + $query .= $current_id."','".$current_user->id."','".$current_user->id."','".$_REQUEST['return_module'].' Attachment'."','".$description."',".$date_var.",".$date_var.")"; $result = $adb->query($query); $sql = "insert into attachments values("; From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 09:55:18 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 03 Apr 2006 16:55:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4836 - /vtigercrm/branches/4.2_postgresql_integration/include/database/PearDatabase.php Message-ID: <20060403165518.9208559F67B@vtiger.fosslabs.com> Author: allanbush Date: Mon Apr 3 10:55:13 2006 New Revision: 4836 Log: Added support for postgres blob insertion (adodb is limited in it's postgres blob support and only one of UpdateBlobFile or UpdateBlob work Modified: vtigercrm/branches/4.2_postgresql_integration/include/database/PearDatabase.php Modified: vtigercrm/branches/4.2_postgresql_integration/include/database/PearDatabase.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/include/database/PearDatabase.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/include/database/PearDatabase.php Mon Apr 3 10:55:13 2006 @@ -264,7 +264,14 @@ { $this->println("updateBlobFile t=".$tablename." c=".$colname." id=".$id." f=".$filename); $this->checkConnection(); - $result = $this->database->UpdateBlobFile($tablename, $colname, $filename, $id); + if($this->isPostgres()) { + $fp = fopen($filename, "r"); + $filecontent = fread($fp, filesize($filename)); + $result = $this->database->UpdateBlob($tablename, $colname, $filecontent, $id); + fclose($fp); + } else { + $result = $this->database->UpdateBlobFile($tablename, $colname, $filename, $id); + } $this->println("updateBlobFile t=".$tablename." c=".$colname." id=".$id." f=".$filename." status=".$result); return $result; } From vtiger-tickets at vtiger.fosslabs.com Mon Apr 3 10:02:15 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 03 Apr 2006 17:02:15 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2317=3A_A?= =?utf-8?q?dd_postgresql_support_to_4=2E2_branch?= In-Reply-To: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> References: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> Message-ID: <085.a978653b484aed441324a2048226a8b8@vtiger.fosslabs.com> #17: Add postgresql support to 4.2 branch ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Resolution: | Keywords: database postgresql ------------------------+--------------------------------------------------- Comment (by allanbush): (In [4837]) Fixed FAQ comment creation by fetching next id value before inserting a new row. Refs #17. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 10:02:16 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 03 Apr 2006 17:02:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4837 - in /vtigercrm/branches/4.2_postgresql_integration: data/CRMEntity.php install/5createTables.inc.php Message-ID: <20060403170216.3E75859F6CE@vtiger.fosslabs.com> Author: allanbush Date: Mon Apr 3 11:02:13 2006 New Revision: 4837 Log: Fixed FAQ comment creation by fetching next id value before inserting a new row. Refs #17. Modified: vtigercrm/branches/4.2_postgresql_integration/data/CRMEntity.php vtigercrm/branches/4.2_postgresql_integration/install/5createTables.inc.php Modified: vtigercrm/branches/4.2_postgresql_integration/data/CRMEntity.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/data/CRMEntity.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/data/CRMEntity.php Mon Apr 3 11:02:13 2006 @@ -753,8 +753,9 @@ $current_time = date('Y-m-d H:i:s'); - $comment = addslashes($_REQUEST['comments']); - $sql = "insert into faqcomments values('',".$this->id.",'".$comment."','".$current_time."')"; + $comment = $adb->quote($_REQUEST['comments']); + $id = $adb->getUniqueID("faqcomments_commentid"); + $sql = "insert into faqcomments values(".$id.",".$this->id.",".$comment.",'".$current_time."')"; $adb->query($sql); } function insertIntoReminderTable($table_name,$module,$recurid) Modified: vtigercrm/branches/4.2_postgresql_integration/install/5createTables.inc.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/install/5createTables.inc.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/install/5createTables.inc.php Mon Apr 3 11:02:13 2006 @@ -235,6 +235,7 @@ $db->getUniqueID("customview"); $db->getUniqueID("def_org_share"); $db->getUniqueID("emailtemplates"); +$db->getUniqueID("faqcomments_commentid"); $db->getUniqueID("field"); $db->getUniqueID("import_maps"); $db->getUniqueID("inventorynotification"); From vtiger-tickets at vtiger.fosslabs.com Mon Apr 3 10:06:11 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 03 Apr 2006 17:06:11 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2317=3A_A?= =?utf-8?q?dd_postgresql_support_to_4=2E2_branch?= In-Reply-To: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> References: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> Message-ID: <085.1f5de052b4ec87bcd8917f4df1e99233@vtiger.fosslabs.com> #17: Add postgresql support to 4.2 branch ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Resolution: | Keywords: database postgresql ------------------------+--------------------------------------------------- Comment (by allanbush): (In [4838]) Fixed error in sales order related list (detail view) by using OR in the query instead of ||. Refs #17. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 10:06:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 03 Apr 2006 17:06:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4838 - /vtigercrm/branches/4.2_postgresql_integration/modules/Orders/SalesOrder.php Message-ID: <20060403170612.0A42859F6E6@vtiger.fosslabs.com> Author: allanbush Date: Mon Apr 3 11:06:09 2006 New Revision: 4838 Log: Fixed error in sales order related list (detail view) by using OR in the query instead of ||. Refs #17. Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Orders/SalesOrder.php Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Orders/SalesOrder.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/modules/Orders/SalesOrder.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/modules/Orders/SalesOrder.php Mon Apr 3 11:06:09 2006 @@ -172,7 +172,7 @@ } function get_activities($id) { - $query = "SELECT contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, activity.*,seactivityrel.*,crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, users.user_name from activity inner join seactivityrel on seactivityrel.activityid=activity.activityid inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid = cntactivityrel.contactid left join users on users.id=crmentity.smownerid where seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and crmentity.deleted=0 and ( activity.status is NULL || activity.status != 'Completed' ) and ( activity.eventstatus is NULL || activity.eventstatus != 'Held')"; + $query = "SELECT contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, activity.*,seactivityrel.*,crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, users.user_name from activity inner join seactivityrel on seactivityrel.activityid=activity.activityid inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid = cntactivityrel.contactid left join users on users.id=crmentity.smownerid where seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and crmentity.deleted=0 and ( activity.status is NULL OR activity.status != 'Completed' ) and ( activity.eventstatus is NULL OR activity.eventstatus != 'Held')"; renderSalesRelatedActivities($query,$id); } function get_history($id) From vtiger-tickets at vtiger.fosslabs.com Mon Apr 3 10:07:29 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 03 Apr 2006 17:07:29 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2317=3A_A?= =?utf-8?q?dd_postgresql_support_to_4=2E2_branch?= In-Reply-To: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> References: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> Message-ID: <085.79639190f0a8c85294f50498b4e2fa9e@vtiger.fosslabs.com> #17: Add postgresql support to 4.2 branch ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Resolution: | Keywords: database postgresql ------------------------+--------------------------------------------------- Comment (by allanbush): (In [4839]) Fixed related list query, replacing || with OR. Refs #17. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 10:07:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 03 Apr 2006 17:07:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4839 - /vtigercrm/branches/4.2_postgresql_integration/modules/Invoice/Invoice.php Message-ID: <20060403170730.9BC2859F6EA@vtiger.fosslabs.com> Author: allanbush Date: Mon Apr 3 11:07:27 2006 New Revision: 4839 Log: Fixed related list query, replacing || with OR. Refs #17. Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Invoice/Invoice.php Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Invoice/Invoice.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/modules/Invoice/Invoice.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/modules/Invoice/Invoice.php Mon Apr 3 11:07:27 2006 @@ -166,7 +166,7 @@ } function get_activities($id) { - $query = "SELECT contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, activity.*,seactivityrel.*,crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, users.user_name from activity inner join seactivityrel on seactivityrel.activityid=activity.activityid inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid = cntactivityrel.contactid left join users on users.id=crmentity.smownerid where seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and crmentity.deleted=0 and ( activity.status is NULL || activity.status != 'Completed' ) and ( activity.eventstatus is NULL || activity.eventstatus != 'Held')"; + $query = "SELECT contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, activity.*,seactivityrel.*,crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, users.user_name from activity inner join seactivityrel on seactivityrel.activityid=activity.activityid inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid = cntactivityrel.contactid left join users on users.id=crmentity.smownerid where seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and crmentity.deleted=0 and ( activity.status is NULL OR activity.status != 'Completed' ) and ( activity.eventstatus is NULL OR activity.eventstatus != 'Held')"; renderRelatedActivities($query,$id); } function get_history($id) From vtiger-tickets at vtiger.fosslabs.com Mon Apr 3 10:16:19 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 03 Apr 2006 17:16:19 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2317=3A_A?= =?utf-8?q?dd_postgresql_support_to_4=2E2_branch?= In-Reply-To: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> References: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> Message-ID: <085.6c0a21a688742d1fb7b0aba5bb4127ad@vtiger.fosslabs.com> #17: Add postgresql support to 4.2 branch ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Resolution: | Keywords: database postgresql ------------------------+--------------------------------------------------- Comment (by allanbush): (In [4840]) Fixed detail view by replacing || with OR in related list query. Refs #17. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 10:16:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 03 Apr 2006 17:16:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4840 - /vtigercrm/branches/4.2_postgresql_integration/modules/Orders/Order.php Message-ID: <20060403171620.4240F59F6E7@vtiger.fosslabs.com> Author: allanbush Date: Mon Apr 3 11:16:17 2006 New Revision: 4840 Log: Fixed detail view by replacing || with OR in related list query. Refs #17. Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Orders/Order.php Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Orders/Order.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/modules/Orders/Order.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/modules/Orders/Order.php Mon Apr 3 11:16:17 2006 @@ -166,7 +166,7 @@ } function get_activities($id) { - $query = "SELECT contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, activity.*,seactivityrel.*,crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, users.user_name from activity inner join seactivityrel on seactivityrel.activityid=activity.activityid inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid = cntactivityrel.contactid left join users on users.id=crmentity.smownerid where seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and crmentity.deleted=0 and ( activity.status is NULL || activity.status != 'Completed' ) and ( activity.eventstatus is NULL || activity.eventstatus != 'Held')"; + $query = "SELECT contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, activity.*,seactivityrel.*,crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, users.user_name from activity inner join seactivityrel on seactivityrel.activityid=activity.activityid inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid = cntactivityrel.contactid left join users on users.id=crmentity.smownerid where seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and crmentity.deleted=0 and ( activity.status is NULL OR activity.status != 'Completed' ) and ( activity.eventstatus is NULL OR activity.eventstatus != 'Held')"; renderRelatedActivities($query,$id); } function get_history($id) From vtiger-tickets at vtiger.fosslabs.com Mon Apr 3 10:41:08 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 03 Apr 2006 17:41:08 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2317=3A_A?= =?utf-8?q?dd_postgresql_support_to_4=2E2_branch?= In-Reply-To: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> References: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> Message-ID: <085.2fa7556ca5d60f1140d205c3596da1ef@vtiger.fosslabs.com> #17: Add postgresql support to 4.2 branch ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Resolution: | Keywords: database postgresql ------------------------+--------------------------------------------------- Comment (by allanbush): (In [4841]) Various changes to get reports working with postgres. Refs #17. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 10:41:08 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 03 Apr 2006 17:41:08 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4841 - in /vtigercrm/branches/4.2_postgresql_integration/modules/Reports: ReportRun.php Save.php SaveReportFolder.php Message-ID: <20060403174108.0BD7259F679@vtiger.fosslabs.com> Author: allanbush Date: Mon Apr 3 11:41:02 2006 New Revision: 4841 Log: Various changes to get reports working with postgres. Refs #17. Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Reports/ReportRun.php vtigercrm/branches/4.2_postgresql_integration/modules/Reports/Save.php vtigercrm/branches/4.2_postgresql_integration/modules/Reports/SaveReportFolder.php Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Reports/ReportRun.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/modules/Reports/ReportRun.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/modules/Reports/ReportRun.php Mon Apr 3 11:41:02 2006 @@ -93,15 +93,15 @@ { if($this->primarymodule == "HelpDesk") { - $querycolumn = "case crmentityRelHelpDesk.setype when 'Accounts' then accountRelHelpDesk.accountname when 'Contacts' then contactdetailsRelHelpDesk.lastname End"." '".$selectedfields[2]."', crmentityRelHelpDesk.setype 'Entity_type'"; + $querycolumn = "case crmentityRelHelpDesk.setype when 'Accounts' then accountRelHelpDesk.accountname when 'Contacts' then contactdetailsRelHelpDesk.lastname End"." AS \"".$selectedfields[2]."\", crmentityRelHelpDesk.setype AS Entity_type"; } if($this->primarymodule == "Products" || $this->secondarymodule == "Products") { - $querycolumn = "case crmentityRelProducts.setype when 'Accounts' then accountRelProducts.accountname when 'Leads' then leaddetailsRelProducts.lastname when 'Potentials' then potentialRelProducts.potentialname End"." '".$selectedfields[2]."', crmentityRelProducts.setype 'Entity_type'"; + $querycolumn = "case crmentityRelProducts.setype when 'Accounts' then accountRelProducts.accountname when 'Leads' then leaddetailsRelProducts.lastname when 'Potentials' then potentialRelProducts.potentialname End"." AS \"".$selectedfields[2]."\", crmentityRelProducts.setype AS Entity_type"; } if($this->primarymodule == "Activities" || $this->secondarymodule == "Activities") { - $querycolumn = "case crmentityRelActivities.setype when 'Accounts' then accountRelActivities.accountname when 'Leads' then leaddetailsRelActivities.lastname when 'Potentials' then potentialRelActivities.potentialname when 'Quotes' then quotesRelActivities.subject when 'Orders' then purchaseorderRelActivities.subject when 'Invoice' then invoiceRelActivities.subject End"." '".$selectedfields[2]."', crmentityRelActivities.setype 'Entity_type'"; + $querycolumn = "case crmentityRelActivities.setype when 'Accounts' then accountRelActivities.accountname when 'Leads' then leaddetailsRelActivities.lastname when 'Potentials' then potentialRelActivities.potentialname when 'Quotes' then quotesRelActivities.subject when 'Orders' then purchaseorderRelActivities.subject when 'Invoice' then invoiceRelActivities.subject End"." AS \"".$selectedfields[2]."\", crmentityRelActivities.setype AS Entity_type"; } } /*if($fieldname == "contact_id") @@ -1471,19 +1471,19 @@ $fieldlist = explode(":",$fieldcolname); if($fieldlist[4] == 2) { - $stdfilterlist[$fieldcolname] = "sum(".$fieldlist[1].".".$fieldlist[2].") ".$fieldlist[3]; + $stdfilterlist[$fieldcolname] = "sum(".$fieldlist[1].".".$fieldlist[2].") AS ".$fieldlist[3]; } if($fieldlist[4] == 3) { - $stdfilterlist[$fieldcolname] = "avg(".$fieldlist[1].".".$fieldlist[2].") ".$fieldlist[3]; + $stdfilterlist[$fieldcolname] = "avg(".$fieldlist[1].".".$fieldlist[2].") AS ".$fieldlist[3]; } if($fieldlist[4] == 4) { - $stdfilterlist[$fieldcolname] = "min(".$fieldlist[1].".".$fieldlist[2].") ".$fieldlist[3]; + $stdfilterlist[$fieldcolname] = "min(".$fieldlist[1].".".$fieldlist[2].") AS ".$fieldlist[3]; } if($fieldlist[4] == 5) { - $stdfilterlist[$fieldcolname] = "max(".$fieldlist[1].".".$fieldlist[2].") ".$fieldlist[3]; + $stdfilterlist[$fieldcolname] = "max(".$fieldlist[1].".".$fieldlist[2].") AS ".$fieldlist[3]; } } } Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Reports/Save.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/modules/Reports/Save.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/modules/Reports/Save.php Mon Apr 3 11:41:02 2006 @@ -36,10 +36,10 @@ //<<<<<<>>>>>>>> //<<<<<<>>>>>>>> -$reportname = $adb->database->qstr($_REQUEST["reportName"]); -$reportdescription = $adb->database->qstr($_REQUEST["reportDesc"]); -$reporttype = $adb->database->qstr($_REQUEST["reportType"]); -$folderid = $adb->database->qstr($_REQUEST["folder"]); +$reportname = $adb->quote($_REQUEST["reportName"]); +$reportdescription = $adb->quote($_REQUEST["reportDesc"]); +$reporttype = $adb->quote($_REQUEST["reportType"]); +$folderid = $adb->quote($_REQUEST["folder"]); //<<<<<<>>>>>>>> //<<<<<<>>>>>>>> @@ -214,9 +214,9 @@ } $ireportsql = "update report set"; - $ireportsql .= " REPORTNAME='".$reportname."',"; - $ireportsql .= " DESCRIPTION='".$reportdescription."',"; - $ireportsql .= " REPORTTYPE='".$reporttype."'"; + $ireportsql .= " REPORTNAME=".$reportname.","; + $ireportsql .= " DESCRIPTION=".$reportdescription.","; + $ireportsql .= " REPORTTYPE=".$reporttype.""; $ireportsql .= " where REPORTID=".$reportid; $ireportresult = $adb->query($ireportsql); $vtlog->logthis("Reports :: Save->Successfully saved report","info"); Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Reports/SaveReportFolder.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/modules/Reports/SaveReportFolder.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/modules/Reports/SaveReportFolder.php Mon Apr 3 11:41:02 2006 @@ -19,8 +19,8 @@ $rfid = $_REQUEST['record']; $mode = $_REQUEST['mode']; -$foldername = addslashes($_REQUEST["folderName"]); -$folderdesc = addslashes($_REQUEST["folderDesc"]); +$foldername = $adb->quote($_REQUEST["folderName"]); +$folderdesc = $adb->quote($_REQUEST["folderDesc"]); //echo $id.$mode."1".$foldername."2".$folderdesc; if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] != "") $return_module = $_REQUEST['return_module']; @@ -32,9 +32,8 @@ { if($rfid=="") { - $sql = "INSERT INTO reportfolder "; - $sql .= "(FOLDERID,FOLDERNAME,DESCRIPTION,STATE) "; - $sql .= "VALUES ('','".$foldername."','".$folderdesc."','CUSTOMIZED')"; + $sql = "INSERT INTO reportfolder (foldername,description,state) + VALUES (".$foldername.",".$folderdesc.",'CUSTOMIZED')"; $result = $adb->query($sql); if($result!=false) { @@ -53,8 +52,8 @@ if($rfid != "") { $sql = "update reportfolder set "; - $sql .= "FOLDERNAME='".$foldername."', "; - $sql .= "DESCRIPTION='".$folderdesc."' "; + $sql .= "FOLDERNAME=".$foldername.", "; + $sql .= "DESCRIPTION=".$folderdesc." "; $sql .= "where folderid=".$rfid; $result = $adb->query($sql); if($result!=false) From vtiger-tickets at vtiger.fosslabs.com Mon Apr 3 10:44:59 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 03 Apr 2006 17:44:59 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2317=3A_A?= =?utf-8?q?dd_postgresql_support_to_4=2E2_branch?= In-Reply-To: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> References: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> Message-ID: <085.cc05aae31c5b4cc6da93f7b575c50712@vtiger.fosslabs.com> #17: Add postgresql support to 4.2 branch ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Resolution: | Keywords: database postgresql ------------------------+--------------------------------------------------- Comment (by allanbush): (In [4842]) Added select column aliases to fix login history page. Refs #17. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 10:44:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 03 Apr 2006 17:44:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4842 - /vtigercrm/branches/4.2_postgresql_integration/modules/Users/LoginHistory.php Message-ID: <20060403174459.C7F0359F6C1@vtiger.fosslabs.com> Author: allanbush Date: Mon Apr 3 11:44:57 2006 New Revision: 4842 Log: Added select column aliases to fix login history page. Refs #17. Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Users/LoginHistory.php Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Users/LoginHistory.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/modules/Users/LoginHistory.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/modules/Users/LoginHistory.php Mon Apr 3 11:44:57 2006 @@ -126,7 +126,7 @@ // Determine if the account name is present in the where clause. // $query = "SELECT * from loginhistory order by login_time"; global $current_user; - $query = "SELECT user_name,user_ip,".$this->db->getDBDateString("login_time")." login_time,".$this->db->getDBDateString("logout_time")." logout_time,status FROM $this->table_name "; + $query = "SELECT user_name,user_ip,".$this->db->getDBDateString("login_time")." AS login_time,".$this->db->getDBDateString("logout_time")." AS logout_time,status FROM $this->table_name "; if($where != "") { if(!is_admin($current_user)) From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 11:27:44 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 03 Apr 2006 18:27:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4843 - /vtigercrm/trunk/include/utils/CommonUtils.php Message-ID: <20060403182744.5199259F810@vtiger.fosslabs.com> Author: don Date: Mon Apr 3 12:27:39 2006 New Revision: 4843 Log: written tab sequence array in tabdata 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 Mon Apr 3 12:27:39 2006 @@ -1279,11 +1279,14 @@ $result = $adb->query($sql); $num_rows=$adb->num_rows($result); $result_array=Array(); + $seq_array=Array(); for($i=0;$i<$num_rows;$i++) { $tabid=$adb->query_result($result,$i,'tabid'); $tabname=$adb->query_result($result,$i,'name'); + $presence=$adb->query_result($result,$i,'presence'); $result_array[$tabname]=$tabid; + $seq_array[$tabid]=$presence; } @@ -1306,6 +1309,8 @@ $newbuf .= "//This file contains the commonly used variables \n"; $newbuf .= "\n"; $newbuf .= "\$tab_info_array=".constructArray($result_array).";\n"; + $newbuf .= "\n"; + $newbuf .= "\$tab_seq_array=".constructArray($seq_array).";\n"; $newbuf .= "?>"; fputs($handle, $newbuf); fclose($handle); From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 11:28:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 03 Apr 2006 18:28:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4844 - /vtigercrm/trunk/include/utils/UserInfoUtil.php Message-ID: <20060403182848.7CDCC59F810@vtiger.fosslabs.com> Author: don Date: Mon Apr 3 12:28:44 2006 New Revision: 4844 Log: Added function getPermittedModuleNames 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 Mon Apr 3 12:28:44 2006 @@ -4034,4 +4034,42 @@ return $fldModArr; } +/** Function to get the permitted module name Array with presence as 0 + * @returns permitted module name Array :: Type Array + * + */ +function getPermittedModuleNames() +{ + global $current_user; + $permittedModules=Array(); + require('user_privileges/user_privileges_'.$current_user->id.'.php'); + include('tabdata.php'); + + if($is_admin == false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1) + { + foreach($tab_seq_array as $tabid=>$seq_value) + { + if($seq_value ==0 && $profileTabsPermission[$tabid] == 0) + { + $permittedModules[]=getTabModuleName($tabid); + } + + } + + + } + else + { + foreach($tab_seq_array as $tabid=>$seq_value) + { + if($seq_value ==0) + { + $permittedModules[]=getTabModuleName($tabid); + } + + } + } + return $permittedModules; +} + ?> From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 11:31:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 03 Apr 2006 18:31:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4845 - in /vtigercrm/trunk/modules/Users: CreateUserPrivilegeFile.php User.php Message-ID: <20060403183112.84E0F59F82E@vtiger.fosslabs.com> Author: don Date: Mon Apr 3 12:31:07 2006 New Revision: 4845 Log: Now in index.php querying user table every time is avoided Modified: vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php vtigercrm/trunk/modules/Users/User.php Modified: vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php ============================================================================== --- vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php (original) +++ vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php Mon Apr 3 12:31:07 2006 @@ -21,9 +21,17 @@ $newbuf .= "//This is the access privilege file\n"; $user_focus= new User(); $user_focus->retrieve($userid); + $userInfo=Array(); + foreach($user_focus->column_fields as $field) + { + $userInfo[$field]= $user_focus->$field; + } + if($user_focus->is_admin == 'on') { $newbuf .= "\$is_admin=true;\n"; + $newbuf .="\n"; + $newbuf .= "\$user_info=".constructSingleStringKeyValueArray($userInfo).";\n"; $newbuf .= "\n"; $newbuf .= "?>"; fputs($handle, $newbuf); @@ -48,6 +56,8 @@ $subRoleAndUsers=getSubordinateRoleAndUsers($user_role); $def_org_share=getDefaultSharingAction(); $parentRoles=getParentRole($user_role); + + $newbuf .= "\$current_user_roles='".$user_role."';\n"; @@ -69,6 +79,8 @@ $newbuf .= "\$parent_roles=".constructSingleCharArray($parentRoles).";\n"; $newbuf .="\n"; $newbuf .= "\$subordinate_roles_users=".constructTwoDimensionalCharIntSingleArray($subRoleAndUsers).";\n"; + $newbuf .="\n"; + $newbuf .= "\$user_info=".constructSingleStringKeyValueArray($userInfo).";\n"; $newbuf .= "?>"; fputs($handle, $newbuf); @@ -1106,6 +1118,32 @@ } } +function constructSingleStringKeyValueArray($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; + } +} + + function constructSingleArray($var) { Modified: vtigercrm/trunk/modules/Users/User.php ============================================================================== --- vtigercrm/trunk/modules/Users/User.php (original) +++ vtigercrm/trunk/modules/Users/User.php Mon Apr 3 12:31:07 2006 @@ -552,6 +552,25 @@ $this->reports_to_name = ''; } } + + function retrieveCurrentUserInfoFromFile($userid) + { + require('user_privileges/user_privileges_'.$userid.'.php'); + foreach($this->column_fields as $field) + { + if(isset($user_info[$field])) + { + $this->$field = $user_info[$field]; + } + } + return $this; + + } + + } + + + ?> From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 11:32:53 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 03 Apr 2006 18:32:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4846 - /vtigercrm/trunk/index.php Message-ID: <20060403183253.D7EB559F82E@vtiger.fosslabs.com> Author: don Date: Mon Apr 3 12:32:49 2006 New Revision: 4846 Log: Modified: vtigercrm/trunk/index.php Modified: vtigercrm/trunk/index.php ============================================================================== --- vtigercrm/trunk/index.php (original) +++ vtigercrm/trunk/index.php Mon Apr 3 12:32:49 2006 @@ -320,37 +320,6 @@ $log->info("current page is $currentModuleFile"); $log->info("current module is $currentModule "); -//define default home pages for each module -require_once("modules/Users/TabMenu.php"); -$tabData = new TabMenu(); - -global $permittedModulesList; - -$permittedModulesList = fetchPermissionDataForTabList(); -//print_r($permittedModulesList); -$tempList=""; -if(!$permittedModulesList == "") -{ - - foreach ($permittedModulesList as $list) - { - if($tempList=="") - { - $tempList = "'".$list."'" ; - } - else - { - $tempList .= ",'" . $list."'" ; - } - $list=""; - } -} - -$moduleList = $tabData->getTabNames($tempList); - -foreach ($moduleList as $mod) { - $moduleDefaultFile[$mod] = "modules/".$currentModule."/index.php"; -} // for printing $module = (isset($_REQUEST['module'])) ? $_REQUEST['module'] : ""; @@ -363,12 +332,21 @@ if($use_current_login) { - $result = $current_user->retrieve($_SESSION['authenticated_user_id']); + //$result = $current_user->retrieve($_SESSION['authenticated_user_id']); + //getting the current user info from flat file + $result = $current_user->retrieveCurrentUserInfoFromFile($_SESSION['authenticated_user_id']); if($result == null) { session_destroy(); header("Location: index.php?action=Login&module=Users"); } + + $moduleList = getPermittedModuleNames(); + + foreach ($moduleList as $mod) { + $moduleDefaultFile[$mod] = "modules/".$currentModule."/index.php"; + } + $log->debug('Current user is: '.$current_user->user_name); } From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 11:41:35 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 03 Apr 2006 18:41:35 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4847 - /vtigercrm/trunk/install/5createTables.inc.php Message-ID: <20060403184135.A901259F7C3@vtiger.fosslabs.com> Author: don Date: Mon Apr 3 12:41:31 2006 New Revision: 4847 Log: Removed reference to TabMenu.php 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 Mon Apr 3 12:41:31 2006 @@ -33,7 +33,6 @@ require_once('modules/Users/User.php'); require_once('modules/Import/ImportMap.php'); require_once('modules/Import/UsersLastImport.php'); -require_once('modules/Users/TabMenu.php'); require_once('modules/Users/LoginHistory.php'); require_once('modules/Settings/FileStorage.php'); require_once('data/Tracker.php'); From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 11:44:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 03 Apr 2006 18:44:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4848 - /vtigercrm/trunk/modules/Users/TabMenu.php Message-ID: <20060403184450.03AFC59F7C3@vtiger.fosslabs.com> Author: don Date: Mon Apr 3 12:44:47 2006 New Revision: 4848 Log: junk file Removed: vtigercrm/trunk/modules/Users/TabMenu.php From vtiger-tickets at vtiger.fosslabs.com Mon Apr 3 12:59:19 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 03 Apr 2006 19:59:19 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2317=3A_A?= =?utf-8?q?dd_postgresql_support_to_4=2E2_branch?= In-Reply-To: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> References: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> Message-ID: <085.14a48d1c42d601034dfec25b7dbd38ec@vtiger.fosslabs.com> #17: Add postgresql support to 4.2 branch ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Resolution: | Keywords: database postgresql ------------------------+--------------------------------------------------- Comment (by allanbush): (In [4849]) Added some input checking to pervent query errors from missing data. Refs #17. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 12:59:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 03 Apr 2006 19:59:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4849 - in /vtigercrm/branches/4.2_postgresql_integration/modules: Notes/Delete.php Products/Delete.php Products/Popup.php Message-ID: <20060403195920.593AB59F890@vtiger.fosslabs.com> Author: allanbush Date: Mon Apr 3 13:59:15 2006 New Revision: 4849 Log: Added some input checking to pervent query errors from missing data. Refs #17. Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Notes/Delete.php vtigercrm/branches/4.2_postgresql_integration/modules/Products/Delete.php vtigercrm/branches/4.2_postgresql_integration/modules/Products/Popup.php Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Notes/Delete.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/modules/Notes/Delete.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/modules/Notes/Delete.php Mon Apr 3 13:59:15 2006 @@ -32,8 +32,10 @@ $sql = 'update notes set contact_id = 0 where notesid = '.$_REQUEST['record']; $adb->query($sql); } -$sql = 'delete from senotesrel where notesid = '.$_REQUEST['record']. ' and crmid = '.$_REQUEST['return_id']; -$adb->query($sql); +if($_REQUEST['return_id']) { + $sql = 'delete from senotesrel where notesid = '.$_REQUEST['record']. ' and crmid = '.$_REQUEST['return_id']; + $adb->query($sql); +} $sql_recentviewed ='delete from tracker where user_id = '.$current_user->id.' and item_id = '.$_REQUEST['record']; $adb->query($sql_recentviewed); Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Products/Delete.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/modules/Products/Delete.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/modules/Products/Delete.php Mon Apr 3 13:59:15 2006 @@ -37,7 +37,7 @@ if($_REQUEST['return_module'] == 'Potentials' || $_REQUEST['return_module'] == 'Accounts' || $_REQUEST['return_module'] == 'Leads') $sql = 'delete from seproductsrel where crmid = '.$_REQUEST['return_id'].' and productid = '.$_REQUEST['record']; - $adb->query($sql); + if($sql) $adb->query($sql); } if($_REQUEST['return_module'] == "Contacts") { Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Products/Popup.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/modules/Products/Popup.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/modules/Products/Popup.php Mon Apr 3 13:59:15 2006 @@ -37,7 +37,7 @@ $xtpl->assign("SMODULE",$_REQUEST['smodule']); $smodule = $_REQUEST['smodule']; $url_string = '&smodule=VENDOR'; - $search_query .= " and vendor_id=''"; + $search_query .= " and vendor_id is null"; } From vtiger-tickets at vtiger.fosslabs.com Mon Apr 3 13:00:33 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 03 Apr 2006 20:00:33 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2317=3A_A?= =?utf-8?q?dd_postgresql_support_to_4=2E2_branch?= In-Reply-To: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> References: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> Message-ID: <085.42641334b347b999ca99335dee6e4f55@vtiger.fosslabs.com> #17: Add postgresql support to 4.2 branch ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Resolution: | Keywords: database postgresql ------------------------+--------------------------------------------------- Comment (by allanbush): (In [4850]) Fixed typo in query line. Refs #17. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 13:00:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 03 Apr 2006 20:00:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4850 - /vtigercrm/branches/4.2_postgresql_integration/modules/Users/saveemailtemplate.php Message-ID: <20060403200034.6552659F8A5@vtiger.fosslabs.com> Author: allanbush Date: Mon Apr 3 14:00:31 2006 New Revision: 4850 Log: Fixed typo in query line. Refs #17. Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Users/saveemailtemplate.php Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Users/saveemailtemplate.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/modules/Users/saveemailtemplate.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/modules/Users/saveemailtemplate.php Mon Apr 3 14:00:31 2006 @@ -42,7 +42,7 @@ } else { - $sql = "insert into emailtemplates values ('". $folderName. "','".$templateName."','".$subject."',".$description.".$body.",0,".$db->getUniqueID('emailtemplates').")"; + $sql = "insert into emailtemplates values ('". $folderName. "','".$templateName."','".$subject."',".$description.",".$body.",0,".$db->getUniqueID('emailtemplates').")"; $adb->query($sql); $vtlog->logthis("added to the db the emailtemplate",'info'); From vtiger-tickets at vtiger.fosslabs.com Mon Apr 3 13:01:18 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 03 Apr 2006 20:01:18 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2317=3A_A?= =?utf-8?q?dd_postgresql_support_to_4=2E2_branch?= In-Reply-To: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> References: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> Message-ID: <085.6c5bcf0a7d926c4f57f659900708c805@vtiger.fosslabs.com> #17: Add postgresql support to 4.2 branch ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Resolution: | Keywords: database postgresql ------------------------+--------------------------------------------------- Comment (by allanbush): (In [4851]) Added input sanitization before using it in a query. Refs #17. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 13:01:18 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 03 Apr 2006 20:01:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4851 - in /vtigercrm/branches/4.2_postgresql_integration/modules: Settings/SaveConvertLead.php Users/SaveOrgSharing.php Message-ID: <20060403200118.C421C59F88F@vtiger.fosslabs.com> Author: allanbush Date: Mon Apr 3 14:01:15 2006 New Revision: 4851 Log: Added input sanitization before using it in a query. Refs #17. Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Settings/SaveConvertLead.php vtigercrm/branches/4.2_postgresql_integration/modules/Users/SaveOrgSharing.php Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Settings/SaveConvertLead.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/modules/Settings/SaveConvertLead.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/modules/Settings/SaveConvertLead.php Mon Apr 3 14:01:15 2006 @@ -27,23 +27,23 @@ $contact_id_name=$lead_id."_contact"; $potential_id_name=$lead_id."_potential"; - $account_id_val=$_REQUEST[$account_id_name]; - $contact_id_val=$_REQUEST[$contact_id_name]; - $potential_id_val=$_REQUEST[$potential_id_name]; + $account_id_val = (int) $_REQUEST[$account_id_name]; + $contact_id_val = (int) $_REQUEST[$contact_id_name]; + $potential_id_val = (int) $_REQUEST[$potential_id_name]; if($account_id_val=="None") { - $account_id_val=""; + $account_id_val="null"; } if($contact_id_val=="None") { - $contact_id_val=""; + $contact_id_val="null"; } if($potential_id_val =="None") { - $potential_id_val=""; + $potential_id_val="null"; } - $update_sql="update convertleadmapping set accountfid='".$account_id_val."',contactfid='".$contact_id_val."',potentialfid='".$potential_id_val."' where leadfid=".$lead_id; + $update_sql="update convertleadmapping set accountfid=".$account_id_val.",contactfid=".$contact_id_val.",potentialfid=".$potential_id_val." where leadfid=".$lead_id; $adb->query($update_sql); } Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Users/SaveOrgSharing.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/modules/Users/SaveOrgSharing.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/modules/Users/SaveOrgSharing.php Mon Apr 3 14:01:15 2006 @@ -23,7 +23,7 @@ if($tabid != 8 && $tab_id != 14 && $tab_id != 15 && $tab_id != 18 && $tab_id != 19 && $tab_id != 16 & $tab_id != 22) { $reqval = $tabid.'_per'; - $permission=$_REQUEST[$reqval]; + $permission = (int) $_REQUEST[$reqval]; $sql7="update def_org_share set permission=".$permission." where tabid=".$tabid." and ruleid=".$ruleid; //echo $sql7; //echo '
'; From vtiger-tickets at vtiger.fosslabs.com Mon Apr 3 14:24:56 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 03 Apr 2006 21:24:56 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2386=3A_H?= =?utf-8?q?elpDesk_Assigned_To_field_pulls_only_user_data_in_Custom_Views?= Message-ID: <076.f9eb297f705149b7cfa25e948aa290f1@vtiger.fosslabs.com> #86: HelpDesk Assigned To field pulls only user data in Custom Views ------------------------------------+--------------------------------------- Reporter: james at jenxnetwork.com | Owner: Any Developer Type: defect | Status: new Priority: critical | Milestone: 4.2.4 Component: vtigercrm | Version: 4.2.3 Keywords: helpdesk, custom views | ------------------------------------+--------------------------------------- I've tested this extensively; email me with any questions. What's happening is when creating a custom view, the Assigned To field can only be filtered for user names. What should happen is that the advanced filter should compare with user names and group names, since groups can be passed to the Assigned To field. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 3 14:25:28 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 03 Apr 2006 21:25:28 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2386=3A_H?= =?utf-8?q?elpDesk_Assigned_To_field_pulls_only_user_data_in_Custom_Views?= In-Reply-To: <076.f9eb297f705149b7cfa25e948aa290f1@vtiger.fosslabs.com> References: <076.f9eb297f705149b7cfa25e948aa290f1@vtiger.fosslabs.com> Message-ID: <085.c53859edbfd645e3795ffd73d04e5825@vtiger.fosslabs.com> #86: HelpDesk Assigned To field pulls only user data in Custom Views ------------------------------------+--------------------------------------- Reporter: james at jenxnetwork.com | Owner: Any Developer Type: defect | Status: new Priority: critical | Milestone: 4.2.4 Component: vtigercrm | Version: 4.2.3 Resolution: | Keywords: helpdesk, custom views ------------------------------------+--------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 20:21:04 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 03:21:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4852 - /vtigercrm/trunk/modules/Settings/CurrencyListView.php Message-ID: <20060404032104.6EF6359F9BB@vtiger.fosslabs.com> Author: saraj Date: Mon Apr 3 21:20:59 2006 New Revision: 4852 Log: changes made for new UI Modified: vtigercrm/trunk/modules/Settings/CurrencyListView.php Modified: vtigercrm/trunk/modules/Settings/CurrencyListView.php ============================================================================== --- vtigercrm/trunk/modules/Settings/CurrencyListView.php (original) +++ vtigercrm/trunk/modules/Settings/CurrencyListView.php Mon Apr 3 21:20:59 2006 @@ -9,62 +9,39 @@ * All Rights Reserved. * ********************************************************************************/ +require_once('Smarty_setup.php'); +require_once('include/database/PearDatabase.php'); +require_once('include/utils/UserInfoUtil.php'); +global $mod_strings,$adb,$theme; +$theme_path="themes/".$theme."/"; +$image_path=$theme_path."images/"; +$smarty=new vtigerCRM_Smarty; -require_once('include/database/PearDatabase.php'); -?> - - - -Roles List - - - - -
- - - -
- -
-
- - - - - - - - - - query($sql); $temprow = $adb->fetch_array($result); - $del="Del "; $cnt=1; - -require_once('include/utils/UserInfoUtil.php'); + $currency = Array(); do { - if ($cnt%2==0) - printf("",$temprow["currency_name"]); - else - printf("%s",$temprow["currency_name"]); - printf("",$temprow["currency_code"]); - printf("",$temprow["currency_symbol"]); - printf("",$temprow["conversion_rate"]); - printf("",$temprow["currency_status"]); - if($temprow["defaultid"] != '-11') - printf("",$del); - $cnt++; + $currency_element = Array(); + $currency_element['name'] = $temprow["currency_name"]; + $currency_element['code'] = $temprow["currency_code"]; + $currency_element['symbol'] = $temprow["currency_symbol"]; + $currency_element['crate'] = $temprow["conversion_rate"]; + $currency_element['status'] = $temprow["currency_status"]; + if($temprow["defaultid"] != '-11') + { + $currency_element['name'] = ''.$temprow["currency_name"].''; + $currency_element['tool']= 'Edit | Delete'; + } + else + $currency_element['tool']= ''; + $currency[] = $currency_element; + $cnt++; }while($temprow = $adb->fetch_array($result)); +$smarty->assign("MOD",$mod_strings); +$smarty->assign("CURRENCY_LIST",$currency); +$smarty->display('CurrencyListView.tpl'); ?> -
 
"); - else - printf("
"); - if($temprow["defaultid"] == '-11') - printf("%s%s%s%s%s%s
- - From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 20:23:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 03:23:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4853 - /vtigercrm/trunk/Smarty/templates/CurrencyListView.tpl Message-ID: <20060404032311.5A74759F9BC@vtiger.fosslabs.com> Author: saraj Date: Mon Apr 3 21:23:06 2006 New Revision: 4853 Log: new UI has been integrated for currency listview Added: vtigercrm/trunk/Smarty/templates/CurrencyListView.tpl From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 20:29:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 03:29:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4854 - /vtigercrm/trunk/modules/Settings/language/en_us.lang.php Message-ID: <20060404032937.B405659F9BB@vtiger.fosslabs.com> Author: saraj Date: Mon Apr 3 21:29:33 2006 New Revision: 4854 Log: labels added for currency listview 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 Mon Apr 3 21:29:33 2006 @@ -70,11 +70,13 @@ 'LBL_CURRENCY_CODE'=>'Currency Code', -'LBL_CURRENCY_SYMBOL'=>'Currency Symbol', +'LBL_CURRENCY_SYMBOL'=>'Symbol', 'LBL_CURRENCY_CRATE'=>'Conversion Rate', 'LBL_CURRENCY_STATUS'=>'Status', + +'LBL_CURRENCY_TOOL'=>'Tools', @@ -298,9 +300,6 @@ 'LBL_CURRENCY_CONFIG'=>'Currency Configuration', 'LBL_CURRENCY_INFO'=>'Currency Information', -'LBL_CURRENCY_NAME'=>'Currency Name', -'LBL_CURRENCY_CODE'=>'Currency Code', -'LBL_CURRENCY_SYMBOL'=>'Currency Symbol', From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 20:58:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 03:58:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4855 - /vtigercrm/trunk/include/utils/ListViewUtils.php Message-ID: <20060404035842.D74DD59F9C3@vtiger.fosslabs.com> Author: saraj Date: Mon Apr 3 21:58:38 2006 New Revision: 4855 Log: changes made to reduce the no. of queries logging for non admin user 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 Mon Apr 3 21:58:38 2006 @@ -63,7 +63,6 @@ $list_header = Array(); //Get the tabid of the module - //require_once('include/utils/UserInfoUtil.php') $tabid = getTabid($smodule); global $current_user; //added for customview 27/5 @@ -75,10 +74,44 @@ } } + //Added to reduce the no. of queries logging for non-admin user -- by minnie-start + $field_list ='('; + $j=0; + require('user_privileges/user_privileges_'.$current_user->id.'.php'); + foreach($focus->list_fields as $name=>$tableinfo) + { + $fieldname = $focus->list_fields_name[$name]; + if($oCv) + { + if(isset($oCv->list_fields_name)) + { + $fieldname = $oCv->list_fields_name[$name]; + } + } + if($j != 0) + { + $field_list .= ', '; + } + $field_list .= "'".$fieldname."'"; + $j++; + } + $field_list .=')'; + if($is_admin==false) + { + $profileList = getCurrentUserProfileList(); + $query = "select profile2field.*,field.fieldname from field inner join profile2field on profile2field.fieldid=field.fieldid inner join def_org_field on def_org_field.fieldid=field.fieldid where field.tabid=".$tabid." and profile2field.visible=0 and def_org_field.visible=0 and profile2field.profileid in ".$profileList." and field.fieldname in ".$field_list." group by field.fieldid"; + $result = $adb->query($query); + $field=Array(); + for($k=0;$k < $adb->num_rows($result);$k++) + { + $field[]=$adb->query_result($result,$k,"fieldname"); + } + } + //end + //modified for customview 27/5 - $app_strings change to $mod_strings foreach($focus->list_fields as $name=>$tableinfo) { - //$fieldname = $focus->list_fields_name[$name]; //commented for customview 27/5 //added for customview 27/5 if($oCv) { @@ -94,19 +127,7 @@ $fieldname = $focus->list_fields_name[$name]; } - //Getting the Entries from Profile2 field table - global $current_user; - require('user_privileges/user_privileges_'.$current_user->id.'.php'); - if($is_admin == false) - { - - $profileList = getCurrentUserProfileList(); - $query = "select profile2field.* from field inner join profile2field on profile2field.fieldid=field.fieldid inner join def_org_field on def_org_field.fieldid=field.fieldid where field.tabid=".$tabid." and profile2field.visible=0 and def_org_field.visible=0 and profile2field.profileid in ".$profileList." and field.fieldname='".$fieldname."' group by field.fieldid"; - $result = $adb->query($query); - } - - - if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] ==0 || $adb->num_rows($result) == 1) + if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] ==0 || in_array($fieldname,$field)) { if(isset($focus->sortby_fields) && $focus->sortby_fields !='') { @@ -184,7 +205,6 @@ //Added condition to hide the close column in Related Lists if($name == 'Close' && $relatedlist != '') { - //$list_header .= ''; // $list_header[] = ''; } else @@ -208,11 +228,8 @@ $arrow=''; $list_header = Array(); - //$theme = $focus->current_theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; - //$list_header = ''; - //$list_header .= ''; foreach($focus->search_fields as $name=>$tableinfo) { $fieldname = $focus->search_fields_name[$name]; @@ -258,11 +275,8 @@ } } $list_header[]=$name; - //$list_header .= ''.$name.''; - //$list_header .=''; } } - //$list_header .= ''; return $list_header; } @@ -343,7 +357,7 @@ //parameter added for customview $oCv 27/5 function getListViewEntries($focus, $module,$list_result,$navigation_array,$relatedlist='',$returnset='',$edit_action='EditView',$del_action='Delete',$oCv='') { - global $adb; + global $adb,$current_user; global $app_strings; $noofrows = $adb->num_rows($list_result); $list_block = Array(); @@ -362,7 +376,40 @@ $focus->list_fields = $oCv->list_fields; } } - + //Added to reduce the no. of queries logging for non-admin user -- by minnie-start + $field_list ='('; + $j=0; + require('user_privileges/user_privileges_'.$current_user->id.'.php'); + foreach($focus->list_fields as $name=>$tableinfo) + { + $fieldname = $focus->list_fields_name[$name]; + if($oCv) + { + if(isset($oCv->list_fields_name)) + { + $fieldname = $oCv->list_fields_name[$name]; + } + } + if($j != 0) + { + $field_list .= ', '; + } + $field_list .= "'".$fieldname."'"; + $j++; + } + $field_list .=')'; + if($is_admin==false) + { + $profileList = getCurrentUserProfileList(); + $query = "select profile2field.*,field.fieldname from field inner join profile2field on profile2field.fieldid=field.fieldid inner join def_org_field on def_org_field.fieldid=field.fieldid where field.tabid=".$tabid." and profile2field.visible=0 and def_org_field.visible=0 and profile2field.profileid in ".$profileList." and field.fieldname in ".$field_list." group by field.fieldid"; + $result = $adb->query($query); + $field=Array(); + for($k=0;$k < $adb->num_rows($result);$k++) + { + $field[]=$adb->query_result($result,$k,"fieldname"); + } + } + //end for ($i=$navigation_array['start']; $i<=$navigation_array['end_val']; $i++) { $list_header =Array(); @@ -404,17 +451,7 @@ } } - global $current_user; - require('user_privileges/user_privileges_'.$current_user->id.'.php'); - if($is_admin==false) - { - $profileList = getCurrentUserProfileList(); - $query = "select profile2field.* from field inner join profile2field on profile2field.fieldid=field.fieldid inner join def_org_field on def_org_field.fieldid=field.fieldid where field.tabid=".$tabid." and profile2field.visible=0 and def_org_field.visible=0 and profile2field.profileid in ".$profileList." and field.fieldname='".$fieldname."' group by field.fieldid"; - - $result = $adb->query($query); - } - - if($is_admin==true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] ==0 || $adb->num_rows($result) == 1) + if($is_admin==true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] ==0 || in_array($fieldname,$field)) { @@ -547,11 +584,9 @@ } else { - - $query = "select * from field where tabid=".$tabid." and fieldname='".$fieldname."'"; + $query="select uitype,columnname from field where tabid=".$tabid." and fieldname='".$fieldname."'"; $field_result = $adb->query($query); $list_result_count = $i-1; - $value = getValue($field_result,$list_result,$fieldname,$focus,$module,$entity_id,$list_result_count,"list","",$returnset,$oCv->setdefaultviewid); } } @@ -600,7 +635,6 @@ $noofrows = $adb->num_rows($list_result); $list_header = ''; global $theme; - //$theme = $focus->current_theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; $list_block = Array(); @@ -612,16 +646,11 @@ for ($i=$navigation_array['start']; $i<=$navigation_array['end_val']; $i++) { - /*if (($i%2)==0) - $list_header .= ''; - else - $list_header .= '';*/ //Getting the entityid $entity_id = $adb->query_result($list_result,$i-1,"crmid"); $list_header=Array(); - //$list_header .= ''; foreach($focus->search_fields as $name=>$tableinfo) { $fieldname = $focus->search_fields_name[$name]; @@ -694,15 +723,11 @@ } } - //$list_header .= ''.$value.''; - //$list_header .=''; $list_header[]=$value; } } - //$list_header .= ''; $list_block[$entity_id]=$list_header; } - //$list_header .= ''; return $list_block; } @@ -856,9 +881,7 @@ if($parentid != '') { $sql="select * from ".$tablename." where ".$idname." = ".$parentid; - //echo '
query : .. '.$sql; $fieldvalue=$adb->query_result($adb->query($sql),0,$fieldname); - //echo '

val : '.$fieldvalue; $value=''.$fieldvalue.''; } @@ -887,9 +910,7 @@ if($parentid != '') { $sql="select * from ".$tablename." where ".$idname." = ".$parentid; - //echo '
query : .. '.$sql; $fieldvalue=$adb->query_result($adb->query($sql),0,$fieldname); - //echo '

val : '.$fieldvalue; $value=''.$fieldvalue.''; } @@ -1047,7 +1068,6 @@ $row_id = $_REQUEST['curr_row']; $unitprice=$adb->query_result($list_result,$list_result_count,'unit_price'); - //$qty_stock=$adb->query_result($list_result,$list_result_count,'qtyinstock'); $value = ''.$temp_val.''; } elseif($popuptype == "inventory_pb") @@ -1185,7 +1205,6 @@ $value = $temp_val; } } -// $value .= $returnset; // Mike Crowe Mod --------------------------------------------------------Make right justified and currency value if ( in_array($uitype,array(71,72,7,9,90)) ) From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 21:06:54 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 04:06:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4856 - /vtigercrm/trunk/include/utils/SearchUtils.php Message-ID: <20060404040654.DE75559F9C8@vtiger.fosslabs.com> Author: saraj Date: Mon Apr 3 22:06:50 2006 New Revision: 4856 Log: changes made to reduce the no. of queries logging for non admin user 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 Mon Apr 3 22:06:50 2006 @@ -26,7 +26,7 @@ global $adb; global $theme; global $app_strings; - global $mod_strings; + global $mod_strings,$current_user; //Seggregating between module and smodule if(isset($_REQUEST['smodule']) && $_REQUEST['smodule'] == 'VENDOR') { @@ -64,6 +64,41 @@ $focus->list_fields = $oCv->list_fields; } } + //Added to reduce the no. of queries logging for non-admin users -- by Minnie-start + $field_list ='('; + $j=0; + require('user_privileges/user_privileges_'.$current_user->id.'.php'); + foreach($focus->list_fields as $name=>$tableinfo) + { + $fieldname = $focus->list_fields_name[$name]; + if($oCv) + { + if(isset($oCv->list_fields_name)) + { + $fieldname = $oCv->list_fields_name[$name]; + } + } + if($j != 0) + { + $field_list .= ', '; + } + $field_list .= "'".$fieldname."'"; + $j++; + } + $field_list .=')'; + //Getting the Entries from Profile2 field table + if($is_admin == false) + { + $profileList = getCurrentUserProfileList(); + //changed to get field.fieldname + $query = "select profile2field.*,field.fieldname from field inner join profile2field on profile2field.fieldid=field.fieldid inner join def_org_field on def_org_field.fieldid=field.fieldid where field.tabid=".$tabid." and profile2field.visible=0 and def_org_field.visible=0 and profile2field.profileid in ".$profileList." and field.fieldname in ".$field_list." group by field.fieldid"; + $result = $adb->query($query); + $field=Array(); + for($k=0;$k < $adb->num_rows($result);$k++) + { + $field[]=$adb->query_result($result,$k,"fieldname"); + } + } //modified for customview 27/5 - $app_strings change to $mod_strings foreach($focus->list_fields as $name=>$tableinfo) @@ -92,19 +127,7 @@ $fieldname = $focus->list_fields_name[$name]; } - //Getting the Entries from Profile2 field table - global $current_user; - require('user_privileges/user_privileges_'.$current_user->id.'.php'); - if($is_admin == false) - { - - $profileList = getCurrentUserProfileList(); - $query = "select profile2field.* from field inner join profile2field on profile2field.fieldid=field.fieldid inner join def_org_field on def_org_field.fieldid=field.fieldid where field.tabid=".$tabid." and profile2field.visible=0 and def_org_field.visible=0 and profile2field.profileid in ".$profileList." and field.fieldname='".$fieldname."' group by field.fieldid"; - $result = $adb->query($query); - } - - - if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] ==0 || $adb->num_rows($result) == 1) + if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] ==0 || in_array($fieldname,$field)) { if(isset($focus->sortby_fields) && $focus->sortby_fields !='') { From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 21:14:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 04:14:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4857 - /vtigercrm/trunk/log4php.properties Message-ID: <20060404041420.AD5D859F9C8@vtiger.fosslabs.com> Author: saraj Date: Mon Apr 3 22:14:16 2006 New Revision: 4857 Log: changes made to fix the issue that logs are not generated in windows machine Modified: vtigercrm/trunk/log4php.properties Modified: vtigercrm/trunk/log4php.properties ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 21:55:54 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 04:55:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4858 - in /vtigercrm/trunk: Smarty/templates/Settings/ModuleOwnersContents.tpl modules/Settings/ListModuleOwners.php modules/Settings/SettingsAjax.php Message-ID: <20060404045554.5382D59F9D6@vtiger.fosslabs.com> Author: don Date: Mon Apr 3 22:55:41 2006 New Revision: 4858 Log: * files added to integrate new UI for module OwnersSmarty/templates/Settings/ModuleOwners.tpl Added: vtigercrm/trunk/Smarty/templates/Settings/ModuleOwnersContents.tpl (with props) vtigercrm/trunk/modules/Settings/SettingsAjax.php Modified: vtigercrm/trunk/modules/Settings/ListModuleOwners.php Modified: vtigercrm/trunk/modules/Settings/ListModuleOwners.php ============================================================================== --- vtigercrm/trunk/modules/Settings/ListModuleOwners.php (original) +++ vtigercrm/trunk/modules/Settings/ListModuleOwners.php Mon Apr 3 22:55:41 2006 @@ -9,63 +9,75 @@ * ********************************************************************************/ -require_once('XTemplate/xtpl.php'); -echo get_module_title($mod_strings['LBL_MODULE_NAME'], $mod_strings['LBL_MODULE_NAME'].' : Assign Module Owners', true); - +require_once('Smarty_setup.php'); +require_once('include/utils/utils.php'); global $mod_strings, $app_strings; global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; +$module_array = getModuleNameList(); +if($_REQUEST['list_module_mode'] != '' && $_REQUEST['list_module_mode'] == 'save') +{ + foreach($module_array as $val) + { + $req_name = 'user_'.strtolower($val); + $userid = $_REQUEST[$req_name]; + $tabid = getTabid($val); + if($tabid != '' && $userid != '') + { + $sql = 'update moduleowners set user_id = '.$userid.' where tabid = '.$tabid; + $adb->query($sql); + } + } + +} +elseif($_REQUEST['list_module_mode'] != '' && $_REQUEST['list_module_mode'] == 'edit') +{ + $user_array = get_user_array(false); + foreach($module_array as $val) + { + $user_combo = getUserCombo($user_array,$val); -$module_array = getModuleNameList(); -$user_array = get_user_array(); + $user_list []= $val; + $user_list []= $user_combo; -$row = 1; -foreach($module_array as $val) -{ - if ($row%2==0) - { - $trowclass = 'evenListRow'; } - else - { - $trowclass = 'oddListRow'; - } - $row ++; - $user_list .= ''.$val.' : '; - - //get the user array as a combo list - $user_id = getModuleOwner(getTabid($val)); - $user_name = getUserName($user_id); - - $user_list .= ''.$user_name.''; - - //To add the modules as single string to pass as hidden value - $modules .= $val.'&&&'; + $user_list = array_chunk($user_list,2); } +$smarty = new vtigerCRM_Smarty; +if($_REQUEST['list_module_mode'] != 'edit') +{ + foreach($module_array as $val) + { + $user_list []= $val; -require_once($theme_path.'layout_utils.php'); + //get the user array as a combo list + $user_id = getModuleOwner(getTabid($val)); + $user_name = getUserName($user_id); + $user_list []= $user_id; + $user_list []= $user_name; + } + + $user_list = array_chunk($user_list,3); +} $log->info("Settings Module Owners view"); -$xtpl=new XTemplate ('modules/Settings/ListModuleOwners.html'); -$xtpl->assign("MOD", $mod_strings); -$xtpl->assign("APP", $app_strings); -$xtpl->assign("THEME", $theme); -$xtpl->assign("IMAGE_PATH", $image_path); -$xtpl->assign("MODULE", "Settings"); +$smarty->assign("MODULE_MODE",$_REQUEST['list_module_mode']); +$smarty->assign("USER_LIST", $user_list); +$smarty->assign("MOD", return_module_language($current_language,'Settings')); +$smarty->assign("IMAGE_PATH",$image_path); +$smarty->assign("APP", $app_strings); +$smarty->assign("CMOD", $mod_strings); -$xtpl->assign("MODULES_LIST", $modules); - -$xtpl->assign("USER_LIST", $user_list); - -$xtpl->parse("main"); - -$xtpl->out("main"); - +if($_REQUEST['file_mode'] != 'ajax') + $smarty->display("Settings/ModuleOwners.tpl"); +else + $smarty->display("Settings/ModuleOwnersContents.tpl"); + function getModuleOwner($tabid) { global $adb; @@ -87,9 +99,31 @@ { array_push($mod_array,$row['name']); } - //echo '
';print_r($mod_array);echo '
'; - return $mod_array; } +function getUserCombo($user_array,$name) +{ + global $adb; + $tabid = getTabid($name); + $sql = "select * from moduleowners where tabid=".$tabid; + $res = $adb->query($sql); + $db_userid = $adb->query_result($res,0,'user_id'); + + //Form the user combo list for each module + $combo_name = "user_".strtolower($name); + $user_combo = ''; + + return $user_combo; +} ?> From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 21:56:26 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 04:56:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4859 - /vtigercrm/trunk/Smarty/templates/Settings/ModuleOwners.tpl Message-ID: <20060404045626.1FEE059F9E2@vtiger.fosslabs.com> Author: don Date: Mon Apr 3 22:56:16 2006 New Revision: 4859 Log: * files added to integrate new UI for module Owners Added: vtigercrm/trunk/Smarty/templates/Settings/ModuleOwners.tpl (with props) From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 21:58:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 04:58:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4860 - in /vtigercrm/trunk/modules/Settings: EditModuleOwners.html EditModuleOwners.php ListModuleOwners.html SaveModuleOwners.php Message-ID: <20060404045824.6710459F9E2@vtiger.fosslabs.com> Author: don Date: Mon Apr 3 22:58:16 2006 New Revision: 4860 Log: files removed as the module owners smartified Removed: vtigercrm/trunk/modules/Settings/EditModuleOwners.html vtigercrm/trunk/modules/Settings/EditModuleOwners.php vtigercrm/trunk/modules/Settings/ListModuleOwners.html vtigercrm/trunk/modules/Settings/SaveModuleOwners.php From vtiger-tickets at vtiger.fosslabs.com Mon Apr 3 22:39:57 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 04 Apr 2006 05:39:57 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2369=3A_R?= =?utf-8?q?emove_custom_adodb_debugging_information?= In-Reply-To: <076.26ddec60f221c4ecc7f1e2da51a456e3@vtiger.fosslabs.com> References: <076.26ddec60f221c4ecc7f1e2da51a456e3@vtiger.fosslabs.com> Message-ID: <085.44ab17bf38f8456ea9af0e72128fe49f@vtiger.fosslabs.com> #69: Remove custom adodb debugging information ------------------------+--------------------------------------------------- Reporter: allanbush | Owner: allanbush Type: task | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: postgres ------------------------+--------------------------------------------------- Comment (by allanbush): (In [4861]) Removed missing transaction support warning from the mysql driver debugging information. Refs #69. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 22:39:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 05:39:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4861 - /vtigercrm/branches/4.2_postgresql_integration/adodb/drivers/adodb-mysql.inc.php Message-ID: <20060404053958.A8C3B59F9EF@vtiger.fosslabs.com> Author: allanbush Date: Mon Apr 3 23:39:55 2006 New Revision: 4861 Log: Removed missing transaction support warning from the mysql driver debugging information. Refs #69. Modified: vtigercrm/branches/4.2_postgresql_integration/adodb/drivers/adodb-mysql.inc.php Modified: vtigercrm/branches/4.2_postgresql_integration/adodb/drivers/adodb-mysql.inc.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/adodb/drivers/adodb-mysql.inc.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/adodb/drivers/adodb-mysql.inc.php Mon Apr 3 23:39:55 2006 @@ -171,7 +171,7 @@ function BeginTrans() { - if ($this->debug) ADOConnection::outp("Transactions not supported in 'mysql' driver. Use 'mysqlt' or 'mysqli' driver"); + //if ($this->debug) ADOConnection::outp("Transactions not supported in 'mysql' driver. Use 'mysqlt' or 'mysqli' driver"); } function _affectedrows() @@ -772,4 +772,4 @@ } -?> +?> From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 23:50:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 06:50:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4862 - /vtigercrm/trunk/include/utils/CommonUtils.php Message-ID: <20060404065058.D0DA559F9F0@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 4 00:50:53 2006 New Revision: 4862 Log: changes made to parenttab from flat 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 Tue Apr 4 00:50:53 2006 @@ -944,19 +944,45 @@ function getParentTabName($parenttabid) { - global $adb; - $sql = "select parenttab_label from parenttab where parenttabid=".$parenttabid; - $result = $adb->query($sql); - $parent_tabname= $adb->query_result($result,0,"parenttab_label"); - return $parent_tabname; -} + global $adb; + if (file_exists('parent_tabdata.php') && (filesize('parent_tabdata.php') != 0)) + { + include('parent_tabdata.php'); + $parent_tabname= $parent_tab_info_array[$parenttabid]; + } + else + { + $sql = "select parenttab_label from parenttab where parenttabid=".$parenttabid; + $result = $adb->query($sql); + $parent_tabname= $adb->query_result($result,0,"parenttab_label"); + } + return $parent_tabname; +} + function getParentTabFromModule($module) { global $adb; - $sql = "select parenttab.* from parenttab inner join parenttabrel on parenttabrel.parenttabid=parenttab.parenttabid inner join tab on tab.tabid=parenttabrel.tabid where tab.name='".$module."'"; - $result = $adb->query($sql); - $tab = $adb->query_result($result,0,"parenttab_label"); - return $tab; + if (file_exists('tabdata.php') && (filesize('tabdata.php') != 0) && file_exists('parent_tabdata.php') && (filesize('parent_tabdata.php') != 0)) + { + include('tabdata.php'); + include('parent_tabdata.php'); + $tabid=$tab_info_array[$module]; + foreach($parent_child_tab_rel_array as $parid=>$childArr) + { + if(in_array($tabid,$childArr)) + { + $parent_tabname= $parent_tab_info_array[$parid]; + } + } + return $parent_tabname; + } + else + { + $sql = "select parenttab.* from parenttab inner join parenttabrel on parenttabrel.parenttabid=parenttab.parenttabid inner join tab on tab.tabid=parenttabrel.tabid where tab.name='".$module."'"; + $result = $adb->query($sql); + $tab = $adb->query_result($result,0,"parenttab_label"); + return $tab; + } } /** From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 00:27:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 07:27:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4863 - /vtigercrm/trunk/modules/Users/listwordtemplates.php Message-ID: <20060404072740.D4E3459FA14@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 4 01:27:36 2006 New Revision: 4863 Log: Modified the listwordtemplate file to integrate the new ui for mail merge templates and smartise it Ahmed Modified: vtigercrm/trunk/modules/Users/listwordtemplates.php Modified: vtigercrm/trunk/modules/Users/listwordtemplates.php ============================================================================== --- vtigercrm/trunk/modules/Users/listwordtemplates.php (original) +++ vtigercrm/trunk/modules/Users/listwordtemplates.php Tue Apr 4 01:27:36 2006 @@ -9,53 +9,49 @@ * All Rights Reserved. * ********************************************************************************/ +require_once('Smarty_setup.php'); +require_once('include/database/PearDatabase.php'); -require_once('include/database/PearDatabase.php'); -?> - - - -Word Templates List - - - - - - -
- -
-
-query($sql); + $edit="Edit "; $del="Del "; $bar=" | "; $cnt=1; -*/ -/* -do -{ - $name=$temprow["name"]; - if ($cnt%2==0) - printf(" "); - else - printf(" "); - - printf(" %s",$temprow["filename"]); -*/ -/* - printf("%s",$temprow["description"]); - $cnt++; - } - while($temprow = mysql_fetch_array($result)); -*/ + +$return_data = Array(); +$num_rows = $adb->num_rows($result); + + +for($i=0;$i < $num_rows; $i++) +{ + $wordtemplatearray=array(); + $wordtemplatearray['templateid'] = $adb->query_result($result,$i,'templateid'); + $wordtemplatearray['description'] = $adb->query_result($result,$i,'description'); + $wordtemplatearray['module'] = $adb->query_result($result,$i,'module'); + $wordtemplatearray['filename'] = $adb->query_result($result,$i,'filename'); + $wordtemplatearray['filetype'] = $adb->query_result($result,$i,'filetype'); + $wordtemplatearray['filesize'] = $adb->query_result($result,$i,'filesize'); + $return_data []= $wordtemplatearray; +} +require_once('include/utils/UserInfoUtil.php'); +global $app_strings; +global $mod_strings; +global $theme; +$theme_path="themes/".$theme."/"; +$image_path=$theme_path."images/"; + +$smarty = new vtigerCRM_Smarty; +global $current_language; +$smod_strings = return_module_language($current_language,'Settings'); +$smarty->assign("MOD", $smod_strings); +$smarty->assign("UMOD", $mod_strings); +$smarty->assign("IMAGE_PATH",$image_path); + + +$smarty->assign("WORDTEMPLATES",$return_data); +$smarty->display("ListWordTemplates.tpl"); ?> - - From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 00:29:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 07:29:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4864 - /vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl Message-ID: <20060404072903.7929659FA14@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 4 01:28:58 2006 New Revision: 4864 Log: Created new wordtemplate tpl for smartification of the new ui of mail merger template - Ahmed Added: vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 00:33:35 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 07:33:35 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4865 - /vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl Message-ID: <20060404073335.D98E259FA14@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 4 01:33:31 2006 New Revision: 4865 Log: Added the settings link in the Header of Email Template Modified: vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl Modified: vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl Tue Apr 4 01:33:31 2006 @@ -62,7 +62,7 @@ From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 00:34:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 07:34:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4866 - /vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl Message-ID: <20060404073411.B893759FA14@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 4 01:34:07 2006 New Revision: 4866 Log: Added the settings link in the Header of Email Template Modified: vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl Modified: vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl Tue Apr 4 01:34:07 2006 @@ -9,7 +9,7 @@

- {$UMOD.LBL_EMAIL_TEMPLATES_LIST} + {$MOD.LBL_SETTINGS} > {$UMOD.LBL_EMAIL_TEMPLATES_LIST}
From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 00:34:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 07:34:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4867 - /vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl Message-ID: <20060404073440.4ADAB59FA14@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 4 01:34:36 2006 New Revision: 4867 Log: Added the settings link in the Header of Email Template Modified: vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl Modified: vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl Tue Apr 4 01:34:36 2006 @@ -109,9 +109,9 @@ From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 00:45:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 07:45:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4868 - /vtigercrm/trunk/include/utils/DetailViewUtils.php Message-ID: <20060404074517.9A6BB59FA21@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 4 01:45:13 2006 New Revision: 4868 Log: Function not in use removed 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 Apr 4 01:45:13 2006 @@ -844,7 +844,6 @@ global $current_user; require('user_privileges/user_privileges_'.$current_user->id.'.php'); - $mod_dir_name=getModuleDirName($module); $cur_tab_id = getTabid($module); $sql1 = "select * from relatedlists where tabid=".$cur_tab_id; From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 00:45:29 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 07:45:29 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4869 - /vtigercrm/trunk/include/RelatedListView.php Message-ID: <20060404074530.0ACD359FA21@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 4 01:45:25 2006 New Revision: 4869 Log: Function not in use removed Modified: vtigercrm/trunk/include/RelatedListView.php Modified: vtigercrm/trunk/include/RelatedListView.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 00:51:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 07:51:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4870 - /vtigercrm/trunk/modules/Users/language/en_us.lang.php Message-ID: <20060404075124.252F959FA29@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 4 01:51:19 2006 New Revision: 4870 Log: Added some labels for Mail Merge Template Smartification Ahmed Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 01:29:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 08:29:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4871 - /vtigercrm/trunk/config.template.php Message-ID: <20060404082928.7B28359FA39@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 4 02:29:24 2006 New Revision: 4871 Log: * Added the FCKEDITOR_DISPLAY variable to show or hide the FCKEditor Modified: vtigercrm/trunk/config.template.php Modified: vtigercrm/trunk/config.template.php ============================================================================== --- vtigercrm/trunk/config.template.php (original) +++ vtigercrm/trunk/config.template.php Tue Apr 4 02:29:24 2006 @@ -19,11 +19,13 @@ // memory limit default value = 16M ini_set('memory_limit','16M'); -// show or hide world clock and calculator +// show or hide world clock, calculator and FCKEditor // world_clock_display default value = true -// calculator_clock_display default value = true +// calculator_display default value = true +// fckeditor_display default value = true $WORLD_CLOCK_DISPLAY = 'true'; $CALCULATOR_DISPLAY = 'true'; +$FCKEDITOR_DISPLAY = 'true'; // url for customer portal (Example: http://vtiger.com/portal) $PORTAL_URL = 'http://your-domain.com/customerportal'; From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 02:59:53 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 09:59:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4872 - /vtigercrm/trunk/pkg/apache/conf/win_httpd.conf Message-ID: <20060404095953.C055F59FA5C@vtiger.fosslabs.com> Author: richie Date: Tue Apr 4 03:59:49 2006 New Revision: 4872 Log: removed MaxSpareServers etc entry as they have no bearing on Windows functionality. Commented out unwanted modules in Apache Modified: vtigercrm/trunk/pkg/apache/conf/win_httpd.conf Modified: vtigercrm/trunk/pkg/apache/conf/win_httpd.conf ============================================================================== --- vtigercrm/trunk/pkg/apache/conf/win_httpd.conf (original) +++ vtigercrm/trunk/pkg/apache/conf/win_httpd.conf Tue Apr 4 03:59:49 2006 @@ -56,10 +56,6 @@ # ServerRoot "VTIGER_HOME/apache" #reference http://www.faqs.org/docs/securing/chap29sec245.html -MinSpareServers 16 -MaxSpareServers 64 -StartServers 16 -MaxClients 512 MaxRequestsPerChild 100000 # @@ -139,25 +135,25 @@ LoadModule access_module modules/mod_access.so LoadModule actions_module modules/mod_actions.so LoadModule alias_module modules/mod_alias.so -LoadModule asis_module modules/mod_asis.so -LoadModule auth_module modules/mod_auth.so +#LoadModule asis_module modules/mod_asis.so +#LoadModule auth_module modules/mod_auth.so #LoadModule auth_anon_module modules/mod_auth_anon.so #LoadModule auth_dbm_module modules/mod_auth_dbm.so #LoadModule auth_digest_module modules/mod_auth_digest.so LoadModule autoindex_module modules/mod_autoindex.so #LoadModule cern_meta_module modules/mod_cern_meta.so -LoadModule cgi_module modules/mod_cgi.so +#LoadModule cgi_module modules/mod_cgi.so #LoadModule dav_module modules/mod_dav.so #LoadModule dav_fs_module modules/mod_dav_fs.so LoadModule dir_module modules/mod_dir.so -LoadModule env_module modules/mod_env.so +#LoadModule env_module modules/mod_env.so #LoadModule expires_module modules/mod_expires.so #LoadModule file_cache_module modules/mod_file_cache.so #LoadModule headers_module modules/mod_headers.so -LoadModule imap_module modules/mod_imap.so -LoadModule include_module modules/mod_include.so +#LoadModule imap_module modules/mod_imap.so +#LoadModule include_module modules/mod_include.so #LoadModule info_module modules/mod_info.so -LoadModule isapi_module modules/mod_isapi.so +#LoadModule isapi_module modules/mod_isapi.so LoadModule log_config_module modules/mod_log_config.so LoadModule mime_module modules/mod_mime.so #LoadModule mime_magic_module modules/mod_mime_magic.so From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 03:54:05 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 10:54:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4873 - /vtigercrm/trunk/include/utils/CommonUtils.php Message-ID: <20060404105405.4776C59FA5C@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 4 04:54:00 2006 New Revision: 4873 Log: Docs added for functions 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 Apr 4 04:54:00 2006 @@ -519,7 +519,13 @@ } - +/** + * Get the username by giving the user id. This method expects the user id + * param $label_list - the array of strings to that contains the option list + * param $key_list - the array of strings to that contains the values list + * param $selected - the string which contains the default value + */ + function getUserName($userid) { global $log; @@ -535,7 +541,11 @@ return $user_name; } - +/** + * Creates and returns database query. To be used for search and other text links. This method expects the module object. + * param $focus - the module object contains the column fields + */ + function getURLstring($focus) { $qry = ""; @@ -566,7 +576,10 @@ } - +/** This function returns the date in user specified format. + * param $cur_date_val - the default date format + */ + function getDisplayDate($cur_date_val) { global $current_user; @@ -576,26 +589,20 @@ $dat_fmt = 'dd-mm-yyyy'; } - //echo $dat_fmt; - //echo '
'.$cur_date_val.'
'; $date_value = explode(' ',$cur_date_val); list($y,$m,$d) = split('-',$date_value[0]); - //echo $y.'----'.$m.'------'.$d; if($dat_fmt == 'dd-mm-yyyy') { - //echo '
inside 1'; $display_date = $d.'-'.$m.'-'.$y; } elseif($dat_fmt == 'mm-dd-yyyy') { - //echo '
inside 2'; $display_date = $m.'-'.$d.'-'.$y; } elseif($dat_fmt == 'yyyy-mm-dd') { - //echo '
inside 3'; $display_date = $y.'-'.$m.'-'.$d; } @@ -607,6 +614,10 @@ } +/** This function returns the date in user specified format. + * Takes no param, receives the date format from current user object + */ + function getNewDisplayDate() { global $log; @@ -638,6 +649,10 @@ return $display_date; } +/** This function returns the default currency information. + * Takes no param, return type array. + */ + function getDisplayCurrency() { global $adb; @@ -655,15 +670,29 @@ return $curr_array; } +/** This function returns the amount converted to dollar. + * param $amount - amount to be converted. + * param $crate - conversion rate. + */ + function convertToDollar($amount,$crate){ return $amount / $crate; } +/** This function returns the amount converted from dollar. + * param $amount - amount to be converted. + * param $crate - conversion rate. + */ function convertFromDollar($amount,$crate){ return $amount * $crate; } +/** This function returns the conversion rate for a given currency. + * param $id - currency id. + * param $symbol - currency symbol. + */ + function getConversionRate($id,$symbol) { global $adb; @@ -673,6 +702,11 @@ return $rate; } +/** This function returns the conversion rate for a given currency. + * param $id - currency id. + * param $symbol - currency symbol. + */ + function getCurrencySymbol($id) { global $adb; @@ -682,6 +716,10 @@ return $curr_symbol; } +/** This function returns the terms and condition from the database. + * Takes no param and the return type is text. + */ + function getTermsandConditions() { global $adb; @@ -691,19 +729,15 @@ return $tandc; } -function getModuleDirName($module) -{ - if($module == 'Vendor' || $module == 'PriceBook') - { - $dir_name = 'Products'; - } - else - { - $dir_name = $module; - } - return $dir_name; -} - +/** + * Create select options in a dropdown list. To be used inside + * a reminder select statement in a activity form. + * param $start - start value + * param $end - end value + * param $fldname - field name + * param $selvalue - selected value + */ + function getReminderSelectOption($start,$end,$fldname,$selvalue='') { global $mod_strings; @@ -722,7 +756,11 @@ return $OPTION_FLD; } - +/** This function returns the List price of a given product in a given price book. + * param $productid - product id. + * param $pbid - pricebook id. + */ + function getListPrice($productid,$pbid) { global $log; @@ -735,12 +773,20 @@ return $lp; } +/** This function returns a string with removed new line character, single quote, and back slash double quoute. + * param $str - string to be converted. + */ + function br2nl($str) { $str = preg_replace("/(\r\n)/", " ", $str); $str = preg_replace("/'/", " ", $str); $str = preg_replace("/\"/", " ", $str); return $str; } + +/** This function returns a text, which escapes the html encode for link tag/ a href tag +*param $text - string/text +*/ function make_clickable($text) { From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 05:01:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 12:01:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4874 - /vtigercrm/trunk/include/utils/ListViewUtils.php Message-ID: <20060404120158.C8A5659FA51@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 4 06:01:54 2006 New Revision: 4874 Log: changes made to reduce the no. of queries logging for listview 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 Apr 4 06:01:54 2006 @@ -74,7 +74,7 @@ } } - //Added to reduce the no. of queries logging for non-admin user -- by minnie-start + //Added to reduce the no. of queries logging for non-admin user -- by Minnie-start $field_list ='('; $j=0; require('user_privileges/user_privileges_'.$current_user->id.'.php'); @@ -224,10 +224,37 @@ global $adb; global $theme; global $app_strings; - global $mod_strings; + global $mod_strings,$current_user; $arrow=''; $list_header = Array(); - + $tabid = getTabid($module); + //Added to reduce the no. of queries logging for non-admin user -- by Minnie-start + $field_list ='('; + $j=0; + require('user_privileges/user_privileges_'.$current_user->id.'.php'); + foreach($focus->search_fields as $name=>$tableinfo) + { + $fieldname = $focus->search_fields_name[$name]; + if($j != 0) + { + $field_list .= ', '; + } + $field_list .= "'".$fieldname."'"; + $j++; + } + $field_list .=')'; + if($is_admin==false) + { + $profileList = getCurrentUserProfileList(); + $query = "select profile2field.*,field.fieldname from field inner join profile2field on profile2field.fieldid=field.fieldid inner join def_org_field on def_org_field.fieldid=field.fieldid where field.tabid=".$tabid." and profile2field.visible=0 and def_org_field.visible=0 and profile2field.profileid in ".$profileList." and field.fieldname in ".$field_list." group by field.fieldid"; + $result = $adb->query($query); + $field=Array(); + for($k=0;$k < $adb->num_rows($result);$k++) + { + $field[]=$adb->query_result($result,$k,"fieldname"); + } + } + //end $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; foreach($focus->search_fields as $name=>$tableinfo) @@ -408,6 +435,21 @@ { $field[]=$adb->query_result($result,$k,"fieldname"); } + } + //constructing the uitype and columnname array + $ui_col_array=Array(); + + $query = "select uitype,columnname,fieldname from field where tabid=".$tabid." and fieldname in".$field_list; + $result = $adb->query($query); + $num_rows=$adb->num_rows($result); + for($i=0;$i<$num_rows;$i++) + { + $tempArr=array(); + $uitype=$adb->query_result($result,$i,'uitype'); + $columnname=$adb->query_result($result,$i,'columnname'); + $field_name=$adb->query_result($result,$i,'fieldname'); + $tempArr[$uitype]=$columnname; + $ui_col_array[$field_name]=$tempArr; } //end for ($i=$navigation_array['start']; $i<=$navigation_array['end_val']; $i++) @@ -584,10 +626,8 @@ } else { - $query="select uitype,columnname from field where tabid=".$tabid." and fieldname='".$fieldname."'"; - $field_result = $adb->query($query); $list_result_count = $i-1; - $value = getValue($field_result,$list_result,$fieldname,$focus,$module,$entity_id,$list_result_count,"list","",$returnset,$oCv->setdefaultviewid); + $value = getValue($ui_col_array,$list_result,$fieldname,$focus,$module,$entity_id,$list_result_count,"list","",$returnset,$oCv->setdefaultviewid); } } //Added condition to hide the close symbol in Related Lists @@ -631,19 +671,58 @@ function getSearchListViewEntries($focus, $module,$list_result,$navigation_array) { - global $adb; + global $adb,$theme,$current_user; $noofrows = $adb->num_rows($list_result); $list_header = ''; - global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; $list_block = Array(); //getting the fieldtable entries from database $tabid = getTabid($module); - global $current_user; require('user_privileges/user_privileges_'.$current_user->id.'.php'); - + + //Added to reduce the no. of queries logging for non-admin user -- by Minnie-start + $field_list ='('; + $j=0; + foreach($focus->search_fields as $name=>$tableinfo) + { + $fieldname = $focus->search_fields_name[$name]; + if($j != 0) + { + $field_list .= ', '; + } + $field_list .= "'".$fieldname."'"; + $j++; + } + $field_list .=')'; + if($is_admin==false) + { + $profileList = getCurrentUserProfileList(); + $query = "select profile2field.*,field.fieldname from field inner join profile2field on profile2field.fieldid=field.fieldid inner join def_org_field on def_org_field.fieldid=field.fieldid where field.tabid=".$tabid." and profile2field.visible=0 and def_org_field.visible=0 and profile2field.profileid in ".$profileList." and field.fieldname in ".$field_list." group by field.fieldid"; + $result = $adb->query($query); + $field=Array(); + for($k=0;$k < $adb->num_rows($result);$k++) + { + $field[]=$adb->query_result($result,$k,"fieldname"); + } + } + //constructing the uitype and columnname array + $ui_col_array=Array(); + + $query = "select uitype,columnname,fieldname from field where tabid=".$tabid." and fieldname in".$field_list; + $result = $adb->query($query); + $num_rows=$adb->num_rows($result); + for($i=0;$i<$num_rows;$i++) + { + $tempArr=array(); + $uitype=$adb->query_result($result,$i,'uitype'); + $columnname=$adb->query_result($result,$i,'columnname'); + $field_name=$adb->query_result($result,$i,'fieldname'); + $tempArr[$uitype]=$columnname; + $ui_col_array[$field_name]=$tempArr; + } + //end for ($i=$navigation_array['start']; $i<=$navigation_array['end_val']; $i++) { @@ -715,11 +794,8 @@ } else { - $query = "select * from field where tabid=".$tabid." and fieldname='".$fieldname."'"; - $field_result = $adb->query($query); $list_result_count = $i-1; - - $value = getValue($field_result,$list_result,$fieldname,$focus,$module,$entity_id,$list_result_count,"search",$focus->popup_type); + $value = getValue($ui_col_array,$list_result,$fieldname,$focus,$module,$entity_id,$list_result_count,"search",$focus->popup_type); } } @@ -738,10 +814,14 @@ function getValue($field_result, $list_result,$fieldname,$focus,$module,$entity_id,$list_result_count,$mode,$popuptype,$returnset='',$viewid='') { global $adb; - $tabname = getParentTab(); - $uitype = $adb->query_result($field_result,0,"uitype"); + $tabname = getParentTab(); + $uicolarr=$field_result[$fieldname]; + foreach($uicolarr as $key=>$value) + { + $uitype = $key; - $colname = $adb->query_result($field_result,0,"columnname"); + $colname = $value; + } //added for getting event status in Custom view - Jaguar if($module == 'Activities' && $colname == "status") From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 05:38:36 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 12:38:36 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4875 - /vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl Message-ID: <20060404123836.8233F49EFA8@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 4 06:38:32 2006 New Revision: 4875 Log: Added new tpl for smartification of new ui of Mail Merge Template - ahmed Added: vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 05:46:04 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 12:46:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4876 - /vtigercrm/trunk/themes/blue/images/fp1.gif Message-ID: <20060404124604.8708759FA8F@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 4 06:45:59 2006 New Revision: 4876 Log: Added 3 images for new ui of Mail Merge Template Added: vtigercrm/trunk/themes/blue/images/fp1.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 05:46:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 12:46:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4877 - /vtigercrm/trunk/themes/blue/images/fp2.gif Message-ID: <20060404124615.8E21959FA8F@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 4 06:46:10 2006 New Revision: 4877 Log: Added 3 images for new ui of Mail Merge Template Added: vtigercrm/trunk/themes/blue/images/fp2.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 05:46:25 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 12:46:25 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4878 - /vtigercrm/trunk/themes/blue/images/fp3.gif Message-ID: <20060404124625.98DEF59FA83@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 4 06:46:20 2006 New Revision: 4878 Log: Added 3 images for new ui of Mail Merge Template Added: vtigercrm/trunk/themes/blue/images/fp3.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 08:04:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 15:04:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4879 - /vtigercrm/trunk/include/database/PearDatabase.php Message-ID: <20060404150406.D272C59FAAA@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 4 09:04:02 2006 New Revision: 4879 Log: log level has been changed for statement at line no 200 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 Tue Apr 4 09:04:02 2006 @@ -200,7 +200,7 @@ else { // $this->println("checkconnect using old connection"); - $log->info('checkconnect using old connection'); + $log->debug('checkconnect using old connection'); } } From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 22:01:14 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 05:01:14 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4880 - /vtigercrm/trunk/modules/Users/upload.php Message-ID: <20060405050114.5ADAC5C7073@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 4 23:01:09 2006 New Revision: 4880 Log: Made the necessary changes for smartification of new ui for mail merge template - Ahmed Modified: vtigercrm/trunk/modules/Users/upload.php Modified: vtigercrm/trunk/modules/Users/upload.php ============================================================================== --- vtigercrm/trunk/modules/Users/upload.php (original) +++ vtigercrm/trunk/modules/Users/upload.php Tue Apr 4 23:01:09 2006 @@ -1,4 +1,6 @@ - + +require_once('Smarty_setup.php'); +require_once('include/database/PearDatabase.php'); +require_once('include/utils/utils.php'); +require_once('modules/Users/add2db.php'); + +global $app_strings; +global $mod_strings; +global $app_list_strings; +global $adb; +global $theme; +$theme_path="themes/".$theme."/"; +$image_path=$theme_path."images/"; +require_once($theme_path.'layout_utils.php'); + +$smarty = new vtigerCRM_Smarty; + + +$smarty->assign("MOD", return_module_language($current_language,'Settings')); +$smarty->assign("IMAGE_PATH",$image_path); +$smarty->assign("APP", $app_strings); +$smarty->assign("UMOD", $mod_strings); + +$smarty->display('CreateWordTemplate.tpl'); + +?> - - - - - -
- - - -

- {$UMOD.LBL_EMAIL_TEMPLATE_INFORMATION} "{$TEMPLATENAME}" + {$MOD.LBL_SETTINGS} > {$UMOD.LBL_EMAIL_TEMPLATE_INFORMATION} "{$TEMPLATENAME}"
 

{if $EMODE eq 'edit'} - Communication Templates > Editing Email Templates > {$TEMPLATENAME} + {$MOD.LBL_SETTINGS} > Communication Templates > Editing Email Templates > {$TEMPLATENAME} {else} - Communication Templates > Creating Email Templates > New + {$MOD.LBL_SETTINGS} > Communication Templates > Creating Email Templates > New {/if}
- - - - - -
- - - - - - - - - - - - - -
: -
:
:
-
- - - - -
- -
- - - + + From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 23:00:51 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 06:00:51 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4881 - /vtigercrm/trunk/modules/CustomView/PopulateCustomView.php Message-ID: <20060405060051.099B45C3718@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 00:00:47 2006 New Revision: 4881 Log: fieldname has been modified for default listview Modified: vtigercrm/trunk/modules/CustomView/PopulateCustomView.php Modified: vtigercrm/trunk/modules/CustomView/PopulateCustomView.php ============================================================================== --- vtigercrm/trunk/modules/CustomView/PopulateCustomView.php (original) +++ vtigercrm/trunk/modules/CustomView/PopulateCustomView.php Wed Apr 5 00:00:47 2006 @@ -134,7 +134,7 @@ 'leaddetails:company:company:Leads_Company:V', 'leadaddress:phone:phone:Leads_Phone:V', 'leadsubdetails:website:website:Leads_Website:V', - 'leaddetails:email:email:Leads_Email:V', + 'leaddetails:email:email:Leads_Email:E', 'crmentity:smownerid:assigned_user_id:Leads_Assigned_To:V'), Array('leaddetails:firstname:firstname:Leads_First_Name:V', @@ -142,14 +142,14 @@ 'leaddetails:company:company:Leads_Company:V', 'leaddetails:leadsource:leadsource:Leads_Lead_Source:V', 'leadsubdetails:website:website:Leads_Website:V', - 'leaddetails:email:email:Leads_Email:V'), + 'leaddetails:email:email:Leads_Email:E'), Array('leaddetails:firstname:firstname:Leads_First_Name:V', 'leaddetails:lastname:lastname:Leads_Last_Name:V', 'leaddetails:company:company:Leads_Company:V', 'leaddetails:leadsource:leadsource:Leads_Lead_Source:V', 'leadsubdetails:website:website:Leads_Website:V', - 'leaddetails:email:email:Leads_Email:V'), + 'leaddetails:email:email:Leads_Email:E'), Array('account:accountname:accountname:Accounts_Account_Name:V', 'accountbillads:city:bill_city:Accounts_City:V', @@ -173,8 +173,8 @@ 'contactdetails:lastname:lastname:Contacts_Last_Name:V', 'contactdetails:title:title:Contacts_Title:V', 'contactdetails:accountid:account_id:Contacts_Account_Name:I', - 'contactdetails:email:email:Contacts_Email:V', - 'contactdetails:phone:phone:Contacts_Phone:V', + 'contactdetails:email:email:Contacts_Email:E', + 'contactdetails:phone:phone:Contacts_Office_Phone:V', 'crmentity:smownerid:assigned_user_id:Contacts_Assigned_To:V'), Array('contactdetails:firstname:firstname:Contacts_First_Name:V', @@ -189,13 +189,13 @@ 'contactdetails:lastname:lastname:Contacts_Last_Name:V', 'contactdetails:title:title:Contacts_Title:V', 'contactdetails:accountid:account_id:Contacts_Account_Name:I', - 'contactdetails:email:email:Contacts_Email:V', + 'contactdetails:email:email:Contacts_Email:E', 'contactsubdetails:otherphone:otherphone:Contacts_Phone:V', 'crmentity:smownerid:assigned_user_id:Contacts_Assigned_To:V'), Array('potential:potentialname:potentialname:Potentials_Potential_Name:V', 'potential:accountid:account_id:Potentials_Account_Name:V', - 'potential:sales_stage:sales_stage:Potentials_Sales_Stage:N', + 'potential:sales_stage:sales_stage:Potentials_Sales_Stage:V', 'potential:leadsource:leadsource:Potentials_Lead_Source:V', 'potential:closingdate:closingdate:Potentials_Expected_Close_Date:D', 'crmentity:smownerid:assigned_user_id:Potentials_Assigned_To:V'), @@ -253,30 +253,30 @@ 'quotes:validtill:validtill:Quotes_Valid_Till:D', 'crmentity:smownerid:assigned_user_id:Quotes_Assigned_To:V'), - Array('activity:status:status:Activities_Status:V', - 'activity:activitytype:activitytype:Activities_Type:V', + Array('activity:status:taskstatus:Activities_Status:V', + 'activity:activitytype::Activities_Type:V', 'activity:subject:subject:Activities_Subject:V', - 'contactdetails:lastname:lastname:Activities_Contact_Name:V', - 'seactivityrel:activityid:activityid:Activities_Related_To:V', + 'cntactivityrel:contactid:contact_id:Activities_Contact_Name:I', + 'seactivityrel:crmid:parent_id:Activities_Related_To:V', 'activity:date_start:date_start:Activities_Start_Date:D', 'activity:due_date:due_date:Activities_End_Date:D', 'crmentity:smownerid:assigned_user_id:Activities_Assigned_To:V'), Array('activity:subject:subject:Emails_Subject:V', - 'seactivityrel:activityid:activityid:Emails_Related_To:I', + 'seactivityrel:crmid:parent_id:Emails_Related_To:I', 'activity:date_start:date_start:Emails_Date_Sent:D', 'crmentity:smownerid:assigned_user_id:Emails_Assigned_To:V'), Array('crmentity:crmid::Invoice_Invoice_Id:I', 'invoice:subject:subject:Invoice_Subject:V', - 'invoice:salesorderid:salesorder_id:Invoice_Sales_Order:V', + 'invoice:salesorderid:salesorder_id:Invoice_Sales_Order:I', 'invoice:invoicestatus:invoicestatus:Invoice_Status:V', 'invoice:total:hdnGrandTotal:Invoice_Total:I', 'crmentity:smownerid:assigned_user_id:Invoice_Assigned_To:V'), Array('notes:title:title:Notes_Title:V', 'notes:contact_id:contact_id:Notes_Contact_Name:I', - 'senotesrel:crmid:crmid:Notes_Related_To:I', + 'senotesrel:crmid:parent_id:Notes_Related_To:I', 'notes:filename:filename:Notes_File:V', 'crmentity:modifiedtime:modifiedtime:Notes_Modified_Time:V'), @@ -304,7 +304,7 @@ Array('vendor:vendorname:vendorname:Vendors_Vendor_Name:V', 'vendor:phone:phone:Vendors_Phone:V', - 'vendor:email:email:Vendors_Email:V', + 'vendor:email:email:Vendors_Email:E', 'vendor:category:category:Vendors_Category:V'), @@ -317,9 +317,12 @@ 'crmentity:createdtime:createdtime:Faq_Created_Time:D', 'crmentity:modifiedtime:modifiedtime:Faq_Modified_Time:D'), //this sequence has to be maintained - Array('campaign:campaignname:campaignname:Campaigns_Campaign_Name:V', - 'campaign:campaignid:campaignid:Campaigns_Campaign_ID:V', - 'campaign:campaigntype:campaigntype:Campaigns_Campaign_Type:V'), + Array('campaign:campaignname:campaignname:Campaigns_Campaign_Name:V', + 'campaign:campaigntype:campaigntype:Campaigns_Campaign_Type:N', + 'campaign:campaignstatus:campaignstatus:Campaigns_Campaign_Status:N', + 'campaign:expectedrevenue:expectedrevenue:Campaigns_Expected_Revenue:V', + 'campaign:closingdate:closingdate:Campaigns_Expected_Close_Date:D', + 'crmentity:smownerid:assigned_user_id:Campaigns_Assigned_To:V'), ); From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 23:02:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 06:02:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4882 - /vtigercrm/trunk/modules/Accounts/ListView.php Message-ID: <20060405060244.144DC5C707C@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 00:02:35 2006 New Revision: 4882 Log: dom array has been removed Modified: vtigercrm/trunk/modules/Accounts/ListView.php Modified: vtigercrm/trunk/modules/Accounts/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/ListView.php (original) +++ vtigercrm/trunk/modules/Accounts/ListView.php Wed Apr 5 00:02:35 2006 @@ -32,10 +32,6 @@ global $currentModule; global $theme; -// Get _dom arrays from Database -$comboFieldNames = Array('accounttype'=>'account_type_dom' - ,'industry'=>'industry_dom'); -$comboFieldArray = getComboArray($comboFieldNames); $category = getParentTab(); // focus_list is the means of passing data to a ListView. From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 23:05:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 06:05:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4883 - /vtigercrm/trunk/modules/Campaigns/ListView.php Message-ID: <20060405060515.397C75C707C@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 00:05:10 2006 New Revision: 4883 Log: dom array has been removed Modified: vtigercrm/trunk/modules/Campaigns/ListView.php Modified: vtigercrm/trunk/modules/Campaigns/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/ListView.php (original) +++ vtigercrm/trunk/modules/Campaigns/ListView.php Wed Apr 5 00:05:10 2006 @@ -21,13 +21,7 @@ global $app_strings,$mod_strings,$current_language; $current_module_strings = return_module_language($current_language, 'Campaigns'); -$comboFieldNames = Array('campaigntype'=>'campaigntype_dom' - ,'campaignstatus'=>'campaignstatus_dom'); -$comboFieldArray = getComboArray($comboFieldNames); -global $currentModule; - - -global $theme; +global $currentModule,$theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 23:07:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 06:07:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4884 - /vtigercrm/trunk/modules/Contacts/ListView.php Message-ID: <20060405060722.8A5555C707C@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 00:07:17 2006 New Revision: 4884 Log: dom array has been removed Modified: vtigercrm/trunk/modules/Contacts/ListView.php Modified: vtigercrm/trunk/modules/Contacts/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/ListView.php (original) +++ vtigercrm/trunk/modules/Contacts/ListView.php Wed Apr 5 00:07:17 2006 @@ -34,12 +34,7 @@ $log = LoggerManager::getLogger('contact_list'); -global $currentModule; -global $theme; - -// Get _dom arrays from Database -$comboFieldNames = Array('leadsource'=>'leadsource_dom'); -$comboFieldArray = getComboArray($comboFieldNames); +global $currentModule,$theme; $focus = new Contact(); $smarty = new vtigerCRM_Smarty; From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 23:12:35 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 06:12:35 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4885 - /vtigercrm/trunk/modules/HelpDesk/ListView.php Message-ID: <20060405061235.DF8285C707D@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 00:12:31 2006 New Revision: 4885 Log: dom array has been removed Modified: vtigercrm/trunk/modules/HelpDesk/ListView.php Modified: vtigercrm/trunk/modules/HelpDesk/ListView.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/ListView.php (original) +++ vtigercrm/trunk/modules/HelpDesk/ListView.php Wed Apr 5 00:12:31 2006 @@ -25,12 +25,6 @@ global $app_strings; global $mod_strings; - -$comboFieldNames = Array('ticketpriorities'=>'ticketpriorities_dom' - ,'ticketstatus'=>'ticketstatus_dom' - ,'ticketcategories'=>'ticketcategories_dom'); -$comboFieldArray = getComboArray($comboFieldNames); - global $currentModule; $focus = new HelpDesk(); From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 23:14:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 06:14:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4886 - /vtigercrm/trunk/modules/Invoice/ListView.php Message-ID: <20060405061403.BB7D25C7085@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 00:13:59 2006 New Revision: 4886 Log: dom array has been removed Modified: vtigercrm/trunk/modules/Invoice/ListView.php Modified: vtigercrm/trunk/modules/Invoice/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/ListView.php (original) +++ vtigercrm/trunk/modules/Invoice/ListView.php Wed Apr 5 00:13:59 2006 @@ -28,11 +28,6 @@ global $app_strings,$list_max_entries_per_page,$currentModule,$theme; $log = LoggerManager::getLogger('order_list'); - -// Get _dom arrays from Database -$comboFieldNames = Array('accounttype'=>'account_type_dom' - ,'industry'=>'industry_dom'); -$comboFieldArray = getComboArray($comboFieldNames); if (!isset($where)) $where = ""; From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 23:18:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 06:18:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4887 - /vtigercrm/trunk/modules/Leads/ListView.php Message-ID: <20060405061807.13BF85A84A5@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 00:18:01 2006 New Revision: 4887 Log: dom array has been modified Modified: vtigercrm/trunk/modules/Leads/ListView.php Modified: vtigercrm/trunk/modules/Leads/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Leads/ListView.php (original) +++ vtigercrm/trunk/modules/Leads/ListView.php Wed Apr 5 00:18:01 2006 @@ -37,10 +37,7 @@ global $theme; // Get _dom arrays from Database -$comboFieldNames = Array('leadsource'=>'leadsource_dom' - ,'leadstatus'=>'leadstatus_dom' - ,'rating'=>'rating_dom' - ,'industry'=>'industry_dom'); +$comboFieldNames = Array('leadstatus'=>'leadstatus_dom'); $comboFieldArray = getComboArray($comboFieldNames); $category = getParentTab(); From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 23:19:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 06:19:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4888 - /vtigercrm/trunk/modules/Potentials/ListView.php Message-ID: <20060405061956.B30F059FA03@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 00:19:45 2006 New Revision: 4888 Log: dom array has been removed Modified: vtigercrm/trunk/modules/Potentials/ListView.php Modified: vtigercrm/trunk/modules/Potentials/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/ListView.php (original) +++ vtigercrm/trunk/modules/Potentials/ListView.php Wed Apr 5 00:19:45 2006 @@ -29,12 +29,6 @@ global $currentModule,$theme; -// Get _dom arrays from Database -$comboFieldNames = Array('leadsource'=>'leadsource_dom' - ,'opportunity_type'=>'opportunity_type_dom' - ,'sales_stage'=>'sales_stage_dom'); -$comboFieldArray = getComboArray($comboFieldNames); - $category = getParentTab(); if (!isset($where)) $where = ""; From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 23:21:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 06:21:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4889 - /vtigercrm/trunk/modules/Products/ListView.php Message-ID: <20060405062155.C86315A84A5@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 00:21:48 2006 New Revision: 4889 Log: dom array has been removed Modified: vtigercrm/trunk/modules/Products/ListView.php Modified: vtigercrm/trunk/modules/Products/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Products/ListView.php (original) +++ vtigercrm/trunk/modules/Products/ListView.php Wed Apr 5 00:21:48 2006 @@ -35,11 +35,6 @@ $category = getParentTab(); $smarty->assign("CATEGORY",$category); $other_text = Array(); - - -$comboFieldNames = Array('manufacturer'=>'manufacturer_dom' - ,'productcategory'=>'productcategory_dom'); -$comboFieldArray = getComboArray($comboFieldNames); $url_string = '&smodule=PRODUCTS'; // assigning http url string From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 23:23:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 06:23:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4890 - /vtigercrm/trunk/modules/PurchaseOrder/ListView.php Message-ID: <20060405062348.A29E55A84A5@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 00:23:44 2006 New Revision: 4890 Log: dom array has been removed Modified: vtigercrm/trunk/modules/PurchaseOrder/ListView.php Modified: vtigercrm/trunk/modules/PurchaseOrder/ListView.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/ListView.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/ListView.php Wed Apr 5 00:23:44 2006 @@ -27,12 +27,6 @@ global $app_strings,$list_max_entries_per_page,$currentModule,$theme; $log = LoggerManager::getLogger('order_list'); - - -// Get _dom arrays from Database -$comboFieldNames = Array('accounttype'=>'account_type_dom' - ,'industry'=>'industry_dom'); -$comboFieldArray = getComboArray($comboFieldNames); if (!isset($where)) $where = ""; From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 23:25:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 06:25:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4891 - /vtigercrm/trunk/modules/Quotes/ListView.php Message-ID: <20060405062506.9D6985A84A5@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 00:25:01 2006 New Revision: 4891 Log: dom array has been removed Modified: vtigercrm/trunk/modules/Quotes/ListView.php Modified: vtigercrm/trunk/modules/Quotes/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/ListView.php (original) +++ vtigercrm/trunk/modules/Quotes/ListView.php Wed Apr 5 00:25:01 2006 @@ -28,10 +28,6 @@ global $app_strings,$list_max_entries_per_page,$currentModule,$theme; $log = LoggerManager::getLogger('quote_list'); - -// Get _dom arrays from Database -$comboFieldNames = Array('quotestage'=>'quotestage_dom'); -$comboFieldArray = getComboArray($comboFieldNames); if (!isset($where)) $where = ""; From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 23:30:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 06:30:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4892 - /vtigercrm/trunk/modules/Settings/CurrencyDetailView.php Message-ID: <20060405063058.5DEBD5C707D@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 00:30:54 2006 New Revision: 4892 Log: changes made for smartification Modified: vtigercrm/trunk/modules/Settings/CurrencyDetailView.php Modified: vtigercrm/trunk/modules/Settings/CurrencyDetailView.php ============================================================================== --- vtigercrm/trunk/modules/Settings/CurrencyDetailView.php (original) +++ vtigercrm/trunk/modules/Settings/CurrencyDetailView.php Wed Apr 5 00:30:54 2006 @@ -8,37 +8,34 @@ * All Rights Reserved. * ********************************************************************************/ -require_once('XTemplate/xtpl.php'); +require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('include/utils/UserInfoUtil.php'); require_once('include/database/PearDatabase.php'); -global $mod_strings; -global $app_strings; -global $app_list_strings; -global $theme; +global $mod_strings,$app_strings,$theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); -$xtpl=new XTemplate ('modules/Settings/CurrencyInfo.html'); -$xtpl->assign("MOD", $mod_strings); -$xtpl->assign("APP", $app_strings); +$smarty=new vtigerCRM_Smarty; +$smarty->assign("MOD", $mod_strings); +$smarty->assign("APP", $app_strings); +$smarty->assign("IMAGE_PATH",$image_path); if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { $tempid = $_REQUEST['record']; $sql = "select * from currency_info where id=".$tempid; $result = $adb->query($sql); $currencyResult = $adb->fetch_array($result); -$xtpl->assign("CURRENCY_NAME",$currencyResult['currency_name']); -$xtpl->assign("CURRENCY_CODE",$currencyResult['currency_code']); -$xtpl->assign("CURRENCY_SYMBOL",$currencyResult['currency_symbol']); -$xtpl->assign("CONVERSION_RATE",$currencyResult['conversion_rate']); -$xtpl->assign("CURRENCY_STATUS",$currencyResult['currency_status']); -$xtpl->assign("ID",$tempid); +$smarty->assign("CURRENCY_NAME",$currencyResult['currency_name']); +$smarty->assign("CURRENCY_CODE",$currencyResult['currency_code']); +$smarty->assign("CURRENCY_SYMBOL",$currencyResult['currency_symbol']); +$smarty->assign("CONVERSION_RATE",$currencyResult['conversion_rate']); +$smarty->assign("CURRENCY_STATUS",$currencyResult['currency_status']); +$smarty->assign("ID",$tempid); } -$xtpl->parse("main"); -$xtpl->out("main"); +$smarty->display("CurrencyEditView.tpl"); From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 23:32:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 06:32:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4893 - /vtigercrm/trunk/modules/Settings/CurrencyEditView.php Message-ID: <20060405063237.7EC8C5C707D@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 00:32:30 2006 New Revision: 4893 Log: file added for currency editview Added: vtigercrm/trunk/modules/Settings/CurrencyEditView.php From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 23:46:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 06:46:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4894 - /vtigercrm/trunk/Smarty/templates/CurrencyEditView.tpl Message-ID: <20060405064640.E771F5C709D@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 00:46:29 2006 New Revision: 4894 Log: CurrencyEditView.tpl has been added Added: vtigercrm/trunk/Smarty/templates/CurrencyEditView.tpl From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 23:48:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 06:48:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4895 - /vtigercrm/trunk/Smarty/templates/CurrencyListView.tpl Message-ID: <20060405064810.5DE7F5C709D@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 00:48:03 2006 New Revision: 4895 Log: action has been modified Modified: vtigercrm/trunk/Smarty/templates/CurrencyListView.tpl Modified: vtigercrm/trunk/Smarty/templates/CurrencyListView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CurrencyListView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CurrencyListView.tpl Wed Apr 5 00:48:03 2006 @@ -13,7 +13,8 @@ -->*}
- + + Modified: vtigercrm/trunk/modules/Dashboard/horizontal_bargraph.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/horizontal_bargraph.php (original) +++ vtigercrm/trunk/modules/Dashboard/horizontal_bargraph.php Wed Apr 5 02:24:29 2006 @@ -10,9 +10,10 @@ * ********************************************************************************/ -include ("jpgraph/src/jpgraph.php"); -include ("jpgraph/src/jpgraph_bar.php"); require_once('config.php'); +require_once('include/utils/GraphUtils.php'); +include_once ('Image/Graph.php'); +include_once ('Image/Canvas.php'); $tmp_dir=$root_directory."cache/images/"; @@ -24,7 +25,7 @@ function horizontal_graph($referdata,$refer_code,$width,$height,$left,$right,$top,$bottom,$title,$target_val,$cache_file_name,$html_image_name) { - global $log,$root_directory; + global $log,$root_directory,$lang_crm,$theme; //We'll be getting the values in the form of a string separated by commas $datay=explode(",",$referdata); // The datay values $datax=explode(",",$refer_code); // The datax values @@ -71,110 +72,152 @@ //datax is the status // Set the basic parameters of the graph - $graph = new Graph($width,$height,'auto'); - $graph->SetScale("textlin"); - - // To get a horizontal Graph - $graph->Set90AndMargin($left,$right,$top,$bottom); - - $graph->xaxis->SetPos('min'); - - // Nice shadow - $graph->SetShadow(); - + $canvas =& Image_Canvas::factory('png', array('width' => $width, 'height' => $height, 'usemap' => true)); + $imagemap = $canvas->getImageMap(); + $graph =& Image_Graph::factory('graph', $canvas); + $font =& $graph->addNew('font', calculate_font_name($lang_crm)); + // set the font size to 12 + $font->setSize(8); + + if($theme == "blue") + { + $font_color = "#212473"; + } + else + { + $font_color = "#000000"; + } + $font->setColor($font_color); + + $graph->setFont($font); + $titlestr =& Image_Graph::factory('title', array($title,10)); + $plotarea =& Image_Graph::factory('plotarea',array( + 'axis', + 'axis', + 'horizontal' + )); + $graph->add( + Image_Graph::vertical($titlestr, + $plotarea, + 5 + ) + ); + + + // Now create a bar plot + $max=0; + $xlabels = array(); + $dataset = & Image_Graph::factory('dataset'); + $fill =& Image_Graph::factory('gradient', array(IMAGE_GRAPH_GRAD_VERTICAL_MIRRORED, 'blue', 'white')); + for($i=0;$i=$max) $max=$datay[$i]; + $dataset->addPoint( + $x, + $datay[$i], + array( + 'url' => $target[$i], + 'alt' => $alts[$i] + ) + ); + // build the xaxis label array to allow intermediate ticks + $xlabels[$x] = $datax[$i]; + $xlabels[$x+1] = ''; + } + + + $bplot = & $plotarea->addNew('bar', $dataset); + $bplot->setFillStyle($fill); + + //You can change the width of the bars if you like + $bplot->setBarWidth(50/count($datax),"%"); + $bplot->setPadding(array('top'=>20)); + + // We want to display the value of each bar at the top + //$bplot->value->Show(); + //$bplot->value->SetFont(FF_FONT2,FS_BOLD,12); + //$bplot->value->SetAlign('left','center'); + //$bplot->value->SetColor("black","gray4"); + //$bplot->value->SetFormat('%d'); + + //$graph->SetBackgroundGradient('#E5E5E5','white',GRAD_VER,BGRAD_PLOT); + $bplot->setBackground(Image_Graph::factory('gradient', array(IMAGE_GRAPH_GRAD_HORIZONTAL, 'white', '#E5E5E5'))); + //$bplot->SetFillGradient("navy","lightsteelblue",GRAD_MIDVER); + + //$graph->SetFrame(false); + //$graph->SetMarginColor('cadetblue2'); + //$graph->ygrid->SetFill(true,'azure1','azure2'); + //$graph->xgrid->Show(); + + // Add the bar to the graph + //$graph->Add($bplot); + // Setup title - $graph->title->Set($title); - $graph->title->SetFont(FF_FONT2,FS_BOLD,14); + //$titlestr->setText($title); // Setup X-axis - $graph->xaxis->SetTickLabels($datax); - $graph->xaxis->SetFont(FF_FONT2,FS_NORMAL,12); - - // Some extra margin looks nicer - $graph->xaxis->SetLabelMargin(5); - - // Label align for X-axis - $graph->xaxis->SetLabelAlign('right','center'); - - if($max>=5) - { - $graph->xaxis->SetLabelFormat('%d'); - } + $xaxis =& $plotarea->getAxis(IMAGE_GRAPH_AXIS_X); + $yaxis =& $plotarea->getAxis(IMAGE_GRAPH_AXIS_Y); + $yaxis->setFontSize(10); + + // Invert X-axis and put Y-axis at bottom + $xaxis->setInverted(true); + $yaxis->setAxisIntersection('max'); + + // set grid + $gridY =& $plotarea->addNew('line_grid', IMAGE_GRAPH_AXIS_Y); + $gridY->setLineColor('#E5E5E5 at 0.5'); + $gridY2 =& $plotarea->addNew('bar_grid', null, IMAGE_GRAPH_AXIS_Y); + $gridY2->setFillColor('#66CDAA at 0.2'); + // Add some grace to y-axis so the bars doesn't go // all the way to the end of the plot area - $graph->yaxis->scale->SetGrace(20); - - // Setup the Y-axis to be displayed in the bottom of the - // graph. We also finetune the exact layout of the title, - // ticks and labels to make them look nice. - $graph->yaxis->SetPos('max'); + $yaxis->forceMaximum(round(($max * 1.1) + 0.5)); // First make the labels look right - $graph->yaxis->SetLabelAlign('center','top'); - $graph->yaxis->SetLabelFormat('%d'); - $graph->yaxis->SetLabelSide(SIDE_RIGHT); + $yaxis->setLabelInterval(1); + $yaxis->setTickOptions(-5,0); + $yaxis->setLabelInterval(0.5,2); + $yaxis->setTickOptions(-2,0,2); + + // Create the xaxis labels + $array_data =& Image_Graph::factory('Image_Graph_DataPreprocessor_Array', + array($xlabels) + ); // The fix the tick marks - //$graph->yaxis->SetTickSide(SIDE_LEFT); - - // Finally setup the title - $graph->yaxis->SetTitleSide(SIDE_RIGHT); - $graph->yaxis->SetTitleMargin(35); - - $graph->yaxis->title->SetFont(FF_FONT2,FS_BOLD,12); - $graph->yaxis->title->SetAngle(0); - - $graph->yaxis->SetFont(FF_FONT2,FS_NORMAL); - - // Now create a bar pot - $max=0; - for($i=0;$i=$max) - $max=$x; - else - $max=$max; - } - - - $bplot = new BarPlot($datay); - $bplot->SetFillColor("aquamarine3"); - - //You can change the width of the bars if you like - $bplot->SetWidth(0.2); - - // We want to display the value of each bar at the top - $bplot->value->Show(); - $bplot->value->SetFont(FF_FONT2,FS_BOLD,12); - $bplot->value->SetAlign('left','center'); - $bplot->value->SetColor("black","gray4"); - $bplot->value->SetFormat('%d'); - - //Adding this top get usemap - $bplot->SetCSIMTargets($target,$alts); - - $graph->SetBackgroundGradient('#E5E5E5','white',GRAD_VER,BGRAD_PLOT); - $bplot->SetFillGradient("navy","lightsteelblue",GRAD_MIDVER); - - $graph->SetFrame(false); - $graph->SetMarginColor('cadetblue2'); - $graph->ygrid->SetFill(true,'azure1','azure2'); - $graph->xgrid->Show(); - - // Add the bar to the graph - $graph->Add($bplot); + $xaxis->setDataPreprocessor($array_data); + $xaxis->forceMinimum(0); + $xaxis->forceMaximum(2*count($datay)); + $xaxis->setLabelInterval(1); + $xaxis->setTickOptions(0,0); + $xaxis->setLabelInterval(2,2); + $xaxis->setTickOptions(5,0,2); + + // set markers + $marker =& $graph->addNew('value_marker', IMAGE_GRAPH_VALUE_Y); + $marker->setFillColor('000000 at 0.0'); + $marker->setBorderColor('000000 at 0.0'); + $marker->setFontSize(10); + // shift markers 10 pix right + $marker_pointing =& $graph->addNew('Image_Graph_Marker_Pointing', array(10,0,& $marker)); + $marker_pointing->setLineColor('000000 at 0.0'); + $bplot->setMarker($marker_pointing); //Getting the graph in the form of html page - $graph-> Stroke( $cache_file_name ); - $imgMap = $graph ->GetHTMLImageMap ($html_image_name); - save_image_map($cache_file_name.'.map', $imgMap); - $base_name_cache_file=basename($cache_file_name); - $ccc="cache/images/".$base_name_cache_file; - $img = "" ; - $img.=$imgMap; + $img = $graph->done( + array( + 'tohtml' => true, + 'border' => 0, + 'filename' => $cache_file_name, + 'filepath' => '', + 'urlpath' => '' + )); + save_image_map($cache_file_name.'.map', $img); + return $img; } Modified: vtigercrm/trunk/modules/Dashboard/pie_graph.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/pie_graph.php (original) +++ vtigercrm/trunk/modules/Dashboard/pie_graph.php Wed Apr 5 02:24:29 2006 @@ -11,8 +11,9 @@ ********************************************************************************/ -include ("jpgraph/src/jpgraph_pie.php"); -include ("jpgraph/src/jpgraph_pie3d.php"); +require_once('include/utils/GraphUtils.php'); +include_once ('Image/Graph.php'); +include_once ('Image/Canvas.php'); /** Function to render the Horizontal Graph @@ -24,7 +25,7 @@ { - global $log,$root_directory; + global $log,$root_directory,$lang_crm,$theme; //We'll be getting the values in the form of a string separated by commas $datay=explode(",",$referdata); // The datay values $datax=explode(",",$refer_code); // The datax values @@ -40,37 +41,99 @@ $alts[]=$name."=%d"; } - $graph = new PieGraph($width,$height,"auto"); + if($theme == "blue") + { + $font_color = "#212473"; + } + else + { + $font_color = "#000000"; + } + + $canvas =& Image_Canvas::factory('png', array('width' => $width, 'height' => $height, 'usemap' => true)); + $imagemap = $canvas->getImageMap(); + $graph =& Image_Graph::factory('graph', $canvas); + $font =& $graph->addNew('font', calculate_font_name('en_en')); + // set the font size to 11 pixels + $font->setSize(8); + $font->setColor($font_color); + + $graph->setFont($font); + // create the plotarea layout + $title =& Image_Graph::factory('title', array($title,10)); + $plotarea =& Image_Graph::factory('plotarea',array( + 'category', + 'axis' + )); + $footer =& Image_Graph::factory('title', array('Footer',8)); + $legend_box =& Image_Graph::factory('legend'); + $graph->add( + Image_Graph::vertical($title, + $plotarea, + 5 + ) + ); + // Generate colours + $colors = color_generator(count($datay),'#33CCFF','#3322FF'); + $dataset = & Image_Graph::factory('dataset'); + $fills =& Image_Graph::factory('Image_Graph_Fill_Array'); + $sum = 0; + for($i=0;$iaddPoint( + $datax[$i], + $datay[$i], + array( + 'url' => $target[$i], + 'alt' => $alts[$i] + ) + ); + $sum += $datay[$i]; + $fills->addColor($colors[$i]); + } - $graph->SetShadow(); + // create an array with % values + $pcvalues = array(); + for($i=0;$ititle->Set($title); - $graph->title->SetFont(FF_FONT1,FS_BOLD); + // create the pie chart and associate the filling colours + $gbplot = & $plotarea->addNew('pie', $dataset); + $plotarea->hideAxis(); + $gbplot->setFillStyle($fills); - $p1 = new PiePlot3D($datay); - $p1->SetTheme("sand"); - $p1->ExplodeSlice(1); - $p1->SetCenter(0.45); - $p1->SetLegends($datax); + // format the data values + $marker_array =& Image_Graph::factory('Image_Graph_DataPreprocessor_Array', array($pcvalues)); + + // set markers + $marker =& $graph->addNew('value_marker', IMAGE_GRAPH_VALUE_Y); + $marker->setDataPreprocessor($marker_array); + $marker->setFillColor('#FFFFFF'); + $marker->setBorderColor($font_color); + $marker->setFontColor($font_color); + $marker->setFontSize(8); + $pointingMarker =& $graph->addNew('Image_Graph_Marker_Pointing_Angular', array(20, &$marker)); + $gbplot->setMarker($pointingMarker); + + // set legend + $legend_box =& $plotarea->addNew('legend'); + $legend_box->setPadding(array('top'=>20,'bottom'=>0,'left'=>0,'right'=>0)); + $legend_box->setFillColor('#F5F5F5'); + $legend_box->showShadow(); - // Setup the labels - $p1->SetLabelType(PIE_VALUE_PER); - $p1->value->Show(); - $p1->value->SetFormat('%2.1f%%'); - $p1->SetCSIMTargets($target,$alts); - // Don't display the border - $graph->SetFrame(false); + $img = $graph->done( + array( + 'tohtml' => true, + 'border' => 0, + 'filename' => $cache_file_name, + 'filepath' => '', + 'urlpath' => '' + )); + save_image_map($cache_file_name.'.map', $img); - $graph->Add($p1); - - $graph-> Stroke( $cache_file_name ); - $imgMap = $graph ->GetHTMLImageMap ($html_image_name); - save_image_map($cache_file_name.'.map', $imgMap); - $base_name_cache_file=basename($cache_file_name); - $ccc="cache/images/".$base_name_cache_file; - $img = "" ; - $img.=$imgMap; return $img; } Modified: vtigercrm/trunk/modules/Dashboard/vertical_bargraph.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/vertical_bargraph.php (original) +++ vtigercrm/trunk/modules/Dashboard/vertical_bargraph.php Wed Apr 5 02:24:29 2006 @@ -10,124 +10,193 @@ * ********************************************************************************/ - -include ("jpgraph/src/jpgraph_flags.php"); -include ("jpgraph/src/jpgraph_iconplot.php"); - -/** Function to render the Vertical Bar Graph - * Portions created by vtiger are Copyright (C) vtiger. - * All Rights Reserved. - * Contributor(s): ______________________________________.. +require_once('config.php'); +require_once('include/utils/GraphUtils.php'); +include_once ('Image/Graph.php'); +include_once ('Image/Canvas.php'); + +$tmp_dir=$root_directory."cache/images/"; + +/** Function to render the Horizontal Graph + * Portions created by vtiger are Copyright (C) vtiger. + * All Rights Reserved. + * Contributor(s): ______________________________________.. */ - function vertical_graph($referdata,$refer_code,$width,$height,$left,$right,$top,$bottom,$title,$target_val,$cache_file_name,$html_image_name) { - //We'll be getting the values in the form of a string separated by commas - $datay=explode(",",$referdata); //The datay values - $datax=explode(",",$refer_code); // The datax values - $target_val=urldecode($target_val);// The links values for bar are given as string in the encoded form, here we are decoding it + global $log,$root_directory,$lang_crm,$theme; +//We'll be getting the values in the form of a string separated by commas + $datay=explode(",",$referdata); // The datay values + $datax=explode(",",$refer_code); // The datax values + +// The links values are given as string in the encoded form, here we are decoding it + $target_val=urldecode($target_val); $target=explode(",",$target_val); - $alts=array(); //Array which contains the data which is displayed on the mouse over + $alts=array(); $temp=array(); for($i=0;$i=14) - $name=substr($name, 0, 14); - $temp[]=$name; +//If the daatx value of a string is greater, adding '\n' to it so that it'll cme inh 2nd line + if(strlen($name)>=14) + $name=substr($name, 0, 14); + if($pos>=2) + { + $val=explode(" ",$name); + $n=count($val)-1; + + $x=""; + for($j=0;$j $width, 'height' => $height, 'usemap' => true)); + $imagemap = $canvas->getImageMap(); + $graph =& Image_Graph::factory('graph', $canvas); + $font =& $graph->addNew('font', calculate_font_name($lang_crm)); + // set the font size to 12 + $font->setSize(8); + + if($theme == "blue") + { + $font_color = "#212473"; + } + else + { + $font_color = "#000000"; + } + $font->setColor($font_color); + + $graph->setFont($font); + $titlestr =& Image_Graph::factory('title', array($title,10)); + $plotarea =& Image_Graph::factory('plotarea',array( + 'axis', + 'axis', + 'vertical' + )); + $graph->add( + Image_Graph::vertical($titlestr, + $plotarea, + 5 + ) + ); + + + // Now create a bar plot $max=0; + $xlabels = array(); + $dataset = & Image_Graph::factory('dataset'); + $fill =& Image_Graph::factory('gradient', array(IMAGE_GRAPH_GRAD_HORIZONTAL_MIRRORED, 'blue', 'white')); for($i=0;$i=$max) - $max=$x; - else - $max=$max; - } - - // Create the graph. These two calls are always required - $graph = new Graph($width,$height,"auto"); - $graph->SetScale("textlin"); - $graph->yaxis->scale->SetGrace(20); - - // Add a drop shadow - $graph->SetShadow(); - - // Adjust the margin a bit to make more room for titles - $graph->img->SetMargin($left,$right,$top,$bottom); - - - - // Create a bar pot - $bplot = new BarPlot($datay); - - // Adjust fill color - $bplot->SetFillColor('orange'); - $bplot->value->Show(); - $graph->Add($bplot); - - // Setup the titles - $graph->title->Set($title); - - // Make the bar a little bit wider - $bplot->SetWidth(0.2); + $x=1+2*$i; + if($datay[$i]>=$max) $max=$datay[$i]; + $dataset->addPoint( + $x, + $datay[$i], + array( + 'url' => $target[$i], + 'alt' => $alts[$i] + ) + ); + // build the xaxis label array to allow intermediate ticks + $xlabels[$x] = $datax[$i]; + $xlabels[$x+1] = ''; + } + + + //$bplot = new BarPlot($datay); + $bplot = & $plotarea->addNew('bar', $dataset); + $bplot->setFillStyle($fill); + + //You can change the width of the bars if you like + $bplot->setBarWidth(50/count($datax),"%"); + $bplot->setPadding(array('top'=>20)); + + $bplot->setBackground(Image_Graph::factory('gradient', array(IMAGE_GRAPH_GRAD_VERTICAL, 'white', '#E5E5E5'))); // Setup X-axis - $graph->xaxis->SetTickLabels($datax); - $graph->xaxis->SetFont(FF_FONT2,FS_Bold,12); - - - $graph->xaxis->SetLabelAlign('center','top'); - $graph->xaxis->SetLabelAngle(90); - - $graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); - if($max>=5) - { - $graph->yaxis->SetLabelFormat('%d'); - } - - // Setup color for gradient fill style - $bplot->SetFillGradient("navy","lightsteelblue",GRAD_MIDVER); - $graph->SetFrame(false); - $graph->SetMarginColor('white'); - $graph->xgrid->Show(); - - // To get the Targets - $bplot->SetCSIMTargets($target,$alts); - - // Set color for the frame of each bar - $bplot->SetColor("navy"); - - - $graph->SetBackgroundGradient('#F2FBDB','white',GRAD_VER,BGRAD_PLOT); - - $graph->title->SetFont(FF_FONT1,FS_BOLD); - - $img_path="test/logo/vtiger-crm-logo.jpg"; - - $icon = new IconPlot($img_path,0.7,0.3,1,30); - $icon->SetAnchor('center','center'); - $graph->Add($icon); - - - $bplot->value->SetFormat('%d'); - - //Getting the graph in the form of html page - $graph-> Stroke( $cache_file_name ); - $imgMap = $graph ->GetHTMLImageMap ($html_image_name); - save_image_map($cache_file_name.'.map', $imgMap); - $base_name_cache_file=basename($cache_file_name); - $ccc="cache/images/".$base_name_cache_file; - $img= "" ; - $img.=$imgMap; + $xaxis =& $plotarea->getAxis(IMAGE_GRAPH_AXIS_X); + $yaxis =& $plotarea->getAxis(IMAGE_GRAPH_AXIS_Y); + $yaxis->setFontSize(10); + + // set grid + $gridY =& $plotarea->addNew('line_grid', IMAGE_GRAPH_AXIS_Y); + $gridY->setLineColor('#E5E5E5 at 0.5'); + $gridY2 =& $plotarea->addNew('bar_grid', null, IMAGE_GRAPH_AXIS_Y); + $gridY2->setFillColor('#66CDAA at 0.2'); + + + // Add some grace to y-axis so the bars doesn't go + // all the way to the end of the plot area + $yaxis->forceMaximum(round(($max * 1.1) + 0.5)); + + // First make the labels look right + $yaxis->setLabelInterval(1); + $yaxis->setTickOptions(5,0); + $yaxis->setLabelInterval(0.5,2); + $yaxis->setTickOptions(2,0,2); + + // Create the xaxis labels + $array_data =& Image_Graph::factory('Image_Graph_DataPreprocessor_Array', + array($xlabels) + ); + + // Then fix the tick marks + $xaxis->setDataPreprocessor($array_data); + $xaxis->forceMinimum(0); + $xaxis->forceMaximum(2*count($datay)); + $xaxis->setFontAngle('vertical'); + $xaxis->setLabelInterval(1); + $xaxis->setTickOptions(0,0); + $xaxis->setLabelInterval(2,2); + $xaxis->setTickOptions(5,0,2); + + // set markers + $marker =& $graph->addNew('value_marker', IMAGE_GRAPH_VALUE_Y); + $marker->setFillColor('000000 at 0.0'); + $marker->setBorderColor('000000 at 0.0'); + $marker->setFontSize(10); + // shift markers 10 pix right + $marker_pointing =& $graph->addNew('Image_Graph_Marker_Pointing', array(0,-10,& $marker)); + $marker_pointing->setLineColor('000000 at 0.0'); + $bplot->setMarker($marker_pointing); + + + //Getting the graph in the form of html page + $img = $graph->done( + array( + 'tohtml' => true, + 'border' => 0, + 'filename' => $cache_file_name, + 'filepath' => '', + 'urlpath' => '' + )); + save_image_map($cache_file_name.'.map', $img); + return $img; - } + ?> Modified: vtigercrm/trunk/modules/Potentials/Charts.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 02:37:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 09:37:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4897 - /vtigercrm/trunk/include/utils/ListViewUtils.php Message-ID: <20060405093722.D18CB5C371B@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 03:37:14 2006 New Revision: 4897 Log: changes made to reduce the query logging 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 Wed Apr 5 03:37:14 2006 @@ -621,8 +621,7 @@ } elseif($owner_id == 0 && $name == 'Assigned To') { - $group_info = getGroupName($entity_id, $module); - $value = $group_info[0]; + $value=$adb->query_result($list_result,$i-1,"groupname"); } else { @@ -661,7 +660,6 @@ else $varreturnset .= '&activity_mode=Events'; } - $mod_dir=getModuleDirName($module); $list_block[$entity_id] = $list_header; } @@ -838,8 +836,7 @@ if($uitype == 52 || $uitype == 53 || $uitype == 77) { - $user_name = getUserName($temp_val); - $value = $user_name; + $value = $adb->query_result($list_result,$list_result_count,'user_name'); } elseif($uitype == 5 || $uitype == 6 || $uitype == 23 || $uitype == 70) { @@ -1797,12 +1794,11 @@ $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; $output = '

From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 01:25:26 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 08:25:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4896 - in /vtigercrm/trunk: ./ Image/ Image/Canvas/ Image/Canvas/Fonts/ Image/Canvas/GD/ Image/Graph/ Image/Graph/Axis/ Image/Graph/Axis/Marker/ Image/Graph/DataPreprocessor/ Image/Graph/DataSelector/ Image/Graph/Dataset/ Image/Graph/Figure/ Image/Graph/Fill/ Image/Graph/Grid/ Image/Graph/Images/ Image/Graph/Images/Icons/ Image/Graph/Images/Maps/ Image/Graph/Layout/ Image/Graph/Line/ Image/Graph/Marker/ Image/Graph/Marker/Pointing/ Image/Graph/Plot/ Image/Graph/Plot/Fit/ Image/Graph/Plot/Smoothed/ Image/Graph/Plotarea/ include/utils/ jpgraph/ modules/Dashboard/ modules/Potentials/ Message-ID: <20060405082526.1575059FAC1@vtiger.fosslabs.com> Author: jacquemesm Date: Wed Apr 5 02:24:29 2006 New Revision: 4896 Log: Image Graph implementation : suppress JPGraph and replace by Image Graph, replace several chart modules Added: vtigercrm/trunk/Image/ vtigercrm/trunk/Image/Canvas/ vtigercrm/trunk/Image/Canvas.php vtigercrm/trunk/Image/Canvas/Color.php vtigercrm/trunk/Image/Canvas/Fonts/ vtigercrm/trunk/Image/Canvas/Fonts/README vtigercrm/trunk/Image/Canvas/Fonts/fontmap.txt vtigercrm/trunk/Image/Canvas/GD/ vtigercrm/trunk/Image/Canvas/GD.php vtigercrm/trunk/Image/Canvas/GD/JPG.php vtigercrm/trunk/Image/Canvas/GD/PNG.php vtigercrm/trunk/Image/Canvas/ImageMap.php vtigercrm/trunk/Image/Canvas/PDF.php vtigercrm/trunk/Image/Canvas/SVG.php vtigercrm/trunk/Image/Canvas/Tool.php vtigercrm/trunk/Image/Canvas/WithMap.php vtigercrm/trunk/Image/Color.php vtigercrm/trunk/Image/Graph/ vtigercrm/trunk/Image/Graph.php vtigercrm/trunk/Image/Graph/Axis/ vtigercrm/trunk/Image/Graph/Axis.php vtigercrm/trunk/Image/Graph/Axis/Category.php vtigercrm/trunk/Image/Graph/Axis/Logarithmic.php vtigercrm/trunk/Image/Graph/Axis/Marker/ vtigercrm/trunk/Image/Graph/Axis/Marker/Area.php vtigercrm/trunk/Image/Graph/Axis/Marker/Line.php vtigercrm/trunk/Image/Graph/Axis/Radar.php vtigercrm/trunk/Image/Graph/Common.php vtigercrm/trunk/Image/Graph/Config.php vtigercrm/trunk/Image/Graph/Constants.php vtigercrm/trunk/Image/Graph/DataPreprocessor/ vtigercrm/trunk/Image/Graph/DataPreprocessor.php vtigercrm/trunk/Image/Graph/DataPreprocessor/Array.php vtigercrm/trunk/Image/Graph/DataPreprocessor/Currency.php vtigercrm/trunk/Image/Graph/DataPreprocessor/Date.php vtigercrm/trunk/Image/Graph/DataPreprocessor/Formatted.php vtigercrm/trunk/Image/Graph/DataPreprocessor/Function.php vtigercrm/trunk/Image/Graph/DataPreprocessor/NumberText.php vtigercrm/trunk/Image/Graph/DataPreprocessor/RomanNumerals.php vtigercrm/trunk/Image/Graph/DataPreprocessor/Sequential.php vtigercrm/trunk/Image/Graph/DataSelector/ vtigercrm/trunk/Image/Graph/DataSelector.php vtigercrm/trunk/Image/Graph/DataSelector/EveryNthPoint.php vtigercrm/trunk/Image/Graph/DataSelector/NoZeros.php vtigercrm/trunk/Image/Graph/DataSelector/Values.php vtigercrm/trunk/Image/Graph/Dataset/ vtigercrm/trunk/Image/Graph/Dataset.php vtigercrm/trunk/Image/Graph/Dataset/Function.php vtigercrm/trunk/Image/Graph/Dataset/Random.php vtigercrm/trunk/Image/Graph/Dataset/Sequential.php vtigercrm/trunk/Image/Graph/Dataset/Trivial.php vtigercrm/trunk/Image/Graph/Dataset/VectorFunction.php vtigercrm/trunk/Image/Graph/Element.php vtigercrm/trunk/Image/Graph/Figure/ vtigercrm/trunk/Image/Graph/Figure/Circle.php vtigercrm/trunk/Image/Graph/Figure/Ellipse.php vtigercrm/trunk/Image/Graph/Figure/Polygon.php vtigercrm/trunk/Image/Graph/Figure/Rectangle.php vtigercrm/trunk/Image/Graph/Fill/ vtigercrm/trunk/Image/Graph/Fill.php vtigercrm/trunk/Image/Graph/Fill/Array.php vtigercrm/trunk/Image/Graph/Fill/Gradient.php vtigercrm/trunk/Image/Graph/Fill/Image.php vtigercrm/trunk/Image/Graph/Font.php vtigercrm/trunk/Image/Graph/Grid/ vtigercrm/trunk/Image/Graph/Grid.php vtigercrm/trunk/Image/Graph/Grid/Bars.php vtigercrm/trunk/Image/Graph/Grid/Lines.php vtigercrm/trunk/Image/Graph/Grid/Polar.php vtigercrm/trunk/Image/Graph/Images/ vtigercrm/trunk/Image/Graph/Images/Icons/ vtigercrm/trunk/Image/Graph/Images/Icons/pinpoint.png (with props) vtigercrm/trunk/Image/Graph/Images/Icons/pinpointr.png (with props) vtigercrm/trunk/Image/Graph/Images/Maps/ vtigercrm/trunk/Image/Graph/Images/Maps/README vtigercrm/trunk/Image/Graph/Layout/ vtigercrm/trunk/Image/Graph/Layout.php vtigercrm/trunk/Image/Graph/Layout/Horizontal.php vtigercrm/trunk/Image/Graph/Layout/Matrix.php vtigercrm/trunk/Image/Graph/Layout/Vertical.php vtigercrm/trunk/Image/Graph/Legend.php vtigercrm/trunk/Image/Graph/Line/ vtigercrm/trunk/Image/Graph/Line/Array.php vtigercrm/trunk/Image/Graph/Line/Dashed.php vtigercrm/trunk/Image/Graph/Line/Dotted.php vtigercrm/trunk/Image/Graph/Line/Formatted.php vtigercrm/trunk/Image/Graph/Line/Solid.php vtigercrm/trunk/Image/Graph/Logo.php vtigercrm/trunk/Image/Graph/Marker/ vtigercrm/trunk/Image/Graph/Marker.php vtigercrm/trunk/Image/Graph/Marker/Array.php vtigercrm/trunk/Image/Graph/Marker/Asterisk.php vtigercrm/trunk/Image/Graph/Marker/Average.php vtigercrm/trunk/Image/Graph/Marker/Box.php vtigercrm/trunk/Image/Graph/Marker/Bubble.php vtigercrm/trunk/Image/Graph/Marker/Circle.php vtigercrm/trunk/Image/Graph/Marker/Cross.php vtigercrm/trunk/Image/Graph/Marker/Diamond.php vtigercrm/trunk/Image/Graph/Marker/Icon.php vtigercrm/trunk/Image/Graph/Marker/Pinpoint.php vtigercrm/trunk/Image/Graph/Marker/Plus.php vtigercrm/trunk/Image/Graph/Marker/Pointing/ vtigercrm/trunk/Image/Graph/Marker/Pointing.php vtigercrm/trunk/Image/Graph/Marker/Pointing/Angular.php vtigercrm/trunk/Image/Graph/Marker/Pointing/Radial.php vtigercrm/trunk/Image/Graph/Marker/ReversePinpoint.php vtigercrm/trunk/Image/Graph/Marker/Star.php vtigercrm/trunk/Image/Graph/Marker/Triangle.php vtigercrm/trunk/Image/Graph/Marker/Value.php vtigercrm/trunk/Image/Graph/Plot/ vtigercrm/trunk/Image/Graph/Plot.php vtigercrm/trunk/Image/Graph/Plot/Area.php vtigercrm/trunk/Image/Graph/Plot/Band.php vtigercrm/trunk/Image/Graph/Plot/Bar.php vtigercrm/trunk/Image/Graph/Plot/BoxWhisker.php vtigercrm/trunk/Image/Graph/Plot/CandleStick.php vtigercrm/trunk/Image/Graph/Plot/Dot.php vtigercrm/trunk/Image/Graph/Plot/Fit/ vtigercrm/trunk/Image/Graph/Plot/Fit/Line.php vtigercrm/trunk/Image/Graph/Plot/Impulse.php vtigercrm/trunk/Image/Graph/Plot/Line.php vtigercrm/trunk/Image/Graph/Plot/Odo.php vtigercrm/trunk/Image/Graph/Plot/Pie.php vtigercrm/trunk/Image/Graph/Plot/Radar.php vtigercrm/trunk/Image/Graph/Plot/Smoothed/ vtigercrm/trunk/Image/Graph/Plot/Smoothed/Area.php vtigercrm/trunk/Image/Graph/Plot/Smoothed/Bezier.php vtigercrm/trunk/Image/Graph/Plot/Smoothed/Line.php vtigercrm/trunk/Image/Graph/Plot/Smoothed/Radar.php vtigercrm/trunk/Image/Graph/Plot/Step.php vtigercrm/trunk/Image/Graph/Plotarea/ vtigercrm/trunk/Image/Graph/Plotarea.php vtigercrm/trunk/Image/Graph/Plotarea/Element.php vtigercrm/trunk/Image/Graph/Plotarea/Map.php vtigercrm/trunk/Image/Graph/Plotarea/Radar.php vtigercrm/trunk/Image/Graph/Simple.php vtigercrm/trunk/Image/Graph/Title.php vtigercrm/trunk/Image/Graph/Tool.php vtigercrm/trunk/PEAR.php vtigercrm/trunk/include/utils/GraphUtils.php Removed: vtigercrm/trunk/jpgraph/ Modified: vtigercrm/trunk/modules/Dashboard/Chart_lead_source_by_outcome.php vtigercrm/trunk/modules/Dashboard/Chart_outcome_by_month.php vtigercrm/trunk/modules/Dashboard/Chart_pipeline_by_lead_source.php vtigercrm/trunk/modules/Dashboard/Chart_pipeline_by_sales_stage.php vtigercrm/trunk/modules/Dashboard/display_charts.php vtigercrm/trunk/modules/Dashboard/horizontal_bargraph.php vtigercrm/trunk/modules/Dashboard/pie_graph.php vtigercrm/trunk/modules/Dashboard/vertical_bargraph.php vtigercrm/trunk/modules/Potentials/Charts.php Modified: vtigercrm/trunk/modules/Dashboard/Chart_lead_source_by_outcome.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/Chart_lead_source_by_outcome.php (original) +++ vtigercrm/trunk/modules/Dashboard/Chart_lead_source_by_outcome.php Wed Apr 5 02:24:29 2006 @@ -101,10 +101,6 @@ $cache_file_name = $id_hash."_lead_source_by_outcome_".$current_language."_".crc32(implode('',$datax)).".png"; $log->debug("cache file name is: $cache_file_name"); -if (substr(phpversion(), 0, 1) == "5") { // php5 } - echo "Charts not supported in PHP 5."; -} -else { if(isPermitted('Potentials','index')=="yes") { $draw_this = new jpgraph(); @@ -147,4 +143,4 @@ { echo $mod_strings['LBL_NO_PERMISSION']; } -}?> +?> Modified: vtigercrm/trunk/modules/Dashboard/Chart_outcome_by_month.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/Chart_outcome_by_month.php (original) +++ vtigercrm/trunk/modules/Dashboard/Chart_outcome_by_month.php Wed Apr 5 02:24:29 2006 @@ -102,10 +102,6 @@ $cache_file_name = $id_hash."_outcome_by_month_".$current_language."_".crc32($date_start.$date_end).".png"; $log->debug("cache file name is: $cache_file_name"); -if (substr(phpversion(), 0, 1) == "5") { // php5 } - echo "Charts not supported in PHP 5."; -} -else { if(isPermitted('Potentials','index')=="yes") { $draw_this = new jpgraph(); @@ -170,4 +166,4 @@ echo $mod_strings['LBL_NO_PERMISSION']; } echo get_validate_chart_js(); -}?> +?> Modified: vtigercrm/trunk/modules/Dashboard/Chart_pipeline_by_lead_source.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/Chart_pipeline_by_lead_source.php (original) +++ vtigercrm/trunk/modules/Dashboard/Chart_pipeline_by_lead_source.php Wed Apr 5 02:24:29 2006 @@ -101,10 +101,6 @@ $cache_file_name = $id_hash."_pipeline_by_lead_source_".$current_language."_".crc32(implode('',$datax)).".png"; $log->debug("cache file name is: $cache_file_name"); -if (substr(phpversion(), 0, 1) == "5") { // php5 } - echo "Charts not supported in PHP 5."; -} -else { if(isPermitted('Potentials','index')=="yes") { $draw_this = new jpgraph(); @@ -147,4 +143,4 @@ { echo $mod_strings['LBL_NO_PERMISSION']; } -}?> +?> Modified: vtigercrm/trunk/modules/Dashboard/Chart_pipeline_by_sales_stage.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/Chart_pipeline_by_sales_stage.php (original) +++ vtigercrm/trunk/modules/Dashboard/Chart_pipeline_by_sales_stage.php Wed Apr 5 02:24:29 2006 @@ -136,10 +136,6 @@ $cache_file_name = $id_hash."_pipeline_".$current_language."_".crc32(implode('',$datax)).$date_start.$date_end.".png"; $log->debug("cache file name is: $cache_file_name"); -if (substr(phpversion(), 0, 1) == "5") { // php5 } - echo "Charts not supported in PHP 5."; -} -else { if(isPermitted('Potentials','index')=="yes") { $draw_this = new jpgraph(); @@ -210,4 +206,4 @@ echo $mod_strings['LBL_NO_PERMISSION']; } //echo get_validate_chart_js(); -}?> +?> Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/display_charts.php (original) +++ vtigercrm/trunk/modules/Dashboard/display_charts.php Wed Apr 5 02:24:29 2006 @@ -110,7 +110,7 @@ $test_target_val=$graph_details[7]; - $width=350; + $width=600; $height=400; $top=30; $left=140; @@ -205,7 +205,7 @@
"; - $sHTML .= render_graph($tmp_dir."pie_".$cache_file_name,$html_imagename."_pie",$cnt_val,$name_val,450,300,40,$right,$top,$bottom,$title,$target_val,"pie"); + $sHTML .= render_graph($tmp_dir."pie_".$cache_file_name,$html_imagename."_pie",$cnt_val,$name_val,$width,$height,40,$right,$top,$bottom,$title,$target_val,"pie"); $sHTML .= "
'; - $dir_name=getModuleDirName($module); - $output .= ''.$navigation_array['allflag'].' '; + $output .= ''.$navigation_array['allflag'].' '; if(($navigation_array['prev']) != 0) { - $output .= ' '; - $output .= ' '; + $output .= ' '; + $output .= ' '; } else @@ -1815,13 +1811,13 @@ $output .=''.$i.' '; } else{ - $output .= ''.$i.' '; + $output .= ''.$i.' '; } } if(($navigation_array['next']) !=0) { - $output .= ' '; - $output .= ' '; + $output .= ' '; + $output .= ' '; } else { From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 02:41:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 09:41:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4898 - /vtigercrm/trunk/modules/CustomView/CustomView.php Message-ID: <20060405094103.04B1F5C70D2@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 03:40:54 2006 New Revision: 4898 Log: query has been changed to get groupname and username in list view query Modified: vtigercrm/trunk/modules/CustomView/CustomView.php Modified: vtigercrm/trunk/modules/CustomView/CustomView.php ============================================================================== --- vtigercrm/trunk/modules/CustomView/CustomView.php (original) +++ vtigercrm/trunk/modules/CustomView/CustomView.php Wed Apr 5 03:40:54 2006 @@ -1135,17 +1135,17 @@ $listviewquery = substr($listquery, strpos($listquery,'from'),strlen($listquery)); if($module == "Activities" || $module == "Emails") { - $query = "select ".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid,activity.* ".$listviewquery; + $query = "select groups.groupname ,users.user_name,".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid,activity.* ".$listviewquery; }else if($module == "Notes") { - $query = "select ".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid,notes.* ".$listviewquery; + $query = "select groups.groupname ,users.user_name,".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid,notes.* ".$listviewquery; } else if($module == "Products") { - $query = "select ".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid,products.* ".$listviewquery; + $query = "select groups.groupname ,users.user_name,".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid,products.* ".$listviewquery; }else { - $query = "select ".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid ".$listviewquery; + $query = "select groups.groupname ,users.user_name,".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid ".$listviewquery; } $stdfiltersql = $this->getCVStdFilterSQL($viewid); $advfiltersql = $this->getCVAdvFilterSQL($viewid); From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 02:43:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 09:43:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4899 - /vtigercrm/trunk/themes/blue/images/currencydelete.gif Message-ID: <20060405094328.8B5055C7385@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 03:43:18 2006 New Revision: 4899 Log: image has been included for currency delete Added: vtigercrm/trunk/themes/blue/images/currencydelete.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 02:49:01 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 09:49:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4900 - /vtigercrm/trunk/pkg/bin/stopvTiger.bat Message-ID: <20060405094901.4B0875C70D2@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 03:48:52 2006 New Revision: 4900 Log: service name changed Modified: vtigercrm/trunk/pkg/bin/stopvTiger.bat Modified: vtigercrm/trunk/pkg/bin/stopvTiger.bat ============================================================================== --- vtigercrm/trunk/pkg/bin/stopvTiger.bat (original) +++ vtigercrm/trunk/pkg/bin/stopvTiger.bat Wed Apr 5 03:48:52 2006 @@ -34,11 +34,11 @@ echo "" echo "stopping vtigercrm5_beta apache service" echo "" -bin\apache -n vtigercrm4_5 -k stop +bin\apache -n vtigercrm5_beta -k stop echo "" echo "uninstalling vtigercrm5_beta apache service" echo "" -bin\apache -k uninstall -n vtigercrm4_5 +bin\apache -k uninstall -n vtigercrm5_beta rem .\bin\ShutdownApache.exe logs\httpd.pid goto StopMySQL From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 03:08:29 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 10:08:29 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4901 - /vtigercrm/trunk/include/utils/CommonUtils.php Message-ID: <20060405100829.4FF8B5C73AE@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 04:08:23 2006 New Revision: 4901 Log: API Docs added for functions 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 Wed Apr 5 04:08:23 2006 @@ -20,25 +20,9 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ - - -/** This function returns the name of the person. - * It currently returns "first last". It should not put the space if either name is not available. - * It should not return errors if either name is not available. - * If no names are present, it will return "" - * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. - * All Rights Reserved. - * Contributor(s): ______________________________________.. - */ - require_once('include/database/PearDatabase.php'); require_once('include/ComboUtil.php'); //new require_once('include/utils/utils.php'); //new - - - - - /** * Check if user id belongs to a system admin. @@ -832,7 +816,6 @@ $block_detail = Array(); $getBlockinfo = ""; $query="select blockid,blocklabel,show_title from blocks where tabid=$tabid and $disp_view=0 and visible = 0 order by sequence"; - //echo $query; $result = $adb->query($query); $noofrows = $adb->num_rows($result); @@ -861,19 +844,16 @@ if($block_label=='LBL_RELATED_PRODUCTS') { $getBlockInfo=getProductDetailsBlockInfo($mode,$module); - //echo '
';print_r($getBlockInfo);echo '
'; } else { $getBlockInfo=getBlockInformation($module,$adb->query_result($result,$i,"blockid"),$mode,$col_fields,$tabid,$info_type); - //echo '
';print_r($getBlockInfo);echo '
'; } } if(is_array($getBlockInfo)) { $block_detail[$block_title] = $getBlockInfo; - //echo '
';print_r($block_detail);echo '
'; } } else @@ -906,7 +886,6 @@ } } - //echo '
';print_r($block_detail);echo '
'; return $block_detail; } @@ -944,6 +923,11 @@ return $blockid; } +/** + * This function is used to get the Parent and Child tab relation array. + * Takes no parameter and get the data from parent_tabdata.php and tabdata.php + * This returns array type value + */ function getHeaderArray() { @@ -988,6 +972,12 @@ return $relatedtabs; } +/** + * This function is used to get the Parent Tab name for a given parent tab id. + * Takes the input parameter as $parenttabid - Parent tab id + * This returns value string type + */ + function getParentTabName($parenttabid) { global $adb; @@ -1004,6 +994,13 @@ } return $parent_tabname; } + +/** + * This function is used to get the Parent Tab name for a given module. + * Takes the input parameter as $module - module name + * This returns value string type + */ + function getParentTabFromModule($module) { @@ -1032,8 +1029,11 @@ } /** - * This function returns the parenttab and for the given module. - */ + * This function is used to get the Parent Tab name for a given module. + * Takes no parameter but gets the parenttab value from form request + * This returns value string type + */ + function getParentTab() { if(isset($_REQUEST['parenttab']) && $_REQUEST['parenttab'] !='') @@ -1216,7 +1216,13 @@ 'mode'=>$mode); return $return_value; } -//function to check whether same product name exists + + /** + * This function is used to generate file name if more than one image with same name is added to a given Product. + * Param $filename - product file name + * Param $exist - number time the file name is repeated. + */ + function file_exist_fn($filename,$exist) { global $uploaddir; @@ -1263,7 +1269,7 @@ } /** - * This function is used get the User Count . + * This function is used get the User Count. * It returns the array which has the total users ,admin users,and the non admin users */ @@ -1280,7 +1286,10 @@ } /** - * This function is used to create folders recursively . + * This function is used to create folders recursively. + * Param $dir - directory name + * Param $mode - directory access mode + * Param $recursive - create directory recursive, default true */ function mkdirs($dir, $mode = 0777, $recursive = true) @@ -1297,6 +1306,9 @@ return FALSE; } +/**This function returns the module name which has been set as default home view for a given user. + * Takes no parameter, but uses the user object $current_user. + */ function DefHomeView() { global $adb; @@ -1332,9 +1344,6 @@ } } } - - - /** * Function to write the tabid and name to a flat file tabdata.txt so that the data @@ -1511,11 +1520,4 @@ return $filepath; } - - - - - - - ?> From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 03:09:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 10:09:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4902 - /vtigercrm/trunk/include/utils/ListViewUtils.php Message-ID: <20060405100921.585185C73AE@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 04:09:15 2006 New Revision: 4902 Log: query has been changed 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 Wed Apr 5 04:09:15 2006 @@ -1372,7 +1372,7 @@ } if($module == "Activities") { - $query = " select crmentity.crmid,crmentity.smownerid,crmentity.setype, activity.*, contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, account.accountid, account.accountname, recurringevents.recurringtype from activity inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid= cntactivityrel.contactid left join seactivityrel on seactivityrel.activityid = activity.activityid left join activitygrouprelation on activitygrouprelation.activityid=crmentity.crmid left join groups on groups.groupname=activitygrouprelation.groupname left outer join account on account.accountid = contactdetails.accountid left outer join recurringevents on recurringevents.activityid=activity.activityid WHERE crmentity.deleted=0 and (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task') ".$where ; + $query = " select crmentity.crmid,crmentity.smownerid,crmentity.setype, activity.*, contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, account.accountid, account.accountname, recurringevents.recurringtype from activity inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid= cntactivityrel.contactid left join seactivityrel on seactivityrel.activityid = activity.activityid left join activitygrouprelation on activitygrouprelation.activityid=crmentity.crmid left join groups on groups.groupname=activitygrouprelation.groupname left join users on users.id=crmentity.smownerid left outer join account on account.accountid = contactdetails.accountid left outer join recurringevents on recurringevents.activityid=activity.activityid WHERE crmentity.deleted=0 and (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task') ".$where ; if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3) { $sec_parameter=getListViewSecurityParameter($module); From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 03:21:38 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 10:21:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4903 - /vtigercrm/trunk/modules/CustomView/CustomView.php Message-ID: <20060405102138.5073E5C739F@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 04:21:33 2006 New Revision: 4903 Log: query has been changed for notes and products Modified: vtigercrm/trunk/modules/CustomView/CustomView.php Modified: vtigercrm/trunk/modules/CustomView/CustomView.php ============================================================================== --- vtigercrm/trunk/modules/CustomView/CustomView.php (original) +++ vtigercrm/trunk/modules/CustomView/CustomView.php Wed Apr 5 04:21:33 2006 @@ -1138,11 +1138,11 @@ $query = "select groups.groupname ,users.user_name,".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid,activity.* ".$listviewquery; }else if($module == "Notes") { - $query = "select groups.groupname ,users.user_name,".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid,notes.* ".$listviewquery; + $query = "select ".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid,notes.* ".$listviewquery; } else if($module == "Products") { - $query = "select groups.groupname ,users.user_name,".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid,products.* ".$listviewquery; + $query = "select ".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid,products.* ".$listviewquery; }else { $query = "select groups.groupname ,users.user_name,".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid ".$listviewquery; From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 03:37:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 10:37:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4904 - /vtigercrm/trunk/modules/Users/Security.php Message-ID: <20060405103703.DA1645C73C7@vtiger.fosslabs.com> Author: don Date: Wed Apr 5 04:36:59 2006 New Revision: 4904 Log: parentmodule marketing added and campagins moved to that module Modified: vtigercrm/trunk/modules/Users/Security.php Modified: vtigercrm/trunk/modules/Users/Security.php ============================================================================== --- vtigercrm/trunk/modules/Users/Security.php (original) +++ vtigercrm/trunk/modules/Users/Security.php Wed Apr 5 04:36:59 2006 @@ -2040,48 +2040,51 @@ } //added by jeri for category view from db $this->db->query("insert into parenttab values - (1,'My Home Page',1,0), - (2,'Sales',2,0), - (3,'Support',3,0), - (5,'Analytics',5,0), - (6,'Inventory',6,0), - (7,'Tools',7,0), - (8,'Settings',8,0)"); + (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) + "); $this->db->query("insert into parenttabrel values - (1,9,2), - (1,17,3), - (1,10,4), - (1,3,1), - (2,7,1), - (2,6,2), - (2,4,3), - (2,2,4), - (2,20,5), - (2,22,6), - (2,23,7), - (2,14,8), - (2,19,9), - (2,8,10), - (3,13,1), - (3,15,2), - (3,6,3), - (3,4,4), - (3,14,5), - (3,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), - (2,26,7), - (7,27,2), - (7,8,3)"); + (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)"); + //rss feeds From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 03:47:04 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 10:47:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4905 - /vtigercrm/trunk/Smarty/templates/QuickCreate.tpl Message-ID: <20060405104704.5E77D5C3719@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 04:46:58 2006 New Revision: 4905 Log: Added QuickCreate tpl file for smartification of new quick create UI - Ahmed Added: vtigercrm/trunk/Smarty/templates/QuickCreate.tpl From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 03:47:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 10:47:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4906 - /vtigercrm/trunk/quickcreate.php Message-ID: <20060405104800.12A455C73C7@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 04:47:52 2006 New Revision: 4906 Log: Added QuickCreate php file for smartification of new quick create UI - Ahmed Added: vtigercrm/trunk/quickcreate.php From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 03:52:14 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 10:52:14 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4907 - /vtigercrm/trunk/themes/blue/style.css Message-ID: <20060405105214.507175C371A@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 04:52:09 2006 New Revision: 4907 Log: Added quick create css - Ahmed Modified: vtigercrm/trunk/themes/blue/style.css Modified: vtigercrm/trunk/themes/blue/style.css ============================================================================== --- vtigercrm/trunk/themes/blue/style.css (original) +++ vtigercrm/trunk/themes/blue/style.css Wed Apr 5 04:52:09 2006 @@ -1555,3 +1555,39 @@ background-color:#000066; opacity:.7; } + +/*quickcreate css*/ + +.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:#ededed; + +} From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 04:10:19 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 11:10:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4908 - /vtigercrm/trunk/Smarty/templates/Header.tpl Message-ID: <20060405111019.AFC155C73C8@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 05:10:11 2006 New Revision: 4908 Log: Made changes in the Header.tpl file to get the new quick create form - ahmed 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 Wed Apr 5 05:10:11 2006 @@ -56,7 +56,7 @@ {foreach key=maintabs item=detail from=$HEADERS} {if $maintabs eq $CATEGORY} - {foreach key=number item=module from=$detail} @@ -255,6 +255,7 @@
+
+ + + {* Begining of Slide Menu *} From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 04:15:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 11:15:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4909 - /vtigercrm/trunk/include/utils/CommonUtils.php Message-ID: <20060405111500.5A97B5C73D2@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 05:14:56 2006 New Revision: 4909 Log: Added Quick Create Function - ahmed 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 Wed Apr 5 05:14:56 2006 @@ -1520,4 +1520,48 @@ return $filepath; } + + + +function QuickCreate($module) +{ + global $adb; + global $mod_strings; + +$tabid = getTabid($module); +$category = getParentTab(); +$quickcreate_query = "select * from field where quickcreate=0 and tabid = ".$tabid." order by quickcreatesequence"; +$result = $adb->query($quickcreate_query); +$noofrows = $adb->num_rows($result); + +for($i=0; $i<$noofrows; $i++) +{ + $fieldtablename = $adb->query_result($result,$i,'tablename'); + $fieldcolname = $adb->query_result($result,$i,"columnname"); + $uitype = $adb->query_result($result,$i,"uitype"); + $fieldname = $adb->query_result($result,$i,"fieldname"); + $fieldlabel = $adb->query_result($result,$i,"fieldlabel"); + $maxlength = $adb->query_result($result,$i,"maximumlength"); + $generatedtype = $adb->query_result($result,$i,"generatedtype"); + $custfld = getOutputHtml($uitype, $fieldname, $fieldlabel, $maxlength, $col_fields,$generatedtype,$module); + //echo '
';print_r($custfld);echo '
'; + $qcreate_arr[]=$custfld; +} +for ($i=0,$j=0;$i $key1,1 => $key2); +} + return $return_data; +} + + ?> From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 04:18:46 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 11:18:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4910 - in /vtigercrm/trunk/themes/blue/images: qcBg.gif qcName.gif Message-ID: <20060405111846.EECB85C73D2@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 05:18:40 2006 New Revision: 4910 Log: Added two images required for quickcreate Added: vtigercrm/trunk/themes/blue/images/qcBg.gif (with props) vtigercrm/trunk/themes/blue/images/qcName.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 04:38:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 11:38:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4911 - /vtigercrm/trunk/modules/Settings/CurrencyListView.php Message-ID: <20060405113843.EF95E5C73CE@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 05:38:39 2006 New Revision: 4911 Log: image name has been changed Modified: vtigercrm/trunk/modules/Settings/CurrencyListView.php Modified: vtigercrm/trunk/modules/Settings/CurrencyListView.php ============================================================================== --- vtigercrm/trunk/modules/Settings/CurrencyListView.php (original) +++ vtigercrm/trunk/modules/Settings/CurrencyListView.php Wed Apr 5 05:38:39 2006 @@ -33,7 +33,7 @@ if($temprow["defaultid"] != '-11') { $currency_element['name'] = ''.$temprow["currency_name"].''; - $currency_element['tool']= 'Edit | Delete'; + $currency_element['tool']= 'Edit | Delete'; } else $currency_element['tool']= ''; From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 04:45:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 11:45:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4912 - /vtigercrm/trunk/modules/CustomView/CustomView.php Message-ID: <20060405114551.170335C73DD@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 05:45:44 2006 New Revision: 4912 Log: changes made for campaign and vendors modules user and group relation Modified: vtigercrm/trunk/modules/CustomView/CustomView.php Modified: vtigercrm/trunk/modules/CustomView/CustomView.php ============================================================================== --- vtigercrm/trunk/modules/CustomView/CustomView.php (original) +++ vtigercrm/trunk/modules/CustomView/CustomView.php Wed Apr 5 05:45:44 2006 @@ -1143,7 +1143,16 @@ else if($module == "Products") { $query = "select ".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid,products.* ".$listviewquery; - }else + } + else if($module == "Campaigns") + { + $query = "select users.user_name,".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid ".$listviewquery; + } + else if($module == "Vendors") + { + $query = "select ".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid ".$listviewquery; + } + else { $query = "select groups.groupname ,users.user_name,".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid ".$listviewquery; } From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 05:46:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 12:46:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4913 - /vtigercrm/trunk/include/utils/ListViewUtils.php Message-ID: <20060405124634.485515C73DC@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 06:46:29 2006 New Revision: 4913 Log: listview query has been changed for leads and campaigns modules 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 Wed Apr 5 06:46:29 2006 @@ -1343,7 +1343,7 @@ } if($module == "Leads") { - $query = "select crmentity.crmid, leaddetails.firstname, leaddetails.lastname, leaddetails.company, leadaddress.phone, leadsubdetails.website, leaddetails.email, crmentity.smownerid, leadscf.* from leaddetails inner join crmentity on crmentity.crmid=leaddetails.leadid inner join leadsubdetails on leadsubdetails.leadsubscriptionid=leaddetails.leadid inner join leadaddress on leadaddress.leadaddressid=leadsubdetails.leadsubscriptionid inner join leadscf on leaddetails.leadid = leadscf.leadid left join leadgrouprelation on leadscf.leadid=leadgrouprelation.leadid left join groups on groups.groupname=leadgrouprelation.groupname where crmentity.deleted=0 and leaddetails.converted=0 "; + $query = "select crmentity.crmid, leaddetails.firstname, leaddetails.lastname, leaddetails.company, leadaddress.phone, leadsubdetails.website, leaddetails.email, crmentity.smownerid, leadscf.* from leaddetails inner join crmentity on crmentity.crmid=leaddetails.leadid inner join leadsubdetails on leadsubdetails.leadsubscriptionid=leaddetails.leadid inner join leadaddress on leadaddress.leadaddressid=leadsubdetails.leadsubscriptionid inner join leadscf on leaddetails.leadid = leadscf.leadid left join leadgrouprelation on leadscf.leadid=leadgrouprelation.leadid left join groups on groups.groupname=leadgrouprelation.groupname left join users on users.id=crmentity.smownerid where crmentity.deleted=0 and leaddetails.converted=0 "; if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3) { $sec_parameter=getListViewSecurityParameter($module); @@ -1448,7 +1448,7 @@ { //Query modified to sort by assigned to //query modified -Code contribute by Geoff(http://forums.vtiger.com/viewtopic.php?t=3376) - $query = "select crmentity.*,campaign.* from campaign inner join crmentity on crmentity.crmid = campaign.campaignid where crmentity.deleted=0".$where; + $query = "select crmentity.*,campaign.* from campaign inner join crmentity on crmentity.crmid = campaign.campaignid left join users on users.id=crmentity.smownerid where crmentity.deleted=0".$where; if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3) { $sec_parameter=getListViewSecurityParameter($module); From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 07:21:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 14:21:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4914 - /vtigercrm/trunk/modules/Settings/language/en_us.lang.php Message-ID: <20060405142113.2C4535C7409@vtiger.fosslabs.com> Author: don Date: Wed Apr 5 08:21:08 2006 New Revision: 4914 Log: lang strings added for email notification 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 Wed Apr 5 08:21:08 2006 @@ -540,6 +540,9 @@ 'LBL_ANNOUNCEMENT'=>'Announcements', 'LBL_SETTING_ANNOUNCEMENT'=>'Announcement', 'LBL_ANNOUNCEMENT_INFO'=>'Type the announcement text below, and click the save button.', +'LBL_EMAIL_CONTENTS'=>'Email Contents', +'LBL_SUBJECT'=>'Subject', +'LBL_MESSAGE'=>'Message', ); From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 07:22:08 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 14:22:08 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4915 - in /vtigercrm/trunk/Smarty/templates/Settings: EditEmailNotofication.tpl EmailNotofication.tpl EmailNotoficationContents.tpl Message-ID: <20060405142208.BE5E95C7409@vtiger.fosslabs.com> Author: don Date: Wed Apr 5 08:21:59 2006 New Revision: 4915 Log: files added as the new UI integrated and Smartified for Email notification Added: vtigercrm/trunk/Smarty/templates/Settings/EditEmailNotofication.tpl vtigercrm/trunk/Smarty/templates/Settings/EmailNotofication.tpl (with props) vtigercrm/trunk/Smarty/templates/Settings/EmailNotoficationContents.tpl From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 07:23:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 14:23:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4916 - in /vtigercrm/trunk/modules/Users: EditNotification.php SaveNotification.php listnotificationschedulers.php Message-ID: <20060405142322.527195C73F6@vtiger.fosslabs.com> Author: don Date: Wed Apr 5 08:23:15 2006 New Revision: 4916 Log: new UI integrated for EmailNotification Modified: vtigercrm/trunk/modules/Users/EditNotification.php vtigercrm/trunk/modules/Users/SaveNotification.php vtigercrm/trunk/modules/Users/listnotificationschedulers.php Modified: vtigercrm/trunk/modules/Users/EditNotification.php ============================================================================== --- vtigercrm/trunk/modules/Users/EditNotification.php (original) +++ vtigercrm/trunk/modules/Users/EditNotification.php Wed Apr 5 08:23:15 2006 @@ -9,52 +9,40 @@ * ********************************************************************************/ -require_once('XTemplate/xtpl.php'); +require_once('Smarty_setup.php'); global $mod_strings; global $app_strings; global $app_list_strings; - -echo get_module_title($mod_strings['LBL_MODULE_NAME'], $mod_strings['LBL_MODULE_NAME'].' : '.$mod_strings['LBL_HDR_EMAIL_SCHDS'], true); -echo '

'; global $adb; global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); +$smarty = new vtigerCRM_Smarty; if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { $id = $_REQUEST['record']; - $mode = 'edit'; - $xtpl=new XTemplate ('modules/Users/EditNotification.html'); - $xtpl->assign("MOD", $mod_strings); - $xtpl->assign("APP", $app_strings); - + $sql="select * from notificationscheduler where schedulednotificationid = ".$id; $result = $adb->query($sql); if($adb->num_rows($result) ==1); { - $label = $mod_strings[$adb->query_result($result,0,'label')]; - $notification_subject = $adb->query_result($result,0,'notificationsubject'); - $notification_body = $adb->query_result($result,0,'notificationbody'); + $notification = Array(); + $notification['active'] = $adb->query_result($result,0,'active'); + $notification['subject'] = $adb->query_result($result,0,'notificationsubject'); + $notification['body'] = $adb->query_result($result,0,'notificationbody'); + $notification['name'] = $mod_strings[$adb->query_result($result,0,'label')]; + $notification['id'] = $adb->query_result($result,0,'schedulednotificationid'); + } + + $smarty->assign("NOTIFY_DETAILS",$notification); +} - $xtpl->assign("RETURN_MODULE","Users"); - $xtpl->assign("RETURN_ACTION","listnotificationschedulers"); - $xtpl->assign("RECORD_ID",$id); - - if (isset($label)) - $xtpl->assign("LABEL",$label); - if (isset($notification_subject)) - $xtpl->assign("SUBNOTIFY",$notification_subject); - if (isset($notification_body)) - $xtpl->assign("BODYNOTIFY",$notification_body); - } - $xtpl->parse("main"); - $xtpl->out("main"); -} -else -{ - header("Location:index.php?module=Users&action=listnotificationschedulers"); -} +$smarty->assign("MOD", return_module_language($current_language,'Settings')); +$smarty->assign("IMAGE_PATH",$image_path); +$smarty->assign("APP", $app_strings); +$smarty->assign("CMOD", $mod_strings); +$smarty->display("Settings/EditEmailNotofication.tpl"); ?> Modified: vtigercrm/trunk/modules/Users/SaveNotification.php ============================================================================== --- vtigercrm/trunk/modules/Users/SaveNotification.php (original) +++ vtigercrm/trunk/modules/Users/SaveNotification.php Wed Apr 5 08:23:15 2006 @@ -14,9 +14,9 @@ if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { - $query="UPDATE notificationscheduler set notificationsubject='".$_REQUEST['notifysubject']."', notificationbody='".$_REQUEST['notifybody']."' where schedulednotificationid=".$_REQUEST['record']; + $query="UPDATE notificationscheduler set notificationsubject='".$_REQUEST['notifysubject']."', notificationbody='".$_REQUEST['notifybody']."', active =".$_REQUEST['active']." where schedulednotificationid=".$_REQUEST['record']; $adb->query($query); } -$loc = "Location: index.php?action=listnotificationschedulers&module=Users"; +$loc = "Location: index.php?action=UsersAjax&file=listnotificationschedulers&module=Users&directmode=ajax"; header($loc); ?> Modified: vtigercrm/trunk/modules/Users/listnotificationschedulers.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 07:24:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 14:24:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4917 - /vtigercrm/trunk/modules/Users/EditNotification.html Message-ID: <20060405142456.9EE1F5C73FB@vtiger.fosslabs.com> Author: don Date: Wed Apr 5 08:24:52 2006 New Revision: 4917 Log: file removed as the email notofication has been smartified Removed: vtigercrm/trunk/modules/Users/EditNotification.html From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 07:32:08 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 14:32:08 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4918 - /vtigercrm/trunk/modules/Users/listnotificationschedulers.php Message-ID: <20060405143208.532FA5C7404@vtiger.fosslabs.com> Author: don Date: Wed Apr 5 08:31:58 2006 New Revision: 4918 Log: status changed into images Modified: vtigercrm/trunk/modules/Users/listnotificationschedulers.php Modified: vtigercrm/trunk/modules/Users/listnotificationschedulers.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 07:37:19 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 14:37:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4919 - in /vtigercrm/trunk/Smarty/templates/Settings: EditEmailNotofication.tpl EmailNotofication.tpl EmailNotoficationContents.tpl Message-ID: <20060405143719.7986C5C7410@vtiger.fosslabs.com> Author: don Date: Wed Apr 5 08:37:14 2006 New Revision: 4919 Log: file removed to change the names Removed: vtigercrm/trunk/Smarty/templates/Settings/EditEmailNotofication.tpl vtigercrm/trunk/Smarty/templates/Settings/EmailNotofication.tpl vtigercrm/trunk/Smarty/templates/Settings/EmailNotoficationContents.tpl From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 07:39:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 14:39:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4920 - in /vtigercrm/trunk/modules/Users: EditNotification.php listnotificationschedulers.php Message-ID: <20060405143942.8EA915C740A@vtiger.fosslabs.com> Author: don Date: Wed Apr 5 08:39:36 2006 New Revision: 4920 Log: code changed as the names for the tpl has been changed Modified: vtigercrm/trunk/modules/Users/EditNotification.php vtigercrm/trunk/modules/Users/listnotificationschedulers.php Modified: vtigercrm/trunk/modules/Users/EditNotification.php ============================================================================== --- vtigercrm/trunk/modules/Users/EditNotification.php (original) +++ vtigercrm/trunk/modules/Users/EditNotification.php Wed Apr 5 08:39:36 2006 @@ -44,5 +44,5 @@ $smarty->assign("IMAGE_PATH",$image_path); $smarty->assign("APP", $app_strings); $smarty->assign("CMOD", $mod_strings); -$smarty->display("Settings/EditEmailNotofication.tpl"); +$smarty->display("Settings/EditEmailNotification.tpl"); ?> Modified: vtigercrm/trunk/modules/Users/listnotificationschedulers.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 07:44:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 14:44:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4921 - /vtigercrm/trunk/include/utils/utils.php Message-ID: <20060405144448.E06D75C740A@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 08:44:44 2006 New Revision: 4921 Log: logs has been removed 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 Wed Apr 5 08:44:44 2006 @@ -744,8 +744,6 @@ { if (file_exists('tabdata.php') && (filesize('tabdata.php') != 0)) { - global $log; - $log->info("the file exists"); include('tabdata.php'); $tabname = array_search($tabid,$tab_info_array); } From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 07:45:25 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 14:45:25 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4922 - /vtigercrm/trunk/include/utils/CommonUtils.php Message-ID: <20060405144525.CC4385C740A@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 08:45:21 2006 New Revision: 4922 Log: logs has been removed 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 Wed Apr 5 08:45:21 2006 @@ -242,8 +242,6 @@ if (file_exists('tabdata.php') && (filesize('tabdata.php') != 0)) { - global $log; - $log->info("the file exists"); include('tabdata.php'); $tabid= $tab_info_array[$module]; } From vtiger-tickets at vtiger.fosslabs.com Wed Apr 5 09:17:41 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 05 Apr 2006 16:17:41 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2387=3A_C?= =?utf-8?q?all_to_undefined_function_error_when_creating_portal_user?= Message-ID: <076.5ccbf2328eba397e11c342285c9a84f1@vtiger.fosslabs.com> #87: Call to undefined function error when creating portal user ---------------------------------------+------------------------------------ Reporter: james at itextension.com | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: customer portal, contacts | ---------------------------------------+------------------------------------ In Contacts module, create or edit a Contact and check the "Portal User" checkbox. The following is the error output: Fatal error: Call to undefined function: makerandompassword() in /opt/CA01.HOUSE/data/www/crm.jenxnetwork.com/public_html/modules/Contacts/Save.php on line 169 -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Apr 5 09:18:09 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 05 Apr 2006 16:18:09 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2387=3A_C?= =?utf-8?q?all_to_undefined_function_error_when_creating_portal_user?= In-Reply-To: <076.5ccbf2328eba397e11c342285c9a84f1@vtiger.fosslabs.com> References: <076.5ccbf2328eba397e11c342285c9a84f1@vtiger.fosslabs.com> Message-ID: <085.df3dc07d5f8086f9f7b8a597ec73283d@vtiger.fosslabs.com> #87: Call to undefined function error when creating portal user ------------------------------------+--------------------------------------- Reporter: james at itextension.com | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: customer portal, contacts ------------------------------------+--------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Apr 5 11:17:54 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 05 Apr 2006 18:17:54 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2387=3A_C?= =?utf-8?q?all_to_undefined_function_error_when_creating_portal_user?= In-Reply-To: <076.5ccbf2328eba397e11c342285c9a84f1@vtiger.fosslabs.com> References: <076.5ccbf2328eba397e11c342285c9a84f1@vtiger.fosslabs.com> Message-ID: <085.b551fb905891bd252b81584228de322d@vtiger.fosslabs.com> #87: Call to undefined function error when creating portal user ------------------------------------+--------------------------------------- Reporter: james at itextension.com | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: customer portal, contacts ------------------------------------+--------------------------------------- Comment (by james at itextension.com): Found the fix -- moved function makeRandomPassword() above the line where it's called. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 20:31:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 03:31:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4923 - /vtigercrm/trunk/modules/Users/EditInventoryNotification.html Message-ID: <20060406033113.8A4495C7582@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 21:31:06 2006 New Revision: 4923 Log: file removed as inventory notification smartified Removed: vtigercrm/trunk/modules/Users/EditInventoryNotification.html From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 20:33:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 03:33:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4924 - in /vtigercrm/trunk: Smarty/templates/Settings/ modules/Users/ Message-ID: <20060406033359.97BED5C7582@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 21:33:49 2006 New Revision: 4924 Log: files added and changes made accordingly to integrate new UI for Inventory notification Added: vtigercrm/trunk/Smarty/templates/Settings/EditInventoryNotify.tpl vtigercrm/trunk/Smarty/templates/Settings/InventoryNotify.tpl (with props) vtigercrm/trunk/Smarty/templates/Settings/InventoryNotifyContents.tpl Modified: vtigercrm/trunk/modules/Users/EditInventoryNotification.php vtigercrm/trunk/modules/Users/SaveInventoryNotification.php vtigercrm/trunk/modules/Users/listinventorynotifications.php Modified: vtigercrm/trunk/modules/Users/EditInventoryNotification.php ============================================================================== --- vtigercrm/trunk/modules/Users/EditInventoryNotification.php (original) +++ vtigercrm/trunk/modules/Users/EditInventoryNotification.php Wed Apr 5 21:33:49 2006 @@ -9,13 +9,10 @@ * ********************************************************************************/ -require_once('XTemplate/xtpl.php'); +require_once('Smarty_setup.php'); global $mod_strings; global $app_strings; global $app_list_strings; - -echo get_module_title($mod_strings['LBL_MODULE_NAME'], $mod_strings['INVENTORYNOTIFICATION'], true); -echo '

'; global $adb; global $theme; @@ -23,14 +20,10 @@ $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); +$smarty = new vtigerCRM_Smarty; if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { $id = $_REQUEST['record']; - $mode = 'edit'; - $xtpl=new XTemplate ('modules/Users/EditInventoryNotification.html'); - $xtpl->assign("MOD", $mod_strings); - $xtpl->assign("APP", $app_strings); - $sql="select * from inventorynotification where notificationid = ".$id; $result = $adb->query($sql); if($adb->num_rows($result) ==1); @@ -38,23 +31,24 @@ $label = $mod_strings[$adb->query_result($result,0,'notificationname')]; $notification_subject = $adb->query_result($result,0,'notificationsubject'); $notification_body = $adb->query_result($result,0,'notificationbody'); + $notification_id = $adb->query_result($result,0,'notificationid'); - $xtpl->assign("RETURN_MODULE","Users"); - $xtpl->assign("RETURN_ACTION","listinventorynotifications"); - $xtpl->assign("RECORD_ID",$id); - - if (isset($label)) - $xtpl->assign("LABEL",$label); - if (isset($notification_subject)) - $xtpl->assign("SUBNOTIFY",$notification_subject); - if (isset($notification_body)) - $xtpl->assign("BODYNOTIFY",$notification_body); + $notification = Array(); + $notification['label'] = $label; + $notification['subject'] = $notification_subject; + $notification['body'] = $notification_body; + $notification['id'] = $notification_id; } - $xtpl->parse("main"); - $xtpl->out("main"); + + $smarty->assign("NOTIFY_DETAILS",$notification); + $smarty->assign("MOD", return_module_language($current_language,'Settings')); + $smarty->assign("IMAGE_PATH",$image_path); + $smarty->assign("APP", $app_strings); + $smarty->assign("CMOD", $mod_strings); + $smarty->display("Settings/EditInventoryNotify.tpl"); } else { - header("Location:index.php?module=Users&action=listnotificationschedulers"); + header("Location:index.php?module=Users&action=listnotificationschedulers&directmode=ajax"); } ?> Modified: vtigercrm/trunk/modules/Users/SaveInventoryNotification.php ============================================================================== --- vtigercrm/trunk/modules/Users/SaveInventoryNotification.php (original) +++ vtigercrm/trunk/modules/Users/SaveInventoryNotification.php Wed Apr 5 21:33:49 2006 @@ -17,6 +17,6 @@ $query="UPDATE inventorynotification set notificationsubject='".$_REQUEST['notifysubject']."', notificationbody='".$_REQUEST['notifybody']."' where notificationid=".$_REQUEST['record']; $adb->query($query); } -$loc = "Location: index.php?action=listinventorynotifications&module=Users"; +$loc = "Location: index.php?action=UsersAjax&file=listinventorynotifications&module=Users&directmode=ajax"; header($loc); ?> Modified: vtigercrm/trunk/modules/Users/listinventorynotifications.php ============================================================================== --- vtigercrm/trunk/modules/Users/listinventorynotifications.php (original) +++ vtigercrm/trunk/modules/Users/listinventorynotifications.php Wed Apr 5 21:33:49 2006 @@ -11,55 +11,35 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); +require_once('Smarty_setup.php'); global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; -?> - - -Untitled Document - - - - -
- -

- - - - - -query($query); $num_rows = $adb->num_rows($result); -$out = ''; +$output = Array(); for($i=0; $i<$num_rows; $i++) { + $out = Array(); $not_id = $adb->query_result($result,$i,'notificationid'); $not_mod = $adb->query_result($result,$i,'notificationname'); $not_des = $adb->query_result($result,$i,'label'); - if($row_list%2 ==1) - { - $ListRow = "oddListRow"; - } - else - { - $ListRow = "evenListRow"; - } - $out .= ''; - $out .=''; - $out .= ''; - $out .= ''; + $out ['notificationname'] = $mod_strings[$not_mod]; + $out ['label'] = $mod_strings[$not_des]; + $out ['id'] = $not_id; + $output [] = $out; } - - echo $out; -?> -
'.$mod_strings[$not_mod].''.$mod_strings[$not_des].'
- - - +$smarty->assign("NOTIFICATION",$output); +$smarty->assign("MOD", return_module_language($current_language,'Settings')); +$smarty->assign("IMAGE_PATH",$image_path); +$smarty->assign("APP", $app_strings); +$smarty->assign("CMOD", $mod_strings); + +if($_REQUEST['directmode'] != '') + $smarty->display("Settings/InventoryNotifyContents.tpl"); +else + $smarty->display("Settings/InventoryNotify.tpl"); From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 20:44:14 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 03:44:14 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4925 - /vtigercrm/trunk/Smarty/templates/Settings/InventoryNotifyContents.tpl Message-ID: <20060406034414.45ADE5C758A@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 21:44:10 2006 New Revision: 4925 Log: id passed as argument Modified: vtigercrm/trunk/Smarty/templates/Settings/InventoryNotifyContents.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings/InventoryNotifyContents.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/InventoryNotifyContents.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/InventoryNotifyContents.tpl Wed Apr 5 21:44:10 2006 @@ -12,7 +12,7 @@ {$smarty.foreach.notifyfor.iteration} {$elements.notificationname} {$elements.label} - + {/foreach} From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 02:44:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 09:44:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4926 - /vtigercrm/trunk/modules/Leads/LeadsAjax.php Message-ID: <20060406094455.E18424E42AA@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 03:44:49 2006 New Revision: 4926 Log: Added the quickcreate.php file for ajaxification of Quick Create Module - Ahmed Modified: vtigercrm/trunk/modules/Leads/LeadsAjax.php Modified: vtigercrm/trunk/modules/Leads/LeadsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Leads/LeadsAjax.php (original) +++ vtigercrm/trunk/modules/Leads/LeadsAjax.php Thu Apr 6 03:44:49 2006 @@ -45,5 +45,6 @@ else { require_once('include/Ajax/CommonAjax.php'); + require_once('quickcreate.php'); } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 02:51:04 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 09:51:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4927 - /vtigercrm/trunk/modules/Accounts/AccountsAjax.php Message-ID: <20060406095104.B517C4E36B3@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 03:50:59 2006 New Revision: 4927 Log: Added the quickcreate.php file for ajaxification of Quick Create Module - Ahmed Modified: vtigercrm/trunk/modules/Accounts/AccountsAjax.php Modified: vtigercrm/trunk/modules/Accounts/AccountsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/AccountsAjax.php (original) +++ vtigercrm/trunk/modules/Accounts/AccountsAjax.php Thu Apr 6 03:50:59 2006 @@ -46,5 +46,6 @@ else { require_once('include/Ajax/CommonAjax.php'); + require_once('quickcreate.php'); } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 02:53:54 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 09:53:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4928 - /vtigercrm/trunk/modules/Contacts/ContactsAjax.php Message-ID: <20060406095354.23B514E4338@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 03:53:48 2006 New Revision: 4928 Log: Added the quickcreate.php file for ajaxification of Quick Create Module - Ahmed Modified: vtigercrm/trunk/modules/Contacts/ContactsAjax.php Modified: vtigercrm/trunk/modules/Contacts/ContactsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/ContactsAjax.php (original) +++ vtigercrm/trunk/modules/Contacts/ContactsAjax.php Thu Apr 6 03:53:48 2006 @@ -47,5 +47,6 @@ else { require_once('include/Ajax/CommonAjax.php'); + require_once('quickcreate.php'); } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 02:54:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 09:54:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4929 - /vtigercrm/trunk/modules/Potentials/PotentialsAjax.php Message-ID: <20060406095427.E83EE4E4338@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 03:54:22 2006 New Revision: 4929 Log: Added the quickcreate.php file for ajaxification of Quick Create Module - Ahmed Modified: vtigercrm/trunk/modules/Potentials/PotentialsAjax.php Modified: vtigercrm/trunk/modules/Potentials/PotentialsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/PotentialsAjax.php (original) +++ vtigercrm/trunk/modules/Potentials/PotentialsAjax.php Thu Apr 6 03:54:22 2006 @@ -46,5 +46,6 @@ else { require_once('include/Ajax/CommonAjax.php'); + require_once('quickcreate.php'); } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 02:55:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 09:55:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4930 - /vtigercrm/trunk/modules/Activities/ActivitiesAjax.php Message-ID: <20060406095513.D7A394E489A@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 03:55:08 2006 New Revision: 4930 Log: Added the quickcreate.php file for ajaxification of Quick Create Module - Ahmed Modified: vtigercrm/trunk/modules/Activities/ActivitiesAjax.php Modified: vtigercrm/trunk/modules/Activities/ActivitiesAjax.php ============================================================================== --- vtigercrm/trunk/modules/Activities/ActivitiesAjax.php (original) +++ vtigercrm/trunk/modules/Activities/ActivitiesAjax.php Thu Apr 6 03:55:08 2006 @@ -46,5 +46,6 @@ else { require_once('include/Ajax/CommonAjax.php'); + require_once('quickcreate.php'); } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 02:56:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 09:56:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4931 - /vtigercrm/trunk/modules/Notes/NotesAjax.php Message-ID: <20060406095624.4A5994E36B3@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 03:56:18 2006 New Revision: 4931 Log: Added the quickcreate.php file for ajaxification of Quick Create Module - Ahmed Modified: vtigercrm/trunk/modules/Notes/NotesAjax.php Modified: vtigercrm/trunk/modules/Notes/NotesAjax.php ============================================================================== --- vtigercrm/trunk/modules/Notes/NotesAjax.php (original) +++ vtigercrm/trunk/modules/Notes/NotesAjax.php Thu Apr 6 03:56:18 2006 @@ -46,5 +46,6 @@ else { require_once('include/Ajax/CommonAjax.php'); + require_once('quickcreate.php'); } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 03:05:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 10:05:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4932 - /vtigercrm/trunk/modules/Emails/EmailsAjax.php Message-ID: <20060406100512.E26AC4E4C50@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 04:05:07 2006 New Revision: 4932 Log: Added the quickcreate.php file for ajaxification of Quick Create Module - Ahmed Modified: vtigercrm/trunk/modules/Emails/EmailsAjax.php Modified: vtigercrm/trunk/modules/Emails/EmailsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Emails/EmailsAjax.php (original) +++ vtigercrm/trunk/modules/Emails/EmailsAjax.php Thu Apr 6 04:05:07 2006 @@ -46,5 +46,6 @@ else { require_once('include/Ajax/CommonAjax.php'); + require_once('quickcreate.php'); } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 03:06:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 10:06:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4933 - /vtigercrm/trunk/modules/HelpDesk/HelpDeskAjax.php Message-ID: <20060406100613.E5A2D4E4C50@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 04:06:07 2006 New Revision: 4933 Log: Added the quickcreate.php file for ajaxification of Quick Create Module - Ahmed Modified: vtigercrm/trunk/modules/HelpDesk/HelpDeskAjax.php Modified: vtigercrm/trunk/modules/HelpDesk/HelpDeskAjax.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/HelpDeskAjax.php (original) +++ vtigercrm/trunk/modules/HelpDesk/HelpDeskAjax.php Thu Apr 6 04:06:07 2006 @@ -47,5 +47,6 @@ else { require_once('include/Ajax/CommonAjax.php'); + require_once('quickcreate.php'); } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 03:06:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 10:06:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4934 - /vtigercrm/trunk/modules/Products/ProductsAjax.php Message-ID: <20060406100652.93E4D4E4C50@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 04:06:47 2006 New Revision: 4934 Log: Added the quickcreate.php file for ajaxification of Quick Create Module - Ahmed Modified: vtigercrm/trunk/modules/Products/ProductsAjax.php Modified: vtigercrm/trunk/modules/Products/ProductsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Products/ProductsAjax.php (original) +++ vtigercrm/trunk/modules/Products/ProductsAjax.php Thu Apr 6 04:06:47 2006 @@ -46,5 +46,6 @@ else { require_once('include/Ajax/CommonAjax.php'); + require_once('quickcreate.php'); } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 03:07:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 10:07:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4935 - /vtigercrm/trunk/modules/Campaigns/CampaignsAjax.php Message-ID: <20060406100734.4D1E34E4C50@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 04:07:29 2006 New Revision: 4935 Log: Added the quickcreate.php file for ajaxification of Quick Create Module - Ahmed Modified: vtigercrm/trunk/modules/Campaigns/CampaignsAjax.php Modified: vtigercrm/trunk/modules/Campaigns/CampaignsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/CampaignsAjax.php (original) +++ vtigercrm/trunk/modules/Campaigns/CampaignsAjax.php Thu Apr 6 04:07:29 2006 @@ -46,5 +46,6 @@ else { require_once('include/Ajax/CommonAjax.php'); + require_once('quickcreate.php'); } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 06:09:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 13:09:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4936 - in /vtigercrm/trunk: Smarty/templates/ Smarty/templates/Settings/ modules/Settings/ modules/Settings/language/ themes/blue/images/ Message-ID: <20060406130943.5BBBD4E535F@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 07:09:20 2006 New Revision: 4936 Log: files added and code modified to integrate new UI for picklistsettings Added: vtigercrm/trunk/Smarty/templates/Settings/EditPickList.tpl vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl vtigercrm/trunk/Smarty/templates/Settings/PickListContents.tpl vtigercrm/trunk/modules/Settings/PickList.php vtigercrm/trunk/themes/blue/images/one.gif (with props) vtigercrm/trunk/themes/blue/images/picklistEditor.gif (with props) vtigercrm/trunk/themes/blue/images/two.gif (with props) Modified: vtigercrm/trunk/Smarty/templates/Settings.tpl vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl vtigercrm/trunk/modules/Settings/EditComboField.php vtigercrm/trunk/modules/Settings/UpdateComboValues.php vtigercrm/trunk/modules/Settings/language/en_us.lang.php Modified: vtigercrm/trunk/Smarty/templates/Settings.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings.tpl Thu Apr 6 07:09:20 2006 @@ -70,8 +70,8 @@ {$MOD.LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS}
{$MOD.LBL_CUSTOM_FIELD_SETTINGS} -{$MOD.LBL_EDIT_PICKLIST_VALUES}
-{$MOD.LBL_PICKLIST_SETTINGS} +{$MOD.LBL_EDIT_PICKLIST_VALUES}
+{$MOD.LBL_PICKLIST_SETTINGS} {$MOD.LBL_FIELD_ORDERING_DESC}
{$MOD.LBL_FIELD_ORDERING} Modified: vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl (original) +++ vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl Thu Apr 6 07:09:20 2006 @@ -35,7 +35,7 @@ Modified: vtigercrm/trunk/modules/Settings/EditComboField.php ============================================================================== --- vtigercrm/trunk/modules/Settings/EditComboField.php (original) +++ vtigercrm/trunk/modules/Settings/EditComboField.php Thu Apr 6 07:09:20 2006 @@ -9,41 +9,35 @@ * ********************************************************************************/ require_once('include/database/PearDatabase.php'); -require_once('XTemplate/xtpl.php'); +require_once('Smarty_setup.php'); global $mod_strings; global $app_strings; global $app_list_strings; -$fld_module=$_REQUEST["fld_module"]; -$fld_name=$_REQUEST["fld_name"]; -$tableName=$_REQUEST["table_name"]; -$columnName=$_REQUEST["column_name"]; - -echo get_module_title("Settings", $mod_strings['LBL_MODULE_NAME'].": ".$fld_module." ".$mod_strings['EditPickListValues'], true); -echo '
'; +$tableName=$_REQUEST["fieldname"]; +$moduleName=$_REQUEST["fld_module"]; global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); -$xtpl=new XTemplate ('modules/Settings/EditField.html'); -$xtpl->assign("MOD", $mod_strings); -$xtpl->assign("APP", $app_strings); -$xtpl->assign("FIELDNAME", $fld_name); -$xtpl->assign("TABLENAME", $tableName); -$xtpl->assign("COLUMNNAME", $columnName); -$xtpl->assign("FIELDMODULE", $fld_module); +$smarty = new vtigerCRM_Smarty; $query = "select * from ".$tableName ;//." order by sortorderid"; $result = $adb->query($query); $fldVal=''; while($row = $adb->fetch_array($result)) { - $fldVal .= $row[$columnName]; + $fldVal .= $row[$tableName]; $fldVal .= "\n"; } -$xtpl->assign("FLDVALUES", $fldVal); -$xtpl->parse("main"); -$xtpl->out("main"); +$smarty->assign("ENTRIES",$fldVal); +$smarty->assign("MODULE",$moduleName); +$smarty->assign("FIELDNAME",$tableName); +$smarty->assign("MOD", return_module_language($current_language,'Settings')); +$smarty->assign("IMAGE_PATH",$image_path); +$smarty->assign("APP", $app_strings); +$smarty->assign("CMOD", $mod_strings); +$smarty->display("Settings/EditPickList.tpl"); ?> Modified: vtigercrm/trunk/modules/Settings/UpdateComboValues.php ============================================================================== --- vtigercrm/trunk/modules/Settings/UpdateComboValues.php (original) +++ vtigercrm/trunk/modules/Settings/UpdateComboValues.php Thu Apr 6 07:09:20 2006 @@ -9,16 +9,14 @@ * ********************************************************************************/ require_once('include/database/PearDatabase.php'); -$fld_module=$_REQUEST["field_module"]; -$fldName=$_REQUEST["field_name"]; +$fld_module=$_REQUEST["fld_module"]; $tableName=$_REQUEST["table_name"]; -$columnName=$_REQUEST["column_name"]; $fldPickList = $_REQUEST['listarea']; //Deleting the already existing values -//$delquery="truncate ".$tableName; $delquery="delete from ".$tableName; $adb->query($delquery); + $pickArray = explode("\n",$fldPickList); $count = count($pickArray); @@ -36,9 +34,8 @@ $query = "insert into ".$tableName." values('".$pickArray[$i]."')"; else $query = "insert into ".$tableName." values('','".$pickArray[$i]."',".$i.",1)"; - - $adb->query($query); + $adb->query($query); } } -header("Location:index.php?module=Settings&action=EditComboField&fld_module=".$fld_module."&fld_name=".$fldName."&table_name=".$tableName."&column_name=".$columnName); +header("Location:index.php?action=SettingsAjax&module=Settings&directmode=ajax&file=PickList&fld_module=".$fld_module); ?> 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 Apr 6 07:09:20 2006 @@ -543,6 +543,12 @@ 'LBL_EMAIL_CONTENTS'=>'Email Contents', 'LBL_SUBJECT'=>'Subject', 'LBL_MESSAGE'=>'Message', +'LBL_PICKLIST_EDITOR'=>'Picklist Editor', +'LBL_PICKLIST_AVAIL'=>'Picklists Availabe in', +'LBL_PICKLIST_AVAILINFO1'=>'The picklists available in', +'LBL_PICKLIST_AVAILINFO2'=>'are shown below. Click Edit to modify the contents of the list.', +'LBL_EDIT_PICKLIST'=>'Edit Pick List', +'LBL_PICKLIST_SAVEINFO'=>'Type the entries one - by - one below and click the Save button to save the list.', ); From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 06:18:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 13:18:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4937 - in /vtigercrm/trunk/Smarty/templates/Settings: EditEmailNotofication.tpl EmailNotofication.tpl EmailNotoficationContents.tpl Message-ID: <20060406131822.CBEDD4E9570@vtiger.fosslabs.com> Author: don Date: Thu Apr 6 07:18:13 2006 New Revision: 4937 Log: files added to integrate new UI for email notification Added: vtigercrm/trunk/Smarty/templates/Settings/EditEmailNotofication.tpl vtigercrm/trunk/Smarty/templates/Settings/EmailNotofication.tpl (with props) vtigercrm/trunk/Smarty/templates/Settings/EmailNotoficationContents.tpl From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 06:21:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 13:21:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4938 - /vtigercrm/trunk/quickcreate.php Message-ID: <20060406132123.7CB894E9570@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 07:21:18 2006 New Revision: 4938 Log: changes made to integrate new UI Modified: vtigercrm/trunk/quickcreate.php Modified: vtigercrm/trunk/quickcreate.php ============================================================================== --- vtigercrm/trunk/quickcreate.php (original) +++ vtigercrm/trunk/quickcreate.php Thu Apr 6 07:21:18 2006 @@ -4,7 +4,7 @@ require_once("include/utils/CommonUtils.php"); require_once("include/FormValidationUtil.php"); -global $mod_strings; +global $mod_strings,$current_user; global $app_strings; global $adb; global $app_list_strings; @@ -18,13 +18,19 @@ $smarty = new vtigerCRM_Smarty; $qcreate_array = QuickCreate("$module"); -$smarty->assign("QUICKCREATE", $qcreate_array); +$validationData = $qcreate_array['data']; +$data = split_validationdataArray($validationData); +$smarty->assign("QUICKCREATE", $qcreate_array['form']); $smarty->assign("THEME",$theme); $smarty->assign("APP",$app_strings); $smarty->assign("MOD",$mod_strings); $smarty->assign("THEME",$theme); $smarty->assign("IMAGE_PATH",$image_path); $smarty->assign("MODULE",$module); +$smarty->assign("USERID",$current_user->id); +$smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); +$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); +$smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); $smarty->assign("CATEGORY",$category); $smarty->display("QuickCreate.tpl"); From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 06:29:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 13:29:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4939 - in /vtigercrm/trunk/include/utils: CommonUtils.php DetailViewUtils.php EditViewUtils.php GraphUtils.php InventoryUtils.php export.php Message-ID: <20060406132912.7416C4E9715@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 07:29:00 2006 New Revision: 4939 Log: Docs added for function Modified: vtigercrm/trunk/include/utils/CommonUtils.php vtigercrm/trunk/include/utils/DetailViewUtils.php vtigercrm/trunk/include/utils/EditViewUtils.php vtigercrm/trunk/include/utils/GraphUtils.php vtigercrm/trunk/include/utils/InventoryUtils.php vtigercrm/trunk/include/utils/export.php Modified: vtigercrm/trunk/include/utils/CommonUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/CommonUtils.php (original) +++ vtigercrm/trunk/include/utils/CommonUtils.php Thu Apr 6 07:29:00 2006 @@ -1519,6 +1519,11 @@ return $filepath; } +/** + * This function is used to get the Quick create form field parameters for a given module. + * Param $module - module name + * returns the value in array format + */ function QuickCreate($module) Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/DetailViewUtils.php (original) +++ vtigercrm/trunk/include/utils/DetailViewUtils.php Thu Apr 6 07:29:00 2006 @@ -20,22 +20,21 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ - - -/** This function returns the name of the person. - * It currently returns "first last". It should not put the space if either name is not available. - * It should not return errors if either name is not available. - * If no names are present, it will return "" - * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. - * All Rights Reserved. - * Contributor(s): ______________________________________.. - */ - - - require_once('include/database/PearDatabase.php'); require_once('include/ComboUtil.php'); //new require_once('include/utils/CommonUtils.php'); //new + + +/** This function returns the detail view form field and and its properties in array format. + * Param $uitype - UI type of the field + * Param $fieldname - Form field name + * Param $fieldlabel - Form field label name + * Param $col_fields - array contains the fieldname and values + * Param $generatedtype - Field generated type (default is 1) + * Param $tabid - tab id to which the Field belongs to (default is "") + * Return type is an array + */ + function getDetailViewOutputHtml($uitype, $fieldname, $fieldlabel, $col_fields,$generatedtype,$tabid='') { global $adb; @@ -732,6 +731,11 @@ return $label_fld; } +/** This function returns a HTML output of associated products for a given entity (Quotes,Invoice,Sales order or Purchase order) + * Param $module - module name + * Param $focus - module object + * Return type string + */ function getDetailAssociatedProducts($module,$focus) { @@ -838,6 +842,12 @@ } +/** This function returns the related tab details for a given entity or a module. +* Param $module - module name +* Param $focus - module object +* Return type is an array +*/ + function getRelatedLists($module,$focus) { global $adb; @@ -873,6 +883,13 @@ return $focus_list; } +/** This function returns the detailed block information of a record in a module. +* Param $module - module name +* Param $block - block id +* Param $col_fields - column fields array for the module +* Param $tabid - tab id +* Return type is an array +*/ function getDetailBlockInformation($module, $block,$col_fields,$tabid) { Modified: vtigercrm/trunk/include/utils/EditViewUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/EditViewUtils.php (original) +++ vtigercrm/trunk/include/utils/EditViewUtils.php Thu Apr 6 07:29:00 2006 @@ -20,20 +20,20 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ - - -/** This function returns the name of the person. - * It currently returns "first last". It should not put the space if either name is not available. - * It should not return errors if either name is not available. - * If no names are present, it will return "" - * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. - * All Rights Reserved. - * Contributor(s): ______________________________________.. - */ - require_once('include/database/PearDatabase.php'); require_once('include/ComboUtil.php'); //new require_once('include/utils/CommonUtils.php'); //new + +/** This function returns the field details for a given fieldname. + * Param $uitype - UI type of the field + * Param $fieldname - Form field name + * Param $fieldlabel - Form field label name + * Param $maxlength - maximum length of the field + * Param $col_fields - array contains the fieldname and values + * Param $generatedtype - Field generated type (default is 1) + * Param $module_name - module name + * Return type is an array + */ function getOutputHtml($uitype, $fieldname, $fieldlabel, $maxlength, $col_fields,$generatedtype,$module_name) { @@ -962,9 +962,12 @@ return $final_arr; } - - - +/** This function returns the invoice object populated with the details from sales order object. +* Param $focus - Invoice object +* Param $so_focus - Sales order focus +* Param $soid - sales order id +* Return type is an object array +*/ function getConvertSoToInvoice($focus,$so_focus,$soid) { @@ -999,6 +1002,12 @@ } +/** This function returns the invoice object populated with the details from quote object. +* Param $focus - Invoice object +* Param $quote_focus - Quote order focus +* Param $quoteid - quote id +* Return type is an object array +*/ function getConvertQuoteToInvoice($focus,$quote_focus,$quoteid) @@ -1027,6 +1036,12 @@ } +/** This function returns the sales order object populated with the details from quote object. +* Param $focus - Sales order object +* Param $quote_focus - Quote order focus +* Param $quoteid - quote id +* Return type is an object array +*/ function getConvertQuoteToSoObject($focus,$quote_focus,$quoteid) { @@ -1058,6 +1073,13 @@ } +/** This function returns the detailed list of products associated to a given entity or a record. +* Param $module - module name +* Param $focus - module object +* Param $seid - sales entity id +* Return type is an object array +*/ + function getAssociatedProducts($module,$focus,$seid='') { @@ -1142,6 +1164,13 @@ } +/** This function returns the no of products associated to the given entity or a record. +* Param $module - module name +* Param $focus - module object +* Param $seid - sales entity id +* Return type is an object array +*/ + function getNoOfAssocProducts($module,$focus,$seid='') { global $adb; @@ -1177,9 +1206,15 @@ return $num_rows; } - - - +/** This function returns the detail block information of a record for given block id. +* Param $module - module name +* Param $block - block name +* Param $mode - view type (detail/edit/create) +* Param $col_fields - fields array +* Param $tabid - tab id +* Param $info_type - information type (basic/advance) default "" +* Return type is an object array +*/ function getBlockInformation($module, $block, $mode, $col_fields,$tabid,$info_type='') { @@ -1276,6 +1311,12 @@ } +/** This function returns the data type of the fields, with field label, which is used for javascript validation. +* Param $validationData - array of fieldnames with datatype +* Return type array +*/ + + function split_validationdataArray($validationData) { $fieldName = ''; Modified: vtigercrm/trunk/include/utils/GraphUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/GraphUtils.php (original) +++ vtigercrm/trunk/include/utils/GraphUtils.php Thu Apr 6 07:29:00 2006 @@ -26,6 +26,10 @@ DEFINE("FF_FONT1",'Verdana'); +/**This function is used to get the font name when a language code is given +* Param $locale - language code +* Return type string +*/ function calculate_font_name($locale) { @@ -48,6 +52,11 @@ return FF_FONT1; } +/**This function is used to generate the color format. +* Param $count - language code +* Return type string +*/ + function color_generator($count = 1, $start = '33CCFF', $step = '221133') { // explode color strings to RGB array @@ -69,4 +78,4 @@ } return $result; } -?> +?> Modified: vtigercrm/trunk/include/utils/InventoryUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/InventoryUtils.php (original) +++ vtigercrm/trunk/include/utils/InventoryUtils.php Thu Apr 6 07:29:00 2006 @@ -50,6 +50,16 @@ return $productBlock; } +/** + * This function updates the stock information once the product is ordered. + * Param $productid - product id + * Param $qty - product quantity in no's + * Param $mode - mode type + * Param $ext_prod_arr - existing products + * Param $module - module name + * return type void + */ + function updateStk($product_id,$qty,$mode,$ext_prod_arr,$module) { global $adb; @@ -118,6 +128,17 @@ } } +/** + * This function sends a mail to the handler whenever the product reaches the reorder level. + * Param $product_id - product id + * Param $upd_qty - updated product quantity in no's + * Param $prod_name - product name + * Param $qtyinstk - quantity in stock + * Param $qty - quantity + * Param $module - module name + * return type void + */ + function sendPrdStckMail($product_id,$upd_qty,$prod_name,$qtyinstk,$qty,$module) { global $current_user; @@ -173,6 +194,10 @@ } } +/**This function is used to get the quantity in stock of a given product +*Param $product_id - product id +*Returns type numeric +*/ function getPrdQtyInStck($product_id) { global $adb; @@ -182,6 +207,11 @@ return $qtyinstck; } +/**This function is used to get the reorder level of a product +*Param $product_id - product id +*Returns type numeric +*/ + function getPrdReOrderLevel($product_id) { global $adb; @@ -191,6 +221,11 @@ return $reorderlevel; } +/**This function is used to get the handler for a given product +*Param $product_id - product id +*Returns type numeric +*/ + function getPrdHandler($product_id) { global $adb; Modified: vtigercrm/trunk/include/utils/export.php ============================================================================== --- vtigercrm/trunk/include/utils/export.php (original) +++ vtigercrm/trunk/include/utils/export.php Thu Apr 6 07:29:00 2006 @@ -51,13 +51,20 @@ die("you can't export!"); } -//Function added to convert line breaks to space in description during export +/**Function convert line breaks to space in description during export + * Pram $str - text + * retrun type string +*/ function br2nl_vt($str) { $str = preg_replace("/(\r\n)/", " ", $str); return $str; } +/**This function exports all the data for a given module + * Param $type - module name + * Return type text +*/ function export_all($type) { $contact_fields = Array(); From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 06:30:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 13:30:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4940 - in /vtigercrm/trunk/Smarty/templates/Settings: EditEmailNotofication.tpl EmailNotofication.tpl EmailNotoficationContents.tpl Message-ID: <20060406133013.CDA1B4E992C@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 07:30:08 2006 New Revision: 4940 Log: file deleted to rename it Removed: vtigercrm/trunk/Smarty/templates/Settings/EditEmailNotofication.tpl vtigercrm/trunk/Smarty/templates/Settings/EmailNotofication.tpl vtigercrm/trunk/Smarty/templates/Settings/EmailNotoficationContents.tpl From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 06:30:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 13:30:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4941 - in /vtigercrm/trunk/Smarty/templates/Settings: EditEmailNotification.tpl EmailNotification.tpl EmailNotificationContents.tpl Message-ID: <20060406133048.2466D4E992C@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 07:30:41 2006 New Revision: 4941 Log: file name changed Added: vtigercrm/trunk/Smarty/templates/Settings/EditEmailNotification.tpl vtigercrm/trunk/Smarty/templates/Settings/EmailNotification.tpl (with props) vtigercrm/trunk/Smarty/templates/Settings/EmailNotificationContents.tpl From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 06:33:31 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 13:33:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4942 - /vtigercrm/trunk/Smarty/templates/QuickCreate.tpl Message-ID: <20060406133331.D1CBF4E9715@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 07:33:26 2006 New Revision: 4942 Log: changes made for quickcreate functionality Modified: vtigercrm/trunk/Smarty/templates/QuickCreate.tpl Modified: vtigercrm/trunk/Smarty/templates/QuickCreate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/QuickCreate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/QuickCreate.tpl Thu Apr 6 07:33:26 2006 @@ -1,14 +1,13 @@ - - - vtiger CRM 5 - Free, Commercial grade Open Source CRM - - - - + + + - -
+{include file='QuickCreateHidden.tpl'}
@@ -365,9 +364,9 @@ - +
- +
@@ -378,6 +377,5 @@
-
+ -v From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 06:34:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 13:34:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4943 - /vtigercrm/trunk/Smarty/templates/Settings/EmailNotification.tpl Message-ID: <20060406133400.318824E992C@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 07:33:55 2006 New Revision: 4943 Log: issue in notification has been fixed Modified: vtigercrm/trunk/Smarty/templates/Settings/EmailNotification.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings/EmailNotification.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/EmailNotification.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/EmailNotification.tpl Thu Apr 6 07:33:55 2006 @@ -16,7 +16,7 @@
- {include file='Settings/EmailNotoficationContents.tpl'} + {include file='Settings/EmailNotificationContents.tpl'}
@@ -31,7 +31,7 @@ {include file='SettingsSubMenu.tpl'} - + {literal} '; - - -return $list; -} ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 07:16:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 14:16:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4955 - /vtigercrm/trunk/Smarty/templates/CustomFieldList.tpl Message-ID: <20060406141620.E0C144EA9A2@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 08:16:15 2006 New Revision: 4955 Log: new UI has been integrated Added: vtigercrm/trunk/Smarty/templates/CustomFieldList.tpl From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 07:16:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 14:16:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4956 - /vtigercrm/trunk/Smarty/templates/CustomFieldEntries.tpl Message-ID: <20060406141649.2413D4EA9A2@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 08:16:44 2006 New Revision: 4956 Log: new UI has been integrated Added: vtigercrm/trunk/Smarty/templates/CustomFieldEntries.tpl From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 07:24:45 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 14:24:45 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4957 - /vtigercrm/trunk/include/images/loginAlpha.gif Message-ID: <20060406142445.431BC4EAFF7@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 08:24:38 2006 New Revision: 4957 Log: image for alpha 5 added Modified: vtigercrm/trunk/include/images/loginAlpha.gif Modified: vtigercrm/trunk/include/images/loginAlpha.gif ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 07:36:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 14:36:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4958 - /vtigercrm/trunk/modules/Users/Login.php Message-ID: <20060406143621.549704EB2F6@vtiger.fosslabs.com> Author: richie Date: Thu Apr 6 08:36:13 2006 New Revision: 4958 Log: Alpha4 references changed to Alpha5. Message Changed Modified: vtigercrm/trunk/modules/Users/Login.php Modified: vtigercrm/trunk/modules/Users/Login.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 07:40:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 14:40:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4959 - /vtigercrm/trunk/Smarty/templates/QuickCreateHidden.tpl Message-ID: <20060406144028.1293C4EB5CF@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 08:40:24 2006 New Revision: 4959 Log: QuickCreateHidden.tpl added for quickcreate hidden fields Added: vtigercrm/trunk/Smarty/templates/QuickCreateHidden.tpl From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 07:46:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 14:46:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4960 - /vtigercrm/trunk/Smarty/templates/ListView.tpl Message-ID: <20060406144621.0C75C4EB789@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 08:46:17 2006 New Revision: 4960 Log: title message has been changed for chat icon 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 Thu Apr 6 08:46:17 2006 @@ -59,7 +59,7 @@ Create {$MODULE}... {/if} Search in {$MODULE}... - Search in {$MODULE}... + Chat... From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 07:53:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 14:53:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4961 - /vtigercrm/trunk/modules/Users/TemplateMerge.php Message-ID: <20060406145307.51D144EB676@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 08:53:03 2006 New Revision: 4961 Log: Removed the FCKEditor Check for the Template Merge Ahmed Modified: vtigercrm/trunk/modules/Users/TemplateMerge.php Modified: vtigercrm/trunk/modules/Users/TemplateMerge.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 07:55:38 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 14:55:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4962 - /vtigercrm/trunk/modules/Potentials/PotentialsAjax.php Message-ID: <20060406145538.D8B834EBA1B@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 08:55:34 2006 New Revision: 4962 Log: Made changes for ajaxification of quick create Modified: vtigercrm/trunk/modules/Potentials/PotentialsAjax.php Modified: vtigercrm/trunk/modules/Potentials/PotentialsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/PotentialsAjax.php (original) +++ vtigercrm/trunk/modules/Potentials/PotentialsAjax.php Thu Apr 6 08:55:34 2006 @@ -43,9 +43,13 @@ echo ":#:FAILURE"; } } + +elseif($_REQUEST['ajaxmode'] == 'qcreate') +{ + require_once('quickcreate.php'); +} else { require_once('include/Ajax/CommonAjax.php'); - require_once('quickcreate.php'); } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 07:57:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 14:57:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4963 - /vtigercrm/trunk/modules/Products/ProductsAjax.php Message-ID: <20060406145707.03C234EBA1B@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 08:57:04 2006 New Revision: 4963 Log: Made changes for ajaxification of quick create Modified: vtigercrm/trunk/modules/Products/ProductsAjax.php Modified: vtigercrm/trunk/modules/Products/ProductsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Products/ProductsAjax.php (original) +++ vtigercrm/trunk/modules/Products/ProductsAjax.php Thu Apr 6 08:57:04 2006 @@ -43,9 +43,13 @@ echo ":#:FAILURE"; } } + +elseif($_REQUEST['ajaxmode'] == 'qcreate') +{ + require_once('quickcreate.php'); +} else { require_once('include/Ajax/CommonAjax.php'); - require_once('quickcreate.php'); } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 08:12:18 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 15:12:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4964 - /vtigercrm/trunk/modules/Notes/NotesAjax.php Message-ID: <20060406151218.DB5864EBDFE@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 09:12:14 2006 New Revision: 4964 Log: Made changes for ajaxification of quick create Modified: vtigercrm/trunk/modules/Notes/NotesAjax.php Modified: vtigercrm/trunk/modules/Notes/NotesAjax.php ============================================================================== --- vtigercrm/trunk/modules/Notes/NotesAjax.php (original) +++ vtigercrm/trunk/modules/Notes/NotesAjax.php Thu Apr 6 09:12:14 2006 @@ -43,9 +43,12 @@ echo ":#:FAILURE"; } } +elseif($_REQUEST['ajaxmode'] == 'qcreate') +{ + require_once('quickcreate.php'); +} else { require_once('include/Ajax/CommonAjax.php'); - require_once('quickcreate.php'); } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 10:15:53 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 17:15:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4965 - in /vtigercrm/trunk: Smarty/templates/ themes/blue/images/ Message-ID: <20060406171553.94D1F4FDF39@vtiger.fosslabs.com> Author: don Date: Thu Apr 6 11:15:35 2006 New Revision: 4965 Log: files added to integrate new UI for Rss Added: vtigercrm/trunk/Smarty/templates/Rss.tpl vtigercrm/trunk/themes/blue/images/rssHeader.gif (with props) vtigercrm/trunk/themes/blue/images/rssdelete.gif (with props) vtigercrm/trunk/themes/blue/images/rssforward.gif (with props) vtigercrm/trunk/themes/blue/images/rssframeHdr.gif (with props) vtigercrm/trunk/themes/blue/images/rssimage.gif (with props) vtigercrm/trunk/themes/blue/images/rssroot.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 10:16:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 17:16:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4966 - in /vtigercrm/trunk/modules/Rss: ListView.php Rss.js Rss.php Message-ID: <20060406171658.47FC24FDE6A@vtiger.fosslabs.com> Author: don Date: Thu Apr 6 11:16:52 2006 New Revision: 4966 Log: changes made to integrate new UI for Rss Modified: vtigercrm/trunk/modules/Rss/ListView.php vtigercrm/trunk/modules/Rss/Rss.js vtigercrm/trunk/modules/Rss/Rss.php Modified: vtigercrm/trunk/modules/Rss/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Rss/ListView.php (original) +++ vtigercrm/trunk/modules/Rss/ListView.php Thu Apr 6 11:16:52 2006 @@ -8,8 +8,8 @@ * All Rights Reserved. * ********************************************************************************/ -require_once('XTemplate/xtpl.php'); require_once("data/Tracker.php"); +require_once('Smarty_setup.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -35,7 +35,7 @@ $recordid = $_REQUEST[record]; } -$rss_form=new XTemplate ('modules/Rss/ListView.html'); +$rss_form = new vtigerCRM_Smarty; $rss_form->assign("MOD", $mod_strings); $rss_form->assign("APP", $app_strings); $rss_form->assign("IMAGEPATH",$image_path); @@ -46,7 +46,7 @@ $oRss = new vtigerRSS(); if(isset($_REQUEST[record])) { - $recordid = $_REQUEST[record]; + $recordid = $_REQUEST[record]; $url = $oRss->getRssUrlfromId($recordid); if($oRss->setRSSUrl($url)) { @@ -55,6 +55,7 @@ { $rss_html = "No RSS Feeds are selected"; } + $rss_form->assign("TITLE",gerRssTitle($recordid)); }else { $rss_html = $oRss->getStarredRssHTML(); @@ -64,29 +65,23 @@ require_once("modules/".$currentModule."/Forms.php"); if (function_exists('get_rssfeeds_form')) { - $rss_form->assign("RSSFEEDS_TITLE","
Add 
"); + $rss_form->assign("RSSFEEDS_TITLE"," Add RSS Feed"); $rss_form->assign("RSSFEEDS", get_rssfeeds_form()); } } - -//$all_rss_html = $oRss->getAllRssFeeds(); -//$stared_rss_html = $oRss->getStaredRssFeeds(); -//$crm_rss_html = $oRss->getCRMRssFeeds(); -//$category_rss_html = $oRss->getRSSCategoryHTML(); -//$top_stared_rss_html = $oRss->getTopStarredRSSFeeds(); -//print_r($rss_hdr_html); -//$rss_form->assign("TOPSTARSSFEEDS",$top_stared_rss_html); -//$rss_form->assign("RSSHEADERDETAILS",$rss_hdr_html); $rss_form->assign("RSSDETAILS",$rss_html); -//$rss_form->assign("ALLRSSFEEDS",$all_rss_html); -//$rss_form->assign("STAREDFEEDS",$stared_rss_html); -//$rss_form->assign("CRMRSSFEEDS",$crm_rss_html); -//$rss_form->assign("CATEGORYFEEDS",$category_rss_html); //<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>// -$rss_form->parse("main"); -$rss_form->out("main"); - +$rss_form->display("Rss.tpl"); +function gerRssTitle($id) +{ + global $adb; + $query = 'select * from rss where rssid ='.$id; + $result = $adb->query($query); + $title = $adb->query_result($result,0,'rsstitle'); + return $title; + +} ?> Modified: vtigercrm/trunk/modules/Rss/Rss.js ============================================================================== --- vtigercrm/trunk/modules/Rss/Rss.js (original) +++ vtigercrm/trunk/modules/Rss/Rss.js Thu Apr 6 11:16:52 2006 @@ -53,4 +53,8 @@ } return true; } - +function display(url,list) +{ + document.getElementById('rsstitle').innerHTML = list; + document.getElementById('mysite').src = url; +} Modified: vtigercrm/trunk/modules/Rss/Rss.php ============================================================================== --- vtigercrm/trunk/modules/Rss/Rss.php (original) +++ vtigercrm/trunk/modules/Rss/Rss.php Thu Apr 6 11:16:52 2006 @@ -99,7 +99,7 @@ foreach($this->rss_object as $key=>$item) { $i = $i + 1; - $shtml .= "
  • $item[title]
    • "; + $shtml .= "
  • $item[title]
    • "; if($i == 10) { return $shtml; @@ -320,7 +320,7 @@ "; $shtml .= ""; if(isset($this->rss_object)) @@ -328,7 +328,7 @@ if(count($this->rss_object) > 10) { $shtml .= ""; } } @@ -374,7 +374,7 @@ { $shtml .= "Today at "; } - $shtml .= " rss_link\" target=\"_blank\">".$allrssrow['rsstitle'].""; + $shtml .= " rss_link."',this)\";>".$allrssrow['rsstitle'].""; $shtml .= ""; $shtml .= ""; } @@ -383,7 +383,7 @@ if(count($this->rss_object) > 10) { $shtml .= ""; } } From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 10:52:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 17:52:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4967 - in /vtigercrm/trunk/modules/Migration: Migration.php MigrationCheck.php MigrationStep2.php ModifyDatabase/42P2_to_50Alpha.php Message-ID: <20060406175212.E760E4FEE29@vtiger.fosslabs.com> Author: don Date: Thu Apr 6 11:52:01 2006 New Revision: 4967 Log: * Added migration queries after 4.5 dev3 release Modified: vtigercrm/trunk/modules/Migration/Migration.php vtigercrm/trunk/modules/Migration/MigrationCheck.php vtigercrm/trunk/modules/Migration/MigrationStep2.php vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Modified: vtigercrm/trunk/modules/Migration/Migration.php ============================================================================== --- vtigercrm/trunk/modules/Migration/Migration.php (original) +++ vtigercrm/trunk/modules/Migration/Migration.php Thu Apr 6 11:52:01 2006 @@ -98,6 +98,9 @@ $conn->query($sql); echo '
    Current Database has been created.'; + + //Added to avoid the No Database Selected error when execute the queries + $conn->connect(); } function applyDumpData($host_name,$mysql_port,$mysql_username,$mysql_password,$dbname,$dumpfile) Modified: vtigercrm/trunk/modules/Migration/MigrationCheck.php ============================================================================== --- vtigercrm/trunk/modules/Migration/MigrationCheck.php (original) +++ vtigercrm/trunk/modules/Migration/MigrationCheck.php Thu Apr 6 11:52:01 2006 @@ -9,7 +9,7 @@ * ********************************************************************************/ -include("config.php"); +include("config.inc.php"); $old_version = $_REQUEST['old_version']; $latest_version = $_REQUEST['latest_version']; @@ -23,8 +23,8 @@ //new database values get from the current vtigerCRM's config.php global $dbconfig; -$new_host_name = $dbconfig['db_host_name']; -$new_mysql_username = $dbconfig['db_user_name']; +$new_host_name = $dbconfig['db_hostname']; +$new_mysql_username = $dbconfig['db_username']; $new_mysql_password = $dbconfig['db_password']; $new_dbname = $dbconfig['db_name']; Modified: vtigercrm/trunk/modules/Migration/MigrationStep2.php ============================================================================== --- vtigercrm/trunk/modules/Migration/MigrationStep2.php (original) +++ vtigercrm/trunk/modules/Migration/MigrationStep2.php Thu Apr 6 11:52:01 2006 @@ -75,12 +75,12 @@ //TODO - Check whether the given file is Dump file and then apply to the new database echo '
    Going to apply the Dump file to the new database.'; - include("config.php"); + include("config.inc.php"); global $dbconfig; - $new_host_name = $dbconfig['db_host_name']; + $new_host_name = $dbconfig['db_hostname']; $new_dbname = $dbconfig['db_name']; - $new_mysql_username = $dbconfig['db_user_name']; + $new_mysql_username = $dbconfig['db_username']; $new_mysql_password = $dbconfig['db_password']; $conn = new PearDatabase("mysql",$new_host_name,$new_dbname,$new_mysql_username,$new_mysql_password); Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php ============================================================================== --- vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php (original) +++ vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Thu Apr 6 11:52:01 2006 @@ -18,6 +18,17 @@ echo "

    Database Modifications for 4.2 Patch2 ==> 5.0(Alpha) Dev 3 Starts here.....
    "; /****************** 5.0(Alpha) dev version 1 Database changes -- Starts*********************/ + +//Added the announcement table creation to avoid the error +$ann_query = "CREATE TABLE `announcement` ( + `creatorid` int(19) NOT NULL, + `announcement` text, + `title` varchar(255) default NULL, + `time` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, + PRIMARY KEY (`creatorid`), + KEY `announcement_UK01` (`creatorid`) + ) ENGINE=InnoDB DEFAULT CHARSET=latin1"; +Execute($ann_query); //Added Primay Keys for the left out tables $alter_array1 = Array( @@ -61,7 +72,7 @@ `globalactionpermission` int(19) default NULL, PRIMARY KEY (`profileid`,`globalactionid`), CONSTRAINT `fk_profile2globalpermissions` FOREIGN KEY (`profileid`) REFERENCES `profile` (`profileid`) ON DELETE CASCADE - ) TYPE=InnoDB"; + )"; $status = $conn->query($create_sql1); echo '
    '.$status.' ==> '.$create_sql1; @@ -815,13 +826,1789 @@ - - +$conn->println("Database Modifications for 5.0(Alpha) Dev 3 ==> 5.0 Alpha starts here."); +echo "

    Database Modifications for 5.0(Alpha) Dev3 ==> 5.0 Alpha starts here.....
    "; +$alter_query_array6 = Array( + "ALTER TABLE users ADD column activity_view VARCHAR(25) DEFAULT 'Today' AFTER homeorder", + "ALTER TABLE activity ADD column notime CHAR(3) DEFAULT '0' AFTER location" + ); +foreach($alter_query_array6 as $query) +{ + Execute($query); +} + +$insert_field_array1 = Array( + "Insert into field values (9,".$conn->getUniqueID("field").",'notime','activity',1,56,'notime','No Time',1,0,0,100,20,1,3,'C~O',1,'')", + "Insert into field values (16,".$conn->getUniqueID("field").",'notime','activity',1,56,'notime','No Time',1,0,0,100,18,1,1,'C~O',1,'')" + ); +foreach($insert_field_array1 as $query) +{ + Execute($query); +} + +$alter_query_array7 = Array( + "alter table vendor add column pobox varchar(30) after state", + "alter table leadaddress add column pobox varchar(30) after state", + "alter table accountbillads add column pobox varchar(30) after state", + "alter table accountshipads add column pobox varchar(30) after state", + "alter table contactaddress add column mailingpobox varchar(30) after mailingstate", + "alter table contactaddress add column otherpobox varchar(30) after otherstate", + "alter table quotesbillads add column bill_pobox varchar(30) after bill_street", + "alter table quotesshipads add column ship_pobox varchar(30) after ship_street", + "alter table pobillads add column bill_pobox varchar(30) after bill_street", + "alter table poshipads add column ship_pobox varchar(30) after ship_street", + "alter table sobillads add column bill_pobox varchar(30) after bill_street", + "alter table soshipads add column ship_pobox varchar(30) after ship_street", + "alter table invoicebillads add column bill_pobox varchar(30) after bill_street", + "alter table invoiceshipads add column ship_pobox varchar(30) after ship_street" + ); +foreach($alter_query_array7 as $query) +{ + Execute($query); +} + +$insert_field_array2 = Array( + "insert into field values (23,".$conn->getUniqueID("field").",'bill_pobox','invoicebillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,2,1,'V~O',1,'')", + "insert into field values (23,".$conn->getUniqueID("field").",'ship_pobox','invoiceshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,2,1,'V~O',1,'')", + + "insert into field values (6,".$conn->getUniqueID("field").",'pobox','accountbillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,2,1,'V~O',1,'')", + "insert into field values (6,".$conn->getUniqueID("field").",'pobox','accountshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,2,1,'V~O',1,'')", + + "insert into field values (7,".$conn->getUniqueID("field").",'pobox','leadaddress',1,'1','pobox','Po Box',1,0,0,100,2,2,1,'V~O',1,'')", + + "insert into field values (4,".$conn->getUniqueID("field").",'mailingpobox','contactaddress',1,'1','mailingpobox','Mailing Po Box',1,0,0,100,3,2,1,'V~O',1,'')", + "insert into field values (4,".$conn->getUniqueID("field").",'otherpobox','contactaddress',1,'1','otherpobox','Other Po Box',1,0,0,100,4,2,1,'V~O',1,'')", + + "insert into field values (18,".$conn->getUniqueID("field").",'pobox','vendor',1,'1','pobox','Po Box',1,0,0,100,2,2,1,'V~O',1,'')", + + "insert into field values (20,".$conn->getUniqueID("field").",'bill_pobox','quotesbillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,2,1,'V~O',1,'')", + "insert into field values (20,".$conn->getUniqueID("field").",'ship_pobox','quotesshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,2,1,'V~O',1,'')", + + "insert into field values (21,".$conn->getUniqueID("field").",'bill_pobox','pobillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,2,1,'V~O',1,'')", + "insert into field values (21,".$conn->getUniqueID("field").",'ship_pobox','poshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,2,1,'V~O',1,'')", + + "insert into field values (22,".$conn->getUniqueID("field").",'bill_pobox','sobillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,2,1,'V~O',1,'')", + "insert into field values (22,".$conn->getUniqueID("field").",'ship_pobox','soshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,2,1,'V~O',1,'')" + ); +foreach($insert_field_array2 as $query) +{ + Execute($query); +} + + +$fieldname =array('bill_city','bill_state','bill_code','bill_country','ship_city','ship_state','ship_code','ship_country'); +$tablename = array('accountbillads','quotesbillads','pobillads','sobillads','invoicebillads','accountshipads','quotesshipads','poshipads','soshipads','invoiceshipads'); +$sequence = array(5,7,9,11,6,8,10,12); +$k = 0; +$n = 0; +for($j = 0;$j < 8;$j++) +{ + if($j == 4) + $n = $n+5; + for($i = 0;$i < 5;$i++) + { + $query1 = "update field set sequence=".$sequence[$j]." where tablename='".$tablename[$n+$i]."' && fieldname='".$fieldname[$j]."'"; + Execute($query1); + } +} + +$fieldname = array('code','city','country','state'); +$tablename = 'leadaddress'; +$sequence = array(3,4,5,6); +for($i = 0;$i < 4;$i++) +{ + $query2 = "update field set sequence=".$sequence[$i]." where tablename='".$tablename."' && fieldname='".$fieldname[$i]."'"; + Execute($query2); +} + +$fieldname = array('city','state','postalcode','country'); +$tablename = 'vendor'; +$sequence = array(3,4,5,6); + +for($i = 0;$i < 4;$i++) +{ + $query3 = "update field set sequence=".$sequence[$i]." where tablename='".$tablename."' && fieldname='".$fieldname[$i]."'"; + Execute($query3); +} + +$fieldname = array('mailingcity','othercity','mailingstate','otherstate','mailingzip','otherzip','mailingcountry','othercountry'); +$tablename = 'contactaddress'; +$sequence = array(5,6,7,8,9,10,11,12); + +for($i = 0;$i < 8;$i++) +{ + $query = "update field set sequence=".$sequence[$i]." where tablename='".$tablename."' && fieldname='".$fieldname[$i]."'"; + Execute($query); +} + +$query_array1 = Array( + "update field set tablename='crmentity' where tabid=10 and fieldname='description'", + "update field set tablename='attachments' where tabid=10 and fieldname='filename'", + "drop table emails", + + "alter table activity drop column description", + "update field set tablename='crmentity' where tabid in (9,16) and fieldname='description'", + + "update tab set name='PurchaseOrder',tablabel='PurchaseOrder' where tabid=21", + "update tab set presence=0 where tabid=22 and name='SalesOrder'", + + "delete from actionmapping where actionname='SalesOrderDetailView'", + "delete from actionmapping where actionname='SalesOrderEditView'", + "delete from actionmapping where actionname='SaveSalesOrder'", + "delete from actionmapping where actionname='DeleteSalesOrder'", + + "insert into field values (13,".$conn->getUniqueID("field").",'filename','attachments',1,'61','filename','Attachment',1,0,0,100,12,2,1,'V~O',0,1)", + + "alter table troubletickets add column filename varchar(50) default NULL after title" + ); +foreach($query_array1 as $query) +{ + Execute($query); +} + +$create_query3 = "create table parenttab(parenttabid int(19) not null, parenttab_label varchar(100) not null, sequence int(10) not null, visible int(2) not null default '0', Primary Key(parenttabid))"; +Execute($create_query3); +$create_query4 = "create table parenttabrel(parenttabid int(3) not null, tabid int(3) not null,sequence int(3) not null)"; +Execute($create_query4); + +$insert_query_array4 = Array( + "insert into 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 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) " + ); +foreach($insert_query_array4 as $query) +{ + Execute($query); +} + + +$create_query5 = "CREATE TABLE blocks ( blockid int(19) NOT NULL, tabid int(19) NOT NULL, blocklabel varchar(100) NOT NULL, sequence int(19) NOT NULL, show_title int(2) NOT NULL, visible int(2) NOT NULL DEFAULT 0, create_view int(2) NOT NULL DEFAULT 0, edit_view int(2) NOT NULL DEFAULT 0, detail_view int(2) NOT NULL DEFAULT 0, PRIMARY KEY (blockid))"; +Execute($create_query5); + +$update_query_array1 = Array( + "update field set block=2 where tabid=2 and block=5", + "update field set block=3 where tabid=2 and block=2", + + "update field set block=4 where tabid=4 and block=1", + "update field set block=5 where tabid=4 and block=5", + "update field set block=6 where tabid=4 and block=4", + "update field set block=7 where tabid=4 and block=2", + "update field set block=8 where tabid=4 and block=3", + + "update field set block=9 where tabid=6 and block=1", + "update field set block=10 where tabid=6 and block=5", + "update field set block=11 where tabid=6 and block=2", + "update field set block=12 where tabid=6 and block=3", + + "update field set block=13 where tabid=7 and block=1", + "update field set block=14 where tabid=7 and block=5", + "update field set block=15 where tabid=7 and block=2", + "update field set block=16 where tabid=7 and block=3", + + "update field set block=17 where tabid=8 and block=1", + "update field set block=17 where tabid=8 and block=2", + "update field set block=18 where tabid=8 and block=3", + + "update field set block=19 where tabid=9 and block=1", + "update field set block=19 where tabid=9 and block=7", + "update field set block=20 where tabid=9 and block=2", + + "update field set block=21 where tabid=10 and block=1", + "update field set block=22 where tabid=10 and block=2", + "update field set block=23 where tabid=10 and block=3", + "update field set block=23 where tabid=10 and block=4", + "update field set block=24 where tabid=10 and block=5", + + "update field set block=25 where tabid=13 and block=1", + "update field set block=26 where tabid=13 and block=2", + "update field set block=27 where tabid=13 and block=5", + "update field set block=28 where tabid=13 and block=3", + "update field set block=29 where tabid=13 and block=4", + "update field set block=30 where tabid=13 and block=6", + + "update field set block=31 where tabid=14 and block=1", + "update field set block=32 where tabid=14 and block=2", + "update field set block=33 where tabid=14 and block=3", + "update field set block=34 where tabid=14 and block=5", + "update field set block=35 where tabid=14 and block=6", + "update field set block=36 where tabid=14 and block=4", + + "update field set block=37 where tabid=15 and block=1", + "update field set block=38 where tabid=15 and block=2", + "update field set block=39 where tabid=15 and block=3", + "update field set block=40 where tabid=15 and block=4", + + "update field set block=41 where tabid=16 and block=1", + "update field set block=42 where tabid=16 and block=7", + "update field set block=43 where tabid=16 and block=2", + + "update field set block=44 where tabid=18 and block=1", + "update field set block=45 where tabid=18 and block=5", + "update field set block=36 where tabid=18 and block=2", + "update field set block=47 where tabid=18 and block=3", + + "update field set block=48 where tabid=19 and block=1", + "update field set block=49 where tabid=19 and block=5", + "update field set block=50 where tabid=19 and block=2", + + "update field set block=51 where tabid=20 and block=1", + "update field set block=52 where tabid=20 and block=5", + "update field set block=53 where tabid=20 and block=2", + "update field set block=55 where tabid=20 and block=6", + "update field set block=56 where tabid=20 and block=3", + + "update field set block=57 where tabid=21 and block=1", + "update field set block=58 where tabid=21 and block=5", + "update field set block=59 where tabid=21 and block=2", + "update field set block=61 where tabid=21 and block=6", + "update field set block=62 where tabid=21 and block=3", + + "update field set block=63 where tabid=22 and block=1", + "update field set block=64 where tabid=22 and block=5", + "update field set block=65 where tabid=22 and block=2", + "update field set block=67 where tabid=22 and block=6", + "update field set block=68 where tabid=22 and block=3", + + + "update field set block=69 where tabid=23 and block=1", + "update field set block=70 where tabid=23 and block=5", + "update field set block=71 where tabid=23 and block=2", + "update field set block=73 where tabid=23 and block=6", + "update field set block=74 where tabid=23 and block=3", + ); +foreach($update_query_array1 as $query) +{ + Execute($query); +} + +$insert_query_array5 = Array( + "insert into blocks values (1,2,'LBL_OPPORTUNITY_INFORMATION',1,0,0,0,0,0)", + "insert into blocks values (2,2,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)", + "insert into blocks values (3,2,'LBL_DESCRIPTION_INFORMATION',3,0,0,0,0,0)", + "insert into blocks values (4,4,'LBL_CONTACT_INFORMATION',1,0,0,0,0,0)", + "insert into blocks values (5,4,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)", + "insert into blocks values (6,4,'LBL_CUSTOMER_PORTAL_INFORMATION',3,0,0,0,0,0)", + "insert into blocks values (7,4,'LBL_ADDRESS_INFORMATION',4,0,0,0,0,0)", + "insert into blocks values (8,4,'LBL_DESCRIPTION_INFORMATION',5,0,0,0,0,0)", + "insert into blocks values (9,6,'LBL_ACCOUNT_INFORMATION',1,0,0,0,0,0)", + "insert into blocks values (10,6,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)", + "insert into blocks values (11,6,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)", + "insert into blocks values (12,6,'LBL_DESCRIPTION_INFORMATION',4,0,0,0,0,0)", + "insert into blocks values (13,7,'LBL_LEAD_INFORMATION',1,0,0,0,0,0)", + "insert into blocks values (14,7,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)", + "insert into blocks values (15,7,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)", + "insert into blocks values (16,7,'LBL_DESCRIPTION_INFORMATION',4,0,0,0,0,0)", + "insert into blocks values (17,8,'LBL_NOTE_INFORMATION',1,0,0,0,0,0)", + "insert into blocks values (18,8,'',2,1,0,0,0,0)", + "insert into blocks values (19,9,'LBL_TASK_INFORMATION',1,0,0,0,0,0)", + "insert into blocks values (20,9,'',2,1,0,0,0,0)", + "insert into blocks values (21,10,'LBL_EMAIL_INFORMATION',1,0,0,0,0,0)", + "insert into blocks values (22,10,'',2,1,0,0,0,0)", + "insert into blocks values (23,10,'',3,1,0,0,0,0)", + "insert into blocks values (24,10,'',4,1,0,0,0,0)", + "insert into blocks values (25,13,'LBL_TICKET_INFORMATION',1,0,0,0,0,0)", + "insert into blocks values (26,13,'',2,1,0,0,0,0)", + "insert into blocks values (27,13,'LBL_CUSTOM_INFORMATION',3,0,0,0,0,0)", + "insert into blocks values (28,13,'LBL_DESCRIPTION_INFORMATION',4,0,0,0,0,0)", + "insert into blocks values (29,13,'LBL_TICKET_RESOLUTION',5,0,0,1,0,0)", + "insert into blocks values (30,13,'LBL_COMMENTS',6,0,0,1,0,0)", + "insert into blocks values (31,14,'LBL_PRODUCT_INFORMATION',1,0,0,0,0,0)", + "insert into blocks values (32,14,'LBL_PRICING_INFORMATION',2,0,0,0,0,0)", + "insert into blocks values (33,14,'LBL_STOCK_INFORMATION',3,0,0,0,0,0)", + "insert into blocks values (34,14,'LBL_CUSTOM_INFORMATION',4,0,0,0,0,0)", + "insert into blocks values (35,14,'LBL_IMAGE_INFORMATION',5,0,0,0,0,0)", + "insert into blocks values (36,14,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)", + "insert into blocks values (37,15,'LBL_FAQ_INFORMATION',1,0,0,0,0,0)", + "insert into blocks values (38,15,'',2,1,0,0,0,0)", + "insert into blocks values (39,15,'',3,1,0,0,0,0)", + "insert into blocks values (40,15,'LBL_COMMENT_INFORMATION',4,0,0,1,0,0)", + "insert into blocks values (41,16,'LBL_EVENT_INFORMATION',1,0,0,0,0,0)", + "insert into blocks values (42,16,'',2,1,0,0,0,0)", + "insert into blocks values (43,16,'',3,1,0,0,0,0)", + "insert into blocks values (44,18,'LBL_VENDOR_INFORMATION',1,0,0,0,0,0)", + "insert into blocks values (45,18,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)", + "insert into blocks values (46,18,'LBL_VENDOR_ADDRESS_INFORMATION',3,0,0,0,0,0)", + "insert into blocks values (47,18,'LBL_DESCRIPTION_INFORMATION',4,0,0,0,0,0)", + "insert into blocks values (48,19,'LBL_PRICEBOOK_INFORMATION',1,0,0,0,0,0)", + "insert into blocks values (49,19,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)", + "insert into blocks values (50,19,'LBL_DESCRIPTION_INFORMATION',3,0,0,0,0,0)", + "insert into blocks values (51,20,'LBL_QUOTE_INFORMATION',1,0,0,0,0,0)", + "insert into blocks values (52,20,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)", + "insert into blocks values (53,20,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)", + "insert into blocks values (54,20,'LBL_RELATED_PRODUCTS',4,0,0,0,0,0)", + "insert into blocks values (55,20,'LBL_TERMS_INFORMATION',5,0,0,0,0,0)", + "insert into blocks values (56,20,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)", + "insert into blocks values (57,21,'LBL_PO_INFORMATION',1,0,0,0,0,0)", + "insert into blocks values (58,21,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)", + "insert into blocks values (59,21,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)", + "insert into blocks values (60,21,'LBL_RELATED_PRODUCTS',4,0,0,0,0,0)", + "insert into blocks values (61,21,'LBL_TERMS_INFORMATION',5,0,0,0,0,0)", + "insert into blocks values (62,21,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)", + "insert into blocks values (63,22,'LBL_SO_INFORMATION',1,0,0,0,0,0)", + "insert into blocks values (64,22,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)", + "insert into blocks values (65,22,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)", + "insert into blocks values (66,22,'LBL_RELATED_PRODUCTS',4,0,0,0,0,0)", + "insert into blocks values (67,22,'LBL_TERMS_INFORMATION',5,0,0,0,0,0)", + "insert into blocks values (68,22,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)", + "insert into blocks values (69,23,'LBL_INVOICE_INFORMATION',1,0,0,0,0,0)", + "insert into blocks values (70,23,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)", + "insert into blocks values (71,23,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)", + "insert into blocks values (72,23,'LBL_RELATED_PRODUCTS',4,0,0,0,0,0)", + "insert into blocks values (73,23,'LBL_TERMS_INFORMATION',5,0,0,0,0,0)", + "insert into blocks values (74,23,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)" + ); +foreach($insert_query_array5 as $query) +{ + Execute($query); +} + +$update_query_array2 = Array( + "update tab set name='Vendors', tablabel='Vendors' where tabid=18", + "update tab set name='PriceBooks', tablabel='PriceBooks' where tabid=19", + "update tab set presence=0 where tabid in(18,19)", + "update relatedlists set label='PriceBooks' where tabid=14 and related_tabid=19" + ); +foreach($update_query_array2 as $query) +{ + Execute($query); +} + +$delete_query1 = "delete from actionmapping where actionname in ('SavePriceBook','SaveVendor','PriceBookEditView','VendorEditView','DeletePriceBook','DeleteVendor','PriceBookDetailView','VendorDetailView')"; +Execute($query); + +$insert_query_array6 = Array( + "insert into customview values(".$conn->getUniqueID('customview').",'All',1,0,'Leads')", + "insert into customview values(".$conn->getUniqueID('customview').",'All',1,0,'Accounts')", + "insert into customview values(".$conn->getUniqueID('customview').",'All',1,0,'Contacts')", + "insert into customview values(".$conn->getUniqueID('customview').",'All',1,0,'Potentials')", + "insert into customview values(".$conn->getUniqueID('customview').",'All',1,0,'HelpDesk')", + "insert into customview values(".$conn->getUniqueID('customview').",'All',1,0,'Quotes')", + "insert into customview values(".$conn->getUniqueID('customview').",'All',1,0,'Activities')", + "insert into customview values(".$conn->getUniqueID('customview').",'All',1,0,'Emails')", + "insert into customview values(".$conn->getUniqueID('customview').",'All',1,0,'Invoice')", + "insert into customview values(".$conn->getUniqueID('customview').",'All',1,0,'Notes')", + "insert into customview values(".$conn->getUniqueID('customview').",'All',1,0,'PriceBooks')", + "insert into customview values(".$conn->getUniqueID('customview').",'All',1,0,'Products')", + "insert into customview values(".$conn->getUniqueID('customview').",'All',1,0,'PurchaseOrder')", + + "insert into customview values(".$conn->getUniqueID('customview').",'All',1,0,'SalesOrder')", + "insert into customview values(".$conn->getUniqueID('customview').",'All',1,0,'Vendors')", + "insert into customview values(".$conn->getUniqueID('customview').",'All',1,0,'Faq')" + ); +foreach($insert_query_array6 as $query) +{ + Execute($query); +} + +$res=$conn->query("select cvid from customview where viewname='All' and entitytype='Leads'"); +$cvid = $conn->query_result($res,0,"cvid"); + +$insert_query_array7 = Array( + "insert into cvcolumnlist values ($cvid,0,'leaddetails:lastname:lastname:Leads_Last_Name:V')", + "insert into cvcolumnlist values ($cvid,1,'leaddetails:firstname:firstname:Leads_First_Name:V')", + "insert into cvcolumnlist values ($cvid,2,'leaddetails:company:company:Leads_Company:V')", + "insert into cvcolumnlist values ($cvid,3,'leadaddress:phone:phone:Leads_Phone:V')", + "insert into cvcolumnlist values ($cvid,4,'leadsubdetails:website:website:Leads_Website:V')", + "insert into cvcolumnlist values ($cvid,5,'leaddetails:email:email:Leads_Email:V')", + "insert into cvcolumnlist values ($cvid,6,'crmentity:smownerid:assigned_user_id:Leads_Assigned_To:V')" + ); +foreach($insert_query_array7 as $query) +{ + Execute($query); +} + +$res=$conn->query("select cvid from customview where viewname='All' and entitytype='Accounts'"); +$cvid = $conn->query_result($res,0,"cvid"); + +$insert_query_array8 = Array( + "insert into cvcolumnlist values ($cvid,0,'account:accountname:accountname:Accounts_Account_Name:V')", + "insert into cvcolumnlist values ($cvid,1,'accountbillads:city:city:Accounts_City:V')", + "insert into cvcolumnlist values ($cvid,2,'account:website:website:Accounts_Website:V')", + "insert into cvcolumnlist values ($cvid,3,'account:phone:phone:Accounts_Phone:V')", + "insert into cvcolumnlist values ($cvid,4,'crmentity:smownerid:assigned_user_id:Accounts_Assigned_To:V')" + ); +foreach($insert_query_array8 as $query) +{ + Execute($query); +} + +$res=$conn->query("select cvid from customview where viewname='All' and entitytype='Contacts'"); +$cvid = $conn->query_result($res,0,"cvid"); + +$insert_query_array9 = Array( + "insert into cvcolumnlist values ($cvid,0,'contactdetails:firstname:firstname:Contacts_First_Name:V')", + "insert into cvcolumnlist values ($cvid,1,'contactdetails:lastname:lastname:Contacts_Last_Name:V')", + "insert into cvcolumnlist values ($cvid,2,'contactdetails:title:title:Contacts_Title:V')", + "insert into cvcolumnlist values ($cvid,3,'account:accountname:accountname:Contacts_Account_Name:V')", + "insert into cvcolumnlist values ($cvid,4,'contactdetails:email:email:Contacts_Email:V')", + "insert into cvcolumnlist values ($cvid,5,'contactdetails:phone:phone:Contacts_Phone_Name:V')", + "insert into cvcolumnlist values ($cvid,6,'crmentity:smownerid:assigned_user_id:Contacts_Assigned_To:V')" + ); +foreach($insert_query_array9 as $query) +{ + Execute($query); +} + +$res=$conn->query("select cvid from customview where viewname='All' and entitytype='Potentials'"); +$cvid = $conn->query_result($res,0,"cvid"); + +$insert_query_array10 = Array( + "insert into cvcolumnlist values ($cvid,0,'potential:potentialname:potentialname:Potentials_Potential_Name:V')", + "insert into cvcolumnlist values ($cvid,1,'potential:accountid:account_id:Potentials_Account_Name:V')", + "insert into cvcolumnlist values ($cvid,2,'potential:amount:amount:Potentials_Amount:N')", + "insert into cvcolumnlist values ($cvid,3,'potential:closingdate:closingdate:Potentials_Expected_Close_Date:D')", + "insert into cvcolumnlist values ($cvid,4,'crmentity:smownerid:assigned_user_id:Potentials_Assigned_To:V')" + ); +foreach($insert_query_array10 as $query) +{ + Execute($query); +} + +$res=$conn->query("select cvid from customview where viewname='All' and entitytype='HelpDesk'"); +$cvid = $conn->query_result($res,0,"cvid"); + +$insert_query_array11 = Array( + "insert into cvcolumnlist values ($cvid,0,'crmentity:crmid::HelpDesk_Ticket_ID:I')", + "insert into cvcolumnlist values ($cvid,1,'troubletickets:title:ticket_title:HelpDesk_Title:V')", + "insert into cvcolumnlist values ($cvid,2,'troubletickets:parent_id:parent_id:HelpDesk_Related_to:I')", + "insert into cvcolumnlist values ($cvid,3,'troubletickets:status:ticketstatus:HelpDesk_Status:V')", + "insert into cvcolumnlist values ($cvid,4,'troubletickets:priority:ticketpriorities:HelpDesk_Priority:V')", + "insert into cvcolumnlist values ($cvid,5,'crmentity:smownerid:assigned_user_id:HelpDesk_Assigned_To:V')" + ); +foreach($insert_query_array11 as $query) +{ + Execute($query); +} + + +$res=$conn->query("select cvid from customview where viewname='All' and entitytype='Quotes'"); +$cvid = $conn->query_result($res,0,"cvid"); + +$insert_query_array12 = Array( + "insert into cvcolumnlist values ($cvid,0,'crmentity:crmid::Quotes_Quote_ID:I')", + "insert into cvcolumnlist values ($cvid,1,'quotes:subject:subject:Quotes_Subject:V')", + "insert into cvcolumnlist values ($cvid,2,'quotes:quotestage:quotestage:Quotes_Quote_Stage:V')", + "insert into cvcolumnlist values ($cvid,3,'quotes:potentialid:potential_id:Quotes_Potential_Name:I')", + "insert into cvcolumnlist values ($cvid,4,'quotes:accountid:account_id:Quotes_Account_Name:I')", + "insert into cvcolumnlist values ($cvid,5,'quotes:total:hdnGrandTotal:Quotes_Total:I')", + "insert into cvcolumnlist values ($cvid,6,'crmentity:smownerid:assigned_user_id:Quotes_Assigned_To:V')" + ); +foreach($insert_query_array12 as $query) +{ + Execute($query); +} + +$res=$conn->query("select cvid from customview where viewname='All' and entitytype='Activities'"); +$cvid = $conn->query_result($res,0,"cvid"); + +$insert_query_array13 = Array( + "insert into cvcolumnlist values ($cvid,0,'activity:status:status:Activities_Status:V')", + "insert into cvcolumnlist values ($cvid,1,'activity:activitytype:activitytype:Activities_Type:V')", + "insert into cvcolumnlist values ($cvid,2,'activity:subject:subject:Activities_Subject:V')", + "insert into cvcolumnlist values ($cvid,3,'contactdetails:lastname:lastname:Activities_Contact_Name:V')", + "insert into cvcolumnlist values ($cvid,4,'seactivityrel:activityid:activityid:Activities_Related_To:V')", + "insert into cvcolumnlist values ($cvid,5,'activity:date_start:date_start:Activities_Start_Date:D')", + "insert into cvcolumnlist values ($cvid,6,'activity:due_date:due_date:Activities_End_Date:D')", + "insert into cvcolumnlist values ($cvid,7,'crmentity:smownerid:assigned_user_id:Activities_Assigned_To:V')" + ); +foreach($insert_query_array13 as $query) +{ + Execute($query); +} + + +$res=$conn->query("select cvid from customview where viewname='All' and entitytype='Emails'"); +$cvid = $conn->query_result($res,0,"cvid"); + +$insert_query_array14 = Array( + "insert into cvcolumnlist values ($cvid,0,'activity:subject:subject:Emails_Subject:V')", + "insert into cvcolumnlist values ($cvid,1,'seactivityrel:activityid:activityid:Emails_Related_To:I')", + "insert into cvcolumnlist values ($cvid,2,'activity:date_start:date_start:Emails_Date_Sent:D')", + "insert into cvcolumnlist values ($cvid,3,'crmentity:smownerid:assigned_user_id:Emails_Assigned_To:V')" + ); +foreach($insert_query_array14 as $query) +{ + Execute($query); +} + +$res=$conn->query("select cvid from customview where viewname='All' and entitytype='Invoice'"); +$cvid = $conn->query_result($res,0,"cvid"); + +$insert_query_array15 = Array( + "insert into cvcolumnlist values ($cvid,0,'crmentity:crmid::Invoice_Invoice_Id:I')", + "insert into cvcolumnlist values ($cvid,1,'invoice:subject:subject:Invoice_Subject:V')", + "insert into cvcolumnlist values ($cvid,2,'invoice:salesorderid:salesorder_id:Invoice_Sales_Order:V')", + "insert into cvcolumnlist values ($cvid,3,'invoice:invoicestatus:invoicestatus:Invoice_Status:V')", + "insert into cvcolumnlist values ($cvid,4,'invoice:total:hdnGrandTotal:Invoice_Total:I')", + "insert into cvcolumnlist values ($cvid,5,'crmentity:smownerid:assigned_user_id:Invoice_Assigned_To:V')" + ); +foreach($insert_query_array15 as $query) +{ + Execute($query); +} + + +$res=$conn->query("select cvid from customview where viewname='All' and entitytype='Notes'"); +$cvid = $conn->query_result($res,0,"cvid"); + +$insert_query_array16 = Array( + "insert into cvcolumnlist values ($cvid,0,'notes:title:title:Notes_Title:V')", + "insert into cvcolumnlist values ($cvid,1,'notes:contact_id:contact_id:Notes_Contact_Name:I')", + "insert into cvcolumnlist values ($cvid,2,'senotesrel:crmid:crmid:Notes_Related_To:I')", + "insert into cvcolumnlist values ($cvid,3,'notes:filename:filename:Notes_File:V')", + "insert into cvcolumnlist values ($cvid,4,'crmentity:modifiedtime:modifiedtime:Notes_Modified_Time:V')" + ); +foreach($insert_query_array16 as $query) +{ + Execute($query); +} + +$res=$conn->query("select cvid from customview where viewname='All' and entitytype='PriceBooks'"); +$cvid = $conn->query_result($res,0,"cvid"); + +$insert_query_array17 = Array( + "insert into cvcolumnlist values ($cvid,1,'pricebook:bookname:bookname:PriceBooks_Price_Book_Name:V')", + "insert into cvcolumnlist values ($cvid,2,'pricebook:active:active:PriceBooks_Active:V')" + ); +foreach($insert_query_array17 as $query) +{ + Execute($query); +} + + +$res=$conn->query("select cvid from customview where viewname='All' and entitytype='Products'"); +$cvid = $conn->query_result($res,0,"cvid"); + +$insert_query_array18 = Array( + "insert into cvcolumnlist values ($cvid,0,'products:productname:productname:Products_Product_Name:V')", + "insert into cvcolumnlist values ($cvid,1,'products:productcode:productcode:Products_Product_Code:V')", + "insert into cvcolumnlist values ($cvid,2,'products:commissionrate:commissionrate:Products_Commission_Rate:V')", + "insert into cvcolumnlist values ($cvid,3,'products:qty_per_unit:qty_per_unit:Products_Qty/Unit:V')", + "insert into cvcolumnlist values ($cvid,4,'products:unit_price:unit_price:Products_Unit_Price:V')" + ); +foreach($insert_query_array18 as $query) +{ + Execute($query); +} + +$res=$conn->query("select cvid from customview where viewname='All' and entitytype='PurchaseOrder'"); +$cvid = $conn->query_result($res,0,"cvid"); + +$insert_query_array19 = Array( + "insert into cvcolumnlist values($cvid,0,'crmentity:crmid::PurchaseOrder_Order_Id:I')", + "insert into cvcolumnlist values($cvid,1,'purchaseorder:subject:subject:PurchaseOrder_Subject:V')", + "insert into cvcolumnlist values($cvid,2,'purchaseorder:vendorid:vendor_id:PurchaseOrder_Vendor_Name:I')", + "insert into cvcolumnlist values($cvid,3,'purchaseorder:tracking_no:tracking_no:PurchaseOrder_Tracking_Number:V')", + "insert into cvcolumnlist values($cvid,4,'crmentity:smownerid:assigned_user_id:PurchaseOrder_Assigned_To:V')" + ); +foreach($insert_query_array19 as $query) +{ + Execute($query); +} + +$res=$conn->query("select cvid from customview where viewname='All' and entitytype='SalesOrder'"); +$cvid = $conn->query_result($res,0,"cvid"); + +$insert_query_array20 = Array( + "insert into cvcolumnlist values ($cvid,0,'crmentity:crmid::SalesOrder_Order_Id:I')", + "insert into cvcolumnlist values ($cvid,1,'salesorder:subject:subject:SalesOrder_Subject:V')", + "insert into cvcolumnlist values ($cvid,2,'account:accountid:account_id:SalesOrder_Account_Name:V')", + "insert into cvcolumnlist values ($cvid,3,'quotes:quoteid:quote_id:SalesOrder_Quote_Name:I')", + "insert into cvcolumnlist values ($cvid,4,'salesorder:total:hdnGrandTotal:SalesOrder_Total:V')", + "insert into cvcolumnlist values ($cvid,5,'crmentity:smownerid:assigned_user_id:SalesOrder_Assigned_To:V')" + ); +foreach($insert_query_array20 as $query) +{ + Execute($query); +} + +$res=$conn->query("select cvid from customview where viewname='All' and entitytype='Vendors'"); +$cvid = $conn->query_result($res,0,"cvid"); + +$insert_query_array21 = Array( + "insert into cvcolumnlist values ($cvid,0,'vendor:vendorname:vendorname:Vendors_Vendor_Name:V')", + "insert into cvcolumnlist values ($cvid,1,'vendor:phone:phone:Vendors_Phone:V')", + "insert into cvcolumnlist values ($cvid,2,'vendor:email:email:Vendors_Email:V')", + "insert into cvcolumnlist values ($cvid,3,'vendor:category:category:Vendors_Category:V')" + ); +foreach($insert_query_array21 as $query) +{ + Execute($query); +} + +$res=$conn->query("select cvid from customview where viewname='All' and entitytype='Faq'"); +$cvid = $conn->query_result($res,0,"cvid"); + +$insert_query_array22 = Array( + "insert into cvcolumnlist values ($cvid,0,'faq:id::Faq_FAQ_Id:I')", + "insert into cvcolumnlist values ($cvid,1,'faq:question:question:Faq_Question:V')", + "insert into cvcolumnlist values ($cvid,2,'faq:category:faqcategories:Faq_Category:V')", + "insert into cvcolumnlist values ($cvid,3,'faq:product_id:product_id:Faq_Product_Name:I')", + "insert into cvcolumnlist values ($cvid,4,'crmentity:createdtime:createdtime:Faq_Created_Time:D')", + "insert into cvcolumnlist values ($cvid,5,'crmentity:modifiedtime:modifiedtime:Faq_Modified_Time:D')" + ); +foreach($insert_query_array22 as $query) +{ + Execute($query); +} + + +$update_query_array3 = Array( + "update field set uitype=53 where tabid=2 and columnname='smownerid'", + "update field set uitype=53 where tabid=4 and columnname='smownerid'", + "update field set uitype=53 where tabid=20 and columnname='smownerid'", + "update field set uitype=53 where tabid=22 and columnname='smownerid'", + "update field set uitype=53 where tabid=23 and columnname='smownerid'" + ); +foreach($update_query_array3 as $query) +{ + Execute($query); +} + +$create_query6 = "CREATE TABLE accountgrouprelation ( accountid int(19) NOT NULL default '0', groupname varchar(100) default NULL, PRIMARY KEY (`accountid`))"; +Execute($create_query6); + +$alter_query_array8 = Array( + "alter table accountgrouprelation ADD CONSTRAINT fk_accountgrouprelation FOREIGN KEY (accountid) REFERENCES account(accountid) ON DELETE CASCADE", + "alter table accountgrouprelation ADD CONSTRAINT fk_accountgrouprelation2 FOREIGN KEY (groupname) REFERENCES groups(name) ON DELETE CASCADE" + ); +foreach($alter_query_array8 as $query) +{ + Execute($query); +} + +$create_query7 = "CREATE TABLE contactgrouprelation ( contactid int(19) NOT NULL default '0', groupname varchar(100) default NULL, PRIMARY KEY (`contactid`))"; +Execute($create_query7); + +$alter_query_array9 = Array( + "alter table contactgrouprelation ADD CONSTRAINT fk_contactgrouprelation FOREIGN KEY (contactid) REFERENCES contactdetails(contactid) ON DELETE CASCADE", + "alter table contactgrouprelation ADD CONSTRAINT fk_contactgrouprelation2 FOREIGN KEY (groupname) REFERENCES groups(name) ON DELETE CASCADE" + ); +foreach($alter_query_array9 as $query) +{ + Execute($query); +} + + +$create_query10 = "CREATE TABLE potentialgrouprelation ( potentialid int(19) NOT NULL default '0', groupname varchar(100) default NULL, PRIMARY KEY (`potentialid`))"; +Execute($create_query10); + +$alter_query_array10 = Array( + "alter table potentialgrouprelation ADD CONSTRAINT fk_potentialgrouprelation FOREIGN KEY (potentialid) REFERENCES potential(potentialid) ON DELETE CASCADE", + "alter table potentialgrouprelation ADD CONSTRAINT fk_potentialgrouprelation2 FOREIGN KEY (groupname) REFERENCES groups(name) ON DELETE CASCADE" + ); +foreach($alter_query_array10 as $query) +{ + Execute($query); +} + +$create_query11 = "CREATE TABLE quotegrouprelation ( quoteid int(19) NOT NULL default '0', groupname varchar(100) default NULL, PRIMARY KEY (`quoteid`) )"; +Execute($create_query11); + +$alter_query_array11 = Array( + "alter table quotegrouprelation ADD CONSTRAINT fk_quotegrouprelation FOREIGN KEY (quoteid) REFERENCES quotes(quoteid) ON DELETE CASCADE", + "alter table quotegrouprelation ADD CONSTRAINT fk_quotegrouprelation2 FOREIGN KEY (groupname) REFERENCES groups(name) ON DELETE CASCADE" + ); +foreach($alter_query_array11 as $query) +{ + Execute($query); +} + +$create_query12 = "CREATE TABLE sogrouprelation ( salesorderid int(19) NOT NULL default '0', groupname varchar(100) default NULL, PRIMARY KEY (`salesorderid`) )"; +Execute($create_query12); + +$alter_query_array12 = Array( + "alter table sogrouprelation ADD CONSTRAINT fk_sogrouprelation FOREIGN KEY (salesorderid) REFERENCES salesorder(salesorderid) ON DELETE CASCADE", + "alter table sogrouprelation ADD CONSTRAINT fk_sogrouprelation2 FOREIGN KEY (groupname) REFERENCES groups(name) ON DELETE CASCADE" + ); +foreach($alter_query_array12 as $query) +{ + Execute($query); +} + +$create_query13 = "CREATE TABLE invoicegrouprelation ( invoiceid int(19) NOT NULL default '0', groupname varchar(100) default NULL, PRIMARY KEY (`invoiceid`))"; +Execute($create_query13); + +$alter_query_array13 = Array( + "alter table invoicegrouprelation ADD CONSTRAINT fk_invoicegrouprelation FOREIGN KEY (invoiceid) REFERENCES invoice(invoiceid) ON DELETE CASCADE", + "alter table invoicegrouprelation ADD CONSTRAINT fk_invoicegrouprelation2 FOREIGN KEY (groupname) REFERENCES groups(name) ON DELETE CASCADE" + ); +foreach($alter_query_array13 as $query) +{ + Execute($query); +} + +$create_query14 = "CREATE TABLE pogrouprelation ( purchaseorderid int(19) NOT NULL default '0', groupname varchar(100) default NULL, PRIMARY KEY (`purchaseorderid`))"; +Execute($create_query14); + +$alter_query_array14 = Array( + "alter table pogrouprelation ADD CONSTRAINT fk_pogrouprelation FOREIGN KEY (purchaseorderid) REFERENCES purchaseorder(purchaseorderid) ON DELETE CASCADE", + "alter table pogrouprelation ADD CONSTRAINT fk_productgrouprelation2 FOREIGN KEY (groupname) REFERENCES groups(name) ON DELETE CASCADE" + ); +foreach($alter_query_array14 as $query) +{ + Execute($query); +} + +$alter_query1 = "ALTER TABLE users ADD column lead_view VARCHAR(25) DEFAULT 'Today' AFTER homeorder"; +Execute($alter_query1); + +$update_query1 = "update users set homeorder = 'ALVT,PLVT,QLTQ,CVLVT,HLT,OLV,GRT,OLTSO,ILTI,MNL'"; +Execute($update_query1); + +$alter_query2 = "ALTER TABLE products change column imagename imagename text"; +Execute($alter_query2); + +$alter_query3 = "alter table systems modify server varchar(50), modify server_username varchar(50), modify server_password varchar(50), add column smtp_auth char(5)"; +Execute($alter_query3); + +$alter_query_array15 = Array( + "alter table users add column imagename varchar(250)", + "alter table users add column tagcloud varchar(250)" + ); +foreach($alter_query_array15 as $query) +{ + Execute($query); +} + +$alter_query_array16 = Array( + "alter table systems change column server server varchar(80) default NULL", + "alter table systems change column server_username server_username varchar(80) default NULL" + ); +foreach($alter_query_array16 as $query) +{ + Execute($query); +} + + +$create_query15 = "create table portal(portalid int(19), portalname varchar(255) NOT NULL, portalurl varchar(255) NOT NULL,sequence int(3) NOT NULL, PRIMARY KEY (portalid))"; +Execute($create_query15); + +$alter_query_array = Array( + "alter table attachments drop column attachmentsize", + "alter table attachments drop column attachmentcontents" + ); +foreach($alter_query_array as $query) +{ + Execute($query); +} + +$update_query2 = "UPDATE field SET fieldlabel = 'Reference' WHERE tabid = 4 and tablename = 'contactdetails'"; +Execute($update_query2); + +$alter_query = "ALTER TABLE field ADD column info_type varchar(20) default NULL after quickcreatesequence"; +Execute($alter_query); + +$update_query_array4 = Array( + "UPDATE field SET info_type = 'BAS'", + + "UPDATE field SET info_type = 'ADV' WHERE tabid = 7 and fieldlabel = 'Website'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 7 and fieldlabel = 'Industry'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 7 and fieldlabel = 'Annual Revenue'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 7 and fieldlabel = 'No Of Employees'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 7 and fieldlabel = 'Yahoo Id'", + + "UPDATE field SET info_type = 'ADV' WHERE tabid = 6 and fieldlabel = 'Ticker Symbol'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 6 and fieldlabel = 'Other Phone'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 6 and fieldlabel = 'Member Of'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 6 and fieldlabel = 'Employees'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 6 and fieldlabel = 'Other Email'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 6 and fieldlabel = 'Ownership'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 6 and fieldlabel = 'Rating'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 6 and fieldlabel = 'industry'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 6 and fieldlabel = 'SIC Code'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 6 and fieldlabel = 'Type'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 6 and fieldlabel = 'Annual Revenue'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 6 and fieldlabel = 'Email Opt Out'", + + "UPDATE field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Home Phone'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Department'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Birthdate'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Email'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Reports To'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Assistant'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Yahoo Id'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Assistant Phone'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Do Not Call'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Email Opt Out'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Reference'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Portal User'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Support Start Date'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Support End Date'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Contact Image'", + + "UPDATE field SET info_type = 'ADV' WHERE tabid = 14 and fieldlabel = 'Usage Unit'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 14 and fieldlabel = 'Qty/Unit'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 14 and fieldlabel = 'Qty In Stock'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 14 and fieldlabel = 'Reorder Level'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 14 and fieldlabel = 'Handler'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 14 and fieldlabel = 'Qty In Demand'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 14 and fieldlabel = 'Product Image'" + ); +foreach($update_query_array4 as $query) +{ + Execute($query); +} + + +$create_query16 = "CREATE TABLE `chat_msg` ( `id` bigint(20) NOT NULL auto_increment, `chat_from` bigint(20) NOT NULL default '0', `chat_to` bigint(20) NOT NULL default '0', `born` timestamp NULL default '0000-00-00 00:00:00', `msg` varchar(255) NOT NULL, PRIMARY KEY (`id`), KEY `chat_to` (`chat_to`), KEY `chat_from` (`chat_from`), KEY `born` (`born`)) ENGINE=InnoDB"; +Execute($create_query16); +$create_query17 = "CREATE TABLE `chat_pchat` ( `id` bigint(20) NOT NULL auto_increment, `msg` bigint(20) NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `msg` (`msg`)) ENGINE=InnoDB"; +Execute($create_query17); + +$create_query18 = "CREATE TABLE `chat_pvchat` ( `id` bigint(20) NOT NULL auto_increment, `msg` bigint(20) NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `msg` (`msg`)) ENGINE=InnoDB"; +Execute($create_query18); + +$create_query19 = "CREATE TABLE `chat_users` ( `id` bigint(20) NOT NULL auto_increment, `nick` varchar(50) NOT NULL, `session` varchar(50) NOT NULL, `ip` varchar(20) NOT NULL default '000.000.000.000', `ping` timestamp NULL default '0000-00-00 00:00:00', PRIMARY KEY (`id`), UNIQUE KEY `session` (`session`), UNIQUE KEY `nick` (`nick`), KEY `ping` (`ping`)) ENGINE=InnoDB"; +Execute($create_query19); + +$alter_query_array17 = Array( + "ALTER TABLE `chat_msg` ADD CONSTRAINT `chat_msg_ibfk_1` FOREIGN KEY (`chat_from`) REFERENCES `chat_users` (`id`) ON DELETE CASCADE", + + "ALTER TABLE `chat_pchat` ADD CONSTRAINT `chat_pchat_ibfk_1` FOREIGN KEY (`msg`) REFERENCES `chat_msg` (`id`) ON DELETE CASCADE", + + "ALTER TABLE `chat_pvchat` ADD CONSTRAINT `chat_pvchat_ibfk_1` FOREIGN KEY (`msg`) REFERENCES `chat_msg` (`id`) ON DELETE CASCADE" + ); +foreach($alter_query_array17 as $query) +{ + Execute($query); +} + +$create_query20 = "CREATE TABLE freetags ( id int(19) NOT NULL, tag varchar(50) NOT NULL default '', raw_tag varchar(50) NOT NULL default '', PRIMARY KEY (id)) TYPE=MyISAM"; +Execute($create_query20); + +$create_query21 = "CREATE TABLE freetagged_objects ( tag_id int(19) NOT NULL default '0', tagger_id int(19) NOT NULL default '0', object_id int(19) NOT NULL default '0', tagged_on datetime NOT NULL default '0000-00-00 00:00:00', module varchar(50) NOT NULL default '', PRIMARY KEY (`tag_id`,`tagger_id`,`object_id`), KEY `tag_id_index` (`tag_id`), KEY `tagger_id_index` (`tagger_id`), KEY `object_id_index` (`object_id`) +) TYPE=MyISAM"; +Execute($create_query21); + +$alter_query4 = "alter table profile add column description text"; +Execute($alter_query4); + +$alter_query5 = "alter table contactdetails add column imagename varchar(250) after currency"; +Execute($alter_query5); + +$alter_query = "ALTER TABLE contactdetails ADD column reference varchar(3) default NULL after imagename"; +Execute($alter_query); + +$insert_query_array23 = Array( + "insert into blocks values(75,4,'LBL_IMAGE_INFORMATION',5,0,0,0,0,0)", + "insert into field values(4,".$conn->getUniqueID("field").",'imagename','contactdetails',1,'69','imagename','Contact Image',1,0,0,100,1,75,1,'V~O',1,null,'ADV')", + + "Insert into field values(9,".$conn->getUniqueID("field").",'visibility','activity',1,15,'visibility','Visibility',1,0,0,100,17,19,3,'V~O',1,null,'BAS')", + "Insert into field values(16,".$conn->getUniqueID("field").",'visibility','activity',1,15,'visibility','Visibility',1,0,0,100,19,41,1,'V~O',1,null,'BAS')" + ); +foreach($insert_query_array23 as $query) +{ + Execute($query); +} + +$alter_query6 = "alter table activity add column visibility varchar(50) NOT NULL after notime"; +Execute($alter_query6); + +$create_query22 = "CREATE TABLE `visibility` ( `visibilityid` int(19) NOT NULL auto_increment, `visibility` varchar(200) NOT NULL default '', `sortorderid` int(19) NOT NULL default '0', `presence` int(1) NOT NULL default '1', PRIMARY KEY (`visibilityid`), UNIQUE KEY `Visibility_VLY` (`visibility`)) ENGINE=InnoDB"; +Execute($create_query22); + + +$create_query23 = "CREATE TABLE `sharedcalendar` ( `userid` int(19) NOT NULL default '0', `sharedid` int(19) NOT NULL default '0', PRIMARY KEY (`userid`,`sharedid`)) ENGINE=MyISAM"; +Execute($create_query23); + +$insert_query6 = "INSERT INTO tab VALUES(26,'Campaigns',0,23,'Campaigns',null,null,1)"; +Execute($insert_query6); +$insert_query7 = "INSERT INTO parenttabrel VALUES(2,26,1)"; +Execute($insert_query7); + +$insert_query8 = "insert into blocks values(76,26,'LBL_CAMPAIGN_INFORMATION',1,0,0,0,0,0)"; +Execute($insert_query8); +$insert_query9 = "insert into blocks values(77,26,'LBL_DESCRIPTION_INFORMATION',2,0,0,0,0,0)"; +Execute($insert_query9); + +$insert_query_array24 = Array( + "insert into field values(26,".$conn->getUniqueID("field").",'campaignname','campaign',1,'2','campaignname','Campaign Name',1,0,0,100,1,76,1,'V~M',0,1,'BAS')", + "insert into field values(26,".$conn->getUniqueID("field").",'campaigntype','campaign',1,15,'campaigntype','Campaign Type',1,0,0,100,2,76,1,'N~O',0,5,'BAS')", + "insert into field values(26,".$conn->getUniqueID("field").",'campaignstatus','campaign',1,15,'campaignstatus','Campaign Status',1,0,0,100,3,76,1,'N~O',0,5,'BAS')", + "insert into field values(26,".$conn->getUniqueID("field").",'closingdate','campaign',1,'23','closingdate','Expected Close Date',1,0,0,100,5,76,1,'D~M',0,3,'BAS')", + "insert into field values(26,".$conn->getUniqueID("field").",'expectedrevenue','campaign',1,'15','expectedrevenue','Expected Revenue',1,0,0,100,6,76,1,'V~O',1,null,'BAS')", + "insert into field values(26,".$conn->getUniqueID("field").",'budgetcost','campaign',1,'1','budgetcost','Budget Cost',1,0,0,100,7,76,1,'V~O',1,null,'BAS')", + "insert into field values(26,".$conn->getUniqueID("field").",'actualcost','campaign',1,'15','actualcost','Actual Cost',1,0,0,100,8,76,1,'V~O',1,null,'BAS')", + "insert into field values(26,".$conn->getUniqueID("field").",'expectedresponse','campaign',1,'16','expectedresponse','Expected Response',1,0,0,100,9,76,1,'V~O',0,4,'BAS')", + "insert into field values(26,".$conn->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,10,76,1,'V~M',1,null,'BAS')", + "insert into field values(26,".$conn->getUniqueID("field").",'numsent','campaign',1,'9','numsent','Num Sent',1,0,0,100,11,76,1,'N~O',1,null,'BAS')", + "insert into field values(26,".$conn->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,13,76,2,'T~O',1,null,'BAS')", + "insert into field values(26,".$conn->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,14,76,2,'T~O',1,null,'BAS')", + "insert into field values(26,".$conn->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,77,1,'V~O',1,null,'BAS')" + ); +foreach($insert_query_array24 as $query) +{ + Execute($query); +} + + +$insert_query_array25 = Array( + "insert into relatedlists values (".$conn->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Contacts").",'get_contacts',1,'Contacts',0)", + "insert into relatedlists values (".$conn->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Leads").",'get_leads',2,'Leads',0)" + ); +foreach($insert_query_array25 as $query) +{ + Execute($query); +} + + +$insert_query_array26 = Array( + "insert into field values (7,".$conn->getUniqueID("field").",'campaignid','leaddetails',1,'51','campaignid','Campaign Name',1,0,0,100,6,4,3,'I~O',1,null,'BAS')", + "insert into field values (4,".$conn->getUniqueID("field").",'campaignid','contactdetails',1,'51','campaignid','Campaign Name',1,0,0,100,6,4,3,'I~O',1,null,'BAS')" + ); +foreach($insert_query_array26 as $query) +{ + Execute($query); +} + + +$create_query24 = "CREATE TABLE `campaign` ( + `campaignname` varchar(255) NOT NULL default '', + `campaigntype` varchar(255) default NULL, + `campaignstatus` varchar(255) default NULL, + `expectedrevenue` decimal(11,3) default NULL, + `budgetcost` decimal(11,3) default NULL, + `actualcost` decimal(11,3) default NULL, + `expectedresponse` decimal(10,0) default NULL, + `numsent` decimal(11,0) default NULL, + `campaignid` int(7) default NULL, + `closingdate` date default NULL, + PRIMARY KEY (`campaignname`), + KEY `idx_campaignid` (`campaignid`), + KEY `idx_campaignname` (`campaignname`) +) ENGINE=InnoDB"; +Execute($create_query24); + +$create_query25 = "CREATE TABLE `campaigncontrel` ( + `campaignid` int(19) NOT NULL default '0', + `contactid` int(19) NOT NULL default '0', + PRIMARY KEY (`campaignid`), + KEY `CampaignContRel_IDX1` (`contactid`), + CONSTRAINT `fk_CampaignContRel2` FOREIGN KEY (`contactid`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE +) ENGINE=InnoDB"; +Execute($create_query25); + +$create_query26 = "CREATE TABLE `campaignleadrel` ( + `campaignid` int(19) NOT NULL default '0', + `leadid` int(19) NOT NULL default '0', + PRIMARY KEY (`campaignid`), + KEY `CampaignLeadRel_IDX1` (`leadid`), + CONSTRAINT `fk_CampaignLeadRel2` FOREIGN KEY (`leadid`) REFERENCES `leaddetails` (`leadid`) ON DELETE CASCADE +) ENGINE=InnoDB"; +Execute($create_query26); + +$alter_query_array18 = Array( + "alter table leaddetails add column campaignid int(19) default NULL after leadid", + "alter table contactdetails add column campaignid int(19) default NULL after accountid", + //"alter table notes drop PRIMARY KEY contact_id", + "alter table notes drop PRIMARY KEY , add primary key(notesid)", + "update field set uitype=99 where fieldname='update_log' and tabid=13" + ); +foreach($alter_query_array18 as $query) +{ + Execute($query); +} + + + +echo "

    Database Modifications for Indexing and some missded tables starts here.....
    "; +//Added queries which are for indexing and the missing tables - Mickie - on 06-04-2006 + +$query_array = Array( + +"ALTER TABLE `accountgrouprelation` DROP INDEX `fk_accountgrouprelation2`", +"ALTER TABLE `accountscf` DROP COLUMN `cf_356`", +"ALTER TABLE `activity` DROP INDEX `status`", +"ALTER TABLE `attachments` DROP INDEX `attachmentsid`", +"ALTER TABLE `carrier` DROP INDEX `carrier_UK0`", +"ALTER TABLE `chat_msg` DROP INDEX `chat_to`", +"ALTER TABLE `chat_msg` DROP INDEX `chat_from`", +"ALTER TABLE `chat_msg` DROP INDEX `born`", +"ALTER TABLE `chat_pchat` DROP INDEX `msg`", +"ALTER TABLE `chat_pvchat` DROP INDEX `msg`", +"ALTER TABLE `chat_users` DROP INDEX `session`", +"ALTER TABLE `chat_users` DROP INDEX `nick`", +"ALTER TABLE `chat_users` DROP INDEX `ping`", +"ALTER TABLE `contactgrouprelation` DROP INDEX `fk_contactgrouprelation2`", +"ALTER TABLE `customview` DROP INDEX `customview`", +"ALTER TABLE `def_org_field` DROP INDEX `tabid`", +"ALTER TABLE `field` DROP INDEX `tabid`", +"ALTER TABLE `freetagged_objects` DROP INDEX `tagger_id_index`", +"ALTER TABLE `freetagged_objects` DROP INDEX `object_id_index`", +"ALTER TABLE `groups` DROP INDEX `groupname`", +"ALTER TABLE `invoicegrouprelation` DROP INDEX `fk_invoicegrouprelation2`", +"ALTER TABLE `leadscf` DROP COLUMN `cf_354`", +"ALTER TABLE `leadscf` DROP COLUMN `cf_358`", +"ALTER TABLE `leadscf` DROP COLUMN `cf_360`", +"ALTER TABLE `pogrouprelation` DROP INDEX `fk_productgrouprelation2`", +"ALTER TABLE `potential` DROP INDEX `potentialid`", +"ALTER TABLE `potentialgrouprelation` DROP INDEX `fk_potentialgrouprelation2`", +"ALTER TABLE `profile2field` DROP INDEX `tabid`", +"ALTER TABLE `profile2tab` DROP INDEX `idx_profile2tab`", +"ALTER TABLE `quotegrouprelation` DROP INDEX `fk_quotegrouprelation2`", +"ALTER TABLE `reportmodules` DROP INDEX `reportmodules_IDX0`", +"ALTER TABLE `reportsortcol` DROP INDEX `reportsortcol_IDX0`", +"ALTER TABLE `reportsummary` DROP INDEX `reportsummary_IDX0`", +"ALTER TABLE `seattachmentsrel` DROP INDEX `attachmentsid`", +"ALTER TABLE `sogrouprelation` DROP INDEX `fk_sogrouprelation2`", +"ALTER TABLE `soproductrel` DROP COLUMN `shortdescription`", +"ALTER TABLE `tab` DROP INDEX `tabid`", +"ALTER TABLE `troubletickets` DROP INDEX `status`", +"ALTER TABLE `accountgrouprelation` TYPE=InnoDB, COMMENT='', ROW_FORMAT=COMPACT", +"ALTER TABLE `activity_reminder` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED", +"ALTER TABLE `activsubtype` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `contactgrouprelation` TYPE=InnoDB, COMMENT='', ROW_FORMAT=COMPACT", +//"DROP TABLE `crmentity_seq`", +"ALTER TABLE `currency_info` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `customerdetails` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +//"DROP TABLE `customfield_sequence_seq`", +"ALTER TABLE `customview_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED", +"ALTER TABLE `def_org_field` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED", +"ALTER TABLE `def_org_share` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED", +"ALTER TABLE `def_org_share_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED", +"ALTER TABLE `defaultcv` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `durationhrs` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `durationmins` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `emailtemplates` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `emailtemplates_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED", +"ALTER TABLE `faqcategories` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `faqstatus` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `field_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED", +"ALTER TABLE `files` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `freetagged_objects` TYPE=InnoDB, COMMENT='', ROW_FORMAT=COMPACT", +"ALTER TABLE `group2grouprel` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED", +"ALTER TABLE `group2role` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `group2rs` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +//"DROP TABLE `groups_seq`", +"ALTER TABLE `headers` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `import_maps` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `inventorynotification_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED", +"ALTER TABLE `invoicegrouprelation` TYPE=InnoDB, COMMENT='', ROW_FORMAT=COMPACT", +"ALTER TABLE `loginhistory` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `mail_accounts` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `notificationscheduler_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED", +"ALTER TABLE `ownernotify` TYPE=InnoDB, COMMENT='', ROW_FORMAT=COMPACT", +"ALTER TABLE `parenttabrel` TYPE=InnoDB, COMMENT='', ROW_FORMAT=COMPACT", +"ALTER TABLE `pogrouprelation` TYPE=InnoDB, COMMENT='', ROW_FORMAT=COMPACT", +"ALTER TABLE `portal` TYPE=InnoDB, COMMENT='', ROW_FORMAT=COMPACT", +"ALTER TABLE `portalinfo` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `potentialgrouprelation` TYPE=InnoDB, COMMENT='', ROW_FORMAT=COMPACT", +"ALTER TABLE `profile2field` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED", +"ALTER TABLE `profile2globalpermissions` TYPE=InnoDB, COMMENT='', ROW_FORMAT=COMPACT", +"ALTER TABLE `profile2standardpermissions` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED", +"ALTER TABLE `profile2tab` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED", +"ALTER TABLE `profile2utility` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED", +"ALTER TABLE `profile_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED", +"ALTER TABLE `quotegrouprelation` TYPE=InnoDB, COMMENT='', ROW_FORMAT=COMPACT", +"ALTER TABLE `rating` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `relatedlists` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `relatedlists_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED", +"ALTER TABLE `role2profile` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `role_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED", +"ALTER TABLE `rss` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `sales_stage` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `salutationtype` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `selectquery_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED", +"ALTER TABLE `sogrouprelation` TYPE=InnoDB, COMMENT='', ROW_FORMAT=COMPACT", +"ALTER TABLE `systems` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `taskpriority` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `taskstatus` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `ticketcategories` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `ticketpriorities` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `ticketseverities` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `ticketstatus` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `ticketstracktime` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED", +"ALTER TABLE `tracker` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `users2group` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED", +"ALTER TABLE `users_last_import` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `users_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED", +"ALTER TABLE `wordtemplates` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", + +"CREATE TABLE `actualcost` ( + `actualcostid` int(19) NOT NULL auto_increment, + `actualcost` varchar(200) NOT NULL, + `sortorderid` int(19) NOT NULL default '0', + `presence` int(1) NOT NULL default '1', + PRIMARY KEY (`actualcostid`), + UNIQUE KEY `CampaignActCst_UK01` (`actualcost`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"CREATE TABLE `campaignstatus` ( + `campaignstatusid` int(19) NOT NULL auto_increment, + `campaignstatus` varchar(200) NOT NULL, + `sortorderid` int(19) NOT NULL default '0', + `presence` int(1) NOT NULL default '1', + PRIMARY KEY (`campaignstatusid`), + KEY `Campaignstatus_UK01` (`campaignstatus`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"CREATE TABLE `campaigntype` ( + `campaigntypeid` int(19) NOT NULL auto_increment, + `campaigntype` varchar(200) NOT NULL, + `sortorderid` int(19) NOT NULL default '0', + `presence` int(1) NOT NULL default '1', + PRIMARY KEY (`campaigntypeid`), + UNIQUE KEY `Campaigntype_UK01` (`campaigntype`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"CREATE TABLE `currency_info_seq` ( + `id` int(11) NOT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1", + +"CREATE TABLE `datashare_grp2grp` ( + `shareid` int(19) NOT NULL, + `share_groupid` int(19) default NULL, + `to_groupid` int(19) default NULL, + `permission` int(19) default NULL, + PRIMARY KEY (`shareid`), + KEY `idx_datashare_grp2grp_share_groupid` (`share_groupid`), + KEY `idx_datashare_grp2grp_to_groupid` (`to_groupid`), + CONSTRAINT `fk_datashare_grp2grp2` FOREIGN KEY (`to_groupid`) REFERENCES `groups` (`groupid`) ON DELETE CASCADE, + CONSTRAINT `fk_datashare_grp2grp1` FOREIGN KEY (`share_groupid`) REFERENCES `groups` (`groupid`) ON DELETE CASCADE, + CONSTRAINT `fk_datashare_grp2grp789` FOREIGN KEY (`shareid`) REFERENCES `datashare_module_rel` (`shareid`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"CREATE TABLE `datashare_grp2role` ( + `shareid` int(19) NOT NULL, + `share_groupid` int(19) default NULL, + `to_roleid` varchar(255) default NULL, + `permission` int(19) default NULL, + PRIMARY KEY (`shareid`), + KEY `idx_datashare_grp2role_share_groupid` (`share_groupid`), + KEY `idx_datashare_grp2role_to_roleid` (`to_roleid`), + CONSTRAINT `fk_datashare_grp2role2` FOREIGN KEY (`to_roleid`) REFERENCES `role` (`roleid`) ON DELETE CASCADE, + CONSTRAINT `fk_datashare_grp2role1` FOREIGN KEY (`share_groupid`) REFERENCES `groups` (`groupid`) ON DELETE CASCADE, + CONSTRAINT `fk_datashare_grp2role345` FOREIGN KEY (`shareid`) REFERENCES `datashare_module_rel` (`shareid`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"CREATE TABLE `datashare_grp2rs` ( + `shareid` int(19) NOT NULL, + `share_groupid` int(19) default NULL, + `to_roleandsubid` varchar(255) default NULL, + `permission` int(19) default NULL, + PRIMARY KEY (`shareid`), + KEY `idx_datashare_grp2rs_share_groupid` (`share_groupid`), + KEY `idx_datashare_grp2rs_to_roleandsubid` (`to_roleandsubid`), + CONSTRAINT `fk_datashare_grp2rs3` FOREIGN KEY (`to_roleandsubid`) REFERENCES `role` (`roleid`) ON DELETE CASCADE, + CONSTRAINT `fk_datashare_grp2rs1` FOREIGN KEY (`share_groupid`) REFERENCES `groups` (`groupid`) ON DELETE CASCADE, + CONSTRAINT `fk_datashare_grp2rs36` FOREIGN KEY (`shareid`) REFERENCES `datashare_module_rel` (`shareid`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"CREATE TABLE `datashare_module_rel` ( + `shareid` int(19) NOT NULL, + `tabid` int(19) NOT NULL, + `relationtype` varchar(200) default NULL, + PRIMARY KEY (`shareid`), + KEY `idx_datashare_module_rel_tabid` (`tabid`), + CONSTRAINT `fk_datashare_module_rel456` FOREIGN KEY (`tabid`) REFERENCES `tab` (`tabid`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"CREATE TABLE `datashare_relatedmodule_permission` ( + `shareid` int(19) NOT NULL, + `datashare_relatedmodule_id` int(19) NOT NULL, + `permission` int(19) default NULL, + PRIMARY KEY (`shareid`,`datashare_relatedmodule_id`), + KEY `datashare_relatedmodule_permission_UK1` (`shareid`,`permission`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"CREATE TABLE `datashare_relatedmodules` ( + `datashare_relatedmodule_id` int(19) NOT NULL, + `tabid` int(19) default NULL, + `relatedto_tabid` int(19) default NULL, + PRIMARY KEY (`datashare_relatedmodule_id`), + KEY `idx_datashare_relatedmodules_tabid` (`tabid`), + KEY `idx_datashare_relatedmodules_relatedto_tabid` (`relatedto_tabid`), + CONSTRAINT `fk_datashare_relatedmodules1` FOREIGN KEY (`relatedto_tabid`) REFERENCES `tab` (`tabid`) ON DELETE CASCADE, + CONSTRAINT `fk_datashare_relatedmodules123` FOREIGN KEY (`tabid`) REFERENCES `tab` (`tabid`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"CREATE TABLE `datashare_relatedmodules_seq` ( + `id` int(11) NOT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1", + +"CREATE TABLE `datashare_role2group` ( + `shareid` int(19) NOT NULL, + `share_roleid` varchar(255) default NULL, + `to_groupid` int(19) default NULL, + `permission` int(19) default NULL, + PRIMARY KEY (`shareid`), + KEY `idx_datashare_role2group_share_roleid` (`share_roleid`), + KEY `idx_datashare_role2group_to_groupid` (`to_groupid`), + CONSTRAINT `fk_datashare_role2group3` FOREIGN KEY (`to_groupid`) REFERENCES `groups` (`groupid`) ON DELETE CASCADE, + CONSTRAINT `fk_datashare_role2group1` FOREIGN KEY (`share_roleid`) REFERENCES `role` (`roleid`) ON DELETE CASCADE, + CONSTRAINT `fk_datashare_role2group568` FOREIGN KEY (`shareid`) REFERENCES `datashare_module_rel` (`shareid`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"CREATE TABLE `datashare_role2role` ( + `shareid` int(19) NOT NULL, + `share_roleid` varchar(255) default NULL, + `to_roleid` varchar(255) default NULL, + `permission` int(19) default NULL, + PRIMARY KEY (`shareid`), + KEY `idx_datashare_role2role_share_roleid` (`share_roleid`), + KEY `idx_datashare_role2role_to_roleid` (`to_roleid`), + CONSTRAINT `fk_datashare_role2role3` FOREIGN KEY (`to_roleid`) REFERENCES `role` (`roleid`) ON DELETE CASCADE, + CONSTRAINT `fk_datashare_role2role1` FOREIGN KEY (`share_roleid`) REFERENCES `role` (`roleid`) ON DELETE CASCADE, + CONSTRAINT `fk_datashare_role2role345` FOREIGN KEY (`shareid`) REFERENCES `datashare_module_rel` (`shareid`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"CREATE TABLE `datashare_role2rs` ( + `shareid` int(19) NOT NULL, + `share_roleid` varchar(255) default NULL, + `to_roleandsubid` varchar(255) default NULL, + `permission` int(19) default NULL, + PRIMARY KEY (`shareid`), + KEY `idx_datashare_role2s_share_roleid` (`share_roleid`), + KEY `idx_datashare_role2s_to_roleandsubid` (`to_roleandsubid`), + CONSTRAINT `fk_datashare_role2rs3` FOREIGN KEY (`to_roleandsubid`) REFERENCES `role` (`roleid`) ON DELETE CASCADE, + CONSTRAINT `fk_datashare_role2rs1` FOREIGN KEY (`share_roleid`) REFERENCES `role` (`roleid`) ON DELETE CASCADE, + CONSTRAINT `fk_datashare_role2rs987` FOREIGN KEY (`shareid`) REFERENCES `datashare_module_rel` (`shareid`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"CREATE TABLE `datashare_rs2grp` ( + `shareid` int(19) NOT NULL, + `share_roleandsubid` varchar(255) default NULL, + `to_groupid` int(19) default NULL, + `permission` int(19) default NULL, + PRIMARY KEY (`shareid`), + KEY `idx_datashare_rs2grp_share_roleandsubid` (`share_roleandsubid`), + KEY `idx_datashare_rs2grp_to_groupid` (`to_groupid`), + CONSTRAINT `fk_datashare_rs2grp2` FOREIGN KEY (`to_groupid`) REFERENCES `groups` (`groupid`) ON DELETE CASCADE, + CONSTRAINT `fk_datashare_rs2grp1` FOREIGN KEY (`share_roleandsubid`) REFERENCES `role` (`roleid`) ON DELETE CASCADE, + CONSTRAINT `fk_datashare_rs2grpQ2` FOREIGN KEY (`shareid`) REFERENCES `datashare_module_rel` (`shareid`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"CREATE TABLE `datashare_rs2role` ( + `shareid` int(19) NOT NULL, + `share_roleandsubid` varchar(255) default NULL, + `to_roleid` varchar(255) default NULL, + `permission` int(19) default NULL, + PRIMARY KEY (`shareid`), + KEY `idx_datashare_rs2role_share_roleandsubid` (`share_roleandsubid`), + KEY `idx_datashare_rs2role_to_roleid` (`to_roleid`), + CONSTRAINT `fk_datashare_rs2role2` FOREIGN KEY (`to_roleid`) REFERENCES `role` (`roleid`) ON DELETE CASCADE, + CONSTRAINT `fk_datashare_rs2role1` FOREIGN KEY (`share_roleandsubid`) REFERENCES `role` (`roleid`) ON DELETE CASCADE, + CONSTRAINT `fk_datashare_rs2role122` FOREIGN KEY (`shareid`) REFERENCES `datashare_module_rel` (`shareid`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"CREATE TABLE `datashare_rs2rs` ( + `shareid` int(19) NOT NULL, + `share_roleandsubid` varchar(255) default NULL, + `to_roleandsubid` varchar(255) default NULL, + `permission` int(19) default NULL, + PRIMARY KEY (`shareid`), + KEY `idx_datashare_rs2rs_share_roleandsubid` (`share_roleandsubid`), + KEY `idx_datashare_rs2rs_to_roleandsubid` (`to_roleandsubid`), + CONSTRAINT `fk_datashare_rs2rs2` FOREIGN KEY (`to_roleandsubid`) REFERENCES `role` (`roleid`) ON DELETE CASCADE, + CONSTRAINT `fk_datashare_rs2rs1` FOREIGN KEY (`share_roleandsubid`) REFERENCES `role` (`roleid`) ON DELETE CASCADE, + CONSTRAINT `fk_datashare_rs2rs353` FOREIGN KEY (`shareid`) REFERENCES `datashare_module_rel` (`shareid`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"CREATE TABLE `expectedresponse` ( + `expectedresponseid` int(19) NOT NULL auto_increment, + `expectedresponse` varchar(200) NOT NULL, + `sortorderid` int(19) NOT NULL default '0', + `presence` int(1) NOT NULL default '1', + PRIMARY KEY (`expectedresponseid`), + UNIQUE KEY `CampaignExpRes_UK01` (`expectedresponse`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"CREATE TABLE `expectedrevenue` ( + `expectedrevenueid` int(19) NOT NULL auto_increment, + `expectedrevenue` varchar(200) NOT NULL, + `sortorderid` int(19) NOT NULL default '0', + `presence` int(1) NOT NULL default '1', + PRIMARY KEY (`expectedrevenueid`), + UNIQUE KEY `CampaignExpRev_UK01` (`expectedrevenue`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"CREATE TABLE `tmp_read_group_rel_sharing_per` ( + `userid` int(11) NOT NULL, + `tabid` int(11) NOT NULL, + `relatedtabid` int(11) NOT NULL, + `sharedgroupid` int(11) NOT NULL, + PRIMARY KEY (`userid`,`tabid`,`relatedtabid`,`sharedgroupid`), + KEY `tmp_read_group_rel_sharing_per_UK1` (`userid`,`sharedgroupid`,`tabid`), + KEY `fk_tmp_read_group_rel_sharing_per2` (`tabid`), + KEY `fk_tmp_read_group_rel_sharing_per4` (`relatedtabid`), + KEY `fk_tmp_read_group_rel_sharing_per3` (`sharedgroupid`), + CONSTRAINT `fk_tmp_read_group_rel_sharing_per3` FOREIGN KEY (`sharedgroupid`) REFERENCES `groups` (`groupid`) ON DELETE CASCADE, + CONSTRAINT `fk_tmp_read_group_rel_sharing_per1` FOREIGN KEY (`userid`) REFERENCES `users` (`id`) ON DELETE CASCADE, + CONSTRAINT `fk_tmp_read_group_rel_sharing_per2` FOREIGN KEY (`tabid`) REFERENCES `tab` (`tabid`) ON DELETE CASCADE, + CONSTRAINT `fk_tmp_read_group_rel_sharing_per4` FOREIGN KEY (`relatedtabid`) REFERENCES `tab` (`tabid`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"CREATE TABLE `tmp_read_group_sharing_per` ( + `userid` int(11) NOT NULL, + `tabid` int(11) NOT NULL, + `sharedgroupid` int(11) NOT NULL, + PRIMARY KEY (`userid`,`tabid`,`sharedgroupid`), + KEY `tmp_read_group_sharing_per_UK1` (`userid`,`sharedgroupid`), + KEY `fk_tmp_read_group_sharing_per2` (`tabid`), + KEY `fk_tmp_read_group_sharing_per3` (`sharedgroupid`), + CONSTRAINT `fk_tmp_read_group_sharing_per3` FOREIGN KEY (`sharedgroupid`) REFERENCES `groups` (`groupid`) ON DELETE CASCADE, + CONSTRAINT `fk_tmp_read_group_sharing_per1` FOREIGN KEY (`userid`) REFERENCES `users` (`id`) ON DELETE CASCADE, + CONSTRAINT `fk_tmp_read_group_sharing_per2` FOREIGN KEY (`tabid`) REFERENCES `tab` (`tabid`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"CREATE TABLE `tmp_read_user_rel_sharing_per` ( + `userid` int(11) NOT NULL, + `tabid` int(11) NOT NULL, + `relatedtabid` int(11) NOT NULL, + `shareduserid` int(11) NOT NULL, + PRIMARY KEY (`userid`,`tabid`,`relatedtabid`,`shareduserid`), + KEY `tmp_read_user_rel_sharing_per_UK1` (`userid`,`shareduserid`,`relatedtabid`), + KEY `fk_tmp_read_user_rel_sharing_per2` (`tabid`), + KEY `fk_tmp_read_user_rel_sharing_per4` (`relatedtabid`), + KEY `fk_tmp_read_user_rel_sharing_per3` (`shareduserid`), + CONSTRAINT `fk_tmp_read_user_rel_sharing_per3` FOREIGN KEY (`shareduserid`) REFERENCES `users` (`id`) ON DELETE CASCADE, + CONSTRAINT `fk_tmp_read_user_rel_sharing_per1` FOREIGN KEY (`userid`) REFERENCES `users` (`id`) ON DELETE CASCADE, + CONSTRAINT `fk_tmp_read_user_rel_sharing_per2` FOREIGN KEY (`tabid`) REFERENCES `tab` (`tabid`) ON DELETE CASCADE, + CONSTRAINT `fk_tmp_read_user_rel_sharing_per4` FOREIGN KEY (`relatedtabid`) REFERENCES `tab` (`tabid`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"CREATE TABLE `tmp_read_user_sharing_per` ( + `userid` int(11) NOT NULL, + `tabid` int(11) NOT NULL, + `shareduserid` int(11) NOT NULL, + PRIMARY KEY (`userid`,`tabid`,`shareduserid`), + KEY `tmp_read_user_sharing_per_UK1` (`userid`,`shareduserid`), + KEY `fk_tmp_read_user_sharing_per2` (`tabid`), + KEY `fk_tmp_read_user_sharing_per3` (`shareduserid`), + CONSTRAINT `fk_tmp_read_user_sharing_per3` FOREIGN KEY (`shareduserid`) REFERENCES `users` (`id`) ON DELETE CASCADE, + CONSTRAINT `fk_tmp_read_user_sharing_per1` FOREIGN KEY (`userid`) REFERENCES `users` (`id`) ON DELETE CASCADE, + CONSTRAINT `fk_tmp_read_user_sharing_per2` FOREIGN KEY (`tabid`) REFERENCES `tab` (`tabid`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"CREATE TABLE `tmp_write_group_rel_sharing_per` ( + `userid` int(11) NOT NULL, + `tabid` int(11) NOT NULL, + `relatedtabid` int(11) NOT NULL, + `sharedgroupid` int(11) NOT NULL, + PRIMARY KEY (`userid`,`tabid`,`relatedtabid`,`sharedgroupid`), + KEY `tmp_write_group_rel_sharing_per_UK1` (`userid`,`sharedgroupid`,`tabid`), + KEY `fk_tmp_write_group_rel_sharing_per2` (`tabid`), + KEY `fk_tmp_write_group_rel_sharing_per4` (`relatedtabid`), + KEY `fk_tmp_write_group_rel_sharing_per3` (`sharedgroupid`), + CONSTRAINT `fk_tmp_write_group_rel_sharing_per3` FOREIGN KEY (`sharedgroupid`) REFERENCES `groups` (`groupid`) ON DELETE CASCADE, + CONSTRAINT `fk_tmp_write_group_rel_sharing_per1` FOREIGN KEY (`userid`) REFERENCES `users` (`id`) ON DELETE CASCADE, + CONSTRAINT `fk_tmp_write_group_rel_sharing_per2` FOREIGN KEY (`tabid`) REFERENCES `tab` (`tabid`) ON DELETE CASCADE, + CONSTRAINT `fk_tmp_write_group_rel_sharing_per4` FOREIGN KEY (`relatedtabid`) REFERENCES `tab` (`tabid`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"CREATE TABLE `tmp_write_group_sharing_per` ( + `userid` int(11) NOT NULL, + `tabid` int(11) NOT NULL, + `sharedgroupid` int(11) NOT NULL, + PRIMARY KEY (`userid`,`tabid`,`sharedgroupid`), + KEY `tmp_write_group_sharing_per_UK1` (`userid`,`sharedgroupid`), + KEY `fk_tmp_write_group_sharing_per2` (`tabid`), + KEY `fk_tmp_write_group_sharing_per3` (`sharedgroupid`), + CONSTRAINT `fk_tmp_write_group_sharing_per3` FOREIGN KEY (`sharedgroupid`) REFERENCES `groups` (`groupid`) ON DELETE CASCADE, + CONSTRAINT `fk_tmp_write_group_sharing_per1` FOREIGN KEY (`userid`) REFERENCES `users` (`id`) ON DELETE CASCADE, + CONSTRAINT `fk_tmp_write_group_sharing_per2` FOREIGN KEY (`tabid`) REFERENCES `tab` (`tabid`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"CREATE TABLE `tmp_write_user_rel_sharing_per` ( + `userid` int(11) NOT NULL, + `tabid` int(11) NOT NULL, + `relatedtabid` int(11) NOT NULL, + `shareduserid` int(11) NOT NULL, + PRIMARY KEY (`userid`,`tabid`,`relatedtabid`,`shareduserid`), + KEY `tmp_write_user_rel_sharing_per_UK1` (`userid`,`shareduserid`,`tabid`), + KEY `fk_tmp_write_user_rel_sharing_per2` (`tabid`), + KEY `fk_tmp_write_user_rel_sharing_per4` (`relatedtabid`), + KEY `fk_tmp_write_user_rel_sharing_per3` (`shareduserid`), + CONSTRAINT `fk_tmp_write_user_rel_sharing_per3` FOREIGN KEY (`shareduserid`) REFERENCES `users` (`id`) ON DELETE CASCADE, + CONSTRAINT `fk_tmp_write_user_rel_sharing_per1` FOREIGN KEY (`userid`) REFERENCES `users` (`id`) ON DELETE CASCADE, + CONSTRAINT `fk_tmp_write_user_rel_sharing_per2` FOREIGN KEY (`tabid`) REFERENCES `tab` (`tabid`) ON DELETE CASCADE, + CONSTRAINT `fk_tmp_write_user_rel_sharing_per4` FOREIGN KEY (`relatedtabid`) REFERENCES `tab` (`tabid`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"CREATE TABLE `tmp_write_user_sharing_per` ( + `userid` int(11) NOT NULL, + `tabid` int(11) NOT NULL, + `shareduserid` int(11) NOT NULL, + PRIMARY KEY (`userid`,`tabid`,`shareduserid`), + KEY `tmp_write_user_sharing_per_UK1` (`userid`,`shareduserid`), + KEY `fk_tmp_write_user_sharing_per2` (`tabid`), + KEY `fk_tmp_write_user_sharing_per3` (`shareduserid`), + CONSTRAINT `fk_tmp_write_user_sharing_per3` FOREIGN KEY (`shareduserid`) REFERENCES `users` (`id`) ON DELETE CASCADE, + CONSTRAINT `fk_tmp_write_user_sharing_per1` FOREIGN KEY (`userid`) REFERENCES `users` (`id`) ON DELETE CASCADE, + CONSTRAINT `fk_tmp_write_user_sharing_per2` FOREIGN KEY (`tabid`) REFERENCES `tab` (`tabid`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"ALTER TABLE `account` MODIFY COLUMN `website` VARCHAR(100) COLLATE latin1_swedish_ci DEFAULT NULL", +"ALTER TABLE `account` MODIFY COLUMN `emailoptout` VARCHAR(3) COLLATE latin1_swedish_ci DEFAULT '0'", +"ALTER TABLE `accountgrouprelation` MODIFY COLUMN `accountid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `actionmapping` MODIFY COLUMN `actionid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `activity` MODIFY COLUMN `date_start` DATE NOT NULL UNIQUE", +"ALTER TABLE `activity` MODIFY COLUMN `sendnotification` VARCHAR(3) COLLATE latin1_swedish_ci NOT NULL DEFAULT '0'", +"ALTER TABLE `activity` MODIFY COLUMN `duration_hours` VARCHAR(2) COLLATE latin1_swedish_ci DEFAULT NULL", +"ALTER TABLE `activity` MODIFY COLUMN `duration_minutes` VARCHAR(2) COLLATE latin1_swedish_ci DEFAULT NULL", +"ALTER TABLE `activity` MODIFY COLUMN `notime` VARCHAR(3) COLLATE latin1_swedish_ci NOT NULL DEFAULT '0'", +"ALTER TABLE `activity_reminder` MODIFY COLUMN `activity_id` INTEGER(11) NOT NULL PRIMARY KEY", +"ALTER TABLE `activity_reminder` MODIFY COLUMN `reminder_time` INTEGER(11) NOT NULL", +"ALTER TABLE `activity_reminder` MODIFY COLUMN `reminder_sent` INTEGER(2) NOT NULL", +"ALTER TABLE `activity_reminder` MODIFY COLUMN `recurringid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `activitygrouprelation` MODIFY COLUMN `activityid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `announcement` MODIFY COLUMN `creatorid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `attachments` MODIFY COLUMN `attachmentsid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `blocks` MODIFY COLUMN `blockid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `blocks` MODIFY COLUMN `tabid` INTEGER(19) NOT NULL UNIQUE", +"ALTER TABLE `blocks` MODIFY COLUMN `sequence` INTEGER(10) DEFAULT NULL", +"ALTER TABLE `blocks` MODIFY COLUMN `show_title` INTEGER(2) DEFAULT NULL", +"ALTER TABLE `campaign` MODIFY COLUMN `campaignname` VARCHAR(255) COLLATE latin1_swedish_ci DEFAULT NULL UNIQUE", +"ALTER TABLE `campaign` MODIFY COLUMN `campaignstatus` VARCHAR(255) COLLATE latin1_swedish_ci DEFAULT NULL UNIQUE", +"ALTER TABLE `campaign` MODIFY COLUMN `expectedrevenue` VARCHAR(255) DEFAULT NULL", +"ALTER TABLE `campaign` MODIFY COLUMN `budgetcost` VARCHAR(255) DEFAULT NULL", +"ALTER TABLE `campaign` MODIFY COLUMN `actualcost` VARCHAR(255) DEFAULT NULL", +"ALTER TABLE `campaign` MODIFY COLUMN `expectedresponse` VARCHAR(255) DEFAULT NULL", +"ALTER TABLE `campaign` MODIFY COLUMN `campaignid` INTEGER(11) NOT NULL PRIMARY KEY", +"ALTER TABLE `chat_msg` MODIFY COLUMN `id` INTEGER(20) NOT NULL AUTO_INCREMENT PRIMARY KEY", +"ALTER TABLE `chat_msg` MODIFY COLUMN `chat_from` INTEGER(20) NOT NULL DEFAULT '0' UNIQUE", +"ALTER TABLE `chat_msg` MODIFY COLUMN `chat_to` INTEGER(20) NOT NULL DEFAULT '0' UNIQUE", +"ALTER TABLE `chat_msg` MODIFY COLUMN `born` DATETIME DEFAULT '0000-00-00 00:00:00' UNIQUE", +"ALTER TABLE `chat_pchat` MODIFY COLUMN `id` INTEGER(20) NOT NULL AUTO_INCREMENT PRIMARY KEY", +"ALTER TABLE `chat_pchat` MODIFY COLUMN `msg` INTEGER(20) DEFAULT '0'", +"ALTER TABLE `chat_pvchat` MODIFY COLUMN `id` INTEGER(20) NOT NULL AUTO_INCREMENT PRIMARY KEY", +"ALTER TABLE `chat_pvchat` MODIFY COLUMN `msg` INTEGER(20) DEFAULT '0'", +"ALTER TABLE `chat_users` MODIFY COLUMN `id` INTEGER(20) NOT NULL AUTO_INCREMENT PRIMARY KEY", +"ALTER TABLE `chat_users` MODIFY COLUMN `nick` VARCHAR(50) COLLATE latin1_swedish_ci NOT NULL UNIQUE", +"ALTER TABLE `chat_users` MODIFY COLUMN `session` VARCHAR(50) COLLATE latin1_swedish_ci NOT NULL UNIQUE", +"ALTER TABLE `chat_users` MODIFY COLUMN `ping` DATETIME DEFAULT '0000-00-00 00:00:00' UNIQUE", +"ALTER TABLE `competitor` MODIFY COLUMN `competitorid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `contactdetails` MODIFY COLUMN `donotcall` VARCHAR(3) COLLATE latin1_swedish_ci DEFAULT NULL", +"ALTER TABLE `contactdetails` MODIFY COLUMN `emailoptout` VARCHAR(3) COLLATE latin1_swedish_ci DEFAULT '0'", +"ALTER TABLE `contactdetails` MODIFY COLUMN `imagename` VARCHAR(150) COLLATE latin1_swedish_ci DEFAULT NULL", +"ALTER TABLE `contactdetails` MODIFY COLUMN `reference` VARCHAR(3) COLLATE latin1_swedish_ci DEFAULT NULL", +"ALTER TABLE `contactgrouprelation` MODIFY COLUMN `contactid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `convertleadmapping` MODIFY COLUMN `leadfid` INTEGER(19) NOT NULL", +"ALTER TABLE `crmentity` MODIFY COLUMN `crmid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `crmentity` MODIFY COLUMN `description` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `crmentity` MODIFY COLUMN `createdtime` DATETIME NOT NULL", +"ALTER TABLE `crmentity` MODIFY COLUMN `modifiedtime` DATETIME NOT NULL", +"ALTER TABLE `currency_info` MODIFY COLUMN `currency_name` VARCHAR(100) COLLATE latin1_swedish_ci DEFAULT NULL", +"ALTER TABLE `currency_info` ADD COLUMN `id` INTEGER(11) NOT NULL AUTO_INCREMENT PRIMARY KEY", +"ALTER TABLE `currency_info` ADD COLUMN `conversion_rate` DECIMAL(5,3) DEFAULT NULL", +"ALTER TABLE `currency_info` ADD COLUMN `currency_status` VARCHAR(25) COLLATE latin1_swedish_ci DEFAULT NULL", +"ALTER TABLE `currency_info` ADD COLUMN `defaultid` VARCHAR(10) COLLATE latin1_swedish_ci NOT NULL DEFAULT '0'", +"ALTER TABLE `customaction` MODIFY COLUMN `cvid` INTEGER(19) NOT NULL UNIQUE", +"ALTER TABLE `customaction` MODIFY COLUMN `content` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `customerdetails` MODIFY COLUMN `customerid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `customerdetails` MODIFY COLUMN `portal` VARCHAR(3) COLLATE latin1_swedish_ci DEFAULT NULL", +"ALTER TABLE `customview` MODIFY COLUMN `cvid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `customview_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL", +"ALTER TABLE `cvadvfilter` MODIFY COLUMN `cvid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `cvadvfilter` MODIFY COLUMN `columnindex` INTEGER(11) NOT NULL PRIMARY KEY", +"ALTER TABLE `cvcolumnlist` MODIFY COLUMN `cvid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `cvcolumnlist` MODIFY COLUMN `columnindex` INTEGER(11) NOT NULL PRIMARY KEY", +"ALTER TABLE `cvstdfilter` MODIFY COLUMN `cvid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `dealintimation` MODIFY COLUMN `dealprobability` DECIMAL(3,2) NOT NULL DEFAULT '0.00'", +"ALTER TABLE `def_org_field` MODIFY COLUMN `fieldid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `def_org_share` MODIFY COLUMN `tabid` INTEGER(11) NOT NULL", +"ALTER TABLE `def_org_share` MODIFY COLUMN `permission` INTEGER(19) DEFAULT NULL UNIQUE", +"ALTER TABLE `def_org_share_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL", +"ALTER TABLE `defaultcv` MODIFY COLUMN `tabid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `defaultcv` MODIFY COLUMN `query` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `emailtemplates` MODIFY COLUMN `description` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `emailtemplates` MODIFY COLUMN `body` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `emailtemplates_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL", +"ALTER TABLE `faq` MODIFY COLUMN `question` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `faq` MODIFY COLUMN `answer` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `faqcomments` MODIFY COLUMN `comments` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `faqcomments` MODIFY COLUMN `createdtime` DATETIME NOT NULL", +"ALTER TABLE `field` MODIFY COLUMN `tabid` INTEGER(19) NOT NULL UNIQUE", +"ALTER TABLE `field` MODIFY COLUMN `readonly` INTEGER(1) NOT NULL", +"ALTER TABLE `field` MODIFY COLUMN `selected` INTEGER(1) NOT NULL", +"ALTER TABLE `field` MODIFY COLUMN `block` INTEGER(19) DEFAULT NULL UNIQUE", +"ALTER TABLE `field` MODIFY COLUMN `displaytype` INTEGER(19) DEFAULT NULL UNIQUE", +"ALTER TABLE `field` MODIFY COLUMN `quickcreate` INTEGER(10) NOT NULL DEFAULT '1'", +"ALTER TABLE `field_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL", +"ALTER TABLE `freetagged_objects` MODIFY COLUMN `tag_id` INTEGER(20) NOT NULL DEFAULT '0' PRIMARY KEY", +"ALTER TABLE `freetagged_objects` MODIFY COLUMN `tagger_id` INTEGER(20) NOT NULL DEFAULT '0' PRIMARY KEY", +"ALTER TABLE `freetagged_objects` MODIFY COLUMN `object_id` INTEGER(20) NOT NULL DEFAULT '0' PRIMARY KEY", +"ALTER TABLE `freetags` MODIFY COLUMN `id` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `group2grouprel` MODIFY COLUMN `groupid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `group2grouprel` MODIFY COLUMN `containsgroupid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `group2role` MODIFY COLUMN `groupid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `group2rs` MODIFY COLUMN `groupid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `groups` MODIFY COLUMN `groupid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `groups` MODIFY COLUMN `description` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `import_maps` MODIFY COLUMN `is_published` VARCHAR(3) COLLATE latin1_swedish_ci NOT NULL DEFAULT 'no'", +"ALTER TABLE `inventory_tandc` MODIFY COLUMN `id` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `inventory_tandc` MODIFY COLUMN `tandc` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `inventory_tandc_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL", +"ALTER TABLE `inventorynotification` MODIFY COLUMN `notificationbody` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `inventorynotification_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL", +"ALTER TABLE `invoice` MODIFY COLUMN `salesorderid` INTEGER(19) DEFAULT NULL UNIQUE", +"ALTER TABLE `invoice` MODIFY COLUMN `terms_conditions` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `invoicegrouprelation` MODIFY COLUMN `invoiceid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `invoiceproductrel` MODIFY COLUMN `invoiceid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `invoiceproductrel` MODIFY COLUMN `productid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `lar` MODIFY COLUMN `createdon` DATE NOT NULL", +"ALTER TABLE `leaddetails` MODIFY COLUMN `leadid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `leaddetails` MODIFY COLUMN `comments` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `leadgrouprelation` MODIFY COLUMN `leadid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `mail_accounts` MODIFY COLUMN `account_id` INTEGER(11) NOT NULL PRIMARY KEY", +"ALTER TABLE `mail_accounts` MODIFY COLUMN `user_id` INTEGER(11) NOT NULL", +"ALTER TABLE `mail_accounts` ADD COLUMN `box_refresh` INTEGER(10) DEFAULT NULL", +"ALTER TABLE `mail_accounts` ADD COLUMN `mails_per_page` INTEGER(10) DEFAULT NULL", +"ALTER TABLE `mail_accounts` ADD COLUMN `ssltype` VARCHAR(50) COLLATE latin1_swedish_ci DEFAULT NULL", +"ALTER TABLE `mail_accounts` ADD COLUMN `sslmeth` VARCHAR(50) COLLATE latin1_swedish_ci DEFAULT NULL", +"ALTER TABLE `mail_accounts` ADD COLUMN `showbody` VARCHAR(10) COLLATE latin1_swedish_ci DEFAULT NULL", +"ALTER TABLE `notes` MODIFY COLUMN `contact_id` INTEGER(19) DEFAULT '0'", +"ALTER TABLE `notes` MODIFY COLUMN `notecontent` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `notificationscheduler` MODIFY COLUMN `notificationbody` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `notificationscheduler_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL", +"ALTER TABLE `opportunitystage` MODIFY COLUMN `probability` DECIMAL(3,2) DEFAULT '0.00'", +"ALTER TABLE `org_share_action2tab` MODIFY COLUMN `share_action_id` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `org_share_action2tab` MODIFY COLUMN `tabid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `org_share_action_mapping` MODIFY COLUMN `share_action_id` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `organizationdetails` MODIFY COLUMN `website` VARCHAR(100) COLLATE latin1_swedish_ci DEFAULT NULL", +"ALTER TABLE `organizationdetails` MODIFY COLUMN `logo` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `ownernotify` MODIFY COLUMN `crmid` INTEGER(19) DEFAULT NULL UNIQUE", +"ALTER TABLE `parenttab` MODIFY COLUMN `parenttabid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `parenttab` MODIFY COLUMN `sequence` INTEGER(10) NOT NULL", +"ALTER TABLE `parenttabrel` MODIFY COLUMN `parenttabid` INTEGER(3) NOT NULL", +"ALTER TABLE `parenttabrel` MODIFY COLUMN `tabid` INTEGER(3) NOT NULL UNIQUE", +"ALTER TABLE `parenttabrel` MODIFY COLUMN `sequence` INTEGER(3) NOT NULL", +"ALTER TABLE `pogrouprelation` MODIFY COLUMN `purchaseorderid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `poproductrel` MODIFY COLUMN `purchaseorderid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `poproductrel` MODIFY COLUMN `productid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `portal` MODIFY COLUMN `portalid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `portal` MODIFY COLUMN `portalname` VARCHAR(200) COLLATE latin1_swedish_ci NOT NULL UNIQUE", +"ALTER TABLE `portal` MODIFY COLUMN `sequence` INTEGER(3) NOT NULL", +"ALTER TABLE `portalinfo` MODIFY COLUMN `id` INTEGER(11) NOT NULL PRIMARY KEY", +"ALTER TABLE `portalinfo` MODIFY COLUMN `last_login_time` DATETIME NOT NULL", +"ALTER TABLE `portalinfo` MODIFY COLUMN `login_time` DATETIME NOT NULL", +"ALTER TABLE `portalinfo` MODIFY COLUMN `logout_time` DATETIME NOT NULL", +"ALTER TABLE `potcompetitorrel` MODIFY COLUMN `potentialid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `potcompetitorrel` MODIFY COLUMN `competitorid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `potential` MODIFY COLUMN `amount` DECIMAL(10,2) DEFAULT '0.00'", +"ALTER TABLE `potential` MODIFY COLUMN `description` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `potentialgrouprelation` MODIFY COLUMN `potentialid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `potstagehistory` MODIFY COLUMN `potentialid` INTEGER(19) NOT NULL UNIQUE", +"ALTER TABLE `potstagehistory` MODIFY COLUMN `probability` DECIMAL(3,2) DEFAULT NULL", +"ALTER TABLE `potstagehistory` MODIFY COLUMN `lastmodified` DATETIME NOT NULL", +"ALTER TABLE `pricebook` MODIFY COLUMN `description` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `pricebookproductrel` MODIFY COLUMN `pricebookid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `pricebookproductrel` MODIFY COLUMN `productid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `productcollaterals` MODIFY COLUMN `productid` INTEGER(11) NOT NULL PRIMARY KEY", +"ALTER TABLE `productcollaterals` MODIFY COLUMN `description` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `products` MODIFY COLUMN `productid` INTEGER(11) NOT NULL PRIMARY KEY", +"ALTER TABLE `products` MODIFY COLUMN `product_description` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `products` MODIFY COLUMN `commissionrate` DECIMAL(3,3) DEFAULT NULL", +"ALTER TABLE `profile2field` MODIFY COLUMN `profileid` INTEGER(11) NOT NULL PRIMARY KEY", +"ALTER TABLE `profile2field` MODIFY COLUMN `fieldid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `profile2globalpermissions` MODIFY COLUMN `profileid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `profile2globalpermissions` MODIFY COLUMN `globalactionid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `profile2standardpermissions` MODIFY COLUMN `profileid` INTEGER(11) NOT NULL PRIMARY KEY", +"ALTER TABLE `profile2standardpermissions` MODIFY COLUMN `tabid` INTEGER(10) NOT NULL PRIMARY KEY", +"ALTER TABLE `profile2standardpermissions` MODIFY COLUMN `Operation` INTEGER(10) NOT NULL PRIMARY KEY", +"ALTER TABLE `profile2utility` MODIFY COLUMN `profileid` INTEGER(11) NOT NULL PRIMARY KEY", +"ALTER TABLE `profile2utility` MODIFY COLUMN `tabid` INTEGER(11) NOT NULL PRIMARY KEY", +"ALTER TABLE `profile2utility` MODIFY COLUMN `activityid` INTEGER(11) NOT NULL PRIMARY KEY", +"ALTER TABLE `profile_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL", +"ALTER TABLE `purchaseorder` MODIFY COLUMN `quoteid` INTEGER(19) DEFAULT NULL UNIQUE", +"ALTER TABLE `purchaseorder` MODIFY COLUMN `vendorid` INTEGER(19) DEFAULT NULL UNIQUE", +"ALTER TABLE `purchaseorder` MODIFY COLUMN `contactid` INTEGER(19) DEFAULT NULL UNIQUE", +"ALTER TABLE `purchaseorder` MODIFY COLUMN `terms_conditions` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `quotegrouprelation` MODIFY COLUMN `quoteid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `quotes` MODIFY COLUMN `potentialid` INTEGER(19) DEFAULT NULL UNIQUE", +"ALTER TABLE `quotes` MODIFY COLUMN `quotestage` VARCHAR(200) COLLATE latin1_swedish_ci DEFAULT NULL", +"ALTER TABLE `quotes` MODIFY COLUMN `contactid` INTEGER(19) DEFAULT NULL UNIQUE", +"ALTER TABLE `quotes` MODIFY COLUMN `terms_conditions` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `quotesproductrel` MODIFY COLUMN `quoteid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `quotesproductrel` MODIFY COLUMN `productid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `recurringevents` MODIFY COLUMN `activityid` INTEGER(19) NOT NULL", +"ALTER TABLE `relatedlists` MODIFY COLUMN `relation_id` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `relatedlists_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL", +"ALTER TABLE `relcriteria` MODIFY COLUMN `queryid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `relcriteria` MODIFY COLUMN `columnindex` INTEGER(11) NOT NULL PRIMARY KEY", +"ALTER TABLE `report` MODIFY COLUMN `reportid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `report` MODIFY COLUMN `folderid` INTEGER(19) NOT NULL UNIQUE", +"ALTER TABLE `reportdatefilter` MODIFY COLUMN `datefilterid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `reportmodules` MODIFY COLUMN `reportmodulesid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `reportsortcol` MODIFY COLUMN `sortcolid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `reportsortcol` MODIFY COLUMN `reportid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `reportsummary` MODIFY COLUMN `reportsummaryid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `reportsummary` MODIFY COLUMN `summarytype` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `role2profile` MODIFY COLUMN `profileid` INTEGER(11) NOT NULL PRIMARY KEY", +"ALTER TABLE `role_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL", +"ALTER TABLE `rss` MODIFY COLUMN `rssid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `salesorder` MODIFY COLUMN `contactid` INTEGER(19) DEFAULT NULL UNIQUE", +"ALTER TABLE `salesorder` MODIFY COLUMN `vendorid` INTEGER(19) DEFAULT NULL UNIQUE", +"ALTER TABLE `salesorder` MODIFY COLUMN `terms_conditions` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `seactivityrel` MODIFY COLUMN `crmid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `seactivityrel` MODIFY COLUMN `activityid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `selectcolumn` MODIFY COLUMN `queryid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `selectquery` MODIFY COLUMN `queryid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `selectquery_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL", +"ALTER TABLE `sharedcalendar` MODIFY COLUMN `userid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `sharedcalendar` MODIFY COLUMN `sharedid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `sogrouprelation` MODIFY COLUMN `salesorderid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `soproductrel` MODIFY COLUMN `salesorderid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `soproductrel` MODIFY COLUMN `productid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `systems` MODIFY COLUMN `id` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `systems` MODIFY COLUMN `server` VARCHAR(30) COLLATE latin1_swedish_ci DEFAULT NULL", +"ALTER TABLE `systems` MODIFY COLUMN `server_username` VARCHAR(30) COLLATE latin1_swedish_ci DEFAULT NULL", +"ALTER TABLE `systems` MODIFY COLUMN `server_password` VARCHAR(30) COLLATE latin1_swedish_ci DEFAULT NULL", +"ALTER TABLE `ticketcomments` MODIFY COLUMN `comments` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `ticketcomments` MODIFY COLUMN `createdtime` DATETIME NOT NULL", +"ALTER TABLE `ticketgrouprelation` MODIFY COLUMN `ticketid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `troubletickets` MODIFY COLUMN `ticketid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `troubletickets` MODIFY COLUMN `description` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `troubletickets` MODIFY COLUMN `solution` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `troubletickets` MODIFY COLUMN `update_log` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `user2role` MODIFY COLUMN `userid` INTEGER(11) NOT NULL PRIMARY KEY", +"ALTER TABLE `user2role` MODIFY COLUMN `roleid` VARCHAR(255) COLLATE latin1_swedish_ci NOT NULL UNIQUE", +"ALTER TABLE `users` MODIFY COLUMN `is_admin` VARCHAR(3) COLLATE latin1_swedish_ci DEFAULT '0'", +"ALTER TABLE `users` MODIFY COLUMN `description` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `users` MODIFY COLUMN `user_preferences` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `users` MODIFY COLUMN `homeorder` VARCHAR(255) COLLATE latin1_swedish_ci DEFAULT 'ALVT,PLVT,QLTQ,CVLVT,HLT,OLV,GRT,OLTSO,ILTI,MNL'", +"ALTER TABLE `users` ADD COLUMN `currency_id` INTEGER(19) NOT NULL DEFAULT '1'", +"ALTER TABLE `users` ADD COLUMN `defhomeview` VARCHAR(100) COLLATE latin1_swedish_ci DEFAULT NULL", +"ALTER TABLE `users2group` MODIFY COLUMN `groupid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `users2group` MODIFY COLUMN `userid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `users_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL", +"ALTER TABLE `vendor` MODIFY COLUMN `street` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `vendor` MODIFY COLUMN `description` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `wordtemplates` MODIFY COLUMN `templateid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `wordtemplates` MODIFY COLUMN `description` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `accountgrouprelation` ADD KEY `accountgrouprelation_IDX1` (`groupname`)", +"ALTER TABLE `activity` ADD KEY `status1` (`status`, `eventstatus`)", +"ALTER TABLE `attachments` ADD KEY `attachmentsid1` (`attachmentsid`)", +"ALTER TABLE `blocks` ADD KEY `block_tabid` (`tabid`)", +"ALTER TABLE `campaign` DROP PRIMARY KEY", +"ALTER TABLE `campaign` ADD PRIMARY KEY (`campaignid`)", +"ALTER TABLE `campaign` ADD KEY `idx_campaignstatus` (`campaignstatus`)", +"ALTER TABLE `campaignleadrel` DROP INDEX CampaignLeadRel_IDX1", +"ALTER TABLE `campaignleadrel` ADD INDEX `CampaignLeadRel_IDX1` (`leadid`, `campaignid`)", +"ALTER TABLE `carrier` ADD UNIQUE KEY `carrier_UK01` (`carrier`)", +"ALTER TABLE `chat_msg` ADD KEY `chat_msg_IDX0` (`chat_from`)", +"ALTER TABLE `chat_msg` ADD KEY `chat_msg_IDX1` (`chat_to`)", +"ALTER TABLE `chat_msg` ADD KEY `chat_msg_IDX2` (`born`)", +"ALTER TABLE `chat_pchat` ADD UNIQUE KEY `chat_pchat_UK0` (`msg`)", +"ALTER TABLE `chat_pvchat` ADD UNIQUE KEY `chat_pvchat_UK0` (`msg`)", +"ALTER TABLE `chat_users` ADD KEY `chat_users_IDX0` (`nick`)", +"ALTER TABLE `chat_users` ADD KEY `chat_users_IDX1` (`session`)", +"ALTER TABLE `chat_users` ADD KEY `chat_users_IDX2` (`ping`)", +"ALTER TABLE `contactgrouprelation` ADD KEY `contactgrouprelation_IDX1` (`groupname`)", +"ALTER TABLE `currency_info` DROP PRIMARY KEY", +"ALTER TABLE `currency_info` ADD PRIMARY KEY ()", +"ALTER TABLE `def_org_field` ADD KEY `tabid4` (`tabid`)", +"ALTER TABLE `def_org_share` ADD KEY `fk_def_org_share23` (`permission`)", +"ALTER TABLE `field` ADD KEY `tabid2` (`tabid`)", +"ALTER TABLE `field` ADD KEY `blockid` (`block`)", +"ALTER TABLE `field` ADD KEY `displaytypeid` (`displaytype`)", +"ALTER TABLE `freetagged_objects` DROP INDEX tag_id_index", +"ALTER TABLE `freetagged_objects` ADD INDEX `tag_id_index` (`tag_id`, `tagger_id`, `object_id`)", +"ALTER TABLE `group2grouprel` ADD KEY `fk_group2grouprel2` (`containsgroupid`)", +"ALTER TABLE `group2role` ADD KEY `fk_group2role2` (`roleid`)", +"ALTER TABLE `group2rs` ADD KEY `fk_group2rs2` (`roleandsubid`)", +"ALTER TABLE `groups` ADD KEY `idx_groups_123group` (`groupname`)", +"ALTER TABLE `invoice` ADD KEY `SoPo_IDX` (`invoiceid`)", +"ALTER TABLE `invoice` ADD KEY `fk_Invoice2` (`salesorderid`)", +"ALTER TABLE `invoicegrouprelation` ADD KEY `invoicegrouprelation_IDX1` (`groupname`, `invoiceid`)", +"ALTER TABLE `leadgrouprelation` ADD KEY `leadgrouprelation_IDX0` (`leadid`)", +"ALTER TABLE `moduleowners` ADD KEY `moduleowners_UK11` (`tabid`, `user_id`)", +"ALTER TABLE `org_share_action2tab` ADD KEY `fk_org_share_action2tab12345` (`tabid`)", +"ALTER TABLE `ownernotify` ADD KEY `ownernotify_UK1` (`crmid`, `flag`)", +"ALTER TABLE `parenttab` ADD KEY `parenttab_UK1` (`parenttabid`, `parenttab_label`, `visible`)", +"ALTER TABLE `parenttabrel` ADD KEY `parenttabrelUK01` (`tabid`, `parenttabid`)", +"ALTER TABLE `pogrouprelation` ADD KEY `pogrouprelation_IDX1` (`groupname`, `purchaseorderid`)", +"ALTER TABLE `portal` ADD KEY `portal_UK01` (`portalname`)", +"ALTER TABLE `potential` ADD KEY `potentialid1` (`potentialid`)", +"ALTER TABLE `potentialgrouprelation` ADD KEY `potentialgrouprelation_IDX1` (`groupname`)", +"ALTER TABLE `potstagehistory` DROP INDEX PotStageHistory_IDX1", +"ALTER TABLE `potstagehistory` ADD INDEX `PotStageHistory_IDX1` (`historyid`)", +"ALTER TABLE `potstagehistory` ADD KEY `fk_PotStageHistory` (`potentialid`)", +"ALTER TABLE `profile2field` ADD KEY `tabid3` (`tabid`, `profileid`)", +"ALTER TABLE `profile2globalpermissions` ADD KEY `idx_profile2globalpermissions` (`profileid`, `globalactionid`)", +"ALTER TABLE `profile2standardpermissions` ADD KEY `idx_prof2stad` (`profileid`, `tabid`, `Operation`)", +"ALTER TABLE `profile2tab` ADD KEY `idx_profile2tab1` (`profileid`, `tabid`)", +"ALTER TABLE `profile2utility` ADD KEY `idx_prof2utility` (`profileid`, `tabid`, `activityid`)", +"ALTER TABLE `purchaseorder` ADD KEY `PO_Vend_IDX` (`vendorid`)", +"ALTER TABLE `purchaseorder` ADD KEY `PO_Quote_IDX` (`quoteid`)", +"ALTER TABLE `purchaseorder` ADD KEY `PO_Contact_IDX` (`contactid`)", +"ALTER TABLE `quotegrouprelation` ADD KEY `quotegrouprelation_IDX1` (`groupname`)", +"ALTER TABLE `quotes` DROP INDEX quotestage", +"ALTER TABLE `quotes` ADD INDEX `quotestage` (`quoteid`)", +"ALTER TABLE `quotes` ADD KEY `potentialid2` (`potentialid`)", +"ALTER TABLE `quotes` ADD KEY `contactid` (`contactid`)", +"ALTER TABLE `recurringtype` ADD UNIQUE KEY `RecurringEvent_UK0` (`recurringtype`)", +"ALTER TABLE `reportsortcol` ADD KEY `FK1_reportsortcol` (`reportid`)", +"ALTER TABLE `role2profile` ADD KEY `idx_role2profileid1` (`roleid`, `profileid`)", +"ALTER TABLE `salesorder` ADD KEY `SoVend_IDX` (`vendorid`)", +"ALTER TABLE `salesorder` ADD KEY `SoContact_IDX` (`contactid`)", +"ALTER TABLE `seattachmentsrel` ADD KEY `attachmentsid2` (`attachmentsid`, `crmid`)", +"ALTER TABLE `selectquery` ADD KEY `selectquery_IDX0` (`queryid`)", +"ALTER TABLE `sogrouprelation` ADD KEY `sogrouprelation_IDX1` (`groupname`)", +"ALTER TABLE `tab` ADD KEY `tabid1` (`tabid`)", +"ALTER TABLE `taxclass` ADD UNIQUE KEY `carrier_UK02` (`taxclass`)", +"ALTER TABLE `troubletickets` ADD KEY `status2` (`status`)", +"ALTER TABLE `users2group` ADD KEY `idx_users2group` (`groupid`, `userid`)", +"ALTER TABLE `users2group` ADD KEY `fk_users2group2` (`userid`)", +"ALTER TABLE `accountgrouprelation` ADD CONSTRAINT `fk_accountgrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `groups` (`groupname`) ON DELETE CASCADE", +"ALTER TABLE `accountgrouprelation` ADD CONSTRAINT `fk_accountgrouprelation123` FOREIGN KEY (`accountid`) REFERENCES `account` (`accountid`) ON DELETE CASCADE", +"ALTER TABLE `campaigncontrel` ADD CONSTRAINT `fk_CampaignContRel1` FOREIGN KEY (`campaignid`) REFERENCES `campaign` (`campaignid`) ON DELETE CASCADE", +"ALTER TABLE `campaignleadrel` ADD CONSTRAINT `fk_CampaignLeadRel1234` FOREIGN KEY (`campaignid`) REFERENCES `campaign` (`campaignid`) ON DELETE CASCADE", +"ALTER TABLE `contactgrouprelation` ADD CONSTRAINT `fk_contactgrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `groups` (`groupname`) ON DELETE CASCADE", +"ALTER TABLE `contactgrouprelation` ADD CONSTRAINT `fk_contactgrouprelation123` FOREIGN KEY (`contactid`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE", +"ALTER TABLE `customaction` ADD CONSTRAINT `customaction_FK1` FOREIGN KEY (`cvid`) REFERENCES `customview` (`cvid`) ON DELETE CASCADE", +"ALTER TABLE `invoice` ADD CONSTRAINT `fk_Invoice2` FOREIGN KEY (`salesorderid`) REFERENCES `salesorder` (`salesorderid`) ON DELETE CASCADE", +"ALTER TABLE `invoicegrouprelation` ADD CONSTRAINT `fk_invoicegrouprelation234` FOREIGN KEY (`invoiceid`) REFERENCES `invoice` (`invoiceid`) ON DELETE CASCADE", +"ALTER TABLE `invoicegrouprelation` ADD CONSTRAINT `fk_invoicegrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `groups` (`groupname`) ON DELETE CASCADE", +"ALTER TABLE `org_share_action2tab` ADD CONSTRAINT `fk_org_share_action2tab12345` FOREIGN KEY (`tabid`) REFERENCES `tab` (`tabid`) ON DELETE CASCADE", +"ALTER TABLE `pogrouprelation` ADD CONSTRAINT `fk_pogrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `groups` (`groupname`) ON DELETE CASCADE", +"ALTER TABLE `pogrouprelation` ADD CONSTRAINT `fk_pogrouprelation123` FOREIGN KEY (`purchaseorderid`) REFERENCES `purchaseorder` (`purchaseorderid`) ON DELETE CASCADE", +"ALTER TABLE `potentialgrouprelation` ADD CONSTRAINT `fk_potentialgrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `groups` (`groupname`) ON DELETE CASCADE", +"ALTER TABLE `potentialgrouprelation` ADD CONSTRAINT `fk_potentialgrouprelation67` FOREIGN KEY (`potentialid`) REFERENCES `potential` (`potentialid`) ON DELETE CASCADE", +"ALTER TABLE `profile2globalpermissions` ADD CONSTRAINT `fk_profile2globalpermissions57` FOREIGN KEY (`profileid`) REFERENCES `profile` (`profileid`) ON DELETE CASCADE", +"ALTER TABLE `purchaseorder` ADD CONSTRAINT `fk_PO3` FOREIGN KEY (`contactid`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE", +"ALTER TABLE `purchaseorder` ADD CONSTRAINT `fk_PO2` FOREIGN KEY (`vendorid`) REFERENCES `vendor` (`vendorid`) ON DELETE CASCADE", +"ALTER TABLE `purchaseorder` ADD CONSTRAINT `fk_PO2345` FOREIGN KEY (`quoteid`) REFERENCES `quotes` (`quoteid`) ON DELETE CASCADE", +"ALTER TABLE `quotegrouprelation` ADD CONSTRAINT `fk_quotegrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `groups` (`groupname`) ON DELETE CASCADE", +"ALTER TABLE `quotegrouprelation` ADD CONSTRAINT `fk_quotegrouprelation132` FOREIGN KEY (`quoteid`) REFERENCES `quotes` (`quoteid`) ON DELETE CASCADE", +"ALTER TABLE `quotes` ADD CONSTRAINT `fk_Quotes3` FOREIGN KEY (`contactid`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE", +"ALTER TABLE `quotes` ADD CONSTRAINT `fk_Quotes2` FOREIGN KEY (`potentialid`) REFERENCES `potential` (`potentialid`) ON DELETE CASCADE", +"ALTER TABLE `salesorder` ADD CONSTRAINT `fk_SO4` FOREIGN KEY (`contactid`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE", +"ALTER TABLE `salesorder` ADD CONSTRAINT `fk_SO2` FOREIGN KEY (`vendorid`) REFERENCES `vendor` (`vendorid`) ON DELETE CASCADE", +"ALTER TABLE `sogrouprelation` ADD CONSTRAINT `fk_sogrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `groups` (`groupname`) ON DELETE CASCADE", +"ALTER TABLE `sogrouprelation` ADD CONSTRAINT `fk_sogrouprelation78` FOREIGN KEY (`salesorderid`) REFERENCES `salesorder` (`salesorderid`) ON DELETE CASCADE", +"ALTER TABLE `vendorcontactrel` ADD CONSTRAINT `fk_VendorContactRel45` FOREIGN KEY (`vendorid`) REFERENCES `vendor` (`vendorid`) ON DELETE CASCADE" + ); +foreach($query_array as $query) +{ + Execute($query); +} + + + + + +$conn->println("Database Modifications for 5.0(Alpha) Dev 3 ==> 5.0 Alpha ends here."); +echo "

    Database Modifications for 5.0(Alpha) Dev3 ==> 5.0 Alpha ends here.....
    "; $conn->println("Database Modifications for 4.2 Patch2 ==> 5.0(Alpha) Dev 3 ends here."); echo "

    Database Modifications for 4.2 Patch2 ==> 5.0(Alpha) Ends here.....
    "; + +function Execute($query) +{ + global $conn; + $status = $conn->query($query); + if(is_object($status)) + { + echo '
    '.$status.' ==> '.$query; + } + else + { + echo '

    '.$status.' ======> '.$query; + } +} //Added on 23-12-2005 which is used to populate the profile2field and def_org_field table entries for the field per tab //if we enter a field in field table then we must populate that field in these table for security access function populateFieldForSecurity($tabid,$fieldid) From vtiger-tickets at vtiger.fosslabs.com Thu Apr 6 10:57:23 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 06 Apr 2006 17:57:23 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2388=3A_L?= =?utf-8?q?ead_Import_problem?= Message-ID: <076.6b1d355b3033814bef6288146e7cc9fc@vtiger.fosslabs.com> #88: Lead Import problem -----------------------+---------------------------------------------------- Reporter: gterro | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- Dear Vtigers I Try to import leads or contacts and I get such error message Import Error: The directory _VT_IMPORTDIR_ does not exist or is not writable Please Any Idea Thanks terro -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 6 14:38:14 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 06 Apr 2006 21:38:14 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2363=3A_R?= =?utf-8?q?estricted_user_modifying_record_erases_hidden_fields?= In-Reply-To: <076.a87db8a72dfb88d9b3f12c6bcfde1dbf@vtiger.fosslabs.com> References: <076.a87db8a72dfb88d9b3f12c6bcfde1dbf@vtiger.fosslabs.com> Message-ID: <085.d87c1ade29ccf0c9bd9cf501c159247f@vtiger.fosslabs.com> #63: Restricted user modifying record erases hidden fields ------------------------+--------------------------------------------------- Reporter: mikecrowe | Owner: developer Type: defect | Status: reopened Priority: critical | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc2 Resolution: | Keywords: ------------------------+--------------------------------------------------- Comment (by quang.lam at ooline.fr): be careful, this change does not work for activity field -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 21:12:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 07 Apr 2006 04:12:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4968 - /vtigercrm/trunk/Smarty/templates/QuickCreate.tpl Message-ID: <20060407041232.98E6363B8A1@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 22:12:28 2006 New Revision: 4968 Log: Added onclick=hide('qcform') for the cancel button of qcreate - ahmed Modified: vtigercrm/trunk/Smarty/templates/QuickCreate.tpl Modified: vtigercrm/trunk/Smarty/templates/QuickCreate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/QuickCreate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/QuickCreate.tpl Thu Apr 6 22:12:28 2006 @@ -366,7 +366,7 @@
    "; $shtml .= " Today at"; - $shtml .= " rss_link\" target=\"_blank\">".$allrssrow['rsstitle'].""; + $shtml .= " rss_link."',this)\";>".$allrssrow['rsstitle'].""; $shtml .= "
      ".$rss_html."
    - rss_link\">More... + rss_link."',this)\";>More...
      ".$rss_html."
    - rss_link\">More... + rss_link."',this)\";>More...
    - +
    From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 22:41:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 07 Apr 2006 05:41:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4969 - /vtigercrm/trunk/themes/blue/style.css Message-ID: <20060407054143.9598863BDE1@vtiger.fosslabs.com> Author: don Date: Thu Apr 6 23:41:38 2006 New Revision: 4969 Log: style for new Rss has been added Modified: vtigercrm/trunk/themes/blue/style.css Modified: vtigercrm/trunk/themes/blue/style.css ============================================================================== --- vtigercrm/trunk/themes/blue/style.css (original) +++ vtigercrm/trunk/themes/blue/style.css Thu Apr 6 23:41:38 2006 @@ -1605,3 +1605,92 @@ border:0px solid #CCCCCC; } +/* RSS STYLES */ + +.subHdr{ + font-family:Arial, Helvetica, sans-serif; + font-size:12px; +color:#FFFFFF; + background-image:url(images/rssHeader.gif); + background-position:top left; + background-repeat:repeat-x; +height:27px; +padding:0px 10px 0px 10px; + vertical-align:middle; +} +.delBg{ + font-family:Arial, Helvetica, sans-serif; + font-size:12px; +color:#FFFFFF; + background-image:url(images/rssdelete.gif); + background-position:top left; + background-repeat:repeat-x; +height:27px; +padding:0px 10px 0px 10px; + vertical-align:middle; +} +#rssScroll{ + font-family:Arial, Helvetica, sans-serif ; + font-size:12px; + background-color:#FFFFFF; +width:100%; +height:150px; +overflow:auto; +border:0px solid #000000; +} + +.rssTable{ + font-family:Arial, Helvetica, sans-serif; + font-size:12px; +width:100%; +border:0px solid #000000; +} +.rssTable tr th{ + background-color:#F0F0F0; + text-align:left; + border-bottom:1px solid #E5E5E5; + border-top:1px solid #FFFFFF; +color:#000000; + font-weight:normal; + padding-left:5px; + padding-right:5px; +height:20px; +} + +.rssTable tr td{ + text-align:left; +border:0px solid #000000; + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + white-space:nowrap; +padding:5px; +height:20px; +} +.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; + font-size:12px; +color:#000000; + background-image:url(images/rssforward.gif); + background-position:top left; + background-repeat:repeat-x; +height:27px; +padding:0px 10px 0px 10px; + vertical-align:middle; + background-color:#D7D7D7; +} + From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 22:54:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 07 Apr 2006 05:54:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4970 - /vtigercrm/trunk/modules/Leads/LeadsAjax.php Message-ID: <20060407055423.9BE7B63BE09@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 23:54:17 2006 New Revision: 4970 Log: Added the quickcreate.php for ajaxification Ahmed Modified: vtigercrm/trunk/modules/Leads/LeadsAjax.php Modified: vtigercrm/trunk/modules/Leads/LeadsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Leads/LeadsAjax.php (original) +++ vtigercrm/trunk/modules/Leads/LeadsAjax.php Thu Apr 6 23:54:17 2006 @@ -42,9 +42,13 @@ echo ":#:FAILURE"; } } + +elseif($_REQUEST['ajaxmode'] == 'qcreate') +{ + require_once('quickcreate.php'); +} else { require_once('include/Ajax/CommonAjax.php'); - require_once('quickcreate.php'); } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 23:05:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 07 Apr 2006 06:05:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4971 - /vtigercrm/trunk/Smarty/templates/Settings/EmailNotificationContents.tpl Message-ID: <20060407060513.3823F63C012@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 7 00:05:09 2006 New Revision: 4971 Log: edit changed as image Modified: vtigercrm/trunk/Smarty/templates/Settings/EmailNotificationContents.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings/EmailNotificationContents.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/EmailNotificationContents.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/EmailNotificationContents.tpl Fri Apr 7 00:05:09 2006 @@ -13,7 +13,7 @@ {$elements.label} {$elements.schedulename} {$elements.active} - edit + {/foreach} From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 23:18:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 07 Apr 2006 06:18:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4972 - /vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl Message-ID: <20060407061807.AED5363C324@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 7 00:17:58 2006 New Revision: 4972 Log: position of the div has been changed Modified: vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl Fri Apr 7 00:17:58 2006 @@ -150,8 +150,8 @@ {include file='SettingsSubMenu.tpl'} - - + + {literal} Modified: vtigercrm/trunk/Smarty/templates/QuickCreate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/QuickCreate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/QuickCreate.tpl Fri Apr 7 02:24:27 2006 @@ -8,14 +8,14 @@ {include file='QuickCreateHidden.tpl'} - +
    - +
    - +
    Create {$MODULE}
    - +
    @@ -23,7 +23,6 @@ {foreach key=mainlabel item=maindata from=$subdata} - - - + + {elseif $uitype eq 50} @@ -168,29 +167,29 @@ {/if} {$fldlabel} - {/if} {elseif $uitype eq 57} - + {elseif $uitype eq 80} - + {elseif $uitype eq 78} - + {elseif $uitype eq 76} - + {elseif $uitype eq 17} - + {elseif $uitype eq 71 || $uitype eq 72} {elseif $uitype eq 357} @@ -353,11 +352,13 @@ {/foreach} + {else} + {/if} {/foreach} {/foreach} - +
    {assign var="uitype" value="$maindata[0][0]"} @@ -150,8 +149,8 @@ {assign var='popuptype' value = 'specific_contact_account_address'} {/if} {$fldlabel} Select  Select *{$fldlabel}  Select Select +  Select {if $uitype eq 75}  {$fldlabel} Select  Select {$fldlabel} Select  Select {$fldlabel} Select  Select {$fldlabel} Select  Select {$fldlabel}  http://   http://  @@ -266,7 +265,7 @@ - +  Select   
     
    @@ -372,7 +373,7 @@
    From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 7 01:27:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 07 Apr 2006 08:27:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4986 - /vtigercrm/trunk/log4php.properties Message-ID: <20060407082723.5EAE363E9A6@vtiger.fosslabs.com> Author: don Date: Fri Apr 7 02:27:19 2006 New Revision: 4986 Log: comments removed to fix the issue in windows Modified: vtigercrm/trunk/log4php.properties Modified: vtigercrm/trunk/log4php.properties ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 7 01:43:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 07 Apr 2006 08:43:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4987 - /vtigercrm/trunk/modules/Users/GroupDetailView.php Message-ID: <20060407084343.44C7563E9BB@vtiger.fosslabs.com> Author: don Date: Fri Apr 7 02:43:39 2006 New Revision: 4987 Log: issue in group detail view has been fixed Modified: vtigercrm/trunk/modules/Users/GroupDetailView.php Modified: vtigercrm/trunk/modules/Users/GroupDetailView.php ============================================================================== --- vtigercrm/trunk/modules/Users/GroupDetailView.php (original) +++ vtigercrm/trunk/modules/Users/GroupDetailView.php Fri Apr 7 02:43:39 2006 @@ -45,10 +45,9 @@ $row=1; $groupMember = $groupInfoArr[2]; $information = array(); - $memberinfo = array(); foreach($groupMember as $memberType=>$memberValue) { - + $memberinfo = array(); foreach($memberValue as $memberId) { $groupmembers = array(); @@ -88,7 +87,8 @@ $row++; $memberinfo [] = $groupmembers; } - $information[$memberDisplayType] = $memberinfo; + if(sizeof($memberinfo) >0) + $information[$memberDisplayType] = $memberinfo; } $returndata=array($groupfields,$information); return $returndata; From vtiger-tickets at vtiger.fosslabs.com Fri Apr 7 01:44:13 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 07 Apr 2006 08:44:13 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2389=3A_C?= =?utf-8?q?annot_change_admin_Password?= Message-ID: <076.2fbbb821e635faa80c32396756edac60@vtiger.fosslabs.com> #89: Cannot change admin Password ------------------------------------+--------------------------------------- Reporter: libregeek at gmail.com | Owner: developer Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: Cannot change password | ------------------------------------+--------------------------------------- Bug with Vtiger-5 alpha4. After successfully installing vtiger, the admin password cannot be changed. when the new password is entered into the Change Password Window and submitted, it redirects to the crm home page on the installation site. The password is not changed and we can login only using the old password. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 7 01:48:31 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 07 Apr 2006 08:48:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4988 - /vtigercrm/trunk/vtigercrm5_alpha_Security.html Message-ID: <20060407084831.F2EAE63E9E7@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 7 02:48:27 2006 New Revision: 4988 Log: document updated for alpha 5 release Modified: vtigercrm/trunk/vtigercrm5_alpha_Security.html Modified: vtigercrm/trunk/vtigercrm5_alpha_Security.html ============================================================================== --- vtigercrm/trunk/vtigercrm5_alpha_Security.html (original) +++ vtigercrm/trunk/vtigercrm5_alpha_Security.html Fri Apr 7 02:48:27 2006 @@ -1,7 +1,7 @@ - + -vtiger CRM 5 Alpha - Security Management Implementation + vtiger CRM 5: Security Management Implementation + - -

    vtiger CRM 5 Alpha - Security Management Implementation

    -

    Date: January 16, 2006 -

    The following functions are incorporated in the vtiger CRM 5 Alpha Security - Management implementation: -

    1. The Role is based on Organization Hierarchy. -

    2. The Roles can have one-to-multiple profiles. -

    3. Each User is associated with a role, which in turn associated with the profiles. -

    4. Profiles specify the access for various actions in each of the modules. -

    5. Group Support- Group can consists of:
    + +

    +

    vtiger CRM 5 - Security Management Implementation

    + Date: 06-04-2006

    +

    +Table of Contents:

    +
      +
    1. Introduction
      2. +
    2. Users
      3. +
    3. Roles
      4. +
    4. Profiles + +
      5. +
    5. Groups
      6. +
    6. Default + Organization Sharing Access
      7. +
    7. User Defined Sharing + Access + +
      8. +
    8. Organizational + Level Field Access
      9. +
    9. Known Issues & Limitations         
      10. +
    +

    1. Introduction

    +

    The vtiger CRM is a Customer Relationship Management + software for your organization-wide sales, marketing, customer support, + and product management requirements. Security Management is one of the primary modules in vtiger CRM that provides access level control (ACL) to various functions to the users according to their privileges in an organization.  With  User Management, + the users for your organization can be created and their access +privileges can be defined. +

    Security Management consists for the following sub-modules:

      -
    • Groups
      • -
    • Roles
      • -
    • Roles & Subordinates
      • -
    • Users
      • +
    • Users
      • +
    • Roles
      • +
    • Profiles
      • +
    • Groups
      • +
    • Default Organization Sharing Access
      • +
    • User Defined Sharing Rules
      • +
    • Default Organization Field Access
    -

    Note: In vtiger CRM 5.0 Alpha group level security has been implemented - only for the Leads, Tickets, FAQ, and Activities modules.

    -

    6.  Profiles override the Sharing Rules i.e. the Profile is the master:

    -

    For example, one of the users has sharing privilege to view others accounts. - But his profile does not allow him to view accounts. In this case,  the - user cannot view the accounts.
    -
    - 7. Default Organization Sharing Access:

    -

    Your organization's - sharing model sets the default access that users have to each other's data. - The default sharing access levels are listed below. 

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Type Default Access Level Controlled By
    AccountsPublic Read/Write Organization-wide defaults
    ActivitiesPrivate -

    Access to other users' activities is based on your  position in - the hierarchy.

    -

    Note that access to events in a calendar view is controlled by the organization-wide - calendar sharing.

    -
    Calendar AccessHide Details and Add EventsOrganization-wide defaults
    TicketsPublic Read/WriteOrganization-wide defaults
    ContactsPublic Read/Write Organization-wide defaults
    EmailsPublic Read/WriteOrganization-wide defaults
    LeadsPublic Read/WriteOrganization-wide defaults
    OpportunitiesPublic Read OnlyOrganization-wide defaults
    QuotesPublic Read/WriteOrganization-wide defaults 
    Sales OrderPublic Read/WriteOrganization-wide defaults
    Purchase OrderPublic Read/WriteOrganization-wide defaults
    InvoicePublic Read/WriteOrganization-wide defaults 
    -

    The following Sharing Permissions can be set :
    -
    - - - - - - - - - - - - - - - - - - - - - - - -
    Field Description
    PrivateOnly the record owner, and users above that role in the hierarchy, - can view, edit, and report on those records.
    Public Read OnlyAll users can view and report on records but not edit them. Only the - owner, and users above that role in the hierarchy, can edit those records.
    Public Read/WriteAll users can view, edit all records.
    Public Read/Write/DeleteAll users can view, edit and delete all records
    -

    Note: When Account is Private, the Related Potential, Ticket, Quote, - Sales Order, Purchase Order, and Invoice access is also set to private in Default - Organization Sharing model.

    -

    8.  Sharing Rules Specification by Administrator:

    +

    Back to Top

    +

    2. Users

    +

    Users in user management facilitate to + Add/Edit/Delete/View Users.  There + are two types of users in vtiger CRM software, Standard Users and Administrator users.
    +
    + Standard Users can perform only + CRUD (Create, Retrieve, Update, and Delete) operations on records such + as, leads, accounts, contacts, potentials, trouble tickets, and + others. Where as Administrators can manage the complete software that includes, managing users/groups & their access privileges, customizing vtiger CRM user interface, + creating communications templates and configuring all organization wide + settings.  In general Standard Users will not have access to the + Settings Panel and only Admin Users will have access to the Settings + Panel
    +
    + How to create a Administrator User and +Standard User?

    +

    In + the user creation screen there is a check box called Admin. When a user + is created with selecting the Admin option then the user is an + Administrator User and if the User is created without selecting the +Admin option then the user is a Standard User.

    + + + + +

    Notes

    +
      +
    • Each user created in the system must be associated with a ROLE
      • +
    • Admin User will have all privileges in the organization
      • +
    • Standard User's  privilege will be defined by his  Role
      • +
    +

    The other functions in User management are Change Password, Deactivate Users, List + Mail Server, Home Page Order, and View Login History.

    +

    Back to Top

    +

    3. Roles

    +

    The + organization level hierarchy can be defined using Roles. Roles control + the visibility level that users have in the organization’s + data. Users at any given role level + can always view, edit, delete  all data owned by users below them + in the hierarchy . For example, the Sales Manger can access/edit/delete all the + Sales Reps' records because they are in the higher hierarchical level + in + the role tree. The Sales Reps can access only their records.
    +
    +Roles in user management facilitate + to Add/Edit/Delete/View Roles. Multiple profile support is available in + roles i.e. a role can consists of one or more number of profiles.

    + + + + +

    Notes

    +
      +
    • Users in the higher level of hierarchy cannot view the records that are shared to their subordinate users
      • +
    • Role must be associated to at least one profile
      • +
    +

    Back to Top

    +

    4. Profiles

    +

    Profile + function provides access to vtiger CRM modules (tabs), standard + actions, utility actions , fields in various modules and global + permissions. Users associated to the specific profile can access the +functions that are assigned to them.

    +

    Profiles defines the access privileges for the +following:

    +

    4.1. + Global Privileges

    +

    Global Privileges define the global permissions for + all modules and all actions. Global Privileges consists of :

      -
    • Apart from the Default Organization Sharing Access, the administrator  - can also create Organization Level Sharing Rules for the following modules - to share the data between Roles, Roles&Subordinates and Groups : -
        -
      • Leads
        • -
      • Accounts/Contacts
        • -
      • Potentials
        • -
      • Emails
        • -
      • HelpDesk
        • -
      • Quotes
        • -
      • SalesOrder
        • -
      • Purchase Order
        • -
      • Invoices
        • -
      -
      • -
    • Sharing Rules can only extend the visibility and cannot hide the visibility  -    
      -
      • -
    • On creating the Sharing Rules, Access for the Related modules can also be - specified.
      -
      • -
    • Sharing Rules are created to share data between Roles, Roles&Subordinates - and Groups
      • +
    • View all: can view + all  module data in the organization
      • +
    • Edit all: can create/edit all module data in the organization
    -

    Notes on Data Sharing:
    +

    4.2. + Tab Privileges

    +

    Tab Privileges define the module tab level access + for the following modules:

    +

    Leads, Accounts, Contacts, Potentials, + Dashboards, Activities, Trouble Tickets, FAQ, Calendar, Price Books, + Purchase Orders,  Invoices, Reports, Notes, Emails, Products, +Vendors, Quotes, Sales Orders, RSS, Campaigns

    +

    4.3. + Standard Privileges

    +

    Standard Privileges define the permissions + for Create/Edit, View, Delete Actions in the following modules:

    +

    -Leads, Accounts, Contacts, + Potentials, Activities, + Trouble Tickets, FAQ, Price Books, Purchase Order,  Invoices, Notes, Emails, + Products, Vendors, Quotes, Sales Orders

    +

    4.4. Field + Privileges

    +

    Field Privileges define the + access permissions for the fields (standard fields/custom fields) in the following modules:

    +

    Leads, + Accounts, Contacts, Potentials, Activities, + Trouble Tickets, FAQ, Price Books, Purchase Orders,  Invoices, Notes, Emails, + Products, Vendors, Quotes, and Sales Orders.

    +

    You can also define Field Privileges for the custom fields.

    +

    4.5. + Utility Privileges

    +

    Utility Privileges define the permissions for the actions Import, Export, Merge, + Convert Lead 
    +         +
    + Profiles in user management + facilitate to Add/Edit/Delete/View Roles.

    + + + + +

    Notes

    +
      +
    • Global Privileges in Profiles override the permissions defined by Tab, Standard, Utility and Field Privileges.  For example, in a profile the access for Potentials tab is denied via Tab Privileges. Even then the Profile User can view the Potentials module data if the 'View all'  permission is allowed in the global privileges of that profile.
      • +
    • Privileges defined in the profile apply to only non-admin users. For admin users the permissions defined in profile is immaterial.
      • +
    • Profiles override the Default Organization Sharing Rules and the User defined Sharing Rules.  For example consider that the organization sharing rule allows an user to view the Potentials of other users. But the user cannot view the Potentials module because his profile does not allow him to access the Potential module.
      • +
    +

    Back to Top

    +

    5. Groups

    +

    Groups + can be created to manage a set of common records.  A group can + consist of the following:

    +
      +
    • Groups --> group can consists of sub groups. All the users + present in this sub group will also be in the main group.
      • +
    • Roles --> all + the users under the given role will be in the group
      • +
    • Roles and + Subordinates --> all the users under the given role and role + subordinates will be in the group.
      • +
    • User --> the specified user will + be present in the group
      • +
    +

    Users associated with a particular group can + access the records assigned to the group and perform the necessary CRUD + operations on the records.

    +

    Groups in + user management + facilitate to Add/Edit/Delete/View Roles. +

    + + + + +

    Notes

    +
      +
    • A user, role, role subordinate, group can be present in any number of groups
      • +
    • When a group is assigned as owner to a crmentity, all the members  of the group can access the entity. When the ownership is changed to any one member in the group  then only that member can access the entity and all other members in the group cannot access the entity. If in this  case it is required that all the members of the group should have access to the entity, then user defined sharing rule should be defined to share all the data between the group members
      • +
    +

    Back to Top

    +

    6. Default + Organization Sharing Access

    +

    Default Organization Sharing Access + controls the data sharing at organization level. Other users can access + the owners' records as per organization-level data (records in various + modules) access privilege. You can provide the following types of + access levels to vtiger CRM + modules:

    +
      +
    • Private: Only the record owner, and + users above + that role in the hierarchy, can view, edit, and delete on those + records.
      • +
    • Public: Read Only: All + users can view the records but cannot edit them. Only the owner, + and users above that role in the hierarchy, can edit/delete those + records.
      • +
    • Public: Read Create/Edit: All + users can view/create/edit the records but cannot delete them. Only the + owner, + and users above that role in the hierarchy, can delete those records.
      • +
    • Public: Read Create/Edit, Delete:  This sharing privilege provides global access for all the users. All + the users can view/create/edit/delete other users records in the + organization.
      • +
    +

    Default Organization sharing privileges can be defined for the + following modules:

    +

    Accounts & Contacts, Potentials, + Leads,  Emails, HelpDesk, Quotes, Purchase Order, Sales Order, + Invoice
    +
    + For Activities module the default organization sharing privilege value +is Private and it is a fixed value and this cannot be altered.
    +
    + By default, the default organization sharing privilege value for all +the modules will be Public:Read Create/Edit, Delete

    + + + + +

    Notes

    +

    If the Default Organization Sharing Privilege is set as Private for Accounts & Contacts, then the default organization sharing privilege value for the following modules will also be set as a private:

    +

    Potentials,  Emails, HelpDesk, Quotes, Purchase Order, Sales Order and Invoice

    +

    Back to Top

    +

    7. User Defined Sharing + Access

    +

    User Defined Sharing Rules + allows the administrators to selectively grant data access to a  set of Users. Data Sharing rules can be created to share data between + the following modules:

    +
      +
    • From Role to Role
      • +
    • From Role to Role + Subordinates
      • +
    • From Role to Group
      • +
    • From Role Subordinates to + Role
      • +
    • From Role Subordinates to + Role Subordinates
      • +
    • From Role Subordinates to + Groups
      • +
    • From Group to Role
      • +
    • From Group to Role + Subordinates
      • +
    • From Group to Group
      • +
    +

    Sharing Rules can be created for the + following modules:

    +

    1. Leads Sharing Rules:

    +

    Leads owned by + the Users of a given Role/Role + Subordinates/Group can be shared with users of a  Role/Role + Subordinates/Group in the permission of  Read Only/Read +Write.

    +

    These lead + related Emails will also be shared in the permission of + Read Only/ Read Write.
    +
    + 2. Accounts Sharing Rules: 

    -
      -
    • Regardless of the organization-wide defaults, users can always view and - edit all data owned by or shared with users below them in the role hierarchy.
      • -
    • While your sharing model controls visibility to records, user permissions - control what users can do to the records that are visible to them. For example, - if you share an account with other users, those users can only see the account - if they have the "Read" permission on accounts. Likewise, users who have the - "Edit" permission on contacts may still not be able to edit contacts they - do not own if they are working in a Private sharing model.
      • -
    • Administrators, and users with the "View All Data" or "Edit All Data" permissions, - have access to view or edit all data.
      • -
    • Only Administrators have access to configure the Access Privileges    -
      • -
    • You must have at least read access to a record to be able to add activities - or other associated records to it (for example associated products)
      • -
    -

    IMPORTANT:

    -

    The new security management support is provided for the following:

    -
      -
    • Home Page, Custom View, Reports, Dashboard, Activity History, and Calendar.
      -
      • -
    • Delete Handling of Roles, Groups is not fully functional.
      -
      • -
    • Editing of Groups will not function properly.
      -
      • -
    • In ListView, Related List View, Popup List View & Search List View - Sharing Rules for Related Modules are not implemented.
      -
      • -
    • Tab hiding in header is not implemented.
      -
      • -
    • Group Level Security support is implemented only for the Leads, Activities - and Tickets modules.
      -
      • -
    • Parent Type Security Handling is not implemented for the Products and Notes - modules.
      -
      • -
    • Read Only Support in field level security is not implemented.
      • -
    +

    Accounts owned + by the Users of a given Role/Role Subordinates/Group can be shared with +users of a  Role/Role Subordinates/Group in the permission of  Read Only/Read Write.

    +

    These account + related Potentials, Tickets, Quotes, Sales Order, Invoice, Emails will +also be shared in the permission of Read Only/ Read Write.

    + + + + +

    Note

    +

    Sharing Rules created for Accounts module will also apply to the contacts module

    +

    3. +Potentials Sharing Rules:

    +

    Potentials + owned by the Users of a given Role/Role + Subordinates/Group can be shared with users of a  Role/Role + Subordinates/Group in the permission of  Read Only/Read + Write.

    +

    These + potential related  Quotes and + Sales Order will also be shared in the permission of + Read Only/ Read Write.
    +
    + 4. + HelpDesk Sharing Rules:

    +

    + Tickets owned by the Users of a given Role/Role + Subordinates/Group can be shared with users of a  Role/Role + Subordinates/Group in the permission of  Read Only/Read + Write. 
    +            
    + 5. +Email Sharing Rules:

    +

    Emails owned by the Users of a given Role/Role + Subordinates/Group can be shared with users of a  Role/Role + Subordinates/Group in the permission of  Read Only/Read Write.
    +
    + 6. +Quotes Sharing Rules:

    +

    Quotes owned + by the Users of a given Role/Role + Subordinates/Group can be shared with users of a  Role/Role + Subordinates/Group in the permission of  Read Only/Read +Write.

    +

    These quote + related  Sales Order will also be shared in the permission of + Read Only/ Read Write.
    +
    + 7. +Purchase Order Sharing Rules:

    +

    Purchase Orders owned by the Users of a given Role/Role + Subordinates/Group can be shared with users of a  Role/Role + Subordinates/Group in the permission of  Read Only/Read Write.
    +
    + 8. +Sales Order Sharing Rules:

    +

    Sales Order + owned by the Users of a given Role/Role + Subordinates/Group can be shared with users of a  Role/Role + Subordinates/Group in the permission of  Read Only/Read + Write.

    +

    These sales + order related  Invoice will also be shared in the permission of + Read Only/ Read Write.
    +
    + 9. Invoice Sharing Rules:

    +

    + Invoices owned by the Users of a given Role/Role + Subordinates/Group can be shared with users of a  Role/Role + Subordinates/Group in the permission of  Read Only/Read Write.

    + + + + +

    Notes

    +
      +
    • Sharing Rules can be used only to widen the data access and they cannot be used to restrict data access
      • +
    • Any number of sharing rules can be defined for a single Role, Role Subordinates and Group
      • +
    • Sharing rules are applicable to all existing data and the data that will be created in future
      • +
    • Sharing Rules cannot be specified to share data between User to User. To achieve this, the two users should be put in two groups and the data sharing rule should be specified to share data between these two groups.
      • +
    +

    Back to Top

    +

    8. Default + Organization Field Access

    +

    + Default Organization Field Access function is used to control the visibility of the fields in various modules for + the entire organization. You can use this function to define your + organization level business process to some extent from vtiger CRM user + interface instead of programmatically defining the fields in various + modules.

    +

    With default organization field access, one can either show or hide a + field to the entire organization. Default Organization Field Privileges + can be defined for the following modules:

    +

    Leads, + Accounts, Contacts, Potentials, Activities, + Trouble Tickets, FAQ, Price Books, Purchase Order,  Invoice, Notes, Emails, + Products, Vendors, Quotes, and Sales Orders.

    + + + + +

    Notes

    +
      +
    • It is not possible to disable the mandatory fields in the modules. (for example, Last Name and Company fields in Leads module)
      • +
    • Default Organization field access overrides the profile level field access. For example your profile may allow to view the website field in leads. But you cannot view this field as it's access if denied in organization level field access
      • +
    • Default Organization level field access can be specified for custom fields also.
      • +
    • Changes made in Users, Roles, Profiles, Sharing Access and Field Access will not be reflected immediately. The user has to logout and login to  get the changes reflected.
      • +
    +

    Back to Top

    +

    9. Know Issues & Limitations

    +

    Security Management functions are not implemented for the +following modules:

    +
      +
    • Calendar, Import, Export, + Mass Delete, Change Owner, Change Status, Campaigns, Attachments and + Outlook Plugin
      • +
    • Non-admin users should be allowed to view + their Roles Subordinates, Profiles, and Groups.
      • +
    • When a group is deleted, handling to change + the current ownership to the entities owned by this group should be + done. +
    +

    Back to Top

    +

    +

    © vtiger.com. 2006 All rights reserved.

    From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 7 01:52:31 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 07 Apr 2006 08:52:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4989 - in /vtigercrm/trunk/Smarty/templates: CreateView.tpl salesEditView.tpl Message-ID: <20060407085231.8C96F63D7BD@vtiger.fosslabs.com> Author: don Date: Fri Apr 7 02:52:23 2006 New Revision: 4989 Log: fckeditor removed for Email module as ir has some issues Modified: vtigercrm/trunk/Smarty/templates/CreateView.tpl vtigercrm/trunk/Smarty/templates/salesEditView.tpl Modified: vtigercrm/trunk/Smarty/templates/CreateView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateView.tpl Fri Apr 7 02:52:23 2006 @@ -1037,9 +1037,6 @@ var oFCKeditor = null; - {if $MODULE eq 'Emails'} - oFCKeditor = new FCKeditor( "description" ) ; - {/if} {if $MODULE eq 'Notes'} oFCKeditor = new FCKeditor( "notecontent" ) ; {/if} Modified: vtigercrm/trunk/Smarty/templates/salesEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/salesEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/salesEditView.tpl Fri Apr 7 02:52:23 2006 @@ -656,9 +656,6 @@ '; + + +return $list; +} ?> From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 7 05:51:02 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 07 Apr 2006 12:51:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5001 - /vtigercrm/trunk/themes/blue/images/ Message-ID: <20060407125102.802E618714F@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 7 06:50:38 2006 New Revision: 5001 Log: new images added for settings Added: vtigercrm/trunk/themes/blue/images/announ.gif (with props) vtigercrm/trunk/themes/blue/images/assign.gif (with props) vtigercrm/trunk/themes/blue/images/backupserver.gif (with props) vtigercrm/trunk/themes/blue/images/block.gif (with props) vtigercrm/trunk/themes/blue/images/company.gif (with props) vtigercrm/trunk/themes/blue/images/custom.gif (with props) vtigercrm/trunk/themes/blue/images/groups.gif (with props) vtigercrm/trunk/themes/blue/images/inventory.gif (with props) vtigercrm/trunk/themes/blue/images/mailmarge.gif (with props) vtigercrm/trunk/themes/blue/images/migrate.gif (with props) vtigercrm/trunk/themes/blue/images/notification.gif (with props) vtigercrm/trunk/themes/blue/images/ogmailserver.gif (with props) vtigercrm/trunk/themes/blue/images/orgshar.gif (with props) vtigercrm/trunk/themes/blue/images/shareaccess.gif (with props) vtigercrm/trunk/themes/blue/images/system.gif (with props) vtigercrm/trunk/themes/blue/images/terms.gif (with props) Modified: vtigercrm/trunk/themes/blue/images/currency.gif vtigercrm/trunk/themes/blue/images/picklist.gif vtigercrm/trunk/themes/blue/images/profile.gif vtigercrm/trunk/themes/blue/images/roles.gif vtigercrm/trunk/themes/blue/images/user.gif Modified: vtigercrm/trunk/themes/blue/images/currency.gif ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/themes/blue/images/picklist.gif ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/themes/blue/images/profile.gif ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/themes/blue/images/roles.gif ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/themes/blue/images/user.gif ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 7 05:51:08 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 07 Apr 2006 12:51:08 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5002 - /vtigercrm/trunk/install/3confirmConfig.php Message-ID: <20060407125108.71A8D187256@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 7 06:51:04 2006 New Revision: 5002 Log: space removed Modified: vtigercrm/trunk/install/3confirmConfig.php Modified: vtigercrm/trunk/install/3confirmConfig.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 7 05:54:26 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 07 Apr 2006 12:54:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5003 - /vtigercrm/trunk/Release_Notes.html Message-ID: <20060407125426.EAE3165C61B@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 7 06:54:21 2006 New Revision: 5003 Log: Removed the Custom Field Smartification Modified: vtigercrm/trunk/Release_Notes.html Modified: vtigercrm/trunk/Release_Notes.html ============================================================================== --- vtigercrm/trunk/Release_Notes.html (original) +++ vtigercrm/trunk/Release_Notes.html Fri Apr 7 06:54:21 2006 @@ -100,7 +100,7 @@ 1 - Smarty template applied to Currency and Custom Fields list view features + Smarty template applied to Currency Configuration Feature 2 From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 7 05:56:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 07 Apr 2006 12:56:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5004 - /vtigercrm/trunk/Smarty/templates/Settings.tpl Message-ID: <20060407125627.5DF5165DB0C@vtiger.fosslabs.com> Author: don Date: Fri Apr 7 06:56:23 2006 New Revision: 5004 Log: new images added for Settings Modified: vtigercrm/trunk/Smarty/templates/Settings.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings.tpl Fri Apr 7 06:56:23 2006 @@ -15,18 +15,18 @@ - - - - @@ -35,17 +35,17 @@ - - - @@ -67,13 +67,13 @@
    {$MOD.LBL_CREATE_AND_MANAGE_USERS}
    +    		{$MOD.LBL_CREATE_AND_MANAGE_USERS}
    {$MOD.LBL_USERS}    		{$MOD.LBL_CREATE_AND_MANAGE_USER_ROLES}
    +    		{$MOD.LBL_CREATE_AND_MANAGE_USER_ROLES}
    {$MOD.LBL_ROLES}     		{$MOD.LBL_CREATE_AND_MANAGE_USER_PROFILES}
    +    		{$MOD.LBL_CREATE_AND_MANAGE_USER_PROFILES}
    {$MOD.LBL_PROFILES}     		{$MOD.LBL_CREATE_AND_MANAGE_USER_GROUPS}
    +    		{$MOD.LBL_CREATE_AND_MANAGE_USER_GROUPS}
    {$MOD.USERGROUPLIST}
    {$MOD.LBL_SETTING_DEFAULT_SHARING_ACCESS}
    +    		{$MOD.LBL_SETTING_DEFAULT_SHARING_ACCESS}
    {$MOD.LBL_DEFAULT_ORGANIZATION_SHARING_ACCESS}     		{$MOD.LBL_SETTING_DEFAULT_ORGANIZATION_FIELDS}
    +    		{$MOD.LBL_SETTING_DEFAULT_ORGANIZATION_FIELDS}
    {$MOD.LBL_DEFAULT_ORGANIZATION_FIELDS}    		{$MOD.LBL_ASSIGN_MODULE_OWNERS}
    -{$MOD.LBL_ASSIGN_MODULE_OWNERS} +    		{$MOD.LBL_ASSIGN_MODULE_OWNERS}
    +{$MOD.LBL_ASSIGN_MODULE_OWNERS} -    		{$MOD.LBL_SETTING_ANNOUNCEMENT}
    +    		{$MOD.LBL_SETTING_ANNOUNCEMENT}
    {$MOD.LBL_ANNOUNCEMENT}    		  
    - - - @@ -98,20 +98,20 @@ - - - - @@ -129,16 +129,16 @@
    {$MOD.LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS}
    +    		{$MOD.LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS}
    {$MOD.LBL_CUSTOM_FIELD_SETTINGS}    		{$MOD.LBL_EDIT_PICKLIST_VALUES}
    +    		{$MOD.LBL_EDIT_PICKLIST_VALUES}
    {$MOD.LBL_PICKLIST_SETTINGS}     		{$MOD.LBL_FIELD_ORDERING_DESC}
    +    		{$MOD.LBL_FIELD_ORDERING_DESC}
    {$MOD.LBL_FIELD_ORDERING}
    {$MOD.LBL_CREATE_EMAIL_TEMPLATES}
    {$MOD.EMAILTEMPLATES}    		{$MOD.LBL_UPLOAD_MSWORD_TEMPLATES}
    +    		{$MOD.LBL_UPLOAD_MSWORD_TEMPLATES}
    {$MOD.WORDINTEGRATION}     		{$MOD.LBL_SCHEDULE_EMAIL_NOTIFICATION}
    +    		{$MOD.LBL_SCHEDULE_EMAIL_NOTIFICATION}
    {$MOD.NOTIFICATIONSCHEDULERS}
     
    {$MOD.LBL_INVENTORY_NOTIFICATIONS}
    +    		{$MOD.LBL_INVENTORY_NOTIFICATIONS}
    {$MOD.INVENTORYNOTIFICATION}    		{$MOD.LBL_INVENTORY_TERMSANDCONDITIONS}
    +    		{$MOD.LBL_INVENTORY_TERMSANDCONDITIONS}
    {$MOD.INVENTORYTERMSANDCONDITIONS}
    - - - - @@ -147,11 +147,11 @@ - - From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 7 06:01:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 07 Apr 2006 13:01:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5005 - /vtigercrm/trunk/Smarty/templates/QuickCreateHidden.tpl Message-ID: <20060407130107.4ECC665DB58@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 7 07:01:02 2006 New Revision: 5005 Log: hidden field included Modified: vtigercrm/trunk/Smarty/templates/QuickCreateHidden.tpl Modified: vtigercrm/trunk/Smarty/templates/QuickCreateHidden.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/QuickCreateHidden.tpl (original) +++ vtigercrm/trunk/Smarty/templates/QuickCreateHidden.tpl Fri Apr 7 07:01:02 2006 @@ -69,6 +69,12 @@ +{elseif $MODULE eq 'Campaigns'} + + + + + {elseif $MODULE eq 'Products'} From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 7 06:09:19 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 07 Apr 2006 13:09:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5006 - /vtigercrm/trunk/index.php Message-ID: <20060407130919.AA479187243@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 7 07:09:14 2006 New Revision: 5006 Log: CustomFieldList has been removed Modified: vtigercrm/trunk/index.php Modified: vtigercrm/trunk/index.php ============================================================================== --- vtigercrm/trunk/index.php (original) +++ vtigercrm/trunk/index.php Fri Apr 7 07:09:14 2006 @@ -265,7 +265,7 @@ { $log->info("About to take action ".$action); $log->debug("in $action"); - if(ereg("^Save", $action) || ereg("^Delete", $action) || ereg("^Choose", $action) || ereg("^Popup", $action) || ereg("^ChangePassword", $action) || ereg("^Authenticate", $action) || ereg("^Logout", $action) || ereg("^Export",$action) || ereg("^add2db", $action) || ereg("^result", $action) || ereg("^LeadConvertToEntities", $action) || ereg("^downloadfile", $action) || ereg("^massdelete", $action) || ereg("^updateLeadDBStatus",$action) || ereg("^AddCustomFieldToDB", $action) || ereg("^updateRole",$action) || ereg("^UserInfoUtil",$action) || ereg("^deleteRole",$action) || ereg("^UpdateComboValues",$action) || ereg("^fieldtypes",$action) || ereg("^app_ins",$action) || ereg("^minical",$action) || ereg("^minitimer",$action) || ereg("^app_del",$action) || ereg("^send_mail",$action) || ereg("^populatetemplate",$action) || ereg("^TemplateMerge",$action) || ereg("^testemailtemplateusage",$action) || ereg("^saveemailtemplate",$action) || ereg("^lookupemailtemplate",$action) || ereg("^deletewordtemplate",$action) || ereg("^deleteemailtemplate",$action) || ereg("^CurrencyDelete",$action) || ereg("^deleteattachments",$action) || ereg("^MassDeleteUsers",$action) || ereg("^UpdateFieldLevelAccess",$action) || ereg("^UpdateDefaultFieldLevelAccess",$action) || ereg("^UpdateProfile",$action) || ereg("^updateRelations",$action) || ereg("^updateNotificationSchedulers",$action) || ereg("^Star",$action) || ereg("^addPbProductRelToDB",$action) || ereg("^UpdateListPrice",$action) || ereg("^PriceListPopup",$action) || ereg("^SalesOrderPopup",$action) || ereg("^CreatePDF",$action) || ereg("^CreateSOPDF",$action) || ereg("^redirect",$action) || ereg("^webmail",$action) || ereg("^left_main",$action) || ereg("^delete_message",$action) || ereg("^mime",$action) || ereg("^move_messages",$action) || ereg("^folders_create",$action) || ereg("^imap_general",$action) || ereg("^mime",$action) || ereg("^download",$action) || ereg("^about_us",$action) || ereg("^SendMailAction",$action) || ereg("^CreateXL",$action) || ereg("^savetermsandconditions",$action) || ereg("^home_rss",$action) || ereg("^ConvertAsFAQ",$action) || ereg("^Tickerdetail",$action) || ereg("^".$module."Ajax",$action) || ereg("^chat",$action) || ereg("^vtchat",$action) || ereg("^updateCalendarSharing",$action) || ereg("^disable_sharing",$action) || ereg("^HeadLines",$action) || ereg("^CustomFieldList",$action)) + if(ereg("^Save", $action) || ereg("^Delete", $action) || ereg("^Choose", $action) || ereg("^Popup", $action) || ereg("^ChangePassword", $action) || ereg("^Authenticate", $action) || ereg("^Logout", $action) || ereg("^Export",$action) || ereg("^add2db", $action) || ereg("^result", $action) || ereg("^LeadConvertToEntities", $action) || ereg("^downloadfile", $action) || ereg("^massdelete", $action) || ereg("^updateLeadDBStatus",$action) || ereg("^AddCustomFieldToDB", $action) || ereg("^updateRole",$action) || ereg("^UserInfoUtil",$action) || ereg("^deleteRole",$action) || ereg("^UpdateComboValues",$action) || ereg("^fieldtypes",$action) || ereg("^app_ins",$action) || ereg("^minical",$action) || ereg("^minitimer",$action) || ereg("^app_del",$action) || ereg("^send_mail",$action) || ereg("^populatetemplate",$action) || ereg("^TemplateMerge",$action) || ereg("^testemailtemplateusage",$action) || ereg("^saveemailtemplate",$action) || ereg("^lookupemailtemplate",$action) || ereg("^deletewordtemplate",$action) || ereg("^deleteemailtemplate",$action) || ereg("^CurrencyDelete",$action) || ereg("^deleteattachments",$action) || ereg("^MassDeleteUsers",$action) || ereg("^UpdateFieldLevelAccess",$action) || ereg("^UpdateDefaultFieldLevelAccess",$action) || ereg("^UpdateProfile",$action) || ereg("^updateRelations",$action) || ereg("^updateNotificationSchedulers",$action) || ereg("^Star",$action) || ereg("^addPbProductRelToDB",$action) || ereg("^UpdateListPrice",$action) || ereg("^PriceListPopup",$action) || ereg("^SalesOrderPopup",$action) || ereg("^CreatePDF",$action) || ereg("^CreateSOPDF",$action) || ereg("^redirect",$action) || ereg("^webmail",$action) || ereg("^left_main",$action) || ereg("^delete_message",$action) || ereg("^mime",$action) || ereg("^move_messages",$action) || ereg("^folders_create",$action) || ereg("^imap_general",$action) || ereg("^mime",$action) || ereg("^download",$action) || ereg("^about_us",$action) || ereg("^SendMailAction",$action) || ereg("^CreateXL",$action) || ereg("^savetermsandconditions",$action) || ereg("^home_rss",$action) || ereg("^ConvertAsFAQ",$action) || ereg("^Tickerdetail",$action) || ereg("^".$module."Ajax",$action) || ereg("^chat",$action) || ereg("^vtchat",$action) || ereg("^updateCalendarSharing",$action) || ereg("^disable_sharing",$action) || ereg("^HeadLines",$action)) { $skipHeaders=true; if(ereg("^Popup", $action) || ereg("^ChangePassword", $action) || ereg("^Export", $action) || ereg("^downloadfile", $action) || ereg("^fieldtypes",$action) || ereg("^lookupemailtemplate",$action) || ereg("^about_us",$action) || ereg("^home_rss",$action) || ereg("^".$module."Ajax",$action) || ereg("^chat",$action)|| ereg("^vtchat",$action) || ereg("^massdelete", $action)) @@ -585,7 +585,7 @@ $theme = $default_theme; } -if((!$viewAttachment) && (!$viewAttachment && $action != 'home_rss') && $action != 'Tickerdetail' && $action != $module."Ajax" && $action != "chat" && $action != "HeadLines" && $action != 'massdelete' && $action != 'CustomFieldList') +if((!$viewAttachment) && (!$viewAttachment && $action != 'home_rss') && $action != 'Tickerdetail' && $action != $module."Ajax" && $action != "chat" && $action != "HeadLines" && $action != 'massdelete') { // Under the SPL you do not have the right to remove this copyright statement. $copyrightstatement=" - -
    {$MOD.LBL_SPECIFY_COMPANY_DETAILS}
    +    		{$MOD.LBL_SPECIFY_COMPANY_DETAILS}
    {$MOD.LBL_ORGANIZATION_DETAILS}    		{$MOD.LBL_CONFIGURE_MAIL_SERVER}
    +    		{$MOD.LBL_CONFIGURE_MAIL_SERVER}
    {$MOD.LBL_EMAIL_CONFIG}    		{$MOD.LBL_CONFIGURE_BACKUP_SERVER}
    +    		{$MOD.LBL_CONFIGURE_BACKUP_SERVER}
    {$MOD.LBL_BACKUP_SERVER_CONFIGURATION}     		{$MOD.LBL_SYSTEM_CONFIGURATION}
    +    		{$MOD.LBL_SYSTEM_CONFIGURATION}
    {$MOD.LBL_SYSTEM_CONFIG}
    {$MOD.LBL_CURRENCY_CONFIGURATION}
    +    		{$MOD.LBL_CURRENCY_CONFIGURATION}
    {$MOD.LBL_CURRENCY_CONFIG}     		{$MOD.LBL_MIGRATION_INFO}
    +    		{$MOD.LBL_MIGRATION_INFO}
    {$MOD.LBL_MIGRATION}
    - - {include file='SettingsMenu.tpl'} - -
    @@ -251,9 +246,6 @@
    -
    {$JAVASCRIPT} - {include file = 'SettingsSubMenu.tpl'} - + From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 20 06:27:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 20 Apr 2006 13:27:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5193 - /vtigercrm/trunk/Smarty/templates/MyPrefEditView.tpl Message-ID: <20060420132710.492CB6AB273@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 20 07:27:05 2006 New Revision: 5193 Log: Removed the Settings Menu from My Preferences - Ahmed Modified: vtigercrm/trunk/Smarty/templates/MyPrefEditView.tpl Modified: vtigercrm/trunk/Smarty/templates/MyPrefEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/MyPrefEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/MyPrefEditView.tpl Thu Apr 20 07:27:05 2006 @@ -14,11 +14,6 @@ - - - - {include file='SettingsMenu.tpl'} - -
    @@ -373,8 +368,4 @@
    -
    - {$JAVASCRIPT} - {include file = 'SettingsSubMenu.tpl'} From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 06:31:08 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 13:31:08 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23717=3A_?= =?utf-8?q?Improper_record_count_after_import?= Message-ID: <076.8ebe8d6e1eb35e4dfb9a4767a5ef5a19@vtiger.fosslabs.com> #717: Improper record count after import --------------------------+------------------------------------------------- Reporter: saraj | Owner: mickie Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: Import Error | --------------------------+------------------------------------------------- During Lead import in 'Step 3 of 3 : Mapping Results' even after importing 10 records it show the message as '0 Import Succesfully Imported' -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 06:34:32 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 13:34:32 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23718=3A_?= =?utf-8?q?Remove_filter_links_in_import_listview?= Message-ID: <076.fdc5818c7b39d9818eec485ae438226d@vtiger.fosslabs.com> #718: Remove filter links in import listview -----------------------------+---------------------------------------------- Reporter: saraj | Owner: mickie Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: import listview | -----------------------------+---------------------------------------------- During Lead import in 'Step 3 of 3' the listview shown has Customview links such as 'filters New Edit Delete' and the 'All' Link takes you to Main listview. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 06:53:40 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 13:53:40 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23719=3A_?= =?utf-8?q?Hacking_attempt_during_import?= Message-ID: <076.49f0afa3aa1bf043577318e21de1ec26@vtiger.fosslabs.com> #719: Hacking attempt during import ------------------------------------+--------------------------------------- Reporter: saraj | Owner: mickie Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: Import Hacking attempt | ------------------------------------+--------------------------------------- In lead import in 'Step 3 of 3' when clicked on import more button 'Hacking attempt' exception is thrown. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 06:57:27 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 13:57:27 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23720=3A_?= =?utf-8?q?Remove_=27+addtag=27_link?= Message-ID: <076.23869c186c774dd330a03c5dc20c5419@vtiger.fosslabs.com> #720: Remove '+addtag' link -------------------------------+-------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: Addtag link Leads | -------------------------------+-------------------------------------------- In Lead detail view right corner we have a '+addtag' link, this when clicked shows the add tag form, even then the '+addtag' link is present this should be removed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 20 07:13:46 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 20 Apr 2006 14:13:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5194 - /vtigercrm/trunk/index.php Message-ID: <20060420141346.720AA6AB2AD@vtiger.fosslabs.com> Author: don Date: Thu Apr 20 08:13:36 2006 New Revision: 5194 Log: Removed Settings Module from skip security check Modified: vtigercrm/trunk/index.php Modified: vtigercrm/trunk/index.php ============================================================================== --- vtigercrm/trunk/index.php (original) +++ vtigercrm/trunk/index.php Thu Apr 20 08:13:36 2006 @@ -295,7 +295,7 @@ $skipHeaders=true; $skipFooters=true; } - if($module == 'Users' || $module == 'Home' || $module == 'Administration' || $module == 'uploads' || $module == 'Settings' || $module == 'Calendar') + if($module == 'Users' || $module == 'Home' || $module == 'Administration' || $module == 'uploads' || $module == 'Calendar') { $skipSecurityCheck=true; } From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 07:31:27 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 14:31:27 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23721=3A_?= =?utf-8?q?Parent_tab_shift?= Message-ID: <076.526e32eb34e2787149e3f31ae9ad3378@vtiger.fosslabs.com> #721: Parent tab shift ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: Parent tab | ------------------------+--------------------------------------------------- While accessing Sales->Contacts->import contacts the highlighted parent tab shifts to 'Support'. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 07:37:18 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 14:37:18 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23722=3A_?= =?utf-8?q?No_error_message_while_importing_without_mapping_the_fields?= Message-ID: <076.8b2946e476024ee97de7909111399e75@vtiger.fosslabs.com> #722: No error message while importing without mapping the fields -----------------------------+---------------------------------------------- Reporter: saraj | Owner: mickie Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: Import Contacts | -----------------------------+---------------------------------------------- While importing 500 contacts, if no field is mapped to Headers and 'Import Now' is clicked the message shows '500 Import Successfully Imported', but no records imported, also the message should be '500 Records Successfully'. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 07:46:32 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 14:46:32 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23443=3A_?= =?utf-8?q?Issue_in_contact_send_mail?= In-Reply-To: <076.430c5dc35b1c3f501f0bbe602ea65fa9@vtiger.fosslabs.com> References: <076.430c5dc35b1c3f501f0bbe602ea65fa9@vtiger.fosslabs.com> Message-ID: <085.e7c2ecbebb51311367f25322408ef2c8@vtiger.fosslabs.com> #443: Issue in contact send mail ------------------------+--------------------------------------------------- Reporter: don | Owner: mickie Type: defect | Status: assigned Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * status: new => assigned * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 07:47:39 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 14:47:39 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23455=3A_?= =?utf-8?q?Pagination_is_not_supported_in_global_search?= In-Reply-To: <076.6e392e06b9e61627753aa3ff916f1484@vtiger.fosslabs.com> References: <076.6e392e06b9e61627753aa3ff916f1484@vtiger.fosslabs.com> Message-ID: <085.ec46fa4495e71b58b4ab8c4cb300044e@vtiger.fosslabs.com> #455: Pagination is not supported in global search ------------------------+--------------------------------------------------- Reporter: don | Owner: mickie Type: defect | Status: assigned Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * status: new => assigned * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 07:48:42 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 14:48:42 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23459=3A_?= =?utf-8?q?Highliting_of_the_search_criteria_in_global_search?= In-Reply-To: <076.706f7ce59cca6fc3873088aa62ae8f98@vtiger.fosslabs.com> References: <076.706f7ce59cca6fc3873088aa62ae8f98@vtiger.fosslabs.com> Message-ID: <085.10c1b3700d703a51c7d8a59d326506e4@vtiger.fosslabs.com> #459: Highliting of the search criteria in global search ------------------------+--------------------------------------------------- Reporter: don | Owner: mickie Type: defect | Status: assigned Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * status: new => assigned * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 07:50:25 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 14:50:25 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23461=3A_?= =?utf-8?q?Issue_in_global_search_result_display_format?= In-Reply-To: <076.db55839c519a11f03b97df3c48274c83@vtiger.fosslabs.com> References: <076.db55839c519a11f03b97df3c48274c83@vtiger.fosslabs.com> Message-ID: <085.ffa3fffe292b990d7c9d6feb0b9feb46@vtiger.fosslabs.com> #461: Issue in global search result display format ------------------------+--------------------------------------------------- Reporter: don | Owner: mickie Type: defect | Status: assigned Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * status: new => assigned * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 07:51:28 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 14:51:28 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23470=3A_?= =?utf-8?q?Enhancement_in_Global_Search?= In-Reply-To: <076.8446f13ac07f4020e0afb305260d69b9@vtiger.fosslabs.com> References: <076.8446f13ac07f4020e0afb305260d69b9@vtiger.fosslabs.com> Message-ID: <085.5611a9729ab7ab102a6bcc86866204a0@vtiger.fosslabs.com> #470: Enhancement in Global Search ------------------------+--------------------------------------------------- Reporter: don | Owner: mickie Type: defect | Status: assigned Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * status: new => assigned * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 07:57:42 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 14:57:42 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23472=3A_?= =?utf-8?q?Search_result_count_is_missing_in_global_search?= In-Reply-To: <076.b8b6a34e31005f060bcb9a5e08e7ad43@vtiger.fosslabs.com> References: <076.b8b6a34e31005f060bcb9a5e08e7ad43@vtiger.fosslabs.com> Message-ID: <085.5381ef0b69cc16c58767b58b68e0dd14@vtiger.fosslabs.com> #472: Search result count is missing in global search ------------------------+--------------------------------------------------- Reporter: don | Owner: mickie Type: defect | Status: assigned Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * status: new => assigned * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 07:58:50 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 14:58:50 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23474=3A_?= =?utf-8?q?UI_issue_in_global_search?= In-Reply-To: <076.eeef6ec5ac3c4f9c7ea62de77ba3c172@vtiger.fosslabs.com> References: <076.eeef6ec5ac3c4f9c7ea62de77ba3c172@vtiger.fosslabs.com> Message-ID: <085.55d0b7779f9f33c29e003d2144639a0a@vtiger.fosslabs.com> #474: UI issue in global search ------------------------+--------------------------------------------------- Reporter: don | Owner: mickie Type: defect | Status: assigned Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * status: new => assigned * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 07:58:59 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 14:58:59 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23723=3A_?= =?utf-8?q?Parent_tab_not_highlighted?= Message-ID: <076.cd496fd3a80ac24dced660612366f644@vtiger.fosslabs.com> #723: Parent tab not highlighted ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: Parent tab | ------------------------+--------------------------------------------------- During Contact Import, in Step 3 of 3, Nither the Parent tab is highlighted nor the Module name is displayed in the menu bar. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 08:00:47 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 15:00:47 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23528=3A_?= =?utf-8?q?Select_Contact_Issue?= In-Reply-To: <076.f07c85055644e29178f6011a8d4b08e7@vtiger.fosslabs.com> References: <076.f07c85055644e29178f6011a8d4b08e7@vtiger.fosslabs.com> Message-ID: <085.07f6078fe5fdd6d72d7a52a5ed28340a@vtiger.fosslabs.com> #528: Select Contact Issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: philip Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Related Lists ---------------------------+------------------------------------------------ Changes (by mickie): * owner: developer => philip -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 08:01:28 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 15:01:28 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23607=3A_?= =?utf-8?q?Unable_to_create_new_ticket=2E?= In-Reply-To: <076.ec2f296a02d16f9111b0d6b6fd3ed24c@vtiger.fosslabs.com> References: <076.ec2f296a02d16f9111b0d6b6fd3ed24c@vtiger.fosslabs.com> Message-ID: <085.0cbfa5f273b8fd1eb58fa11a1d9fc381@vtiger.fosslabs.com> #607: Unable to create new ticket. ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mickie Type: defect | Status: assigned Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * status: new => assigned * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 08:02:14 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 15:02:14 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23611=3A_?= =?utf-8?q?Title_missing_in_Global_search_for_Campaigns_module?= In-Reply-To: <076.5534457e7415fafccee51d069cb46bf8@vtiger.fosslabs.com> References: <076.5534457e7415fafccee51d069cb46bf8@vtiger.fosslabs.com> Message-ID: <085.9507e320caeed2bfcba9b2b5cfc4a54c@vtiger.fosslabs.com> #611: Title missing in Global search for Campaigns module ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: mickie Type: defect | Status: assigned Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Security ---------------------------+------------------------------------------------ Changes (by mickie): * status: new => assigned * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 08:03:51 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 15:03:51 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23612=3A_?= =?utf-8?q?logs_in_Emails_module?= In-Reply-To: <076.605072bac9ef0b45dc981de0eb910dfc@vtiger.fosslabs.com> References: <076.605072bac9ef0b45dc981de0eb910dfc@vtiger.fosslabs.com> Message-ID: <085.e93fb48a25e65fa702b3796565550970@vtiger.fosslabs.com> #612: logs in Emails module --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: mickie Type: defect | Status: assigned Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: --------------------------------+------------------------------------------- Changes (by mickie): * status: new => assigned * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 08:04:30 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 15:04:30 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23615=3A_?= =?utf-8?q?Issue_in_email_editview?= In-Reply-To: <076.70b3d4b4709afdb2b590cc0efc2c6fd1@vtiger.fosslabs.com> References: <076.70b3d4b4709afdb2b590cc0efc2c6fd1@vtiger.fosslabs.com> Message-ID: <085.975c58852f7cf97862ebde4a54343aec@vtiger.fosslabs.com> #615: Issue in email editview --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: mickie Type: defect | Status: assigned Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: --------------------------------+------------------------------------------- Changes (by mickie): * status: new => assigned * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 08:05:15 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 15:05:15 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23676=3A_?= =?utf-8?q?Migration_Issues_-_Quick_Create_Potentials_Non_Functional?= In-Reply-To: <076.396c5f0dc651a29c5494394f2a4bac76@vtiger.fosslabs.com> References: <076.396c5f0dc651a29c5494394f2a4bac76@vtiger.fosslabs.com> Message-ID: <085.a4949dab31915bad1069eac067792c7c@vtiger.fosslabs.com> #676: Migration Issues - Quick Create Potentials Non Functional ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: assigned Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * status: new => assigned * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 20 08:06:25 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 20 Apr 2006 15:06:25 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5195 - /vtigercrm/trunk/Smarty/templates/DetailView.tpl Message-ID: <20060420150625.40CDF6AB2C2@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 20 09:06:20 2006 New Revision: 5195 Log: convertlead button type has been changed 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 Apr 20 09:06:20 2006 @@ -199,7 +199,7 @@ {/if} {if $MODULE eq 'Leads'} {if $CONVERTLEAD eq 'permitted'} -   +   {/if} {/if} From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 08:06:49 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 15:06:49 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23679=3A_?= =?utf-8?q?Migration_Issues_-_Exceptions_Thrown_in_Vendors?= In-Reply-To: <076.2af5095a13ae186cfdfff0e886a79dc2@vtiger.fosslabs.com> References: <076.2af5095a13ae186cfdfff0e886a79dc2@vtiger.fosslabs.com> Message-ID: <085.ffc439bfde7b44048aaf68bccc38abc4@vtiger.fosslabs.com> #679: Migration Issues - Exceptions Thrown in Vendors ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: assigned Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * status: new => assigned * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 08:07:53 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 15:07:53 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23682=3A_?= =?utf-8?q?Migration_Issues_-_Duplication_of_Purchase_Order_Returns_No_Val?= =?utf-8?q?ues?= In-Reply-To: <076.260f3255a06e7eaa5036495341824543@vtiger.fosslabs.com> References: <076.260f3255a06e7eaa5036495341824543@vtiger.fosslabs.com> Message-ID: <085.0811b72a5b7e429419337b50d77e7d18@vtiger.fosslabs.com> #682: Migration Issues - Duplication of Purchase Order Returns No Values ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: assigned Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * status: new => assigned * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 08:08:50 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 15:08:50 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23724=3A_?= =?utf-8?q?Save_Maping_Not_validated?= Message-ID: <076.6f363360800dc0069d98f1d72303001a@vtiger.fosslabs.com> #724: Save Maping Not validated -------------------------+-------------------------------------------------- Reporter: saraj | Owner: mickie Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: Save maping | -------------------------+-------------------------------------------------- While importing contact, in step 2 or 3 if 'Save maping' is checked and the field is set empty and contine import it does not throw any exception and the mapping does not get saved. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 08:08:53 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 15:08:53 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23687=3A_?= =?utf-8?q?Migration_Issues_-_Users_Link_in_Settings?= In-Reply-To: <076.fe8007d1417bdc1609b69fd5446e55e4@vtiger.fosslabs.com> References: <076.fe8007d1417bdc1609b69fd5446e55e4@vtiger.fosslabs.com> Message-ID: <085.b81b92084f0930b20c2ef4f78896fb6f@vtiger.fosslabs.com> #687: Migration Issues - Users Link in Settings ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: assigned Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * status: new => assigned * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 08:10:16 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 15:10:16 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23695=3A_?= =?utf-8?q?Migration_Issues_-_My_Preferences_throws_exception?= In-Reply-To: <076.d5c2f446b43753dbeb39d9660fb3e039@vtiger.fosslabs.com> References: <076.d5c2f446b43753dbeb39d9660fb3e039@vtiger.fosslabs.com> Message-ID: <085.2701d5751c96ddde8516686a319d0ba8@vtiger.fosslabs.com> #695: Migration Issues - My Preferences throws exception ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: assigned Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * status: new => assigned * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 08:13:32 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 15:13:32 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23725=3A_?= =?utf-8?q?Inconsistent_higlighting_of_parent_tab?= Message-ID: <076.5f5553ce99dcea645fe55b8d2ce2c004@vtiger.fosslabs.com> #725: Inconsistent higlighting of parent tab ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: Parent tab | ------------------------+--------------------------------------------------- While browsing Sales->Products-> import Products the parent tab shifts to 'Support' -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 08:15:16 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 15:15:16 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23536=3A_?= =?utf-8?q?Ticketsystem_Emails?= In-Reply-To: <076.c51ff6414ec289c44df50737baa910d6@vtiger.fosslabs.com> References: <076.c51ff6414ec289c44df50737baa910d6@vtiger.fosslabs.com> Message-ID: <085.7068d1036fc6ffe187defa04c5943671@vtiger.fosslabs.com> #536: Ticketsystem Emails -----------------------------+---------------------------------------------- Reporter: anonymous | Owner: mickie Type: enhancement | Status: assigned Priority: major | Milestone: Component: customerportal | Version: 5.0.0 Resolution: | Keywords: Ticket mail -----------------------------+---------------------------------------------- Changes (by mickie): * status: new => assigned * owner: developer => mickie Comment: In ticket system the notification mail contains email address. i accept. but the ticket details will sent only to the owner of the ticket and the related contact. other than these, no mail will sent to others. in which mail we can hide the email address? can you please let me explain in detail about this problem if i am wrong. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 08:16:45 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 15:16:45 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23363=3A_?= =?utf-8?q?Redirection_Issues_-_HelpDesk?= In-Reply-To: <076.c629bba7c27d91e7293e6a60bd6b5601@vtiger.fosslabs.com> References: <076.c629bba7c27d91e7293e6a60bd6b5601@vtiger.fosslabs.com> Message-ID: <085.f257bedbdb6c1f4d02a5728772ff3522@vtiger.fosslabs.com> #363: Redirection Issues - HelpDesk ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: assigned Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * status: new => assigned * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 08:18:38 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 15:18:38 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23689=3A_?= =?utf-8?q?Migration_Issues_-_Global_Access_Privileges_-_settings?= In-Reply-To: <076.3145637101ebdf830949cfecd724434c@vtiger.fosslabs.com> References: <076.3145637101ebdf830949cfecd724434c@vtiger.fosslabs.com> Message-ID: <085.f315a8ce4b0f75cc25ee2f85a2e55c00@vtiger.fosslabs.com> #689: Migration Issues - Global Access Privileges - settings ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: assigned Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * status: new => assigned * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 08:29:05 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 15:29:05 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23726=3A_?= =?utf-8?q?Records_imported_but_improper_message_and_no_import_listview?= Message-ID: <076.b862c11474936e902c562fd6cb797ecc@vtiger.fosslabs.com> #726: Records imported but improper message and no import listview ----------------------------+----------------------------------------------- Reporter: saraj | Owner: developer Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: Product import | ----------------------------+----------------------------------------------- I exported the existing products, and tried to import it back, it showed the following message. Step 3 of 3 : Mapping Results Success! 0 Import Succesfully Imported 0 records skipped because the id's either existed or where longer than 36 characters 0 records skipped because they were missing one or more required fields It didn't show the imported records in list view, but it imported all the records and this was seen inthe product list view. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 08:29:23 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 15:29:23 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23726=3A_?= =?utf-8?q?Records_imported_but_improper_message_and_no_import_listview?= In-Reply-To: <076.b862c11474936e902c562fd6cb797ecc@vtiger.fosslabs.com> References: <076.b862c11474936e902c562fd6cb797ecc@vtiger.fosslabs.com> Message-ID: <085.9ec34b9b238094a8c6b60a07df7e8b8a@vtiger.fosslabs.com> #726: Records imported but improper message and no import listview ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mickie Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Product import ------------------------+--------------------------------------------------- Changes (by saraj): * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 20 08:51:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 20 Apr 2006 15:51:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5196 - /vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl Message-ID: <20060420155141.CD1F66AB2DB@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 20 09:51:34 2006 New Revision: 5196 Log: Populated Merge Field Combo Values with initial value of None - Ahmed Modified: vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl Modified: vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl Thu Apr 20 09:51:34 2006 @@ -24,7 +24,7 @@ function init() {ldelim} - var blankOption = new Option('', ''); + var blankOption = new Option('--None--', '--None--'); var allOpts = new Object(0); var options = null; @@ -173,7 +173,7 @@ {$UMOD.LBL_SELECT_FIELD_TYPE}   {$UMOD.LBL_SELECT_FIELD} - +   {$UMOD.LBL_MERGE_FIELD_VALUE} From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 08:58:35 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 15:58:35 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23550=3A_?= =?utf-8?q?combo_box_in_emailtemplates_createview?= In-Reply-To: <076.78884aba025a76978f4584da2b44a3dd@vtiger.fosslabs.com> References: <076.78884aba025a76978f4584da2b44a3dd@vtiger.fosslabs.com> Message-ID: <085.e5ed7b7b901e994d1e9ba633ae0b3497@vtiger.fosslabs.com> #550: combo box in emailtemplates createview --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: ela Type: enhancement | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: assigned => closed Comment: The Default Selected Value is diplayed as None instead of empty. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 20 10:43:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 20 Apr 2006 17:43:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5197 - /vtigercrm/trunk/include/utils/UserInfoUtil.php Message-ID: <20060420174328.7B8AE6AB2F6@vtiger.fosslabs.com> Author: don Date: Thu Apr 20 11:43:21 2006 New Revision: 5197 Log: Security check added for Settings module in isPermitted() 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 Thu Apr 20 11:43:21 2006 @@ -1196,13 +1196,28 @@ require('user_privileges/user_privileges_'.$current_user->id.'.php'); require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); $permission = "no"; - if($module == 'Users' || $module == 'Home' || $module == 'Administration' || $module == 'uploads' || $module == 'Settings' || $module == 'Calendar') + if($module == 'Users' || $module == 'Home' || $module == 'Administration' || $module == 'uploads' || $module == 'Calendar') { //These modules dont have security right now $permission = "yes"; return $permission; } + + //Checking the Access for the Settings Module + if($module == 'Settings') + { + if(! $is_admin) + { + $permission = "no"; + } + else + { + $permission = "yes"; + } + return $permission; + } + //Checking whether the user is admin if($is_admin) { From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 10:44:35 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 17:44:35 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23683=3A_?= =?utf-8?q?Settings_Menu_should_not_be_shown_in_My_Preference_Page?= In-Reply-To: <076.bf8980ab378cbfb991ebb9daeafbe17b@vtiger.fosslabs.com> References: <076.bf8980ab378cbfb991ebb9daeafbe17b@vtiger.fosslabs.com> Message-ID: <085.b31c78888d216d753c3769df71a9b6a4@vtiger.fosslabs.com> #683: Settings Menu should not be shown in My Preference Page ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: ahmed Type: defect | Status: new Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Users ---------------------------+------------------------------------------------ Changes (by don): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 10:47:32 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 17:47:32 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23681=3A_?= =?utf-8?q?Security_Issue?= In-Reply-To: <076.dca335256be3201b348646b620f80668@vtiger.fosslabs.com> References: <076.dca335256be3201b348646b620f80668@vtiger.fosslabs.com> Message-ID: <085.1003afa055dd3cff79a01d9883578d71@vtiger.fosslabs.com> #681: Security Issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: Don Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: Security ---------------------------+------------------------------------------------ Changes (by don): * resolution: => invalid * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 10:51:36 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 17:51:36 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23678=3A_?= =?utf-8?q?Home_Page_Security_Support_is_not_proper?= In-Reply-To: <076.0108077923a68a13c0fb45ff815a79d5@vtiger.fosslabs.com> References: <076.0108077923a68a13c0fb45ff815a79d5@vtiger.fosslabs.com> Message-ID: <085.76df27e6b92380ed9e2dd2f2fb221d93@vtiger.fosslabs.com> #678: Home Page Security Support is not proper ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Security ---------------------------+------------------------------------------------ Changes (by don): * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 20 12:24:35 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 20 Apr 2006 19:24:35 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5198 - in /vtigercrm/trunk: include/utils/ListViewUtils.php modules/Emails/DetailView.php modules/Emails/EditView.php modules/Emails/Save.php modules/Emails/mailsend.php Message-ID: <20060420192435.67BB26AB333@vtiger.fosslabs.com> Author: don Date: Thu Apr 20 13:24:26 2006 New Revision: 5198 Log: code changed to integrate new UI for Emails Modified: vtigercrm/trunk/include/utils/ListViewUtils.php vtigercrm/trunk/modules/Emails/DetailView.php vtigercrm/trunk/modules/Emails/EditView.php vtigercrm/trunk/modules/Emails/Save.php vtigercrm/trunk/modules/Emails/mailsend.php Modified: vtigercrm/trunk/include/utils/ListViewUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/ListViewUtils.php (original) +++ vtigercrm/trunk/include/utils/ListViewUtils.php Thu Apr 20 13:24:26 2006 @@ -681,6 +681,7 @@ } return $list_block; + } /**This function generates the List view entries in a popup list view @@ -1313,10 +1314,14 @@ $value = ''.$temp_val.''; } - else - { - $value = ''.$temp_val.''; - } + elseif($module == 'Emails') + { + $value = ''.$temp_val.''; + } + else + { + $value = ''.$temp_val.''; + } } } else Modified: vtigercrm/trunk/modules/Emails/DetailView.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/Emails/EditView.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/Emails/Save.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/Emails/mailsend.php ============================================================================== --- vtigercrm/trunk/modules/Emails/mailsend.php (original) +++ vtigercrm/trunk/modules/Emails/mailsend.php Thu Apr 20 13:24:26 2006 @@ -159,8 +159,12 @@ //The following function call is used to parse and form a encoded error message and then pass to result page $mail_error_str = getMailErrorString($mail_status_str); $adb->println("Mail Sending Process has been finished.\n\n"); - -header("Location:index.php?module=$returnmodule&action=$returnaction&record=$returnid&$returnset&$mail_error_str"); +if(isset($_REQUEST['popupaction']) && $_REQUEST['popupaction'] != '') +{ + $inputs=""; + echo $inputs; +} +//header("Location:index.php?module=$returnmodule&action=$returnaction&record=$returnid&$returnset&$mail_error_str"); ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 20 12:44:38 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 20 Apr 2006 19:44:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5199 - in /vtigercrm/trunk: Smarty/templates/ComposeEmail.tpl Smarty/templates/EmailDetails.tpl Smarty/templates/Emails.tpl themes/blue/images/composeMail.jpg themes/blue/images/mailHdr.jpg themes/blue/images/mailTitle.jpg Message-ID: <20060420194438.51DDF6AB336@vtiger.fosslabs.com> Author: don Date: Thu Apr 20 13:44:24 2006 New Revision: 5199 Log: new files added for new UI for Email Added: vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl vtigercrm/trunk/Smarty/templates/EmailDetails.tpl vtigercrm/trunk/themes/blue/images/composeMail.jpg (with props) vtigercrm/trunk/themes/blue/images/mailHdr.jpg (with props) vtigercrm/trunk/themes/blue/images/mailTitle.jpg (with props) Modified: vtigercrm/trunk/Smarty/templates/Emails.tpl Modified: vtigercrm/trunk/Smarty/templates/Emails.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Emails.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Emails.tpl Thu Apr 20 13:44:24 2006 @@ -1,4 +1,19 @@ +

    @@ -29,7 +44,7 @@     		-  Compose +  Compose @@ -135,13 +150,8 @@
      - - - - - - -
    From : 
    CC : 
    BCC :  
    Subject 
     
    +
    +
    @@ -159,4 +169,5 @@ + From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 20:37:43 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 03:37:43 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23727=3A_?= =?utf-8?q?Tab_order_is_wrong?= Message-ID: <076.ea581fa4aac1776c35ded59ffa1bb5b7@vtiger.fosslabs.com> #727: Tab order is wrong --------------------------+------------------------------------------------- Reporter: OnwealdTim | Owner: developer Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: ui tab order | --------------------------+------------------------------------------------- Tab order is invalid. Field layout is always two columns. Tab order alternates left and right. This is not natural. Here is a good example... try to create an account. Go the the billing address field. Type in the street address and hit tab. You would expect that your next field would be in the billing address... but it isn't. The cursor moves to the shipping address. So assume that the normal situation exists where there is only one address. With V5, you enter "billing street" then tab '''FOUR''' times to get to the "billing city". Then tab twice to "billing state". Then tab '''FOUR''' times to "billing country". I have marked this priority as "major" because it impacts usability. If no don't believe it is important, then demo that to a sales person and see if they don't gripe about having to tab so much. (sorry...venting here) -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 20:39:03 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 03:39:03 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23727=3A_?= =?utf-8?q?Tab_order_is_wrong?= In-Reply-To: <076.ea581fa4aac1776c35ded59ffa1bb5b7@vtiger.fosslabs.com> References: <076.ea581fa4aac1776c35ded59ffa1bb5b7@vtiger.fosslabs.com> Message-ID: <085.0885f6d776fc37f91bb53b6b15efff3d@vtiger.fosslabs.com> #727: Tab order is wrong -------------------------+-------------------------------------------------- Reporter: OnwealdTim | Owner: developer Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ui tab order -------------------------+-------------------------------------------------- Comment (by OnwealdTim): You can reach me at "Tsmith" email @onweald.com. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 20:46:05 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 03:46:05 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23728=3A_?= =?utf-8?q?Add_accounts_and_contacts_links_to_Marketing_tab?= Message-ID: <076.2b0185f2a18c096fb40efbfe665effd3@vtiger.fosslabs.com> #728: Add accounts and contacts links to Marketing tab -------------------------+-------------------------------------------------- Reporter: OnwealdTim | Owner: developer Type: enhancement | Status: new Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -------------------------+-------------------------------------------------- Just like Sales and Customer Service, Marketing users need access to accounts and contacts. It should be simple to add these links to the marketing tab. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 21:00:11 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 04:00:11 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23729=3A_?= =?utf-8?q?Need_appropriate_dashboard_for_sales_or_customer_service?= Message-ID: <076.9c59a58160b093b88ed4ee9faba261b3@vtiger.fosslabs.com> #729: Need appropriate dashboard for sales or customer service -------------------------+-------------------------------------------------- Reporter: OnwealdTim | Owner: developer Type: enhancement | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -------------------------+-------------------------------------------------- The homepage in version 4 was better because it let you get more done by viewing all the information you need at once. For example, what does a customer service person want to see immediately? 1. List of new support tickets 2. List of support tickets assigned to me 3. List of my activities not completed. For sales people: 1. List of activities not completed 2. List of new leads assigned to me 3. List of open opportunities I am working on So basically, everybody (Sales, Customer Service, Marketing) needs an appropriate home page that they can customize. Each home page would contain grids show filtered queries of tables. I like the look of the new home page but unfortunately, it doesn't help people get their work done. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 21:02:58 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 04:02:58 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23730=3A_?= =?utf-8?q?Hacking_Attempt_Issue_in_=22My_Group_Allocation=22?= Message-ID: <076.afb6bb7e87d60638729f9cb3596de7c6@vtiger.fosslabs.com> #730: Hacking Attempt Issue in "My Group Allocation" -----------------------+---------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- Click "My Group Allocation" tab in "My Home Page". Click an entity name (in my case "Individual Customization -Menu and RSS") Get error: Hacking Attempt Note that there is no html returned. Just the error text. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 21:05:28 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 04:05:28 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23731=3A_?= =?utf-8?q?Mark_as_Default_View_does_not_work?= Message-ID: <076.501758f748d7cf5f1d223fa12c0890b9@vtiger.fosslabs.com> #731: Mark as Default View does not work ------------------------+--------------------------------------------------- Reporter: OnwealdTim | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | ------------------------+--------------------------------------------------- Each tab on "My home at a glance" has the ability to set it as the default view. It does nothing that I can tell. I would expect that the next time I clicked on "My home" that I would see the selected tab. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 21:07:38 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 04:07:38 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23730=3A_?= =?utf-8?q?Hacking_Attempt_Issue_in_=22My_Group_Allocation=22?= In-Reply-To: <076.afb6bb7e87d60638729f9cb3596de7c6@vtiger.fosslabs.com> References: <076.afb6bb7e87d60638729f9cb3596de7c6@vtiger.fosslabs.com> Message-ID: <085.1e3a30edcacc21e62ad14f35e1564be5@vtiger.fosslabs.com> #730: Hacking Attempt Issue in "My Group Allocation" ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Comment (by OnwealdTim): BTW, this was reported by OnwealdTim -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 20 22:47:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 21 Apr 2006 05:47:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5200 - /vtigercrm/trunk/install/0welcome.php Message-ID: <20060421054737.6F63E6A6412@vtiger.fosslabs.com> Author: richie Date: Thu Apr 20 23:47:30 2006 New Revision: 5200 Log: msg formatted Modified: vtigercrm/trunk/install/0welcome.php Modified: vtigercrm/trunk/install/0welcome.php ============================================================================== Binary files - no diff available. From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 22:49:58 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 05:49:58 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23575=3A_?= =?utf-8?q?Slected_module_is_not_displayed?= In-Reply-To: <076.afbb6baa5fe07092c5316e5b81fd684e@vtiger.fosslabs.com> References: <076.afbb6baa5fe07092c5316e5b81fd684e@vtiger.fosslabs.com> Message-ID: <085.8ca54e5842fdedf556de34dd56b66716@vtiger.fosslabs.com> #575: Slected module is not displayed ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Custom Field ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => Custom Field -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 22:50:43 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 05:50:43 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23581=3A_?= =?utf-8?q?Improper_properties_for_default_custom_field?= In-Reply-To: <076.f22ea1b5a8ba85bc8dbaa620fde8f1c7@vtiger.fosslabs.com> References: <076.f22ea1b5a8ba85bc8dbaa620fde8f1c7@vtiger.fosslabs.com> Message-ID: <085.d2b670548066b6f77cbbc99e30fcd4e3@vtiger.fosslabs.com> #581: Improper properties for default custom field ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Custom Field ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => Custom Field -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 22:51:52 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 05:51:52 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23590=3A_?= =?utf-8?q?Does_not_have_new_UI?= In-Reply-To: <076.7b1cc95fea69a974fb443653b3b554c2@vtiger.fosslabs.com> References: <076.7b1cc95fea69a974fb443653b3b554c2@vtiger.fosslabs.com> Message-ID: <085.d11900d15914ab956a262b0e083a9d9b@vtiger.fosslabs.com> #590: Does not have new UI ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Need new UI ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => Need new UI -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 22:52:24 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 05:52:24 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23593=3A_?= =?utf-8?q?Module_link_disappears_in_Settings?= In-Reply-To: <076.938499b732b177ef0dad020e8bc0e62e@vtiger.fosslabs.com> References: <076.938499b732b177ef0dad020e8bc0e62e@vtiger.fosslabs.com> Message-ID: <085.9206c7ddeb5ef7eaa71c77a5ea34c355@vtiger.fosslabs.com> #593: Module link disappears in Settings ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Custom Field ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => Custom Field -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 22:53:00 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 05:53:00 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23597=3A_?= =?utf-8?q?Could_Not_Delete_Custom_field?= In-Reply-To: <076.9c60b0908294d48b138cbb0101c00ede@vtiger.fosslabs.com> References: <076.9c60b0908294d48b138cbb0101c00ede@vtiger.fosslabs.com> Message-ID: <085.ba4ea08932b79503bd115fa73c3fc83b@vtiger.fosslabs.com> #597: Could Not Delete Custom field ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Custom Field ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => Custom Field -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 22:53:54 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 05:53:54 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23570=3A_?= =?utf-8?q?Pick_List_icons_inconsistent?= In-Reply-To: <076.1ef32f153a483f1423972c5c8cf63f26@vtiger.fosslabs.com> References: <076.1ef32f153a483f1423972c5c8cf63f26@vtiger.fosslabs.com> Message-ID: <085.85eb5793d574bae18cf120ef40137417@vtiger.fosslabs.com> #570: Pick List icons inconsistent ------------------------+--------------------------------------------------- Reporter: saraj | Owner: ela Type: defect | Status: assigned Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Pick List icons Custom Field ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => Pick List icons Custom Field -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 22:55:31 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 05:55:31 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23600=3A_?= =?utf-8?q?Mispelled_column_name?= In-Reply-To: <076.b65b2c1314c1f9f04ba05babf632fd4a@vtiger.fosslabs.com> References: <076.b65b2c1314c1f9f04ba05babf632fd4a@vtiger.fosslabs.com> Message-ID: <085.b5077bb55bc78ce242e58d96fda0a88f@vtiger.fosslabs.com> #600: Mispelled column name ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by saraj): * status: assigned => new * owner: ela => mangai -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 20 22:57:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 21 Apr 2006 05:57:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5201 - /vtigercrm/trunk/install/1checkSystem.php Message-ID: <20060421055756.0188F6AB2BE@vtiger.fosslabs.com> Author: don Date: Thu Apr 20 23:57:52 2006 New Revision: 5201 Log: write permission check info changed for tabdata and parenttabdata Modified: vtigercrm/trunk/install/1checkSystem.php Modified: vtigercrm/trunk/install/1checkSystem.php ============================================================================== Binary files - no diff available. From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 22:57:55 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 05:57:55 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23600=3A_?= =?utf-8?q?Mispelled_column_name?= In-Reply-To: <076.b65b2c1314c1f9f04ba05babf632fd4a@vtiger.fosslabs.com> References: <076.b65b2c1314c1f9f04ba05babf632fd4a@vtiger.fosslabs.com> Message-ID: <085.79700a03c275a16176ac25adda815b67@vtiger.fosslabs.com> #600: Mispelled column name ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Custom Field column header ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => Custom Field column header -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 23:02:00 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 06:02:00 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23272=3A_?= =?utf-8?q?User_name_duplicated_in_popup?= In-Reply-To: <076.bcf5f8a6d18be7a4229ae7d427ac1f31@vtiger.fosslabs.com> References: <076.bcf5f8a6d18be7a4229ae7d427ac1f31@vtiger.fosslabs.com> Message-ID: <085.a079991bd27816397ff474f8dc347a40@vtiger.fosslabs.com> #272: User name duplicated in popup ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: User Popup ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => User Popup * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 23:13:10 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 06:13:10 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23284=3A_?= =?utf-8?q?Email_field_not_validated?= In-Reply-To: <076.8958de9cd73803ee58879a56b01fa34a@vtiger.fosslabs.com> References: <076.8958de9cd73803ee58879a56b01fa34a@vtiger.fosslabs.com> Message-ID: <085.8ef59f008445e1d6c45284f0168ae42f@vtiger.fosslabs.com> #284: Email field not validated ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Users Email Validation ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => Users Email Validation * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 23:14:30 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 06:14:30 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23304=3A_?= =?utf-8?q?Show_contents_on-mousover?= In-Reply-To: <076.12b5e03c26eb7033b97b03b38ef20578@vtiger.fosslabs.com> References: <076.12b5e03c26eb7033b97b03b38ef20578@vtiger.fosslabs.com> Message-ID: <085.4b70ae86359935f026734ae765ed750f@vtiger.fosslabs.com> #304: Show contents on-mousover ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: User Detail view ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => User Detail view * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 23:15:29 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 06:15:29 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23315=3A_?= =?utf-8?q?Check_if_user_already_exists=2C_in_the_same_page=2E?= In-Reply-To: <076.2e1aaf74031a03bfe756a227e3d670ca@vtiger.fosslabs.com> References: <076.2e1aaf74031a03bfe756a227e3d670ca@vtiger.fosslabs.com> Message-ID: <085.7eba493d31054f6a8d2d720c28d08272@vtiger.fosslabs.com> #315: Check if user already exists, in the same page. ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: User Create View Duplicate user ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => User Create View Duplicate user * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 23:16:33 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 06:16:33 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23316=3A_?= =?utf-8?q?Error_Message_merges_with_the_arrow?= In-Reply-To: <076.2e31abce995b69bf750fa51b6fc23dc7@vtiger.fosslabs.com> References: <076.2e31abce995b69bf750fa51b6fc23dc7@vtiger.fosslabs.com> Message-ID: <085.c8aaac84212a5479c1182231cf587788@vtiger.fosslabs.com> #316: Error Message merges with the arrow ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Duplicate user Error message ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => Duplicate user Error message * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 23:17:19 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 06:17:19 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23323=3A_?= =?utf-8?q?Error_Mesage_goes_out_of_Parent_Home_page=2E?= In-Reply-To: <076.86b7a11d76b69a5fb8170be99018757b@vtiger.fosslabs.com> References: <076.86b7a11d76b69a5fb8170be99018757b@vtiger.fosslabs.com> Message-ID: <085.9d8ceba918acf095da8c918488aed6be@vtiger.fosslabs.com> #323: Error Mesage goes out of Parent Home page. ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Create User ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => Create User * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 23:28:02 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 06:28:02 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23330=3A_?= =?utf-8?q?Existing_image_name_should_be_displayed_in_the_field?= In-Reply-To: <076.16fe0771edb6771801e498a1a0de5d62@vtiger.fosslabs.com> References: <076.16fe0771edb6771801e498a1a0de5d62@vtiger.fosslabs.com> Message-ID: <085.090ad60a8e2fc15f10b8257bbaaf9c1b@vtiger.fosslabs.com> #330: Existing image name should be displayed in the field ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Create User ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => Create User * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 23:29:07 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 06:29:07 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23333=3A_?= =?utf-8?q?No_css_for_Change_password_popup?= In-Reply-To: <076.166732b8cfc76c7f522640e2cbaa3eef@vtiger.fosslabs.com> References: <076.166732b8cfc76c7f522640e2cbaa3eef@vtiger.fosslabs.com> Message-ID: <085.f6df13e5b3e108a77011a22a6045aacd@vtiger.fosslabs.com> #333: No css for Change password popup ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: User Change Password popup ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => User Change Password popup * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 23:29:44 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 06:29:44 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23345=3A_?= =?utf-8?q?No_css/smartification_for_Login_History?= In-Reply-To: <076.6e3fb9b3ca30ba32d7be19a23d4a1c22@vtiger.fosslabs.com> References: <076.6e3fb9b3ca30ba32d7be19a23d4a1c22@vtiger.fosslabs.com> Message-ID: <085.1e00e6f6a1d1e989362f59b72f882237@vtiger.fosslabs.com> #345: No css/smartification for Login History ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Login History ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => Login History * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 23:40:44 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 06:40:44 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23353=3A_?= =?utf-8?q?Improper_redirection_after_saving_user_info=2E?= In-Reply-To: <076.16451aac6901713fe57067ba9815fe54@vtiger.fosslabs.com> References: <076.16451aac6901713fe57067ba9815fe54@vtiger.fosslabs.com> Message-ID: <085.80f521db16ca024ab38e2af4a71b426a@vtiger.fosslabs.com> #353: Improper redirection after saving user info. ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: User Save ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => User Save * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 23:42:06 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 06:42:06 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23356=3A_?= =?utf-8?q?My_Mail_Server_Details_link_is_broken?= In-Reply-To: <076.4278d8a764c99e1c7fce31d0bb54bc43@vtiger.fosslabs.com> References: <076.4278d8a764c99e1c7fce31d0bb54bc43@vtiger.fosslabs.com> Message-ID: <085.4d962aac374002162b4c7648ca5c631d@vtiger.fosslabs.com> #356: My Mail Server Details link is broken ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Mail Server ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => Mail Server * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 23:48:35 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 06:48:35 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23362=3A_?= =?utf-8?q?Password_change_button_not_working?= In-Reply-To: <076.04d872851b07e69b050f147c45a8fc45@vtiger.fosslabs.com> References: <076.04d872851b07e69b050f147c45a8fc45@vtiger.fosslabs.com> Message-ID: <085.cb787e196f889e394811ed5d9315e2ba@vtiger.fosslabs.com> #362: Password change button not working ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Users Password change ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => Users Password change * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 23:49:26 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 06:49:26 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23364=3A_?= =?utf-8?q?MY_photo_-_not_woking?= In-Reply-To: <076.f202743bc19114a43c94845f1c70b42e@vtiger.fosslabs.com> References: <076.f202743bc19114a43c94845f1c70b42e@vtiger.fosslabs.com> Message-ID: <085.ae52a1647132a29fc3462e74c74eb3d9@vtiger.fosslabs.com> #364: MY photo - not woking ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: User Image ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => User Image * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 23:50:48 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 06:50:48 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23373=3A_?= =?utf-8?q?no_css/smartification_for_user_popup?= In-Reply-To: <076.f6d4ea79d0fdd4a5716878c6e1ed2ab6@vtiger.fosslabs.com> References: <076.f6d4ea79d0fdd4a5716878c6e1ed2ab6@vtiger.fosslabs.com> Message-ID: <085.84185c0783eae5a94488cd1a1a75a700@vtiger.fosslabs.com> #373: no css/smartification for user popup ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: User Popup ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => User Popup * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 23:51:01 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 06:51:01 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23373=3A_?= =?utf-8?q?no_css/smartification_for_user_popup?= In-Reply-To: <076.f6d4ea79d0fdd4a5716878c6e1ed2ab6@vtiger.fosslabs.com> References: <076.f6d4ea79d0fdd4a5716878c6e1ed2ab6@vtiger.fosslabs.com> Message-ID: <085.bfe24e8973312ddd4496e67ef66354cd@vtiger.fosslabs.com> #373: no css/smartification for user popup ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: User Popup ------------------------+--------------------------------------------------- Changes (by saraj): * milestone: => 5.0.0 -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 23:52:14 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 06:52:14 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23378=3A_?= =?utf-8?q?Primay_email_id_missing_in_my_preference?= In-Reply-To: <076.9605de8a0a9544f75c23e69263630e20@vtiger.fosslabs.com> References: <076.9605de8a0a9544f75c23e69263630e20@vtiger.fosslabs.com> Message-ID: <085.2712b8e79f3f03cc865eb5980cea2a8d@vtiger.fosslabs.com> #378: Primay email id missing in my preference ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Email Field My preference ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => Email Field My preference * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 00:00:28 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 07:00:28 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23382=3A_?= =?utf-8?q?No_validation_when_user_data_edited?= In-Reply-To: <076.eadf7fb20abbf73be16f9e9f05ec9131@vtiger.fosslabs.com> References: <076.eadf7fb20abbf73be16f9e9f05ec9131@vtiger.fosslabs.com> Message-ID: <085.2ccdbf2be6e4127db3e0b5ad8f6445e6@vtiger.fosslabs.com> #382: No validation when user data edited ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: User update ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => User update * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 00:01:18 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 07:01:18 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23388=3A_?= =?utf-8?q?In_consistent_headings_in_Setting_pages?= In-Reply-To: <076.cd4fd81a0701b4d2a86d39847cf87427@vtiger.fosslabs.com> References: <076.cd4fd81a0701b4d2a86d39847cf87427@vtiger.fosslabs.com> Message-ID: <085.7ec0391e17bbda422b4cf4e08b013ddc@vtiger.fosslabs.com> #388: In consistent headings in Setting pages ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Settings ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => Settings * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 00:05:19 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 07:05:19 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23393=3A_?= =?utf-8?q?Problem_in_expand_collapse_in_Settings_module?= In-Reply-To: <076.7b27ce41ba1454e26c00bd24f88a4fa3@vtiger.fosslabs.com> References: <076.7b27ce41ba1454e26c00bd24f88a4fa3@vtiger.fosslabs.com> Message-ID: <085.da205177026b713922fc89086f03c792@vtiger.fosslabs.com> #393: Problem in expand collapse in Settings module ------------------------+--------------------------------------------------- Reporter: saraj | Owner: ela Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: UI problem ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => UI problem * owner: developer => ela -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 00:06:11 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 07:06:11 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23406=3A_?= =?utf-8?q?Campaigns_module_missing?= In-Reply-To: <076.69533f198515fd391ea1fa6897389004@vtiger.fosslabs.com> References: <076.69533f198515fd391ea1fa6897389004@vtiger.fosslabs.com> Message-ID: <085.0d1b929aed7f023aba79214d6f9a047b@vtiger.fosslabs.com> #406: Campaigns module missing ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Setting Assign Module Owners ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => Setting Assign Module Owners * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 00:07:39 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 07:07:39 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23410=3A_?= =?utf-8?q?Improper_redirection_on_clicking_cancel?= In-Reply-To: <076.04eee924b1ab2c373eba75721188a75f@vtiger.fosslabs.com> References: <076.04eee924b1ab2c373eba75721188a75f@vtiger.fosslabs.com> Message-ID: <085.b6cf0d03ec95a3252f78eeeda7d34e7b@vtiger.fosslabs.com> #410: Improper redirection on clicking cancel ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Settings Assign Moudle Owners ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => Settings Assign Moudle Owners * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 00:08:34 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 07:08:34 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23535=3A_?= =?utf-8?q?Feature_Explanation=2E=2E=2E=3F!_in_Settings?= In-Reply-To: <076.945b6b8539d74910f146ef63ca692def@vtiger.fosslabs.com> References: <076.945b6b8539d74910f146ef63ca692def@vtiger.fosslabs.com> Message-ID: <085.dc2bb3f1398299b4216fa641d27dec47@vtiger.fosslabs.com> #535: Feature Explanation...?! in Settings ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mangai Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Custom Field ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => Custom Field * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 00:09:27 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 07:09:27 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23552=3A_?= =?utf-8?q?Multi_select_combo_-_does_not_show_more_than_one?= In-Reply-To: <076.a29e2878cda6efdae6641e152e7459e0@vtiger.fosslabs.com> References: <076.a29e2878cda6efdae6641e152e7459e0@vtiger.fosslabs.com> Message-ID: <085.1dcd450b75a73da4a91e9e134d3d310f@vtiger.fosslabs.com> #552: Multi select combo - does not show more than one ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Pick List ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => Pick List * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 00:09:54 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 07:09:54 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23564=3A_?= =?utf-8?q?Image_missing_at_installation_Step_5_of_5?= In-Reply-To: <076.491f69969dbf544e4a7bd702ab6179d7@vtiger.fosslabs.com> References: <076.491f69969dbf544e4a7bd702ab6179d7@vtiger.fosslabs.com> Message-ID: <085.ef8d0b232731ca92032923f821caa1a5@vtiger.fosslabs.com> #564: Image missing at installation Step 5 of 5 ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Installation ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => Installation * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 21 00:10:38 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 21 Apr 2006 07:10:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5202 - /vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl Message-ID: <20060421071038.8B1B76AB2F2@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 21 01:10:34 2006 New Revision: 5202 Log: Missing Headers & Labels in Mail Merge Template Fixed - Ahmed Modified: vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl Modified: vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl Fri Apr 21 01:10:34 2006 @@ -62,11 +62,11 @@ - {$UMOD.LBL_UPLOAD_FILE} + {$UMOD.LBL_UPLOAD} - {$UMOD.LBL_FILE_MERGE} : + {$UMOD.LBL_MERGE_FILE}
    (Eg - .doc, .rtf files) From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 00:10:58 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 07:10:58 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23605=3A_?= =?utf-8?q?Incomplete_description_for_Pick_List_Editor?= In-Reply-To: <076.39e93a7028e5b13d3dd484adfef8ba8a@vtiger.fosslabs.com> References: <076.39e93a7028e5b13d3dd484adfef8ba8a@vtiger.fosslabs.com> Message-ID: <085.fc95a70efe6a58c16d6bd63199e77f49@vtiger.fosslabs.com> #605: Incomplete description for Pick List Editor ------------------------+--------------------------------------------------- Reporter: saraj | Owner: managai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Pick List ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => Pick List * owner: developer => managai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 00:11:15 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 07:11:15 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23605=3A_?= =?utf-8?q?Incomplete_description_for_Pick_List_Editor?= In-Reply-To: <076.39e93a7028e5b13d3dd484adfef8ba8a@vtiger.fosslabs.com> References: <076.39e93a7028e5b13d3dd484adfef8ba8a@vtiger.fosslabs.com> Message-ID: <085.a690884a81cac931413d6a256b418371@vtiger.fosslabs.com> #605: Incomplete description for Pick List Editor ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Pick List ------------------------+--------------------------------------------------- Changes (by saraj): * owner: managai => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 00:12:02 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 07:12:02 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23614=3A_?= =?utf-8?q?Edit_Pick_list_popup_is_half_displayed?= In-Reply-To: <076.19bd966bb5be11457c9445cff5c6903c@vtiger.fosslabs.com> References: <076.19bd966bb5be11457c9445cff5c6903c@vtiger.fosslabs.com> Message-ID: <085.fe43aefd787afc4f418a0fe7082b1d86@vtiger.fosslabs.com> #614: Edit Pick list popup is half displayed ------------------------+--------------------------------------------------- Reporter: saraj | Owner: ela Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Pick List Settings ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => Pick List Settings * owner: developer => ela -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 00:24:32 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 07:24:32 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23536=3A_?= =?utf-8?q?Ticketsystem_Emails?= In-Reply-To: <076.c51ff6414ec289c44df50737baa910d6@vtiger.fosslabs.com> References: <076.c51ff6414ec289c44df50737baa910d6@vtiger.fosslabs.com> Message-ID: <085.70fe23c749705aa1fa2c0dadeae18951@vtiger.fosslabs.com> #536: Ticketsystem Emails -----------------------------+---------------------------------------------- Reporter: anonymous | Owner: mickie Type: enhancement | Status: assigned Priority: major | Milestone: Component: customerportal | Version: 5.0.0 Resolution: | Keywords: Ticket mail -----------------------------+---------------------------------------------- Comment (by anonymous): Thanks for your answer. I mean the mail addresses in "Reported by:" and "Cc:" in the ticket itself wich can be viewed online. Yes, it is not neccassary to write my mail address in the fields, but I thought this would not be displayed in the online ticket and is only for internal use... The problem is that anyone (a Spambot for example) can visit this site to harvest email addresses. So, either you should put a warning note here that the email address will be viewable for anyone who visit this site, or you hide it for anonymous users, or you hide it completly. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 21 00:46:29 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 21 Apr 2006 07:46:29 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5203 - /vtigercrm/trunk/modules/Campaigns/ListView.php Message-ID: <20060421074629.16B2A6AB33A@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 21 01:46:25 2006 New Revision: 5203 Log: Advance Search link added Modified: vtigercrm/trunk/modules/Campaigns/ListView.php Modified: vtigercrm/trunk/modules/Campaigns/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/ListView.php (original) +++ vtigercrm/trunk/modules/Campaigns/ListView.php Fri Apr 21 01:46:25 2006 @@ -49,16 +49,16 @@ if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { - $where=Search($currentModule); + $where=getWhereCondition($currentModule); $url_string .="&query=true"; - if (isset($_REQUEST['campaignid'])) $campaignid = $_REQUEST['campaignid']; +/* if (isset($_REQUEST['campaignid'])) $campaignid = $_REQUEST['campaignid']; if (isset($_REQUEST['campaignname'])) $campaignname = $_REQUEST['campaignname']; if (isset($_REQUEST['campaigntype'])) $campaigntype = $_REQUEST['campaigntype']; if (isset($_REQUEST['campaignstatus'])) $campaignstatus = $_REQUEST['campaignstatus']; if (isset($_REQUEST['current_user_only'])) $current_user_only = $_REQUEST['current_user_only']; - +*/ } //<<<>>>>>> @@ -113,6 +113,7 @@ { $list_query .= ' and '.$where; } + //sort by "assignedto" and default sort by "ticketid"(DESC) if(isset($order_by) && $order_by != '') { @@ -185,6 +186,13 @@ $smarty->assign("LISTENTITY", $listview_entries); $smarty->assign("SELECT_SCRIPT", $view_script); $navigationOutput = getTableHeaderNavigation($navigation_array, $url_string,"Campaigns","index",$viewid); +$alphabetical = AlphabeticalSearch($currentModule,'index','campaignname','true','basic',"","","","",$viewid); +$fieldnames = getAdvSearchfields($module); +$criteria = getcriteria_options(); +$smarty->assign("CRITERIA", $criteria); +$smarty->assign("FIELDNAMES", $fieldnames); +$smarty->assign("ALPHABETICAL", $alphabetical); + $smarty->assign("NAVIGATION", $navigationOutput); $smarty->assign("RECORD_COUNTS", $record_string); From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 00:48:33 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 07:48:33 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2386=3A_H?= =?utf-8?q?elpDesk_Assigned_To_field_pulls_only_user_data_in_Custom_Views?= In-Reply-To: <076.f9eb297f705149b7cfa25e948aa290f1@vtiger.fosslabs.com> References: <076.f9eb297f705149b7cfa25e948aa290f1@vtiger.fosslabs.com> Message-ID: <085.08306ee46db3a8f8ace48534031d8d6d@vtiger.fosslabs.com> #86: HelpDesk Assigned To field pulls only user data in Custom Views ------------------------------------+--------------------------------------- Reporter: james at jenxnetwork.com | Owner: allanbush Type: defect | Status: assigned Priority: critical | Milestone: 4.2.4 Component: vtigercrm | Version: 4.2.3 Resolution: | Keywords: helpdesk, custom views ------------------------------------+--------------------------------------- Changes (by allanbush): * status: new => assigned * owner: Any Developer => allanbush Comment: I've added a patch which enables this for Activities, Emails, HelpDesk and Leads (unless I missed something that's the only places you can assign an entry to a group). It may be too late to check this in before the 4.2.4 release, I'll let Mike Fedyk make that call. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 21 01:10:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 21 Apr 2006 08:10:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5204 - in /vtigercrm/trunk/themes/blue/images: bookMark.gif btnL3AllMenu.gif uparrow.gif Message-ID: <20060421081057.8B76F6AB352@vtiger.fosslabs.com> Author: richie Date: Fri Apr 21 02:10:49 2006 New Revision: 5204 Log: Images added to integrate New UI for Home Page Added: vtigercrm/trunk/themes/blue/images/bookMark.gif (with props) vtigercrm/trunk/themes/blue/images/btnL3AllMenu.gif (with props) vtigercrm/trunk/themes/blue/images/uparrow.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 21 01:12:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 21 Apr 2006 08:12:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5205 - /vtigercrm/trunk/Smarty/templates/HomePage.tpl Message-ID: <20060421081220.A83BA6AB353@vtiger.fosslabs.com> Author: richie Date: Fri Apr 21 02:12:16 2006 New Revision: 5205 Log: Code Changed to integrate New UI for Home Page 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 Fri Apr 21 02:12:16 2006 @@ -1,46 +1,14 @@ - - - - + + + + + + + + + + + @@ -80,8 +48,12 @@ + + + +
    Open Calendar...Show World Clock... Open Calculator... Open All Menu...
    @@ -101,138 +73,157 @@ {* Main Contents Start Here *} - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - -
    - -
    - - - - - {* {foreach item=hometab from=$HOMEDETAILS} - {if $hometab.Title.3 neq ''} - - {/if} - {/foreach} *} - - - -
    My Home - At a Glance - - - - {$hometab.Title.3} -
    -
    -
     
    - - - - - - -
    - - {foreach item=hometab from=$HOMEDETAILS} - {if $hometab neq ''} - {if $hometab.Title.2 eq $HOMEDEFAULTVIEW} - - - - - - {else} - - - - - {/if} - {/if} - {/foreach} -
    {$hometab.Title.1}
    {$hometab.Title.1}
    -     		+ + + + +
    + +
    {foreach item=tabledetail from=$HOMEDETAILS} {if $tabledetail neq ''} - {if $tabledetail.Title.2 neq $HOMEDEFAULTVIEW} - +
    + +{* Quick Access Functionality *} +
    + + + + + - + + + + - - - - {foreach key=header item=headerdetail from=$tabledetail.Header} - - {/foreach} - - - - {foreach key=row item=detail from=$tabledetail.Entries} - - - {foreach key=label item=entries from=$detail} - - {/foreach} - - - {/foreach} - -
    Jump To +
    {$tabledetail.Title.1} (Mark as Default View) + + Home + Home + Activities + Calander + Email + Sales + + Leads + Accounts + Contacts + Potentials + Quotes + Sales Order + + Invoice + Campaigns + Products + Price Books + Notes + + Support + Help Desk + Faq + Accounts + Contacts + + Products + Notes + Analytics + Dashboard + Reports + Inventory + + Products + Vendors + Price Books + PurchaseOrder + SalesOrder + Quotes + + Invoice + + Tools + Rss + Portal + Notes + + Settings + Settings +
     
     {$headerdetail}
    {$entries}
    -
    -{/if} -{/foreach} -
     

    - - {if $TAGCLOUD_JS ne ''} - - - {/if} -
    -
    - - - - - - + + +{literal} + + + +{/literal} - + @@ -9,7 +9,8 @@
    @@ -30,7 +31,7 @@ From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 21 04:49:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 21 Apr 2006 11:49:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5222 - /vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl Message-ID: <20060421114900.83DA46A22A2@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 21 05:48:56 2006 New Revision: 5222 Log: Fixed the redirection issues & crumbs in Email Templates - Ahmed Modified: vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl Modified: vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl Fri Apr 21 05:48:56 2006 @@ -1,6 +1,6 @@ - + + @@ -101,8 +99,11 @@ - - + '; + +if(isPermitted("Potentials",'EditView') == 'yes') +{ +$convertlead .=' @@ -122,6 +123,11 @@ ('.$current_user->date_format.') + @@ -135,8 +141,9 @@

    - {$MOD.LBL_SETTINGS} > {$UMOD.LBL_EMAIL_TEMPLATE_INFORMATION} "{$TEMPLATENAME}" + {$MOD.LBL_SETTINGS} + > {$UMOD.LBL_EMAIL_TEMPLATE_INFORMATION} "{$TEMPLATENAME}"
    		 
    {$TEMPLATENAME}
    - {$TEMPLATENAME} Template - provided by vtiger CRM Team + {$TEMPLATENAME} Template
    '.$mod_strings['LBL_ACCOUNT_NAME'].'
    '.$mod_strings['LBL_DO_NOT_CREATE_NEW_POTENTIAL'].'
    - - + '; +} +$convertlead .='   @@ -149,6 +156,4 @@ '; echo $convertlead; -//$xtpl->assign("CALENDAR_DATEFORMAT", parse_calendardate($app_strings['NTC_DATE_FORMAT'])); - ?> From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 21 07:07:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 21 Apr 2006 14:07:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5237 - /vtigercrm/trunk/install/populateSeedData.php Message-ID: <20060421140710.86E696AB344@vtiger.fosslabs.com> Author: richie Date: Fri Apr 21 08:07:04 2006 New Revision: 5237 Log: entries for campaign added Modified: vtigercrm/trunk/install/populateSeedData.php Modified: vtigercrm/trunk/install/populateSeedData.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 21 07:07:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 21 Apr 2006 14:07:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5238 - /vtigercrm/trunk/schema/DatabaseSchema.xml Message-ID: <20060421140738.0C25A6AB344@vtiger.fosslabs.com> Author: richie Date: Fri Apr 21 08:07:33 2006 New Revision: 5238 Log: new fields added to campaign Modified: vtigercrm/trunk/schema/DatabaseSchema.xml Modified: vtigercrm/trunk/schema/DatabaseSchema.xml ============================================================================== --- vtigercrm/trunk/schema/DatabaseSchema.xml (original) +++ vtigercrm/trunk/schema/DatabaseSchema.xml Fri Apr 21 08:07:33 2006 @@ -1744,7 +1744,20 @@ - + + + + + + + + + + + + + + From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 21 07:07:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 21 Apr 2006 14:07:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5239 - /vtigercrm/trunk/modules/Campaigns/language/en_us.lang.php Message-ID: <20060421140749.25A536AB344@vtiger.fosslabs.com> Author: richie Date: Fri Apr 21 08:07:45 2006 New Revision: 5239 Log: new fields added to campaign Modified: vtigercrm/trunk/modules/Campaigns/language/en_us.lang.php Modified: vtigercrm/trunk/modules/Campaigns/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/Campaigns/language/en_us.lang.php Fri Apr 21 08:07:45 2006 @@ -44,7 +44,13 @@ 'TargetSize'=>'TargetSize', 'Sponsor'=>'Sponsor', +'Expected Sales Count'=>'Expected Sales Count', +'Expected Response Count'=>'Expected Response Count', +'Expected ROI'=>'Expected ROI', +'Actual Sales Count'=>'Actual Sales Count', +'Actual Response Count'=>'Actual Response Count', +'Actual ROI'=>'Actual ROI', ); From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 21 07:13:08 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 21 Apr 2006 14:13:08 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5240 - /vtigercrm/trunk/modules/Users/Security.php Message-ID: <20060421141308.728036AB455@vtiger.fosslabs.com> Author: richie Date: Fri Apr 21 08:13:03 2006 New Revision: 5240 Log: entries for campaign added Modified: vtigercrm/trunk/modules/Users/Security.php Modified: vtigercrm/trunk/modules/Users/Security.php ============================================================================== --- vtigercrm/trunk/modules/Users/Security.php (original) +++ vtigercrm/trunk/modules/Users/Security.php Fri Apr 21 08:13:03 2006 @@ -362,9 +362,9 @@ $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'product','campaign',1,59,'product','Product',1,0,0,100,3,76,1,'V~O',0,5,'BAS')"); $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'campaignstatus','campaign',1,15,'campaignstatus','Campaign Status',1,0,0,100,4,76,1,'V~O',0,5,'BAS')"); $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'closingdate','campaign',1,'23','closingdate','Expected Close Date',1,0,0,100,5,76,1,'D~M',0,3,'BAS')"); - $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'expectedrevenue','campaign',1,'15','expectedrevenue','Expected Revenue',1,0,0,100,6,76,1,'I~O',1,null,'BAS')"); + $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'expectedrevenue','campaign',1,'1','expectedrevenue','Expected Revenue',1,0,0,100,6,76,1,'I~O',1,null,'BAS')"); $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'budgetcost','campaign',1,'1','budgetcost','Budget Cost',1,0,0,100,7,76,1,'I~O',1,null,'BAS')"); - $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'actualcost','campaign',1,'15','actualcost','Actual Cost',1,0,0,100,8,76,1,'I~O',1,null,'BAS')"); + $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'actualcost','campaign',1,'1','actualcost','Actual Cost',1,0,0,100,8,76,1,'I~O',1,null,'BAS')"); $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'expectedresponse','campaign',1,'16','expectedresponse','Expected Response',1,0,0,100,9,76,1,'V~O',0,4,'BAS')"); $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,10,76,1,'V~M',1,null,'BAS')"); $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'numsent','campaign',1,'9','numsent','Num Sent',1,0,0,100,11,76,1,'N~O',1,null,'BAS')"); @@ -372,6 +372,12 @@ $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'targetaudience','campaign',1,'1','targetaudience','Target Audience',1,0,0,100,13,76,1,'V~O',1,null,'BAS')"); $this->db->query("insert into field values(26,".$this->db->getUniqueID("field").",'targetsize','campaign',1,'1','targetsize','TargetSize',1,0,0,100,14,76,1,'N~O',1,null,'BAS')"); +$this->db->query("insert into field values(26,".$this->db->getUniqueID("field").",'expectedresponsecount','campaign',1,'1','expectedresponsecount','Expected Response Count',1,0,0,100,17,76,1,'N~O',1,null,'BAS')"); +$this->db->query("insert into field values(26,".$this->db->getUniqueID("field").",'expectedsalescount','campaign',1,'1','expectedsalescount','Expected Sales Count',1,0,0,100,15,76,1,'N~O',1,null,'BAS')"); +$this->db->query("insert into field values(26,".$this->db->getUniqueID("field").",'expectedroi','campaign',1,'1','expectedroi','Expected ROI',1,0,0,100,19,76,1,'N~O',1,null,'BAS')"); +$this->db->query("insert into field values(26,".$this->db->getUniqueID("field").",'actualresponsecount','campaign',1,'1','actualresponsecount','Actual Response Count',1,0,0,100,18,76,1,'N~O',1,null,'BAS')"); +$this->db->query("insert into field values(26,".$this->db->getUniqueID("field").",'actualsalescount','campaign',1,'1','actualsalescount','Actual Sales Count',1,0,0,100,16,76,1,'N~O',1,null,'BAS')"); +$this->db->query("insert into field values(26,".$this->db->getUniqueID("field").",'actualroi','campaign',1,'1','actualroi','Actual ROI',1,0,0,100,20,76,1,'N~O',1,null,'BAS')"); $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,15,76,2,'T~O',1,null,'BAS')"); $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,16,76,2,'T~O',1,null,'BAS')"); From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 21 07:50:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 21 Apr 2006 14:50:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5241 - /vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl Message-ID: <20060421145049.3695C6AB461@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 21 08:50:44 2006 New Revision: 5241 Log: Fixed the Default Folder Selection for Edit Email Template - Ahmed Modified: vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl Modified: vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl Fri Apr 21 08:50:44 2006 @@ -144,10 +144,20 @@

    - + From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 07:51:56 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 14:51:56 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23660=3A_?= =?utf-8?q?Edit_Email_templates_-_folder_not_selected?= In-Reply-To: <076.29e376e162944559ac983660660e4deb@vtiger.fosslabs.com> References: <076.29e376e162944559ac983660660e4deb@vtiger.fosslabs.com> Message-ID: <085.28478a687c708eec8bece052b48f5dc8@vtiger.fosslabs.com> #660: Edit Email templates - folder not selected ------------------------+--------------------------------------------------- Reporter: saraj | Owner: ahmed Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Email template ------------------------+--------------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Fixed the Issue - Default Folder is getting selected in Edit Email Template -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 07:52:57 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 14:52:57 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23661=3A_?= =?utf-8?q?Email_template_-_Link_inactive?= In-Reply-To: <076.a0f1721081661b63e851a9ae7ba7b900@vtiger.fosslabs.com> References: <076.a0f1721081661b63e851a9ae7ba7b900@vtiger.fosslabs.com> Message-ID: <085.8937fb46f53768c3b89c664525ff4590@vtiger.fosslabs.com> #661: Email template - Link inactive ------------------------+--------------------------------------------------- Reporter: saraj | Owner: ahmed Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Email template ------------------------+--------------------------------------------------- Changes (by ahmed): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 07:54:10 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 14:54:10 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23661=3A_?= =?utf-8?q?Email_template_-_Link_inactive?= In-Reply-To: <076.a0f1721081661b63e851a9ae7ba7b900@vtiger.fosslabs.com> References: <076.a0f1721081661b63e851a9ae7ba7b900@vtiger.fosslabs.com> Message-ID: <085.56ef9f29f32b129a323de924bb2a3bfb@vtiger.fosslabs.com> #661: Email template - Link inactive ------------------------+--------------------------------------------------- Reporter: saraj | Owner: ahmed Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Email template ------------------------+--------------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue Fixed - the link "View sample Email" is active and working. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 07:54:53 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 14:54:53 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23663=3A_?= =?utf-8?q?Email_Template_name_-_typo_error?= In-Reply-To: <076.9ac9b70ca88ed5b1d50faf1360ad902d@vtiger.fosslabs.com> References: <076.9ac9b70ca88ed5b1d50faf1360ad902d@vtiger.fosslabs.com> Message-ID: <085.89b7744461a30c70521940a51dc5b3ce@vtiger.fosslabs.com> #663: Email Template name - typo error ------------------------+--------------------------------------------------- Reporter: saraj | Owner: ahmed Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Email template ------------------------+--------------------------------------------------- Changes (by ahmed): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 07:55:33 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 14:55:33 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23663=3A_?= =?utf-8?q?Email_Template_name_-_typo_error?= In-Reply-To: <076.9ac9b70ca88ed5b1d50faf1360ad902d@vtiger.fosslabs.com> References: <076.9ac9b70ca88ed5b1d50faf1360ad902d@vtiger.fosslabs.com> Message-ID: <085.3c44a1e7a2d81401df5f0aaa14d98a91@vtiger.fosslabs.com> #663: Email Template name - typo error ------------------------+--------------------------------------------------- Reporter: saraj | Owner: ahmed Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Email template ------------------------+--------------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Typo Error Fixed - Good replaced with Goods -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 21 08:14:14 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 21 Apr 2006 15:14:14 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5242 - /vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl Message-ID: <20060421151414.025F66AB46C@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 21 09:14:10 2006 New Revision: 5242 Log: parenttab added in Detail View & List View of Email Template - Ahmed Modified: vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl Modified: vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl Fri Apr 21 09:14:10 2006 @@ -82,7 +82,7 @@   -
    +
    {* *} @@ -102,9 +102,9 @@ {else} {/if} -  {$template.templatename} +  {$template.templatename} {$template.description} - View Sample Email + View Sample Email {/foreach} From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 08:15:12 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 15:15:12 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23526=3A_?= =?utf-8?q?parenttab_is_not_selected_in_Email_Templates?= In-Reply-To: <076.ee1ce31cc15b35115ca870efbfe083c4@vtiger.fosslabs.com> References: <076.ee1ce31cc15b35115ca870efbfe083c4@vtiger.fosslabs.com> Message-ID: <085.ae11d4260465ce40d12727f7814df548@vtiger.fosslabs.com> #526: parenttab is not selected in Email Templates --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: ahmed Type: defect | Status: new Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: --------------------------------+------------------------------------------- Changes (by ahmed): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 08:15:58 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 15:15:58 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23526=3A_?= =?utf-8?q?parenttab_is_not_selected_in_Email_Templates?= In-Reply-To: <076.ee1ce31cc15b35115ca870efbfe083c4@vtiger.fosslabs.com> References: <076.ee1ce31cc15b35115ca870efbfe083c4@vtiger.fosslabs.com> Message-ID: <085.a4111eb292be7d175204a1856b3aecb0@vtiger.fosslabs.com> #526: parenttab is not selected in Email Templates --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: ahmed Type: defect | Status: closed Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue Fixed - Parenttab is now getting selected as Settings -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 08:16:23 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 15:16:23 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23531=3A_?= =?utf-8?q?parrenttab_is_not_selected_for_detailview?= In-Reply-To: <076.e9e2f24c26be232acb486aa3346ff440@vtiger.fosslabs.com> References: <076.e9e2f24c26be232acb486aa3346ff440@vtiger.fosslabs.com> Message-ID: <085.caf8d5dfad00f567e70d80c853a16c33@vtiger.fosslabs.com> #531: parrenttab is not selected for detailview --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: ahmed Type: defect | Status: new Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: --------------------------------+------------------------------------------- Changes (by ahmed): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 08:17:01 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 15:17:01 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23531=3A_?= =?utf-8?q?parrenttab_is_not_selected_for_detailview?= In-Reply-To: <076.e9e2f24c26be232acb486aa3346ff440@vtiger.fosslabs.com> References: <076.e9e2f24c26be232acb486aa3346ff440@vtiger.fosslabs.com> Message-ID: <085.0220d8ecb6a33b47bd2b3f4166d569a7@vtiger.fosslabs.com> #531: parrenttab is not selected for detailview --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: ahmed Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue Fixed - Parenttab is now select with value as Settings -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 08:18:23 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 15:18:23 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23548=3A_?= =?utf-8?q?redirection_issue_in_email_template_creation?= In-Reply-To: <076.e12934318bebde0ef82f6cc8f0934264@vtiger.fosslabs.com> References: <076.e12934318bebde0ef82f6cc8f0934264@vtiger.fosslabs.com> Message-ID: <085.85cac487a08ce5d730116d23b837d1a3@vtiger.fosslabs.com> #548: redirection issue in email template creation --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: ahmed Type: defect | Status: new Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: --------------------------------+------------------------------------------- Changes (by ahmed): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 08:19:50 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 15:19:50 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23548=3A_?= =?utf-8?q?redirection_issue_in_email_template_creation?= In-Reply-To: <076.e12934318bebde0ef82f6cc8f0934264@vtiger.fosslabs.com> References: <076.e12934318bebde0ef82f6cc8f0934264@vtiger.fosslabs.com> Message-ID: <085.2973c35c990d0443509cf5d030bf9397@vtiger.fosslabs.com> #548: redirection issue in email template creation --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: ahmed Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Redirection Issue is Fixed - The page is getting redirected to Detail view after saving Create/Edit of Email Templates -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 08:20:45 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 15:20:45 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23546=3A_?= =?utf-8?q?link_to_Email_Templates?= In-Reply-To: <076.0276c69b9b3880e30b1f5d200ddc24ad@vtiger.fosslabs.com> References: <076.0276c69b9b3880e30b1f5d200ddc24ad@vtiger.fosslabs.com> Message-ID: <085.3da3d1872ed1e5d1df8b53c63bd105c8@vtiger.fosslabs.com> #546: link to Email Templates --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: ahmed Type: enhancement | Status: new Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: --------------------------------+------------------------------------------- Changes (by ahmed): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 08:21:43 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 15:21:43 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23546=3A_?= =?utf-8?q?link_to_Email_Templates?= In-Reply-To: <076.0276c69b9b3880e30b1f5d200ddc24ad@vtiger.fosslabs.com> References: <076.0276c69b9b3880e30b1f5d200ddc24ad@vtiger.fosslabs.com> Message-ID: <085.0b1040f67e6a7e920010f18e0b2a6408@vtiger.fosslabs.com> #546: link to Email Templates --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: ahmed Type: enhancement | Status: closed Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue Fixed - The Link in the Edit View of Email Templates is now getting redirected to List view on click -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 21 23:56:02 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 22 Apr 2006 06:56:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5243 - in /vtigercrm/trunk/modules/Migration: Migration.php ModifyDatabase/42P2_to_50Alpha.php Message-ID: <20060422065602.0AB386AB569@vtiger.fosslabs.com> Author: don Date: Sat Apr 22 00:55:56 2006 New Revision: 5243 Log: * Modified to capture all the failed and success queries and changed some queries Modified: vtigercrm/trunk/modules/Migration/Migration.php vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Modified: vtigercrm/trunk/modules/Migration/Migration.php ============================================================================== --- vtigercrm/trunk/modules/Migration/Migration.php (original) +++ vtigercrm/trunk/modules/Migration/Migration.php Sat Apr 22 00:55:56 2006 @@ -195,6 +195,13 @@ $this->conn->println("Inside the function modifyDatabase"); echo '

    Note : Please note that for each query the "Object" string will be displayed at the starting of the line if the query executed successfully. If the query fails then "Object" will not be displayed. we can find out the failed queries based on these Object display.'; $conn->println("\n\n\nMickie ---- Starts"); + + //Added variables to get the queries list and count + $query_count = 1; + $success_query_count = 1; + $failure_query_count = 1; + $success_query_array = Array(); + $failure_query_array = Array(); //To handle the file includes for each and every version //Here we have to decide which files should be included, where the files will be added newly for every public release Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php ============================================================================== --- vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php (original) +++ vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Sat Apr 22 00:55:56 2006 @@ -13,6 +13,8 @@ global $conn; +global $query_count, $success_query_count, $failure_query_count; +global $success_query_array, $failure_query_array; $conn->println("Database Modifications for 4.2 Patch2 ==> 5.0(Alpha) Dev 3 Starts here."); echo "

    Database Modifications for 4.2 Patch2 ==> 5.0(Alpha) Dev 3 Starts here.....
    "; @@ -1531,7 +1533,7 @@ Execute($query); } -$update_query2 = "UPDATE field SET fieldlabel = 'Reference' WHERE tabid = 4 and tablename = 'contactdetails'"; +$update_query2 = "UPDATE field SET fieldlabel = 'Reference' WHERE tabid = 4 and tablename = 'contactdetails' and fieldname='reference'"; Execute($update_query2); $alter_query = "ALTER TABLE field ADD column info_type varchar(20) default NULL after quickcreatesequence"; @@ -1894,6 +1896,15 @@ `id` int(11) NOT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1", +"CREATE TABLE `datashare_module_rel` ( + `shareid` int(19) NOT NULL, + `tabid` int(19) NOT NULL, + `relationtype` varchar(200) default NULL, + PRIMARY KEY (`shareid`), + KEY `idx_datashare_module_rel_tabid` (`tabid`), + CONSTRAINT `fk_datashare_module_rel456` FOREIGN KEY (`tabid`) REFERENCES `tab` (`tabid`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + "CREATE TABLE `datashare_grp2grp` ( `shareid` int(19) NOT NULL, `share_groupid` int(19) default NULL, @@ -1931,15 +1942,6 @@ CONSTRAINT `fk_datashare_grp2rs3` FOREIGN KEY (`to_roleandsubid`) REFERENCES `role` (`roleid`) ON DELETE CASCADE, CONSTRAINT `fk_datashare_grp2rs1` FOREIGN KEY (`share_groupid`) REFERENCES `groups` (`groupid`) ON DELETE CASCADE, CONSTRAINT `fk_datashare_grp2rs36` FOREIGN KEY (`shareid`) REFERENCES `datashare_module_rel` (`shareid`) ON DELETE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1", - -"CREATE TABLE `datashare_module_rel` ( - `shareid` int(19) NOT NULL, - `tabid` int(19) NOT NULL, - `relationtype` varchar(200) default NULL, - PRIMARY KEY (`shareid`), - KEY `idx_datashare_module_rel_tabid` (`tabid`), - CONSTRAINT `fk_datashare_module_rel456` FOREIGN KEY (`tabid`) REFERENCES `tab` (`tabid`) ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=latin1", "CREATE TABLE `datashare_relatedmodule_permission` ( @@ -2227,11 +2229,6 @@ "ALTER TABLE `crmentity` MODIFY COLUMN `description` TEXT COLLATE latin1_swedish_ci", "ALTER TABLE `crmentity` MODIFY COLUMN `createdtime` DATETIME NOT NULL", "ALTER TABLE `crmentity` MODIFY COLUMN `modifiedtime` DATETIME NOT NULL", -"ALTER TABLE `currency_info` MODIFY COLUMN `currency_name` VARCHAR(100) COLLATE latin1_swedish_ci DEFAULT NULL", -"ALTER TABLE `currency_info` ADD COLUMN `id` INTEGER(11) NOT NULL AUTO_INCREMENT PRIMARY KEY", -"ALTER TABLE `currency_info` ADD COLUMN `conversion_rate` DECIMAL(5,3) DEFAULT NULL", -"ALTER TABLE `currency_info` ADD COLUMN `currency_status` VARCHAR(25) COLLATE latin1_swedish_ci DEFAULT NULL", -"ALTER TABLE `currency_info` ADD COLUMN `defaultid` VARCHAR(10) COLLATE latin1_swedish_ci NOT NULL DEFAULT '0'", "ALTER TABLE `customaction` MODIFY COLUMN `cvid` INTEGER(19) NOT NULL UNIQUE", "ALTER TABLE `customaction` MODIFY COLUMN `content` TEXT COLLATE latin1_swedish_ci", "ALTER TABLE `customerdetails` MODIFY COLUMN `customerid` INTEGER(19) NOT NULL PRIMARY KEY", @@ -2435,6 +2432,11 @@ "ALTER TABLE `chat_users` ADD KEY `chat_users_IDX2` (`ping`)", "ALTER TABLE `contactgrouprelation` ADD KEY `contactgrouprelation_IDX1` (`groupname`)", "ALTER TABLE `currency_info` DROP PRIMARY KEY", +"ALTER TABLE `currency_info` MODIFY COLUMN `currency_name` VARCHAR(100) COLLATE latin1_swedish_ci DEFAULT NULL", +"ALTER TABLE `currency_info` ADD COLUMN `id` INTEGER(11) NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST", +"ALTER TABLE `currency_info` ADD COLUMN `conversion_rate` DECIMAL(5,3) DEFAULT NULL", +"ALTER TABLE `currency_info` ADD COLUMN `currency_status` VARCHAR(25) COLLATE latin1_swedish_ci DEFAULT NULL", +"ALTER TABLE `currency_info` ADD COLUMN `defaultid` VARCHAR(10) COLLATE latin1_swedish_ci NOT NULL DEFAULT '0'", "ALTER TABLE `currency_info` ADD PRIMARY KEY ()", "ALTER TABLE `def_org_field` ADD KEY `tabid4` (`tabid`)", "ALTER TABLE `def_org_share` ADD KEY `fk_def_org_share23` (`permission`)", @@ -2523,6 +2525,25 @@ Execute($query); } +//Added on 22-04-06 - to add the Notify Owner field in Contacts and Accounts +$notify_owner_array = Array( + "update field set sequence=26 where tabid=4 and fieldname='modifiedtime'", + "update field set sequence=25 where tabid=4 and fieldname='createdtime'", + + "insert into field values(4,".$conn->getUniqueID("field").",'notify_owner','contactdetails',1,56,'notify_owner','Notify Owner',1,0,0,10,24,4,1,'C~O',1,NULL,'ADV')", + "alter table contactdetails add column notify_owner varchar(3) default 0 after reference", + + "update field set sequence=21 where tabid=6 and fieldname='modifiedtime'", + "update field set sequence=20 where tabid=6 and fieldname='createdtime'", + "update field set sequence=19 where tabid=6 and fieldname='assigned_user_id'", + + "insert into field values(6,".$conn->getUniqueID("field").",'notify_owner','account',1,56,'notify_owner','Notify Owner',1,0,0,10,18,9,1,'C~O',1,NULL,'ADV')", + "alter table account add column notify_owner varchar(3) default 0 after emailoptout" + ); +foreach($notify_owner_array as $query) +{ + Execute($query); +} @@ -2537,21 +2558,33 @@ echo "
    Database Modifications for 4.2 Patch2 ==> 5.0(Alpha) Ends here.....
    "; echo '
    Migration has been successfully completed. Data has been moved from your old vtiger to Latest vtigerCRM.'; echo '
    Please note down all the failed queries or please copy the whole table and save. This may be useful in future.    '; + + +echo '

    '; +echo '
    Total Number of Queries executed = '.$query_count; +echo '
    Total Number of Success Queries = '.$success_query_count; +echo '
    Total Number of Failure Queries = '.$failure_query_count; +//echo '
    Success Queries => ';print_r($success_query_array);echo '
    '; +//echo '
    Failure Queries => ';print_r($failure_query_array);echo '
    '; + + echo '


    '; echo ''; echo '


    '; - - - - +echo '
    Failed Queries are :

    '; +foreach($failure_query_array as $failed_query) + echo '
    '.$failed_query.''; +echo '

    '; function Execute($query) { - global $conn; + global $conn, $query_count, $success_query_count, $failure_query_count, $success_query_array, $failure_query_array; + $status = $conn->query($query); + $query_count++; if(is_object($status)) { echo ' @@ -2561,7 +2594,7 @@ '.$query.' '; //echo '
    '.$status.' ==> '.$query; - $success_query_array[] = $query; + $success_query_array[$success_query_count++] = $query; } else { @@ -2572,7 +2605,7 @@ '.$query.' '; //echo '

    '.$status.' ======> '.$query; - $failure_query_array[] = $query; + $failure_query_array[$failure_query_count++] = $query; } } From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 22 07:10:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 22 Apr 2006 14:10:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5244 - /vtigercrm/trunk/modules/Users/language/en_us.lang.php Message-ID: <20060422141023.CC41E6AB61D@vtiger.fosslabs.com> Author: richie Date: Sat Apr 22 08:10:16 2006 New Revision: 5244 Log: Reassigned the List Header for Users and removed Department list Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 22 07:11:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 22 Apr 2006 14:11:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5245 - /vtigercrm/trunk/modules/Users/User.php Message-ID: <20060422141106.2E8166AB624@vtiger.fosslabs.com> Author: richie Date: Sat Apr 22 08:11:01 2006 New Revision: 5245 Log: Rearranged the Listview of Users Module 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 Apr 22 08:11:01 2006 @@ -492,13 +492,13 @@ function getUserListViewHeader() { global $mod_strings; - $header_array=array($mod_strings['LBL_LIST_TOOLS'], + $header_array=array( + $mod_strings['LBL_LIST_TOOLS'], + $mod_strings['LBL_LIST_USER_NAME'], + $mod_strings['LBL_USER_ROLE'], + $mod_strings['LBL_LIST_EMAIL'], $mod_strings['LBL_LIST_NAME'], - $mod_strings['LBL_LIST_USER_NAME'], - $mod_strings['LBL_LIST_DEPARTMENT'], - $mod_strings['LBL_LIST_EMAIL'], - $mod_strings['LBL_USER_ROLE'], - $mod_strings['LBL_LIST_ADMIN']); + $mod_strings['LBL_LIST_ADMIN']); return $header_array; } @@ -520,7 +520,7 @@ $entries[]='Edit  Delete'; $entries[]=$this->db->query_result($result,$i-1,'first_name').' '.$this->db->query_result($result,$i-1,'last_name'); $entries[]=''.$this->db->query_result($result,$i-1,'user_name').''; - $entries[]=$this->db->query_result($result,$i-1,'department'); +// $entries[]=$this->db->query_result($result,$i-1,'department'); $entries[]=$this->db->query_result($result,$i-1,'email1'); $rolecode= fetchUserRole($this->db->query_result($result,$i-1,'id')); $entries[]=''.$roleinfo[$rolecode][0]; From vtiger-tickets at vtiger.fosslabs.com Sat Apr 22 07:12:09 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sat, 22 Apr 2006 14:12:09 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23139=3A_?= =?utf-8?q?user_list_view_not_proper?= In-Reply-To: <076.cf92dc58156e3952e7f8400a73d9ebed@vtiger.fosslabs.com> References: <076.cf92dc58156e3952e7f8400a73d9ebed@vtiger.fosslabs.com> Message-ID: <085.f595d5715bf22664a31cedbadd8fdf04@vtiger.fosslabs.com> #139: user list view not proper ------------------------+--------------------------------------------------- Reporter: richie | Owner: ahmed Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: tools ------------------------+--------------------------------------------------- Changes (by ahmed): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sat Apr 22 07:13:20 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sat, 22 Apr 2006 14:13:20 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23139=3A_?= =?utf-8?q?user_list_view_not_proper?= In-Reply-To: <076.cf92dc58156e3952e7f8400a73d9ebed@vtiger.fosslabs.com> References: <076.cf92dc58156e3952e7f8400a73d9ebed@vtiger.fosslabs.com> Message-ID: <085.53f122b41eef7a1f8142e725671ffcf4@vtiger.fosslabs.com> #139: user list view not proper ------------------------+--------------------------------------------------- Reporter: richie | Owner: ahmed Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: tools ------------------------+--------------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue Fixed - User List view made proper with intuitive headings, Removed department column too. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sat Apr 22 10:09:53 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sat, 22 Apr 2006 17:09:53 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23665=3A_?= =?utf-8?q?Pages_titles_need_to_be_more_descriptive?= In-Reply-To: <076.55f05ab788b002570f7aa354c0519de6@vtiger.fosslabs.com> References: <076.55f05ab788b002570f7aa354c0519de6@vtiger.fosslabs.com> Message-ID: <085.00155fbff2719a7645899a6aff575d27@vtiger.fosslabs.com> #665: Pages titles need to be more descriptive --------------------------+------------------------------------------------- Reporter: allanbush | Owner: developer Type: enhancement | Status: new Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: UI --------------------------+------------------------------------------------- Comment (by ncrossland): Could I suggest making the title user configurable? I would prefer not even to have the module name in the title - just the name of the customer or account. It would be possible to assign a different favicon to each module, so the icon of the tab would convey the module it belonged to. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Apr 23 08:34:03 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sun, 23 Apr 2006 15:34:03 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23733=3A_?= =?utf-8?q?Can=27t_add_products_to_quotes=2C_etc=2E?= Message-ID: <076.4109756da8bcd9540d179c9a4bfe8466@vtiger.fosslabs.com> #733: Can't add products to quotes, etc. ------------------------------------------+--------------------------------- Reporter: client.services.ny at gmail.com | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | ------------------------------------------+--------------------------------- Pulled down the Vtiger5 subversion repo, and installed on FC5. Install went well. Nothing seemed out of the ordinary. Went to put in some quotes and can't see any products to add. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Apr 23 09:28:58 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sun, 23 Apr 2006 16:28:58 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23733=3A_?= =?utf-8?q?Can=27t_add_products_to_quotes=2C_etc=2E?= In-Reply-To: <076.4109756da8bcd9540d179c9a4bfe8466@vtiger.fosslabs.com> References: <076.4109756da8bcd9540d179c9a4bfe8466@vtiger.fosslabs.com> Message-ID: <085.5b6ed386bd47dbe8edf0b187ff5fa7f1@vtiger.fosslabs.com> #733: Can't add products to quotes, etc. -------------------------------------------+-------------------------------- Reporter: client.services.ny at gmail.com | Owner: developer Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: -------------------------------------------+-------------------------------- Changes (by anonymous): * milestone: => 5.0.0 * priority: major => blocker -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Apr 23 09:29:58 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sun, 23 Apr 2006 16:29:58 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23733=3A_?= =?utf-8?q?Can=27t_add_products_to_quotes=2C_etc=2E?= In-Reply-To: <076.4109756da8bcd9540d179c9a4bfe8466@vtiger.fosslabs.com> References: <076.4109756da8bcd9540d179c9a4bfe8466@vtiger.fosslabs.com> Message-ID: <085.6356d2a5394ae3c3f650b0e98e0d7e33@vtiger.fosslabs.com> #733: Can't add products to quotes, etc. -------------------------------------------+-------------------------------- Reporter: client.services.ny at gmail.com | Owner: developer Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: -------------------------------------------+-------------------------------- Comment (by client.services.ny at gmail.com): Products were added. Pricebook was created. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Sun Apr 23 22:05:19 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 05:05:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5246 - /vtigercrm/branches/4.2.4/ Message-ID: <20060424050520.7C99659CF82@vtiger.fosslabs.com> Author: mmbrich Date: Sun Apr 23 23:05:15 2006 New Revision: 5246 Log: 4.2.4 branch Added: vtigercrm/branches/4.2.4/ - copied from r5245, vtigercrm/branches/4.2/ From vtiger-tickets at vtiger.fosslabs.com Sun Apr 23 22:26:13 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 05:26:13 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23555=3A_?= =?utf-8?q?parenttab_in_mailmerge_template_not_selected?= In-Reply-To: <076.d2fa66ec64af11b77a293fbea4edb079@vtiger.fosslabs.com> References: <076.d2fa66ec64af11b77a293fbea4edb079@vtiger.fosslabs.com> Message-ID: <085.c4e0ca7b3543c7e1f043d84db08815f4@vtiger.fosslabs.com> #555: parenttab in mailmerge template not selected --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: ahmed Type: defect | Status: new Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: --------------------------------+------------------------------------------- Changes (by ahmed): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Apr 23 22:27:21 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 05:27:21 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23555=3A_?= =?utf-8?q?parenttab_in_mailmerge_template_not_selected?= In-Reply-To: <076.d2fa66ec64af11b77a293fbea4edb079@vtiger.fosslabs.com> References: <076.d2fa66ec64af11b77a293fbea4edb079@vtiger.fosslabs.com> Message-ID: <085.d6587b0b27b9ddecdf951cd7735a27a4@vtiger.fosslabs.com> #555: parenttab in mailmerge template not selected --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: ahmed Type: defect | Status: closed Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue Fixed - Parenttab Settings is now selected when we create a new mail merge template -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Apr 23 22:36:21 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 05:36:21 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23664=3A_?= =?utf-8?q?Mail_Merge_template_-_field_label_missing?= In-Reply-To: <076.6222bb0fbf4fea358d5ea741def86716@vtiger.fosslabs.com> References: <076.6222bb0fbf4fea358d5ea741def86716@vtiger.fosslabs.com> Message-ID: <085.d88e59708f08444aba45649be07de260@vtiger.fosslabs.com> #664: Mail Merge template - field label missing ------------------------+--------------------------------------------------- Reporter: saraj | Owner: ela Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Mail Merger template ------------------------+--------------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: assigned => closed Comment: Issue Fixed - The field label is added by updating the language file. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Apr 23 22:49:38 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 05:49:38 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23553=3A_?= =?utf-8?q?issue_in_cancel_button?= In-Reply-To: <076.1739a829c23df08f328b183d4285241c@vtiger.fosslabs.com> References: <076.1739a829c23df08f328b183d4285241c@vtiger.fosslabs.com> Message-ID: <085.5a29ad19959696774fedbf72d6664fbb@vtiger.fosslabs.com> #553: issue in cancel button --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: ahmed Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: --------------------------------+------------------------------------------- Changes (by ahmed): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Apr 23 22:50:37 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 05:50:37 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23553=3A_?= =?utf-8?q?issue_in_cancel_button?= In-Reply-To: <076.1739a829c23df08f328b183d4285241c@vtiger.fosslabs.com> References: <076.1739a829c23df08f328b183d4285241c@vtiger.fosslabs.com> Message-ID: <085.6dae8d0c7c8d430b4639dbe5d1aa0c15@vtiger.fosslabs.com> #553: issue in cancel button --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: ahmed Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue Fixed - The alert message no more appears, Changed the type to 'button' for cancel value. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Apr 23 23:14:19 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 06:14:19 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23143=3A_?= =?utf-8?q?Customize_Tab=2C_Home_PageOrder_remove?= In-Reply-To: <076.11dad4514a3d98794cf23cd3e224783e@vtiger.fosslabs.com> References: <076.11dad4514a3d98794cf23cd3e224783e@vtiger.fosslabs.com> Message-ID: <085.2b1d0ee51850ada262322c908b12cac9@vtiger.fosslabs.com> #143: Customize Tab, Home PageOrder remove ------------------------+--------------------------------------------------- Reporter: richie | Owner: ahmed Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: HomePageOrder,Customize Tab ------------------------+--------------------------------------------------- Changes (by ahmed): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Apr 23 23:15:31 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 06:15:31 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23143=3A_?= =?utf-8?q?Customize_Tab=2C_Home_PageOrder_remove?= In-Reply-To: <076.11dad4514a3d98794cf23cd3e224783e@vtiger.fosslabs.com> References: <076.11dad4514a3d98794cf23cd3e224783e@vtiger.fosslabs.com> Message-ID: <085.8a0b686cef234c05752d01a8159b7c74@vtiger.fosslabs.com> #143: Customize Tab, Home PageOrder remove ------------------------+--------------------------------------------------- Reporter: richie | Owner: ahmed Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: HomePageOrder,Customize Tab ------------------------+--------------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue Fixed - Customize Tabs & HomePage Order Buttons Removed from User Detail View. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Apr 23 23:52:47 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 06:52:47 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23163=3A_?= =?utf-8?q?mailserver_details_throws_exception?= In-Reply-To: <076.e8c6a6b2b25f7031e102264397786cd6@vtiger.fosslabs.com> References: <076.e8c6a6b2b25f7031e102264397786cd6@vtiger.fosslabs.com> Message-ID: <085.cfbca0c3e6cd4689947c24173d1af08c@vtiger.fosslabs.com> #163: mailserver details throws exception ------------------------+--------------------------------------------------- Reporter: richie | Owner: ahmed Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: mailserver details ------------------------+--------------------------------------------------- Changes (by ahmed): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Apr 23 23:56:24 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 06:56:24 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23427=3A_?= =?utf-8?q?mailserver_details_fails?= In-Reply-To: <076.9e7e654229d664e748d9809d31b4de35@vtiger.fosslabs.com> References: <076.9e7e654229d664e748d9809d31b4de35@vtiger.fosslabs.com> Message-ID: <085.0cfe6a102f919b71f6fd6e9fcfd897c4@vtiger.fosslabs.com> #427: mailserver details fails ------------------------+--------------------------------------------------- Reporter: richie | Owner: ahmed Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: mailserver ------------------------+--------------------------------------------------- Changes (by ahmed): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 00:14:09 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 07:14:09 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23482=3A_?= =?utf-8?q?Issue_in_currency_configuratin?= In-Reply-To: <076.f78409040b96b8f9d78b271ef840470c@vtiger.fosslabs.com> References: <076.f78409040b96b8f9d78b271ef840470c@vtiger.fosslabs.com> Message-ID: <085.9f4d0964a733060ca91d15fa9c75217a@vtiger.fosslabs.com> #482: Issue in currency configuratin ------------------------+--------------------------------------------------- Reporter: don | Owner: mangai Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * resolution: => fixed * status: new => closed Comment: This has been fixed and integrated in SVN. It will be available in our next release. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 00:34:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 07:34:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5247 - /vtigercrm/trunk/modules/Users/Security.php Message-ID: <20060424073403.AFE3359D3F5@vtiger.fosslabs.com> Author: don Date: Mon Apr 24 01:33:58 2006 New Revision: 5247 Log: Add Rss Category has been added Modified: vtigercrm/trunk/modules/Users/Security.php Modified: vtigercrm/trunk/modules/Users/Security.php ============================================================================== --- vtigercrm/trunk/modules/Users/Security.php (original) +++ vtigercrm/trunk/modules/Users/Security.php Mon Apr 24 01:33:58 2006 @@ -354,6 +354,10 @@ //Potential Details -- END +//Rss entries being added + $this->db->query("insert into field values (24,".$this->db->getUniqueID("field").",'rsscategory','rss',1,'15','rsscategory','rsscategory',1,0,0,255,13,null,1,'V~O',1,null,'BAS')"); +//End of Rss entries + //campaign entries being added From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 00:37:10 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 07:37:10 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23708=3A_?= =?utf-8?q?Rss_folder_adding_is_not_available?= In-Reply-To: <076.76eff0c970275ddd20777607c8f4020d@vtiger.fosslabs.com> References: <076.76eff0c970275ddd20777607c8f4020d@vtiger.fosslabs.com> Message-ID: <085.c147076cd1d6fd1c21a84de930176c9c@vtiger.fosslabs.com> #708: Rss folder adding is not available ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: Jerrysgeorge Type: defect | Status: closed Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Rss ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 01:17:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 08:17:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5248 - /vtigercrm/trunk/modules/System/templates/classic/classic.css Message-ID: <20060424081730.85DA46D03A5@vtiger.fosslabs.com> Author: don Date: Mon Apr 24 02:17:25 2006 New Revision: 5248 Log: style changed as the settings Menu is included in for system configuration Modified: vtigercrm/trunk/modules/System/templates/classic/classic.css Modified: vtigercrm/trunk/modules/System/templates/classic/classic.css ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 01:21:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 08:21:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5249 - /vtigercrm/trunk/include/utils/export.php Message-ID: <20060424082149.17B6D6D03A5@vtiger.fosslabs.com> Author: don Date: Mon Apr 24 02:21:45 2006 New Revision: 5249 Log: Security Modified: vtigercrm/trunk/include/utils/export.php Modified: vtigercrm/trunk/include/utils/export.php ============================================================================== --- vtigercrm/trunk/include/utils/export.php (original) +++ vtigercrm/trunk/include/utils/export.php Mon Apr 24 02:21:45 2006 @@ -30,8 +30,10 @@ require_once('modules/Potentials/Opportunity.php'); require_once('modules/Users/User.php'); require_once('modules/Products/Product.php'); +require_once('include/utils/UserInfoUtil.php'); global $allow_exports; + session_start(); $current_user = new User(); @@ -46,9 +48,22 @@ } } + +//Security Check +if(isPermitted($_REQUEST['module'],"Export") == "no") +{ + $allow_exports="none"; +} + if ($allow_exports=='none' || ( $allow_exports=='admin' && ! is_admin($current_user) ) ) { - die("you can't export!"); + +?> + + References: <076.4c46ddeaf8a9bd9a0763c3db83037d45@vtiger.fosslabs.com> Message-ID: <085.3737d55fbbb60e86a91fccecefd63242@vtiger.fosslabs.com> #96: PDF-generation (invoice) sometimes fails -----------------------------------+---------------------------------------- Reporter: hpw at softechmatrix.nl | Owner: developer Type: defect | Status: reopened Priority: major | Milestone: Component: vtigercrm | Version: 4.2.3 Resolution: | Keywords: error pdf invoice order -----------------------------------+---------------------------------------- Changes (by hpw at softechmatrix.nl): * resolution: fixed => * status: closed => reopened Comment: I think my explanation was indeed not suffucient. I'll try to elaborate it: The user first creates an order, and generates the PDF for that order. No problem there. Next he generates an invoice from this order (NOTE that he does not go to the order-list, everything happens in the order-screen so far). The generated invoice appears and then the user generate the PDF for the invoice. This is the point where the error occurs. My diagnosis was based on this part of the error-message: headers already sent by (output started at C:\Program Files\xampp\htdocs\vtiger_crm\modules\Invoice\CreatePDF.php:375) and this part: FPDF error: Some data has already been output to browser, can't send PDF file It seems to me that the error occurs because the PDF-generation is not reset completely after generating the PDF. Going to an overview screen (like the orders list) seems to reset the problem as after that you can generate the PDF for the invoice without problems. NOTE: the problem is only happening when you generate a PDF for an order and immediately generate the invoice and subsequently also generate the PDF for the invoice. My client stumbled upon this while trying out the functionality of vTiger. In normal daily use I think there will almost always be a timespan between creating the order and creating the invoice. I reopened the ticket so you might test the solution with my additional information. I hope the solution is a sure fix. Thanks -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 02:11:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 09:11:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5250 - /vtigercrm/trunk/modules/System/systemconfig.php Message-ID: <20060424091120.E21B14E2804@vtiger.fosslabs.com> Author: don Date: Mon Apr 24 03:11:16 2006 New Revision: 5250 Log: Settings Menu added for System Informtion Modified: vtigercrm/trunk/modules/System/systemconfig.php Modified: vtigercrm/trunk/modules/System/systemconfig.php ============================================================================== Binary files - no diff available. From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 02:11:39 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 09:11:39 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23707=3A_?= =?utf-8?q?System_configuration_In_new_page?= In-Reply-To: <076.1e6b7b0720063ab885e855b2adc20aeb@vtiger.fosslabs.com> References: <076.1e6b7b0720063ab885e855b2adc20aeb@vtiger.fosslabs.com> Message-ID: <085.ffee5b561273ac43f17c84096eba9b47@vtiger.fosslabs.com> #707: System configuration In new page ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: system configuration ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 02:21:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 09:21:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5251 - /vtigercrm/trunk/Smarty/templates/Settings/EditCompanyInfo.tpl Message-ID: <20060424092157.CA0C259D56C@vtiger.fosslabs.com> Author: don Date: Mon Apr 24 03:21:53 2006 New Revision: 5251 Log: Company image made to show in the edit view of company details Modified: vtigercrm/trunk/Smarty/templates/Settings/EditCompanyInfo.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings/EditCompanyInfo.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/EditCompanyInfo.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/EditCompanyInfo.tpl Mon Apr 24 03:21:53 2006 @@ -30,7 +30,11 @@ + {if $ORGANIZATIONLOGONAME neq ''} + + {else} + {/if} From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 02:23:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 09:23:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5252 - /vtigercrm/trunk/modules/Settings/language/en_us.lang.php Message-ID: <20060424092355.C195A4E2804@vtiger.fosslabs.com> Author: don Date: Mon Apr 24 03:23:51 2006 New Revision: 5252 Log: Logo Name Changed to logo Ticket ID 706 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 Mon Apr 24 03:23:51 2006 @@ -482,7 +482,7 @@ 'LBL_ORGANIZATION_WEBSITE'=>'Website', 'LBL_ORGANIZATION_DETAILS'=>'Company Information', 'LBL_SPECIFY_COMPANY_DETAILS'=>' - Specify Company Information', -'LBL_ORGANIZATION_LOGO'=>'Logo Name', +'LBL_ORGANIZATION_LOGO'=>'Logo', 'LBL_UPLOAD'=>'Upload', 'LBL_FILENAME'=>'File Name', 'LBL_SETTINGS'=>'Settings', From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 02:23:59 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 09:23:59 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23706=3A_?= =?utf-8?q?Show_the_company_logo_during_edtion?= In-Reply-To: <076.2c8080811125d3f1140f7b8761aa9968@vtiger.fosslabs.com> References: <076.2c8080811125d3f1140f7b8761aa9968@vtiger.fosslabs.com> Message-ID: <085.127c6972dc358a713f9e66b401ee23f6@vtiger.fosslabs.com> #706: Show the company logo during edtion ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Company Logo ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 02:28:35 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 09:28:35 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5253 - /vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl Message-ID: <20060424092835.66FB56D198D@vtiger.fosslabs.com> Author: saraj Date: Mon Apr 24 03:28:29 2006 New Revision: 5253 Log: Default Folder Name selected now in Create/Edit View of Email Templates - Ahmed Modified: vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl Modified: vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl Mon Apr 24 03:28:29 2006 @@ -144,8 +144,8 @@

    - {foreach item=arr from=$FOLDERNAME} @@ -158,6 +158,12 @@ {/foreach} + {else} + + {/if}
      {$ORGANIZATIONNAME} {$ERRORFLAG}
    @@ -200,7 +206,7 @@   {$UMOD.LBL_MERGE_FIELD_VALUE} - + ({$UMOD.LBL_COPY_AND_PASTE_MERGE_FIELD}) + + + From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 08:16:31 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 15:16:31 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23197=3A_?= =?utf-8?q?missing_cancel_in_picklist?= In-Reply-To: <076.ac3b820c333eea49d38881f9080aa48d@vtiger.fosslabs.com> References: <076.ac3b820c333eea49d38881f9080aa48d@vtiger.fosslabs.com> Message-ID: <085.4aade0d2fa5ded0c787ce33ecded6444@vtiger.fosslabs.com> #197: missing cancel in picklist ------------------------+--------------------------------------------------- Reporter: richie | Owner: richie Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed Comment: Changeset 5285 has the fix for this issue -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 08:17:28 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 15:17:28 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23206=3A_?= =?utf-8?q?unable_to_save_outgoing_mail_server_info?= In-Reply-To: <076.8e9907477ed00259bc1939ad6c9185b6@vtiger.fosslabs.com> References: <076.8e9907477ed00259bc1939ad6c9185b6@vtiger.fosslabs.com> Message-ID: <085.143be31586f8015ae2dd5dcd292a59ea@vtiger.fosslabs.com> #206: unable to save outgoing mail server info ------------------------+--------------------------------------------------- Reporter: richie | Owner: richie Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: outgoing mailserver info ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 08:17:40 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 15:17:40 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23631=3A_?= =?utf-8?q?Migration_Issues_-_Accounts_click_throws_exception?= In-Reply-To: <076.3d1f994e1687a0767573fdae64126183@vtiger.fosslabs.com> References: <076.3d1f994e1687a0767573fdae64126183@vtiger.fosslabs.com> Message-ID: <085.d8ed009fa80654b9d88533f7974cc208@vtiger.fosslabs.com> #631: Migration Issues - Accounts click throws exception ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Migration ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * keywords: => Migration * status: assigned => closed Comment: This issue has been fixed and has been checkedin in the svn. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 08:18:52 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 15:18:52 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23654=3A_?= =?utf-8?q?Migration_Issues_-_Exceptions_Thrown_in_Contacts_Module?= In-Reply-To: <076.fba129ee4b692f89f63d56a783b481a9@vtiger.fosslabs.com> References: <076.fba129ee4b692f89f63d56a783b481a9@vtiger.fosslabs.com> Message-ID: <085.f158da1c3c32a295d0ecaef01a248fab@vtiger.fosslabs.com> #654: Migration Issues - Exceptions Thrown in Contacts Module ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Migration ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * keywords: => Migration * status: assigned => closed Comment: This issue has been fixed and has been checkedin in the svn. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 08:19:32 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 15:19:32 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23655=3A_?= =?utf-8?q?Migration_Issues_-_Potentials_Module_Non_functional?= In-Reply-To: <076.6ed48a3ea7c455abea96901ebc95c4f0@vtiger.fosslabs.com> References: <076.6ed48a3ea7c455abea96901ebc95c4f0@vtiger.fosslabs.com> Message-ID: <085.574789cac6d0996bf0e6594bf83ca1cf@vtiger.fosslabs.com> #655: Migration Issues - Potentials Module Non functional ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Migration ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * keywords: => Migration * status: assigned => closed Comment: This issue has been fixed and has been checkedin in the svn. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 08:20:14 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 15:20:14 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23677=3A_?= =?utf-8?q?Migration_Issues_-_Products_Module_throws_exception?= In-Reply-To: <076.dff424836ab0be00ef6a6b263f6854c1@vtiger.fosslabs.com> References: <076.dff424836ab0be00ef6a6b263f6854c1@vtiger.fosslabs.com> Message-ID: <085.80710c525aa90461500e79c58b5d566c@vtiger.fosslabs.com> #677: Migration Issues - Products Module throws exception ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Migration ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * keywords: => Migration * status: assigned => closed Comment: This issue has been fixed and has been checkedin in the svn. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 08:23:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 15:23:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5288 - /vtigercrm/trunk/include/utils/CommonUtils.php Message-ID: <20060424152334.EE2BD40E6DC@vtiger.fosslabs.com> Author: saraj Date: Mon Apr 24 09:23:29 2006 New Revision: 5288 Log: Added new function getQuickCreateModules for getting all module with quick create feature in the Header combo - Ahmed 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 Mon Apr 24 09:23:29 2006 @@ -1495,6 +1495,31 @@ } /** + * This function is used to get the all the modules that have Quick Create Feature. + * Returns Tab Name and Tablabel. + */ + +function getQuickCreateModules() +{ + global $adb; + global $mod_strings; + +$qc_query = "select distinct tablabel,tab.name from field inner join tab on tab.tabid = field.tabid where quickcreate=0 order by tab.tablabel"; +$result = $adb->query($qc_query); +$noofrows = $adb->num_rows($result); +$qcmodule_array = Array(); +for($i = 0; $i < $noofrows; $i++) +{ + $tablabel = $adb->query_result($result,$i,'tablabel'); + $tabname = $adb->query_result($result,$i,'name'); + $return_qcmodule[] = $tablabel; + $return_qcmodule[] = $tabname; +} + $return_qcmodule = array_chunk($return_qcmodule,2); + return $return_qcmodule; +} + +/** * This function is used to get the Quick create form field parameters for a given module. * Param $module - module name * returns the value in array format From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 08:30:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 15:30:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5289 - /vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl Message-ID: <20060424153033.DB2F740E747@vtiger.fosslabs.com> Author: don Date: Mon Apr 24 09:30:29 2006 New Revision: 5289 Log: Fixed the caption issue Modified: vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl Modified: vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl Mon Apr 24 09:30:29 2006 @@ -130,14 +130,14 @@ - Tabs for "{$PROFILE_NAME}"
    - Select the tabs / modules to be shown + Standard Action Privileges for "{$PROFILE_NAME}"
    + Select the standard actions to be permitted - 12 selected, 9 remaining +   @@ -197,14 +197,14 @@ - Tabs for "{$PROFILE_NAME}"
    - Select the tabs / modules to be shown + Tab Privileges for "{$PROFILE_NAME}"
    + Select the tabs/modules to be permitted - 12 selected, 9 remaining +   @@ -261,14 +261,14 @@ - Tabs for "{$PROFILE_NAME}"
    - Select the tabs / modules to be shown + Utility Action Privileges for "{$PROFILE_NAME}"
    + Select the utility actions to be permitted - 12 selected, 9 remaining +   @@ -327,8 +327,8 @@ - Tabs for "{$PROFILE_NAME}"
    - Select the tabs / modules to be shown + Field Privileges for "{$PROFILE_NAME}"
    + Select the fields to be permitted From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 08:32:02 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 15:32:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5290 - /vtigercrm/trunk/Smarty/templates/Header.tpl Message-ID: <20060424153202.252A640E73C@vtiger.fosslabs.com> Author: saraj Date: Mon Apr 24 09:31:57 2006 New Revision: 5290 Log: Made Requisite Changes for Quick Create Module - Ahmed 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 Mon Apr 24 09:31:57 2006 @@ -54,16 +54,11 @@ {/foreach} - {foreach key=maintabs item=detail from=$HEADERS} - {if $maintabs eq $CATEGORY} - - {/if} + From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 08:34:16 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 15:34:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5291 - in /vtigercrm/trunk: Smarty/templates/UserDetailView.tpl Smarty/templates/UserEditView.tpl modules/Users/Save.php Message-ID: <20060424153416.4230D40E746@vtiger.fosslabs.com> Author: don Date: Mon Apr 24 09:34:08 2006 New Revision: 5291 Log: Parenttab Issue in Users has been fixed Ticket ID 669 Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl vtigercrm/trunk/Smarty/templates/UserEditView.tpl vtigercrm/trunk/modules/Users/Save.php Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Mon Apr 24 09:34:08 2006 @@ -27,6 +27,7 @@ + Modified: vtigercrm/trunk/Smarty/templates/UserEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserEditView.tpl Mon Apr 24 09:34:08 2006 @@ -37,6 +37,7 @@ +   Modified: vtigercrm/trunk/modules/Users/Save.php ============================================================================== Binary files - no diff available. From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 08:34:36 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 15:34:36 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23669=3A_?= =?utf-8?q?Parenttab_Missing_for_all_operations_from_Users_DetailView?= In-Reply-To: <076.50efb7ae96c893dc52a96040c59f4ec7@vtiger.fosslabs.com> References: <076.50efb7ae96c893dc52a96040c59f4ec7@vtiger.fosslabs.com> Message-ID: <085.75c895b1e712c5f4c1b9b94ce71fd25b@vtiger.fosslabs.com> #669: Parenttab Missing for all operations from Users DetailView ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Users ---------------------------+------------------------------------------------ Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 08:37:05 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 15:37:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5292 - /vtigercrm/trunk/themes/blue/header.php Message-ID: <20060424153705.94C9440E746@vtiger.fosslabs.com> Author: saraj Date: Mon Apr 24 09:37:01 2006 New Revision: 5292 Log: Added a new array that has all the modules having quickcreate feature & assigning it to a variable QCMODULE - Ahmed Modified: vtigercrm/trunk/themes/blue/header.php Modified: vtigercrm/trunk/themes/blue/header.php ============================================================================== --- vtigercrm/trunk/themes/blue/header.php (original) +++ vtigercrm/trunk/themes/blue/header.php Mon Apr 24 09:37:01 2006 @@ -62,6 +62,9 @@ $smarty->assign("THEME",$theme); $smarty->assign("IMAGEPATH",$image_path); +$qc_modules = getQuickCreateModules(); +$smarty->assign("QCMODULE", $qc_modules); + $smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); $smarty->assign("MODULE_NAME", $currentModule); From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 08:41:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 15:41:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5293 - /vtigercrm/trunk/modules/Settings/add2db.php Message-ID: <20060424154149.ADC3740E738@vtiger.fosslabs.com> Author: don Date: Mon Apr 24 09:41:45 2006 New Revision: 5293 Log: parenttab issue has been fixed Ticket ID 598 Modified: vtigercrm/trunk/modules/Settings/add2db.php Modified: vtigercrm/trunk/modules/Settings/add2db.php ============================================================================== --- vtigercrm/trunk/modules/Settings/add2db.php (original) +++ vtigercrm/trunk/modules/Settings/add2db.php Mon Apr 24 09:41:45 2006 @@ -136,12 +136,12 @@ if($savelogo=="true") { - header("Location: index.php?module=Settings&action=OrganizationConfig"); + header("Location: index.php?parenttab=Settings&module=Settings&action=OrganizationConfig"); } elseif($savelogo=="false") { - header("Location: index.php?module=Settings&action=EditCompanyDetails&flag=".$error_flag); + header("Location: index.php?parenttab=Settings&module=Settings&action=EditCompanyDetails&flag=".$error_flag); } From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 08:42:12 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 15:42:12 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23598=3A_?= =?utf-8?q?parenttab_is_not_selected_in_companyinformation?= In-Reply-To: <076.611351575d0f773ca7d5cc4fe6b00916@vtiger.fosslabs.com> References: <076.611351575d0f773ca7d5cc4fe6b00916@vtiger.fosslabs.com> Message-ID: <085.9b8c2f18626f723c981eae802b28ed21@vtiger.fosslabs.com> #598: parenttab is not selected in companyinformation --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 08:44:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 15:44:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5294 - /vtigercrm/trunk/Smarty/templates/EditProfile.tpl Message-ID: <20060424154441.1305140E73C@vtiger.fosslabs.com> Author: don Date: Mon Apr 24 09:44:37 2006 New Revision: 5294 Log: Fixed the caption issues Modified: vtigercrm/trunk/Smarty/templates/EditProfile.tpl Modified: vtigercrm/trunk/Smarty/templates/EditProfile.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/EditProfile.tpl (original) +++ vtigercrm/trunk/Smarty/templates/EditProfile.tpl Mon Apr 24 09:44:37 2006 @@ -132,14 +132,14 @@ - Tabs for "{$PROFILE_NAME}"
    - Select the tabs / modules to be shown + Standard Privileges for "{$PROFILE_NAME}"
    + Select the standard actions to be permitted - 12 selected, 9 remaining + &nsbp; @@ -199,14 +199,13 @@ - Tabs for "{$PROFILE_NAME}"
    - Select the tabs / modules to be shown + Tab Privileges for "{$PROFILE_NAME}"
    + Select the tabs/modules to be permitted - 12 selected, 9 remaining @@ -263,14 +262,14 @@ - Tabs for "{$PROFILE_NAME}"
    - Select the tabs / modules to be shown + Utility Privileges for "{$PROFILE_NAME}"
    + Select the utility actions to be permitted - 12 selected, 9 remaining +   @@ -329,8 +328,8 @@ - Tabs for "{$PROFILE_NAME}"
    - Select the tabs / modules to be shown + Field Privileges for "{$PROFILE_NAME}"
    + Select the fields to be permitted From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 08:47:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 15:47:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5295 - /vtigercrm/trunk/Smarty/templates/Settings/CompanyInfo.tpl Message-ID: <20060424154750.1817B40E73C@vtiger.fosslabs.com> Author: don Date: Mon Apr 24 09:47:46 2006 New Revision: 5295 Log: Company website made to open in a new Window Modified: vtigercrm/trunk/Smarty/templates/Settings/CompanyInfo.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings/CompanyInfo.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/CompanyInfo.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/CompanyInfo.tpl Mon Apr 24 09:47:46 2006 @@ -73,7 +73,7 @@ {$ORGANIZATIONPHONE} {$MOD.LBL_ORGANIZATION_WEBSITE} : -     {$ORGANIZATIONWEBSITE} + {$ORGANIZATIONWEBSITE} {$MOD.LBL_ORGANIZATION_FAX} : From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 08:48:03 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 15:48:03 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23594=3A_?= =?utf-8?q?new_window_for_company_website?= In-Reply-To: <076.5284d108ceddba6095782827b9f01b06@vtiger.fosslabs.com> References: <076.5284d108ceddba6095782827b9f01b06@vtiger.fosslabs.com> Message-ID: <085.4d6b1df5892c59645a047968ee39c0c5@vtiger.fosslabs.com> #594: new window for company website --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 08:48:28 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 15:48:28 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23592=3A_?= =?utf-8?q?No_Tab_Security_support_for_Faq_and_Portal?= In-Reply-To: <076.4fb8656631aa096eed05bda565def3c7@vtiger.fosslabs.com> References: <076.4fb8656631aa096eed05bda565def3c7@vtiger.fosslabs.com> Message-ID: <085.20073c35323248f99c3c79c8920a727d@vtiger.fosslabs.com> #592: No Tab Security support for Faq and Portal ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Security ---------------------------+------------------------------------------------ Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 08:49:53 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 15:49:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5296 - in /vtigercrm/trunk: Popup.php include/utils/ListViewUtils.php Message-ID: <20060424154953.A0C7B40E723@vtiger.fosslabs.com> Author: saraj Date: Mon Apr 24 09:49:47 2006 New Revision: 5296 Log: changes made to show non-selected records in the popup Modified: vtigercrm/trunk/Popup.php vtigercrm/trunk/include/utils/ListViewUtils.php Modified: vtigercrm/trunk/Popup.php ============================================================================== --- vtigercrm/trunk/Popup.php (original) +++ vtigercrm/trunk/Popup.php Mon Apr 24 09:49:47 2006 @@ -492,8 +492,11 @@ $query = 'select pricebook.*, pricebookproductrel.productid, pricebookproductrel.listprice, crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime from pricebook inner join pricebookproductrel on pricebookproductrel.pricebookid = pricebook.pricebookid inner join crmentity on crmentity.crmid = pricebook.pricebookid where pricebookproductrel.productid='.$productid.' and crmentity.deleted=0'; } else - $query = getListQuery($currentModule); - +{ + $where_relquery = getRelCheckquery($currentModule,$_REQUEST['return_module'],$_REQUEST['recordid']); + $query = getListQuery($currentModule,$where_relquery); +} + if(isset($where) && $where != '') { $query .= ' and '.$where; Modified: vtigercrm/trunk/include/utils/ListViewUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/ListViewUtils.php (original) +++ vtigercrm/trunk/include/utils/ListViewUtils.php Mon Apr 24 09:49:47 2006 @@ -1875,4 +1875,33 @@ return $output; } +/**This function return the entity ids that need to be excluded in popup listview for a given record +Param $currentmodule - modulename of the entity to be selected +Param $returnmodule - modulename for which the entity is assingned +Param $recordid - the record id for which the entity is assigned +Return tyep string. +*/ +function getRelCheckquery($currentmodule,$returnmodule,$recordid) +{ + global $adb; + $skip_id = Array(); + $where_relquery = ""; + + if($currentmodule=="Contacts" && $returnmodule == "Potentials") + { + $query = "select contactid from contpotentialrel where potentialid = ".$recordid; + $result = $adb->query($query); + if($adb->num_rows($result)!=0) + { + for($k=0;$k < $adb->num_rows($result);$k++) + { + $skip_id[]=$adb->query_result($result,$k,"contactid"); + } + $skipids = constructList($skip_id,'INTEGER'); + $where_relquery = "and contactdetails.contactid not in ".$skipids; + } + } + return $where_relquery; +} + ?> From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 08:49:55 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 15:49:55 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23591=3A_?= =?utf-8?q?Profile_link_is_wrong_in_role_detailview?= In-Reply-To: <076.53484beb82e337b08bda71c19b77893d@vtiger.fosslabs.com> References: <076.53484beb82e337b08bda71c19b77893d@vtiger.fosslabs.com> Message-ID: <085.e0469ef4269e6e2439e334a6d619cbd6@vtiger.fosslabs.com> #591: Profile link is wrong in role detailview ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: ela Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by jerrydgeorge): * resolution: => fixed * status: assigned => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 08:51:32 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 15:51:32 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23427=3A_?= =?utf-8?q?mailserver_details_fails?= In-Reply-To: <076.9e7e654229d664e748d9809d31b4de35@vtiger.fosslabs.com> References: <076.9e7e654229d664e748d9809d31b4de35@vtiger.fosslabs.com> Message-ID: <085.4ed5cffc41d762dbd78b5eaa23948af1@vtiger.fosslabs.com> #427: mailserver details fails ------------------------+--------------------------------------------------- Reporter: richie | Owner: richie Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: mailserver ------------------------+--------------------------------------------------- Changes (by richie): * owner: ahmed => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 08:51:36 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 15:51:36 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23434=3A_?= =?utf-8?q?Duplicate_contacts_not_working?= In-Reply-To: <076.9d9d6f6764390bbb73fe76c0dbf40e3c@vtiger.fosslabs.com> References: <076.9d9d6f6764390bbb73fe76c0dbf40e3c@vtiger.fosslabs.com> Message-ID: <085.0949a0c3e0affe02dd72423292fe1a1d@vtiger.fosslabs.com> #434: Duplicate contacts not working ------------------------+--------------------------------------------------- Reporter: don | Owner: richie Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 08:51:40 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 15:51:40 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23436=3A_?= =?utf-8?q?Mass_Change_Owner_option_is_missing_in_contacts?= In-Reply-To: <076.2a85e9ca07304adbf6788d457c3f9084@vtiger.fosslabs.com> References: <076.2a85e9ca07304adbf6788d457c3f9084@vtiger.fosslabs.com> Message-ID: <085.f02bba847bca11c0b4687a066381bdf5@vtiger.fosslabs.com> #436: Mass Change Owner option is missing in contacts ------------------------+--------------------------------------------------- Reporter: don | Owner: richie Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 08:51:46 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 15:51:46 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23101=3A_?= =?utf-8?q?Cancel_is_not_working_in_notes_editview?= In-Reply-To: <076.0bcf8c55c0755817b23252914667adc3@vtiger.fosslabs.com> References: <076.0bcf8c55c0755817b23252914667adc3@vtiger.fosslabs.com> Message-ID: <085.ed8042bab55177ca989cfcf3aeb16a37@vtiger.fosslabs.com> #101: Cancel is not working in notes editview ------------------------+--------------------------------------------------- Reporter: Minnie | Owner: richie Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: cancel button ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 08:51:49 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 15:51:49 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23109=3A_?= =?utf-8?q?Issue_in_Mass_Delete?= In-Reply-To: <076.ca39a8dd0e1a26f9efcc5fecf629d930@vtiger.fosslabs.com> References: <076.ca39a8dd0e1a26f9efcc5fecf629d930@vtiger.fosslabs.com> Message-ID: <085.3e3d9064b577a333a87f9c2ce2b9d302@vtiger.fosslabs.com> #109: Issue in Mass Delete ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: richie Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Accounts,MassDelete ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 08:51:54 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 15:51:54 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23120=3A_?= =?utf-8?q?Issue_in_Mass_Delete?= In-Reply-To: <076.52335e78ac6b04c98e0c3aae3b5564f0@vtiger.fosslabs.com> References: <076.52335e78ac6b04c98e0c3aae3b5564f0@vtiger.fosslabs.com> Message-ID: <085.6450be7a59621d22c2a7362f8a6e915f@vtiger.fosslabs.com> #120: Issue in Mass Delete ------------------------+--------------------------------------------------- Reporter: jeri | Owner: richie Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: massdelete ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 08:51:58 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 15:51:58 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23123=3A_?= =?utf-8?q?can_not_delete_email?= In-Reply-To: <076.eeb10874885266140e84ce5cf9bfd4cc@vtiger.fosslabs.com> References: <076.eeb10874885266140e84ce5cf9bfd4cc@vtiger.fosslabs.com> Message-ID: <085.faeda41dca78c03f8c4f8c7afc922010@vtiger.fosslabs.com> #123: can not delete email --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: richie Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: can not delete email --------------------------------+------------------------------------------- Changes (by richie): * owner: philip => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 08:52:01 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 15:52:01 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23322=3A_?= =?utf-8?q?quick_edit_of_Description_field_is_not_working?= In-Reply-To: <076.cbc407907f556cdd833010ab07611ffc@vtiger.fosslabs.com> References: <076.cbc407907f556cdd833010ab07611ffc@vtiger.fosslabs.com> Message-ID: <085.e964c3d9d28b75e2ddc06bb93afde048@vtiger.fosslabs.com> #322: quick edit of Description field is not working ------------------------+--------------------------------------------------- Reporter: don | Owner: richie Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 08:52:05 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 15:52:05 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23341=3A_?= =?utf-8?q?Issue_in_duplication_of_tab?= In-Reply-To: <076.dd81b801a269e17c7e74219cbdac9a20@vtiger.fosslabs.com> References: <076.dd81b801a269e17c7e74219cbdac9a20@vtiger.fosslabs.com> Message-ID: <085.a1747aa03b15060903e727bdfac88a28@vtiger.fosslabs.com> #341: Issue in duplication of tab ------------------------+--------------------------------------------------- Reporter: don | Owner: richie Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 08:52:08 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 15:52:08 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23723=3A_?= =?utf-8?q?Parent_tab_not_highlighted?= In-Reply-To: <076.cd496fd3a80ac24dced660612366f644@vtiger.fosslabs.com> References: <076.cd496fd3a80ac24dced660612366f644@vtiger.fosslabs.com> Message-ID: <085.36d6dc2b7a08063c249a2441ced64971@vtiger.fosslabs.com> #723: Parent tab not highlighted ------------------------+--------------------------------------------------- Reporter: saraj | Owner: richie Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Parent tab ------------------------+--------------------------------------------------- Changes (by richie): * owner: jerrydgeorge => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 08:52:13 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 15:52:13 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23261=3A_?= =?utf-8?q?Delete_User__Pop-up_-_Typo?= In-Reply-To: <076.08912867dcb0f1ce45081a7806548cbf@vtiger.fosslabs.com> References: <076.08912867dcb0f1ce45081a7806548cbf@vtiger.fosslabs.com> Message-ID: <085.2b918d1661fa0482e9b0bf15ccebb5c2@vtiger.fosslabs.com> #261: Delete User Pop-up - Typo ------------------------+--------------------------------------------------- Reporter: gopal | Owner: richie Type: defect | Status: new Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 08:54:38 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 15:54:38 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23545=3A_?= =?utf-8?q?Issue_in_tag_fields?= In-Reply-To: <076.91411a9272aff4f8629259ca2f0e2a67@vtiger.fosslabs.com> References: <076.91411a9272aff4f8629259ca2f0e2a67@vtiger.fosslabs.com> Message-ID: <085.920be7dc761e078f2e1c6e0ccb12aad9@vtiger.fosslabs.com> #545: Issue in tag fields ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: global Search ---------------------------+------------------------------------------------ Changes (by jerrydgeorge): * resolution: => invalid * status: new => closed Comment: Unable to reproduce -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 08:58:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 15:58:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5297 - /vtigercrm/trunk/modules/Users/UpdateDefaultFieldLevelAccess.php Message-ID: <20060424155849.B53A440E75B@vtiger.fosslabs.com> Author: don Date: Mon Apr 24 09:58:45 2006 New Revision: 5297 Log: parenttab issue in Org Filed Has been fixed Modified: vtigercrm/trunk/modules/Users/UpdateDefaultFieldLevelAccess.php Modified: vtigercrm/trunk/modules/Users/UpdateDefaultFieldLevelAccess.php ============================================================================== --- vtigercrm/trunk/modules/Users/UpdateDefaultFieldLevelAccess.php (original) +++ vtigercrm/trunk/modules/Users/UpdateDefaultFieldLevelAccess.php Mon Apr 24 09:58:45 2006 @@ -45,7 +45,7 @@ } } -$loc = "Location: index.php?action=DefaultFieldPermissions&module=Users&fld_module=".$_REQUEST['fld_module']; +$loc = "Location: index.php?action=DefaultFieldPermissions&module=Users&parenttab=Settings&fld_module=".$_REQUEST['fld_module']; header($loc); ?> From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 08:58:52 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 15:58:52 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23524=3A_?= =?utf-8?q?Parenttab_Missing_for_Field_Access?= In-Reply-To: <076.469538ce212063298c5f3bdf7aa19f4d@vtiger.fosslabs.com> References: <076.469538ce212063298c5f3bdf7aa19f4d@vtiger.fosslabs.com> Message-ID: <085.9e85a5556838409111f1879578d0132e@vtiger.fosslabs.com> #524: Parenttab Missing for Field Access ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 09:13:51 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 16:13:51 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23525=3A_?= =?utf-8?q?Organisation_Sharing_Privileges_parenttab_Issue?= In-Reply-To: <076.ba314e341f973e61476d89125d35f341@vtiger.fosslabs.com> References: <076.ba314e341f973e61476d89125d35f341@vtiger.fosslabs.com> Message-ID: <085.a8e7fe4213b1df2bff19bf20be25f675@vtiger.fosslabs.com> #525: Organisation Sharing Privileges parenttab Issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 09:13:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 16:13:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5298 - in /vtigercrm/trunk: Smarty/templates/ modules/Users/ Message-ID: <20060424161352.9829340E72D@vtiger.fosslabs.com> Author: don Date: Mon Apr 24 10:13:43 2006 New Revision: 5298 Log: UI issue in Orgsharing Detail view has been fixed ticket ID 525 Modified: vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl vtigercrm/trunk/Smarty/templates/OrgSharingEditView.tpl vtigercrm/trunk/modules/Users/CreateSharingRule.php vtigercrm/trunk/modules/Users/DeleteSharingRule.php vtigercrm/trunk/modules/Users/SaveOrgSharing.php vtigercrm/trunk/modules/Users/SaveSharingRule.php Modified: vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl Mon Apr 24 10:13:43 2006 @@ -60,8 +60,8 @@ Global Access Privileges - - + +   Modified: vtigercrm/trunk/Smarty/templates/OrgSharingEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/OrgSharingEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/OrgSharingEditView.tpl Mon Apr 24 10:13:43 2006 @@ -21,6 +21,7 @@
    + Global Access Privileges Modified: vtigercrm/trunk/modules/Users/CreateSharingRule.php ============================================================================== --- vtigercrm/trunk/modules/Users/CreateSharingRule.php (original) +++ vtigercrm/trunk/modules/Users/CreateSharingRule.php Mon Apr 24 10:13:43 2006 @@ -100,6 +100,7 @@ } $output.=' + Modified: vtigercrm/trunk/modules/Users/DeleteSharingRule.php ============================================================================== --- vtigercrm/trunk/modules/Users/DeleteSharingRule.php (original) +++ vtigercrm/trunk/modules/Users/DeleteSharingRule.php Mon Apr 24 10:13:43 2006 @@ -13,5 +13,5 @@ $shareid = $_REQUEST['shareid']; deleteSharingRule($shareid); -header("Location: index.php?module=Users&action=OrgSharingDetailView"); +header("Location: index.php?module=Users&action=OrgSharingDetailView&parenttab=Settings"); ?> Modified: vtigercrm/trunk/modules/Users/SaveOrgSharing.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/Users/SaveSharingRule.php ============================================================================== --- vtigercrm/trunk/modules/Users/SaveSharingRule.php (original) +++ vtigercrm/trunk/modules/Users/SaveSharingRule.php Mon Apr 24 10:13:43 2006 @@ -58,6 +58,6 @@ -$loc = "Location: index.php?action=OrgSharingDetailView&module=Users"; +$loc = "Location: index.php?action=OrgSharingDetailView&module=Users&parenttab=Settings"; header($loc); ?> From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 09:15:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 16:15:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5299 - /vtigercrm/trunk/Smarty/templates/FieldAccess.tpl Message-ID: <20060424161523.7FFD140E74A@vtiger.fosslabs.com> Author: don Date: Mon Apr 24 10:15:19 2006 New Revision: 5299 Log: Fixed the Label Issue Modified: vtigercrm/trunk/Smarty/templates/FieldAccess.tpl Modified: vtigercrm/trunk/Smarty/templates/FieldAccess.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/FieldAccess.tpl (original) +++ vtigercrm/trunk/Smarty/templates/FieldAccess.tpl Mon Apr 24 10:15:19 2006 @@ -8,7 +8,7 @@ From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 09:19:47 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 16:19:47 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5300 - /vtigercrm/trunk/modules/Users/SaveRole.php Message-ID: <20060424161947.B325540E763@vtiger.fosslabs.com> Author: don Date: Mon Apr 24 10:19:43 2006 New Revision: 5300 Log: Parenttab missing issue fixed Modified: vtigercrm/trunk/modules/Users/SaveRole.php Modified: vtigercrm/trunk/modules/Users/SaveRole.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 09:39:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 16:39:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5301 - /vtigercrm/trunk/Smarty/templates/RoleDetailView.tpl Message-ID: <20060424163959.17D7A40E755@vtiger.fosslabs.com> Author: don Date: Mon Apr 24 10:39:55 2006 New Revision: 5301 Log: Delete Button added in role detail view Modified: vtigercrm/trunk/Smarty/templates/RoleDetailView.tpl Modified: vtigercrm/trunk/Smarty/templates/RoleDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/RoleDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/RoleDetailView.tpl Mon Apr 24 10:39:55 2006 @@ -31,7 +31,7 @@ @@ -98,5 +98,21 @@

    -{$MOD.LBL_SETTINGS} > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_PROFILES} +{$MOD.LBL_SETTINGS} > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_DEFAULT_ORGANIZATION_FIELDS}
    {$ROLE_NAME} - +  
    + {include file='SettingsSubMenu.tpl'} +
    + From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 10:04:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 17:04:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5302 - in /vtigercrm/trunk/Smarty/templates: CreateProfile.tpl CreateProfile1.tpl EditProfile.tpl ProfileDetailView.tpl UserProfile.tpl Message-ID: <20060424170410.95E4B40E76F@vtiger.fosslabs.com> Author: don Date: Mon Apr 24 11:04:03 2006 New Revision: 5302 Log: Issue in Profile Parenttab has been fixed Modified: vtigercrm/trunk/Smarty/templates/CreateProfile.tpl vtigercrm/trunk/Smarty/templates/CreateProfile1.tpl vtigercrm/trunk/Smarty/templates/EditProfile.tpl vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl vtigercrm/trunk/Smarty/templates/UserProfile.tpl Modified: vtigercrm/trunk/Smarty/templates/CreateProfile.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateProfile.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateProfile.tpl Mon Apr 24 11:04:03 2006 @@ -10,6 +10,7 @@ +
    {$MOD.LBL_SETTINGS} > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_PROFILES} @@ -30,18 +31,18 @@ {$CMOD.LBL_NEW_PROFILE_NAME} - + {$CMOD.LBL_DESCRIPTION} - +      -   +   @@ -64,4 +65,18 @@ {include file='SettingsSubMenu.tpl'} - + Modified: vtigercrm/trunk/Smarty/templates/CreateProfile1.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateProfile1.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateProfile1.tpl Mon Apr 24 11:04:03 2006 @@ -12,6 +12,7 @@ +
    {$MOD.LBL_SETTINGS} > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_PROFILES} Modified: vtigercrm/trunk/Smarty/templates/EditProfile.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/EditProfile.tpl (original) +++ vtigercrm/trunk/Smarty/templates/EditProfile.tpl Mon Apr 24 11:04:03 2006 @@ -34,6 +34,7 @@ + Modified: vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl Mon Apr 24 11:04:03 2006 @@ -35,6 +35,7 @@ + Modified: vtigercrm/trunk/Smarty/templates/UserProfile.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserProfile.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserProfile.tpl Mon Apr 24 11:04:03 2006 @@ -10,6 +10,7 @@ +
    {$MOD.LBL_SETTINGS} > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_PROFILES} From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 10:06:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 17:06:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5303 - in /vtigercrm/trunk/modules/Users: DeleteProfile.php SaveProfile.php UpdateProfileChanges.php Message-ID: <20060424170620.3953340E76F@vtiger.fosslabs.com> Author: don Date: Mon Apr 24 11:06:14 2006 New Revision: 5303 Log: parenttab issue in profiles has been fixed Modified: vtigercrm/trunk/modules/Users/DeleteProfile.php vtigercrm/trunk/modules/Users/SaveProfile.php vtigercrm/trunk/modules/Users/UpdateProfileChanges.php Modified: vtigercrm/trunk/modules/Users/DeleteProfile.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/Users/SaveProfile.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/Users/UpdateProfileChanges.php ============================================================================== --- vtigercrm/trunk/modules/Users/UpdateProfileChanges.php (original) +++ vtigercrm/trunk/modules/Users/UpdateProfileChanges.php Mon Apr 24 11:06:14 2006 @@ -170,7 +170,7 @@ } } - $loc = "Location: index.php?action=".$return_action."&module=Users&mode=view&profileid=".$profileid; + $loc = "Location: index.php?action=".$return_action."&module=Users&mode=view&parenttab=Settings&profileid=".$profileid; header($loc); function getPermissionValue($req_per) From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 10:10:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 17:10:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5304 - /vtigercrm/trunk/modules/Users/SaveGroup.php Message-ID: <20060424171030.E101740E74A@vtiger.fosslabs.com> Author: don Date: Mon Apr 24 11:10:26 2006 New Revision: 5304 Log: parenttab issue has been fixed Modified: vtigercrm/trunk/modules/Users/SaveGroup.php Modified: vtigercrm/trunk/modules/Users/SaveGroup.php ============================================================================== --- vtigercrm/trunk/modules/Users/SaveGroup.php (original) +++ vtigercrm/trunk/modules/Users/SaveGroup.php Mon Apr 24 11:10:26 2006 @@ -99,11 +99,11 @@ $groupId=createGroup($groupName,$groupMemberArray,$description); //Inserting into role Table //$roleId = createRole($rolename,$parentRoleId,$profile_array); - $loc = "Location: index.php?action=".$returnaction."&module=Users&groupId=".$groupId; + $loc = "Location: index.php?action=".$returnaction."&parenttab=Settings&module=Users&groupId=".$groupId; } else { - $loc = "Location: index.php?action=createnewgroup&module=Users&groupname=".$groupName."&desc=".$description."&error=true"; + $loc = "Location: index.php?action=createnewgroup&parenttab=Settings&module=Users&groupname=".$groupName."&desc=".$description."&error=true"; } From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 10:10:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 17:10:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5305 - /vtigercrm/trunk/include/utils/CommonUtils.php Message-ID: <20060424171050.B801840E74A@vtiger.fosslabs.com> Author: saraj Date: Mon Apr 24 11:10:46 2006 New Revision: 5305 Log: Security Check Enabled for Quick Create - Ahmed 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 Mon Apr 24 11:10:46 2006 @@ -1512,8 +1512,11 @@ { $tablabel = $adb->query_result($result,$i,'tablabel'); $tabname = $adb->query_result($result,$i,'name'); - $return_qcmodule[] = $tablabel; - $return_qcmodule[] = $tabname; + if(isPermitted($tabname,'EditView','') == 'yes') + { + $return_qcmodule[] = $tablabel; + $return_qcmodule[] = $tabname; + } } $return_qcmodule = array_chunk($return_qcmodule,2); return $return_qcmodule; From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 10:17:38 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 17:17:38 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2396=3A_P?= =?utf-8?q?DF-generation_=28invoice=29_sometimes_fails?= In-Reply-To: <076.4c46ddeaf8a9bd9a0763c3db83037d45@vtiger.fosslabs.com> References: <076.4c46ddeaf8a9bd9a0763c3db83037d45@vtiger.fosslabs.com> Message-ID: <085.dcc4c29143b860e58598dfcdb297ed39@vtiger.fosslabs.com> #96: PDF-generation (invoice) sometimes fails -----------------------------------+---------------------------------------- Reporter: hpw at softechmatrix.nl | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 4.2.4 Component: vtigercrm | Version: 4.2.3 Resolution: fixed | Keywords: error pdf invoice order -----------------------------------+---------------------------------------- Changes (by allanbush): * resolution: => fixed * milestone: => 4.2.4 * status: reopened => closed Comment: Thank you for the detailed explanation and your attempt at explaining the cause. Changeset [5113] has been tested with your steps to reproduce and the problem no longer presents its self. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 15:30:21 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 22:30:21 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2317=3A_A?= =?utf-8?q?dd_postgresql_support_to_4=2E2_branch?= In-Reply-To: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> References: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> Message-ID: <085.5093868e3a0545c6425de9603a4ceea5@vtiger.fosslabs.com> #17: Add postgresql support to 4.2 branch ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Resolution: | Keywords: database postgresql ------------------------+--------------------------------------------------- Comment (by jeffk): (In [5306]) refs #62 and #17. merging source:vtigercrm/branches/4.2_postgresql_integration back to source:vtigercrm/branches/4.2. This closes the postgresql_integration branch. Some work will remain to properly support both mysql and postgresql (e.g. in source:vtigercrm/branches/4.2/config.inc.php) What follows is a journal of how this merge was performed: My present working copy is: $ svn info Path: . URL: http://jeffk at vtiger.fosslabs.com/svn/vtiger/vtigercrm/branches/4.2_postgresql_integration Repository Root: http://jeffk at vtiger.fosslabs.com/svn/vtiger Repository UUID: 83ef7b00-670c-0410-b3e3-e45103aa6900 Revision: 5305 Node Kind: directory Schedule: normal Last Changed Author: jeffk Last Changed Rev: 5114 Last Changed Date: 2006-04-13 19:47:22 -0400 (Thu, 13 Apr 2006) Check that there are no changes in my working copy to commit: $ svn diff (there are none) Check for late changes to the original (target) branch that I should merge first: $ svn diff -r 5113:HEAD http://jeffk at vtiger.fosslabs.com/svn/vtiger/vtigercrm/branches/4.2 (there are none) Switch my working copy to the original (target) branch. This is a good preview of files affected by the coming merge of the two branches. $ svn switch http://jeffk at vtiger.fosslabs.com/svn/vtiger/vtigercrm/branches/4.2 U config.inc.php U sendreminder.php U modules/Accounts/ListViewTop.php U modules/Accounts/Account.php U modules/Accounts/Popup_picker.php U modules/Accounts/Popup.php U modules/Accounts/ListView.php U modules/Accounts/AccountFormBase.php U modules/Quotes/Quote.php U modules/Quotes/Delete.php U modules/Quotes/Popup.php U modules/Quotes/ListView.php U modules/Potentials/Popup.php U modules/Potentials/ListView.php U modules/Potentials/Opportunity.php U modules/Leads/Popup.php U modules/Leads/Lead.php U modules/Leads/ListView.php U modules/Leads/LeadConvertToEntities.php U modules/Home/UnifiedSearch.php U modules/Notes/Delete.php U modules/Notes/ListView.php U modules/Invoice/Invoice.php U modules/Invoice/ListView.php U modules/Orders/SalesOrderListView.php U modules/Orders/SalesOrder.php U modules/Orders/Order.php U modules/Orders/DeleteSalesOrder.php U modules/Orders/PopupSalesOrder.php U modules/Orders/ListView.php U modules/Reports/ReportRun.php U modules/Reports/SaveReportFolder.php U modules/Reports/Save.php U modules/Reports/Reports.php U modules/Reports/PopulateReports.php U modules/HelpDesk/HelpDesk.php U modules/HelpDesk/FaqList.php U modules/HelpDesk/ListView.php U modules/Settings/SaveConvertLead.php U modules/Settings/DeleteCustomField.php U modules/Settings/UpdateComboValues.php U modules/Users/User.php U modules/Users/SaveProfile.php U modules/Users/SaveOrgSharing.php U modules/Users/massdelete.php U modules/Users/LoginHistory.php U modules/Users/saveemailtemplate.php U modules/Users/ListView.php U modules/Users/Security.php U modules/Users/updateLeadDBStatus.php U modules/Users/UserInfoUtil.php U modules/Users/SaveRole.php U modules/Products/Popup.php U modules/Products/AddProductsToPriceBook.php U modules/Products/VendorPopup.php U modules/Products/ListView.php U modules/Products/Delete.php U modules/Products/PriceBookListView.php U modules/Products/Product.php U modules/Products/VendorListView.php U modules/Activities/Activity.php U modules/Activities/ListView.php U modules/Activities/RenderRelatedListUI.php U modules/Activities/OpenListView.php U modules/CustomView/Save.php U modules/CustomView/CustomView.php U modules/Faq/ListView.php U modules/uploads/add2db.php U modules/Calendar/appointment.pinc U modules/Import/UsersLastImport.php U modules/Emails/Email.php U modules/Emails/ListView.php U modules/Meetings/ListView.php U modules/Contacts/Contact.php U modules/Contacts/Popup.php U modules/Contacts/SaveBusinessCard.php U modules/Contacts/ListView.php U data/CRMEntity.php U data/SugarBean.php U include/RelatedListView.php U include/database/PearDatabase.php U include/PopulateComboValues.php U include/utils.php U soap.php U contactserialize.php U schema/DatabaseSchema.xml U install/5createTables.inc.php U install/4createConfigFile.php U install/1checkSystem.php U install/2setConfig.php U install/populateSeedData.php U install/3confirmConfig.php U adodb/adodb.inc.php U adodb/adodb-lib.inc.php U adodb/drivers/adodb-mysql.inc.php Updated to revision 5305. Confirm my working copy info: $ svn info Path: . URL: http://jeffk at vtiger.fosslabs.com/svn/vtiger/vtigercrm/branches/4.2 Repository Root: http://jeffk at vtiger.fosslabs.com/svn/vtiger Repository UUID: 83ef7b00-670c-0410-b3e3-e45103aa6900 Revision: 5305 Node Kind: directory Schedule: normal Last Changed Author: allanbush Last Changed Rev: 5113 Last Changed Date: 2006-04-13 17:25:30 -0400 (Thu, 13 Apr 2006) Perform the actual merge. The form is 'svn merge URL1 URL2'. This updates your working copy with the diff between URL1 and URL2. You confirm the correctness of the merge, write an appropriate message referencing trac tickets, and commit. Since we've been keeping the diff minimized with regular update merges, this merge should a) apply cleanly, and b) represent only the required changes to add postgresql support to vtigercrm-4.2.4. This changeset will be a very useful reference for the equivalent effort on the vtigercrm/trunk $ svn merge http://jeffk at vtiger.fosslabs.com/svn/vtiger/vtigercrm/branches/4.2 http://jeffk at vtiger.fosslabs.com/svn/vtiger/vtigercrm/branches/4.2_postgresql_integration U config.inc.php U sendreminder.php U modules/Accounts/ListViewTop.php U modules/Accounts/Account.php U modules/Accounts/Popup_picker.php U modules/Accounts/Popup.php U modules/Accounts/ListView.php U modules/Accounts/AccountFormBase.php U modules/Quotes/Quote.php U modules/Quotes/Delete.php U modules/Quotes/Popup.php U modules/Quotes/ListView.php U modules/Potentials/Popup.php U modules/Potentials/ListView.php U modules/Potentials/Opportunity.php U modules/Leads/Popup.php U modules/Leads/Lead.php U modules/Leads/ListView.php U modules/Leads/LeadConvertToEntities.php U modules/Home/UnifiedSearch.php U modules/Notes/Delete.php U modules/Notes/ListView.php U modules/Invoice/Invoice.php U modules/Invoice/ListView.php U modules/Orders/SalesOrderListView.php U modules/Orders/SalesOrder.php U modules/Orders/Order.php U modules/Orders/DeleteSalesOrder.php U modules/Orders/PopupSalesOrder.php U modules/Orders/ListView.php U modules/Reports/ReportRun.php U modules/Reports/SaveReportFolder.php U modules/Reports/Save.php U modules/Reports/Reports.php U modules/Reports/PopulateReports.php U modules/HelpDesk/HelpDesk.php U modules/HelpDesk/FaqList.php U modules/HelpDesk/ListView.php U modules/Settings/SaveConvertLead.php U modules/Settings/DeleteCustomField.php U modules/Settings/UpdateComboValues.php U modules/Users/User.php U modules/Users/SaveProfile.php U modules/Users/SaveOrgSharing.php U modules/Users/massdelete.php U modules/Users/LoginHistory.php U modules/Users/saveemailtemplate.php U modules/Users/ListView.php U modules/Users/Security.php U modules/Users/updateLeadDBStatus.php U modules/Users/UserInfoUtil.php U modules/Users/SaveRole.php U modules/Products/Popup.php U modules/Products/AddProductsToPriceBook.php U modules/Products/VendorPopup.php U modules/Products/ListView.php U modules/Products/Delete.php U modules/Products/PriceBookListView.php U modules/Products/Product.php U modules/Products/VendorListView.php U modules/Activities/Activity.php U modules/Activities/ListView.php U modules/Activities/RenderRelatedListUI.php U modules/Activities/OpenListView.php U modules/CustomView/Save.php U modules/CustomView/CustomView.php U modules/Faq/ListView.php U modules/uploads/add2db.php U modules/Calendar/appointment.pinc U modules/Import/UsersLastImport.php U modules/Emails/Email.php U modules/Emails/ListView.php U modules/Meetings/ListView.php U modules/Contacts/Contact.php U modules/Contacts/Popup.php U modules/Contacts/SaveBusinessCard.php U modules/Contacts/ListView.php U data/CRMEntity.php U data/SugarBean.php U include/RelatedListView.php U include/database/PearDatabase.php U include/PopulateComboValues.php U include/utils.php U soap.php U contactserialize.php U schema/DatabaseSchema.xml U install/5createTables.inc.php U install/4createConfigFile.php U install/1checkSystem.php U install/2setConfig.php U install/populateSeedData.php U install/3confirmConfig.php U adodb/adodb.inc.php U adodb/adodb-lib.inc.php U adodb/drivers/adodb-mysql.inc.php All files modified by the merge have indicator 'U', meaning clean update. If there had been any 'C' conflicts, you'd need to repair them manually. Please note that this is only a blind merge of the two branches. In addition to testing, there *will* need to be work done on the 4.2 branch to support both mysql and postgresql for the end user. This integration should be done as quickly as possible, and a vtigercrm/tags/vtigercrm-4.2.5 release created. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 15:30:20 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 22:30:20 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2362=3A_a?= =?utf-8?q?dd_postgresql_support_to_vtigercrm-4=2E2=2Ex?= In-Reply-To: <076.1443774be51c11a69826f1418e20e4c8@vtiger.fosslabs.com> References: <076.1443774be51c11a69826f1418e20e4c8@vtiger.fosslabs.com> Message-ID: <085.ad5dd926f0e46061982739a01a825acb@vtiger.fosslabs.com> #62: add postgresql support to vtigercrm-4.2.x ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: jeffk Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Resolution: | Keywords: database postgresql adodb ------------------------+--------------------------------------------------- Comment (by jeffk): (In [5306]) refs #62 and #17. merging source:vtigercrm/branches/4.2_postgresql_integration back to source:vtigercrm/branches/4.2. This closes the postgresql_integration branch. Some work will remain to properly support both mysql and postgresql (e.g. in source:vtigercrm/branches/4.2/config.inc.php) What follows is a journal of how this merge was performed: My present working copy is: $ svn info Path: . URL: http://jeffk at vtiger.fosslabs.com/svn/vtiger/vtigercrm/branches/4.2_postgresql_integration Repository Root: http://jeffk at vtiger.fosslabs.com/svn/vtiger Repository UUID: 83ef7b00-670c-0410-b3e3-e45103aa6900 Revision: 5305 Node Kind: directory Schedule: normal Last Changed Author: jeffk Last Changed Rev: 5114 Last Changed Date: 2006-04-13 19:47:22 -0400 (Thu, 13 Apr 2006) Check that there are no changes in my working copy to commit: $ svn diff (there are none) Check for late changes to the original (target) branch that I should merge first: $ svn diff -r 5113:HEAD http://jeffk at vtiger.fosslabs.com/svn/vtiger/vtigercrm/branches/4.2 (there are none) Switch my working copy to the original (target) branch. This is a good preview of files affected by the coming merge of the two branches. $ svn switch http://jeffk at vtiger.fosslabs.com/svn/vtiger/vtigercrm/branches/4.2 U config.inc.php U sendreminder.php U modules/Accounts/ListViewTop.php U modules/Accounts/Account.php U modules/Accounts/Popup_picker.php U modules/Accounts/Popup.php U modules/Accounts/ListView.php U modules/Accounts/AccountFormBase.php U modules/Quotes/Quote.php U modules/Quotes/Delete.php U modules/Quotes/Popup.php U modules/Quotes/ListView.php U modules/Potentials/Popup.php U modules/Potentials/ListView.php U modules/Potentials/Opportunity.php U modules/Leads/Popup.php U modules/Leads/Lead.php U modules/Leads/ListView.php U modules/Leads/LeadConvertToEntities.php U modules/Home/UnifiedSearch.php U modules/Notes/Delete.php U modules/Notes/ListView.php U modules/Invoice/Invoice.php U modules/Invoice/ListView.php U modules/Orders/SalesOrderListView.php U modules/Orders/SalesOrder.php U modules/Orders/Order.php U modules/Orders/DeleteSalesOrder.php U modules/Orders/PopupSalesOrder.php U modules/Orders/ListView.php U modules/Reports/ReportRun.php U modules/Reports/SaveReportFolder.php U modules/Reports/Save.php U modules/Reports/Reports.php U modules/Reports/PopulateReports.php U modules/HelpDesk/HelpDesk.php U modules/HelpDesk/FaqList.php U modules/HelpDesk/ListView.php U modules/Settings/SaveConvertLead.php U modules/Settings/DeleteCustomField.php U modules/Settings/UpdateComboValues.php U modules/Users/User.php U modules/Users/SaveProfile.php U modules/Users/SaveOrgSharing.php U modules/Users/massdelete.php U modules/Users/LoginHistory.php U modules/Users/saveemailtemplate.php U modules/Users/ListView.php U modules/Users/Security.php U modules/Users/updateLeadDBStatus.php U modules/Users/UserInfoUtil.php U modules/Users/SaveRole.php U modules/Products/Popup.php U modules/Products/AddProductsToPriceBook.php U modules/Products/VendorPopup.php U modules/Products/ListView.php U modules/Products/Delete.php U modules/Products/PriceBookListView.php U modules/Products/Product.php U modules/Products/VendorListView.php U modules/Activities/Activity.php U modules/Activities/ListView.php U modules/Activities/RenderRelatedListUI.php U modules/Activities/OpenListView.php U modules/CustomView/Save.php U modules/CustomView/CustomView.php U modules/Faq/ListView.php U modules/uploads/add2db.php U modules/Calendar/appointment.pinc U modules/Import/UsersLastImport.php U modules/Emails/Email.php U modules/Emails/ListView.php U modules/Meetings/ListView.php U modules/Contacts/Contact.php U modules/Contacts/Popup.php U modules/Contacts/SaveBusinessCard.php U modules/Contacts/ListView.php U data/CRMEntity.php U data/SugarBean.php U include/RelatedListView.php U include/database/PearDatabase.php U include/PopulateComboValues.php U include/utils.php U soap.php U contactserialize.php U schema/DatabaseSchema.xml U install/5createTables.inc.php U install/4createConfigFile.php U install/1checkSystem.php U install/2setConfig.php U install/populateSeedData.php U install/3confirmConfig.php U adodb/adodb.inc.php U adodb/adodb-lib.inc.php U adodb/drivers/adodb-mysql.inc.php Updated to revision 5305. Confirm my working copy info: $ svn info Path: . URL: http://jeffk at vtiger.fosslabs.com/svn/vtiger/vtigercrm/branches/4.2 Repository Root: http://jeffk at vtiger.fosslabs.com/svn/vtiger Repository UUID: 83ef7b00-670c-0410-b3e3-e45103aa6900 Revision: 5305 Node Kind: directory Schedule: normal Last Changed Author: allanbush Last Changed Rev: 5113 Last Changed Date: 2006-04-13 17:25:30 -0400 (Thu, 13 Apr 2006) Perform the actual merge. The form is 'svn merge URL1 URL2'. This updates your working copy with the diff between URL1 and URL2. You confirm the correctness of the merge, write an appropriate message referencing trac tickets, and commit. Since we've been keeping the diff minimized with regular update merges, this merge should a) apply cleanly, and b) represent only the required changes to add postgresql support to vtigercrm-4.2.4. This changeset will be a very useful reference for the equivalent effort on the vtigercrm/trunk $ svn merge http://jeffk at vtiger.fosslabs.com/svn/vtiger/vtigercrm/branches/4.2 http://jeffk at vtiger.fosslabs.com/svn/vtiger/vtigercrm/branches/4.2_postgresql_integration U config.inc.php U sendreminder.php U modules/Accounts/ListViewTop.php U modules/Accounts/Account.php U modules/Accounts/Popup_picker.php U modules/Accounts/Popup.php U modules/Accounts/ListView.php U modules/Accounts/AccountFormBase.php U modules/Quotes/Quote.php U modules/Quotes/Delete.php U modules/Quotes/Popup.php U modules/Quotes/ListView.php U modules/Potentials/Popup.php U modules/Potentials/ListView.php U modules/Potentials/Opportunity.php U modules/Leads/Popup.php U modules/Leads/Lead.php U modules/Leads/ListView.php U modules/Leads/LeadConvertToEntities.php U modules/Home/UnifiedSearch.php U modules/Notes/Delete.php U modules/Notes/ListView.php U modules/Invoice/Invoice.php U modules/Invoice/ListView.php U modules/Orders/SalesOrderListView.php U modules/Orders/SalesOrder.php U modules/Orders/Order.php U modules/Orders/DeleteSalesOrder.php U modules/Orders/PopupSalesOrder.php U modules/Orders/ListView.php U modules/Reports/ReportRun.php U modules/Reports/SaveReportFolder.php U modules/Reports/Save.php U modules/Reports/Reports.php U modules/Reports/PopulateReports.php U modules/HelpDesk/HelpDesk.php U modules/HelpDesk/FaqList.php U modules/HelpDesk/ListView.php U modules/Settings/SaveConvertLead.php U modules/Settings/DeleteCustomField.php U modules/Settings/UpdateComboValues.php U modules/Users/User.php U modules/Users/SaveProfile.php U modules/Users/SaveOrgSharing.php U modules/Users/massdelete.php U modules/Users/LoginHistory.php U modules/Users/saveemailtemplate.php U modules/Users/ListView.php U modules/Users/Security.php U modules/Users/updateLeadDBStatus.php U modules/Users/UserInfoUtil.php U modules/Users/SaveRole.php U modules/Products/Popup.php U modules/Products/AddProductsToPriceBook.php U modules/Products/VendorPopup.php U modules/Products/ListView.php U modules/Products/Delete.php U modules/Products/PriceBookListView.php U modules/Products/Product.php U modules/Products/VendorListView.php U modules/Activities/Activity.php U modules/Activities/ListView.php U modules/Activities/RenderRelatedListUI.php U modules/Activities/OpenListView.php U modules/CustomView/Save.php U modules/CustomView/CustomView.php U modules/Faq/ListView.php U modules/uploads/add2db.php U modules/Calendar/appointment.pinc U modules/Import/UsersLastImport.php U modules/Emails/Email.php U modules/Emails/ListView.php U modules/Meetings/ListView.php U modules/Contacts/Contact.php U modules/Contacts/Popup.php U modules/Contacts/SaveBusinessCard.php U modules/Contacts/ListView.php U data/CRMEntity.php U data/SugarBean.php U include/RelatedListView.php U include/database/PearDatabase.php U include/PopulateComboValues.php U include/utils.php U soap.php U contactserialize.php U schema/DatabaseSchema.xml U install/5createTables.inc.php U install/4createConfigFile.php U install/1checkSystem.php U install/2setConfig.php U install/populateSeedData.php U install/3confirmConfig.php U adodb/adodb.inc.php U adodb/adodb-lib.inc.php U adodb/drivers/adodb-mysql.inc.php All files modified by the merge have indicator 'U', meaning clean update. If there had been any 'C' conflicts, you'd need to repair them manually. Please note that this is only a blind merge of the two branches. In addition to testing, there *will* need to be work done on the 4.2 branch to support both mysql and postgresql for the end user. This integration should be done as quickly as possible, and a vtigercrm/tags/vtigercrm-4.2.5 release created. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 15:30:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 22:30:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5306 - in /vtigercrm/branches/4.2: ./ adodb/ adodb/drivers/ data/ include/ include/database/ install/ modules/Accounts/ modules/Activities/ modules/Calendar/ modules/Contacts/ modules/CustomView/ modules/Emails/ modules/Faq/ modules/HelpDesk/ modules/Home/ modules/Import/ modules/Invoice/ modules/Leads/ modules/Meetings/ modules/Notes/ modules/Orders/ modules/Potentials/ modules/Products/ modules/Quotes/ modules/Reports/ modules/Settings/ modules/Users/ modules/uploads/ schema/ Message-ID: <20060424223025.DCCF740E7C8@vtiger.fosslabs.com> Author: jeffk Date: Mon Apr 24 16:29:46 2006 New Revision: 5306 Log: refs #62 and #17. merging source:vtigercrm/branches/4.2_postgresql_integration back to source:vtigercrm/branches/4.2. This closes the postgresql_integration branch. Some work will remain to properly support both mysql and postgresql (e.g. in source:vtigercrm/branches/4.2/config.inc.php) What follows is a journal of how this merge was performed: My present working copy is: $ svn info Path: . URL: http://jeffk at vtiger.fosslabs.com/svn/vtiger/vtigercrm/branches/4.2_postgresql_integration Repository Root: http://jeffk at vtiger.fosslabs.com/svn/vtiger Repository UUID: 83ef7b00-670c-0410-b3e3-e45103aa6900 Revision: 5305 Node Kind: directory Schedule: normal Last Changed Author: jeffk Last Changed Rev: 5114 Last Changed Date: 2006-04-13 19:47:22 -0400 (Thu, 13 Apr 2006) Check that there are no changes in my working copy to commit: $ svn diff (there are none) Check for late changes to the original (target) branch that I should merge first: $ svn diff -r 5113:HEAD http://jeffk at vtiger.fosslabs.com/svn/vtiger/vtigercrm/branches/4.2 (there are none) Switch my working copy to the original (target) branch. This is a good preview of files affected by the coming merge of the two branches. $ svn switch http://jeffk at vtiger.fosslabs.com/svn/vtiger/vtigercrm/branches/4.2 U config.inc.php U sendreminder.php U modules/Accounts/ListViewTop.php U modules/Accounts/Account.php U modules/Accounts/Popup_picker.php U modules/Accounts/Popup.php U modules/Accounts/ListView.php U modules/Accounts/AccountFormBase.php U modules/Quotes/Quote.php U modules/Quotes/Delete.php U modules/Quotes/Popup.php U modules/Quotes/ListView.php U modules/Potentials/Popup.php U modules/Potentials/ListView.php U modules/Potentials/Opportunity.php U modules/Leads/Popup.php U modules/Leads/Lead.php U modules/Leads/ListView.php U modules/Leads/LeadConvertToEntities.php U modules/Home/UnifiedSearch.php U modules/Notes/Delete.php U modules/Notes/ListView.php U modules/Invoice/Invoice.php U modules/Invoice/ListView.php U modules/Orders/SalesOrderListView.php U modules/Orders/SalesOrder.php U modules/Orders/Order.php U modules/Orders/DeleteSalesOrder.php U modules/Orders/PopupSalesOrder.php U modules/Orders/ListView.php U modules/Reports/ReportRun.php U modules/Reports/SaveReportFolder.php U modules/Reports/Save.php U modules/Reports/Reports.php U modules/Reports/PopulateReports.php U modules/HelpDesk/HelpDesk.php U modules/HelpDesk/FaqList.php U modules/HelpDesk/ListView.php U modules/Settings/SaveConvertLead.php U modules/Settings/DeleteCustomField.php U modules/Settings/UpdateComboValues.php U modules/Users/User.php U modules/Users/SaveProfile.php U modules/Users/SaveOrgSharing.php U modules/Users/massdelete.php U modules/Users/LoginHistory.php U modules/Users/saveemailtemplate.php U modules/Users/ListView.php U modules/Users/Security.php U modules/Users/updateLeadDBStatus.php U modules/Users/UserInfoUtil.php U modules/Users/SaveRole.php U modules/Products/Popup.php U modules/Products/AddProductsToPriceBook.php U modules/Products/VendorPopup.php U modules/Products/ListView.php U modules/Products/Delete.php U modules/Products/PriceBookListView.php U modules/Products/Product.php U modules/Products/VendorListView.php U modules/Activities/Activity.php U modules/Activities/ListView.php U modules/Activities/RenderRelatedListUI.php U modules/Activities/OpenListView.php U modules/CustomView/Save.php U modules/CustomView/CustomView.php U modules/Faq/ListView.php U modules/uploads/add2db.php U modules/Calendar/appointment.pinc U modules/Import/UsersLastImport.php U modules/Emails/Email.php U modules/Emails/ListView.php U modules/Meetings/ListView.php U modules/Contacts/Contact.php U modules/Contacts/Popup.php U modules/Contacts/SaveBusinessCard.php U modules/Contacts/ListView.php U data/CRMEntity.php U data/SugarBean.php U include/RelatedListView.php U include/database/PearDatabase.php U include/PopulateComboValues.php U include/utils.php U soap.php U contactserialize.php U schema/DatabaseSchema.xml U install/5createTables.inc.php U install/4createConfigFile.php U install/1checkSystem.php U install/2setConfig.php U install/populateSeedData.php U install/3confirmConfig.php U adodb/adodb.inc.php U adodb/adodb-lib.inc.php U adodb/drivers/adodb-mysql.inc.php Updated to revision 5305. Confirm my working copy info: $ svn info Path: . URL: http://jeffk at vtiger.fosslabs.com/svn/vtiger/vtigercrm/branches/4.2 Repository Root: http://jeffk at vtiger.fosslabs.com/svn/vtiger Repository UUID: 83ef7b00-670c-0410-b3e3-e45103aa6900 Revision: 5305 Node Kind: directory Schedule: normal Last Changed Author: allanbush Last Changed Rev: 5113 Last Changed Date: 2006-04-13 17:25:30 -0400 (Thu, 13 Apr 2006) Perform the actual merge. The form is 'svn merge URL1 URL2'. This updates your working copy with the diff between URL1 and URL2. You confirm the correctness of the merge, write an appropriate message referencing trac tickets, and commit. Since we've been keeping the diff minimized with regular update merges, this merge should a) apply cleanly, and b) represent only the required changes to add postgresql support to vtigercrm-4.2.4. This changeset will be a very useful reference for the equivalent effort on the vtigercrm/trunk $ svn merge http://jeffk at vtiger.fosslabs.com/svn/vtiger/vtigercrm/branches/4.2 http://jeffk at vtiger.fosslabs.com/svn/vtiger/vtigercrm/branches/4.2_postgresql_integration U config.inc.php U sendreminder.php U modules/Accounts/ListViewTop.php U modules/Accounts/Account.php U modules/Accounts/Popup_picker.php U modules/Accounts/Popup.php U modules/Accounts/ListView.php U modules/Accounts/AccountFormBase.php U modules/Quotes/Quote.php U modules/Quotes/Delete.php U modules/Quotes/Popup.php U modules/Quotes/ListView.php U modules/Potentials/Popup.php U modules/Potentials/ListView.php U modules/Potentials/Opportunity.php U modules/Leads/Popup.php U modules/Leads/Lead.php U modules/Leads/ListView.php U modules/Leads/LeadConvertToEntities.php U modules/Home/UnifiedSearch.php U modules/Notes/Delete.php U modules/Notes/ListView.php U modules/Invoice/Invoice.php U modules/Invoice/ListView.php U modules/Orders/SalesOrderListView.php U modules/Orders/SalesOrder.php U modules/Orders/Order.php U modules/Orders/DeleteSalesOrder.php U modules/Orders/PopupSalesOrder.php U modules/Orders/ListView.php U modules/Reports/ReportRun.php U modules/Reports/SaveReportFolder.php U modules/Reports/Save.php U modules/Reports/Reports.php U modules/Reports/PopulateReports.php U modules/HelpDesk/HelpDesk.php U modules/HelpDesk/FaqList.php U modules/HelpDesk/ListView.php U modules/Settings/SaveConvertLead.php U modules/Settings/DeleteCustomField.php U modules/Settings/UpdateComboValues.php U modules/Users/User.php U modules/Users/SaveProfile.php U modules/Users/SaveOrgSharing.php U modules/Users/massdelete.php U modules/Users/LoginHistory.php U modules/Users/saveemailtemplate.php U modules/Users/ListView.php U modules/Users/Security.php U modules/Users/updateLeadDBStatus.php U modules/Users/UserInfoUtil.php U modules/Users/SaveRole.php U modules/Products/Popup.php U modules/Products/AddProductsToPriceBook.php U modules/Products/VendorPopup.php U modules/Products/ListView.php U modules/Products/Delete.php U modules/Products/PriceBookListView.php U modules/Products/Product.php U modules/Products/VendorListView.php U modules/Activities/Activity.php U modules/Activities/ListView.php U modules/Activities/RenderRelatedListUI.php U modules/Activities/OpenListView.php U modules/CustomView/Save.php U modules/CustomView/CustomView.php U modules/Faq/ListView.php U modules/uploads/add2db.php U modules/Calendar/appointment.pinc U modules/Import/UsersLastImport.php U modules/Emails/Email.php U modules/Emails/ListView.php U modules/Meetings/ListView.php U modules/Contacts/Contact.php U modules/Contacts/Popup.php U modules/Contacts/SaveBusinessCard.php U modules/Contacts/ListView.php U data/CRMEntity.php U data/SugarBean.php U include/RelatedListView.php U include/database/PearDatabase.php U include/PopulateComboValues.php U include/utils.php U soap.php U contactserialize.php U schema/DatabaseSchema.xml U install/5createTables.inc.php U install/4createConfigFile.php U install/1checkSystem.php U install/2setConfig.php U install/populateSeedData.php U install/3confirmConfig.php U adodb/adodb.inc.php U adodb/adodb-lib.inc.php U adodb/drivers/adodb-mysql.inc.php All files modified by the merge have indicator 'U', meaning clean update. If there had been any 'C' conflicts, you'd need to repair them manually. Please note that this is only a blind merge of the two branches. In addition to testing, there *will* need to be work done on the 4.2 branch to support both mysql and postgresql for the end user. This integration should be done as quickly as possible, and a vtigercrm/tags/vtigercrm-4.2.5 release created. Modified: vtigercrm/branches/4.2/adodb/adodb-lib.inc.php vtigercrm/branches/4.2/adodb/adodb.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-mysql.inc.php vtigercrm/branches/4.2/config.inc.php vtigercrm/branches/4.2/contactserialize.php vtigercrm/branches/4.2/data/CRMEntity.php vtigercrm/branches/4.2/data/SugarBean.php vtigercrm/branches/4.2/include/PopulateComboValues.php vtigercrm/branches/4.2/include/RelatedListView.php vtigercrm/branches/4.2/include/database/PearDatabase.php vtigercrm/branches/4.2/include/utils.php vtigercrm/branches/4.2/install/1checkSystem.php vtigercrm/branches/4.2/install/2setConfig.php vtigercrm/branches/4.2/install/3confirmConfig.php vtigercrm/branches/4.2/install/4createConfigFile.php vtigercrm/branches/4.2/install/5createTables.inc.php vtigercrm/branches/4.2/install/populateSeedData.php vtigercrm/branches/4.2/modules/Accounts/Account.php vtigercrm/branches/4.2/modules/Accounts/AccountFormBase.php vtigercrm/branches/4.2/modules/Accounts/ListView.php vtigercrm/branches/4.2/modules/Accounts/ListViewTop.php vtigercrm/branches/4.2/modules/Accounts/Popup.php vtigercrm/branches/4.2/modules/Accounts/Popup_picker.php vtigercrm/branches/4.2/modules/Activities/Activity.php vtigercrm/branches/4.2/modules/Activities/ListView.php vtigercrm/branches/4.2/modules/Activities/OpenListView.php vtigercrm/branches/4.2/modules/Activities/RenderRelatedListUI.php vtigercrm/branches/4.2/modules/Calendar/appointment.pinc vtigercrm/branches/4.2/modules/Contacts/Contact.php vtigercrm/branches/4.2/modules/Contacts/ListView.php vtigercrm/branches/4.2/modules/Contacts/Popup.php vtigercrm/branches/4.2/modules/Contacts/SaveBusinessCard.php vtigercrm/branches/4.2/modules/CustomView/CustomView.php vtigercrm/branches/4.2/modules/CustomView/Save.php vtigercrm/branches/4.2/modules/Emails/Email.php vtigercrm/branches/4.2/modules/Emails/ListView.php vtigercrm/branches/4.2/modules/Faq/ListView.php vtigercrm/branches/4.2/modules/HelpDesk/FaqList.php vtigercrm/branches/4.2/modules/HelpDesk/HelpDesk.php vtigercrm/branches/4.2/modules/HelpDesk/ListView.php vtigercrm/branches/4.2/modules/Home/UnifiedSearch.php vtigercrm/branches/4.2/modules/Import/UsersLastImport.php vtigercrm/branches/4.2/modules/Invoice/Invoice.php vtigercrm/branches/4.2/modules/Invoice/ListView.php vtigercrm/branches/4.2/modules/Leads/Lead.php vtigercrm/branches/4.2/modules/Leads/LeadConvertToEntities.php vtigercrm/branches/4.2/modules/Leads/ListView.php vtigercrm/branches/4.2/modules/Leads/Popup.php vtigercrm/branches/4.2/modules/Meetings/ListView.php vtigercrm/branches/4.2/modules/Notes/Delete.php vtigercrm/branches/4.2/modules/Notes/ListView.php vtigercrm/branches/4.2/modules/Orders/DeleteSalesOrder.php vtigercrm/branches/4.2/modules/Orders/ListView.php vtigercrm/branches/4.2/modules/Orders/Order.php vtigercrm/branches/4.2/modules/Orders/PopupSalesOrder.php vtigercrm/branches/4.2/modules/Orders/SalesOrder.php vtigercrm/branches/4.2/modules/Orders/SalesOrderListView.php vtigercrm/branches/4.2/modules/Potentials/ListView.php vtigercrm/branches/4.2/modules/Potentials/Opportunity.php vtigercrm/branches/4.2/modules/Potentials/Popup.php vtigercrm/branches/4.2/modules/Products/AddProductsToPriceBook.php vtigercrm/branches/4.2/modules/Products/Delete.php vtigercrm/branches/4.2/modules/Products/ListView.php vtigercrm/branches/4.2/modules/Products/Popup.php vtigercrm/branches/4.2/modules/Products/PriceBookListView.php vtigercrm/branches/4.2/modules/Products/Product.php vtigercrm/branches/4.2/modules/Products/VendorListView.php vtigercrm/branches/4.2/modules/Products/VendorPopup.php vtigercrm/branches/4.2/modules/Quotes/Delete.php vtigercrm/branches/4.2/modules/Quotes/ListView.php vtigercrm/branches/4.2/modules/Quotes/Popup.php vtigercrm/branches/4.2/modules/Quotes/Quote.php vtigercrm/branches/4.2/modules/Reports/PopulateReports.php vtigercrm/branches/4.2/modules/Reports/ReportRun.php vtigercrm/branches/4.2/modules/Reports/Reports.php vtigercrm/branches/4.2/modules/Reports/Save.php vtigercrm/branches/4.2/modules/Reports/SaveReportFolder.php vtigercrm/branches/4.2/modules/Settings/DeleteCustomField.php vtigercrm/branches/4.2/modules/Settings/SaveConvertLead.php vtigercrm/branches/4.2/modules/Settings/UpdateComboValues.php vtigercrm/branches/4.2/modules/Users/ListView.php vtigercrm/branches/4.2/modules/Users/LoginHistory.php vtigercrm/branches/4.2/modules/Users/SaveOrgSharing.php vtigercrm/branches/4.2/modules/Users/SaveProfile.php vtigercrm/branches/4.2/modules/Users/SaveRole.php vtigercrm/branches/4.2/modules/Users/Security.php vtigercrm/branches/4.2/modules/Users/User.php vtigercrm/branches/4.2/modules/Users/UserInfoUtil.php vtigercrm/branches/4.2/modules/Users/massdelete.php vtigercrm/branches/4.2/modules/Users/saveemailtemplate.php vtigercrm/branches/4.2/modules/Users/updateLeadDBStatus.php vtigercrm/branches/4.2/modules/uploads/add2db.php vtigercrm/branches/4.2/schema/DatabaseSchema.xml vtigercrm/branches/4.2/sendreminder.php vtigercrm/branches/4.2/soap.php Modified: vtigercrm/branches/4.2/adodb/adodb-lib.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/adodb-lib.inc.php (original) +++ vtigercrm/branches/4.2/adodb/adodb-lib.inc.php Mon Apr 24 16:29:46 2006 @@ -933,18 +933,19 @@ $dbt = $zthis->databaseType; if (isset($zthis->dsnType)) $dbt .= '-'.$zthis->dsnType; - if ($inBrowser) { - if ($ss) { - $ss = ''.htmlspecialchars($ss).''; - } - if ($zthis->debug === -1) - ADOConnection::outp( "
    \n($dbt): ".htmlspecialchars($sqlTxt)."   $ss\n
    \n",false); - else - ADOConnection::outp( "
    \n($dbt): ".htmlspecialchars($sqlTxt)."   $ss\n
    \n",false); - } else { - ADOConnection::outp("-----\n($dbt): ".$sqlTxt."\n-----\n",false); - } - +/* + if ($inBrowser) { + if ($ss) { + $ss = ''.htmlspecialchars($ss).''; + } + if ($zthis->debug === -1) + ADOConnection::outp( "
    \n($dbt): ".htmlspecialchars($sqlTxt)."   $ss\n
    \n",false); + else + ADOConnection::outp( "
    \n($dbt): ".htmlspecialchars($sqlTxt)."   $ss\n
    \n",false); + } else { + ADOConnection::outp("-----\n($dbt): ".$sqlTxt."\n-----\n",false); + } +// */ $qID = $zthis->_query($sql,$inputarr); /* @@ -957,6 +958,17 @@ if ($err = $zthis->ErrorNo()) ADOConnection::outp($err.': '.$emsg); } } else if (!$qID) { + if ($inBrowser) { + if ($ss) { + $ss = ''.htmlspecialchars($ss).''; + } + if ($zthis->debug === -1) + ADOConnection::outp( "
    \n($dbt): ".htmlspecialchars($sqlTxt)."   $ss\n
    \n",false); + else + ADOConnection::outp( "
    \n($dbt): ".htmlspecialchars($sqlTxt)."   $ss\n
    \n",false); + } else { + ADOConnection::outp("-----\n($dbt): ".$sqlTxt."\n-----\n",false); + } ADOConnection::outp($zthis->ErrorNo() .': '. $zthis->ErrorMsg()); } @@ -1018,4 +1030,4 @@ return $s; } -?> +?> Modified: vtigercrm/branches/4.2/adodb/adodb.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/adodb.inc.php (original) +++ vtigercrm/branches/4.2/adodb/adodb.inc.php Mon Apr 24 16:29:46 2006 @@ -747,7 +747,7 @@ $this->_transOK = false; if ($this->debug) ADOConnection::outp("Smart Commit failed"); } else - if ($this->debug) ADOConnection::outp("Smart Commit occurred"); + if (false) ADOConnection::outp("Smart Commit occurred"); } else { $this->_transOK = false; $this->RollbackTrans(); Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-mysql.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/drivers/adodb-mysql.inc.php (original) +++ vtigercrm/branches/4.2/adodb/drivers/adodb-mysql.inc.php Mon Apr 24 16:29:46 2006 @@ -171,7 +171,7 @@ function BeginTrans() { - if ($this->debug) ADOConnection::outp("Transactions not supported in 'mysql' driver. Use 'mysqlt' or 'mysqli' driver"); + //if ($this->debug) ADOConnection::outp("Transactions not supported in 'mysql' driver. Use 'mysqlt' or 'mysqli' driver"); } function _affectedrows() @@ -772,4 +772,4 @@ } -?> +?> Modified: vtigercrm/branches/4.2/config.inc.php ============================================================================== --- vtigercrm/branches/4.2/config.inc.php (original) +++ vtigercrm/branches/4.2/config.inc.php Mon Apr 24 16:29:46 2006 @@ -1,7 +1,7 @@ 'en', 'ja'=>'jp', 'sp_ve'=>'sp', 'it_it'=>'it', 'tw_zh'=>'zh', 'pt_br'=>'pt', 'se'=>'sv', 'cn_zh'=>'zh', 'ge_ge'=>'de', 'ge_ch'=>'de', 'fr'=>'fr'); + +// default_module default value = Home $default_module = 'Home'; + +// default_action default value = index $default_action = 'index'; // set default theme +// default_theme default value = blue $default_theme = 'blue'; -$databasetype = 'mysql'; // show or hide time to compose each page +// calculate_response_time default value = true $calculate_response_time = true; // default text that is placed initially in the login form for user name +// no default_user_name default value $default_user_name = ''; // default text that is placed initially in the login form for password +// no default_password default value $default_password = ''; // create user with default username and password +// create_default_user default value = false $create_default_user = false; +// default_user_is_admin default value = false +$default_user_is_admin = false; -// login message -// if a message is provided, it will be placed on the login screen -// this is for site specific special instructions -$login_message = 'Please login to the application.'; +// if your MySQL/PHP configuration does not support persistent connections set this to true to avoid a large performance slowdown +// disable_persistent_connections default value = false +$disable_persistent_connections = false; + +// defined languages available. the key must be the language file prefix. (Example 'en_us' is the prefix for every 'en_us.lang.php' file) +// languages default value = en_us=>US English +$languages = Array('en_us'=>'US English',); + +// default charset +// default charset default value = ISO-8859-1 +$default_charset = 'ISO-8859-1'; + +// default language +// default_language default value = en_us +$default_language = 'en_us'; + +// add the language pack name to every translation string in the display. +// translation_string_prefix default value = false +$translation_string_prefix = false; ?> Modified: vtigercrm/branches/4.2/contactserialize.php ============================================================================== --- vtigercrm/branches/4.2/contactserialize.php (original) +++ vtigercrm/branches/4.2/contactserialize.php Mon Apr 24 16:29:46 2006 @@ -1189,9 +1189,10 @@ function add_contacts_matching_email_address(&$output_list, $email_address, &$seed_contact) { //global $log; + global $adb; $safe_email_address = addslashes($email_address); - $where = "email1 like '$safe_email_address' OR email2 like '$safe_email_address'"; + $where = "email1 ".$adb->getLike()." '$safe_email_address' OR email2 ".$adb->getLike()." '$safe_email_address'"; $response = $seed_contact->get_list("first_name,last_name,primary_address_city", $where, 0); $contactList = $response['list']; @@ -1306,8 +1307,9 @@ function contact_by_search($name) { // global $log; + global $adb; $seed_contact = new Contact(); - $where = "first_name like '$name%' OR last_name like '$name%' OR email1 like '$name%' OR email2 like '$name%'"; + $where = "first_name ".$adb->getLike()." '$name%' OR last_name ".$adb->getLike()." '$name%' OR email1 ".$adb->getLike()." '$name%' OR email2 ".$adb->getLike()." '$name%'"; $response = $seed_contact->get_list("first_name, last_name", $where, 0); $contactList = $response['list']; //$row_count = $response['row_count']; @@ -1661,6 +1663,7 @@ function retrievereportsto($reports_to,$user_id,$account_id) { + global $adb; if($reports_to=="") { return null; @@ -1695,7 +1698,7 @@ // to do handle smartly handle the manager name - $query = "select contactdetails.contactid as contactid from contactdetails inner join crmentity on crmentity.crmid=contactdetails.contactid where crmentity.deleted=0 and contactdetails.firstname like '".$first_name ."' and contactdetails.lastname like '" .$last_name ."'"; + $query = "select contactdetails.contactid as contactid from contactdetails inner join crmentity on crmentity.crmid=contactdetails.contactid where crmentity.deleted=0 and contactdetails.firstname ".$adb->getLike()." '".$first_name ."' and contactdetails.lastname ".$adb->getLike()." '" .$last_name ."'"; @@ -1972,8 +1975,9 @@ function retrieve_task($name) { // global $log; + global $adb; $task = new Task(); - $where = "name like '$name%'"; + $where = "name ".$adb->getLike()." '$name%'"; $response = $task->get_list("name", $where, 0); $taskList = $response['list']; $output_list = Array(); @@ -2218,8 +2222,9 @@ function retrieve_calendar($name) { + global $adb; $task = new Task(); - $where = "name like '$name%'"; + $where = "name ".$adb->getLike()." '$name%'"; $response = $task->get_list("name", $where, 0); $taskList = $response['list']; $output_list = Array(); Modified: vtigercrm/branches/4.2/data/CRMEntity.php ============================================================================== --- vtigercrm/branches/4.2/data/CRMEntity.php (original) +++ vtigercrm/branches/4.2/data/CRMEntity.php Mon Apr 24 16:29:46 2006 @@ -130,11 +130,11 @@ function insertIntoAttachment1($id,$module,$filedata,$filename,$filesize,$filetype,$user_id) { - $date_var = date('YmdHis'); // global $current_user; global $adb; //global $root_directory; global $vtlog; + $date_var = $adb->database->DBTimeStamp(date('YmdHis')); $ownerid = $user_id; @@ -156,7 +156,7 @@ $sql="update ".$tablename." set filename='".$filename."' where ".$idname."=".$id; $adb->query($sql); - $sql1 = "insert into crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values(".$current_id.",".$current_user->id.",".$ownerid.",'".$module." Attachment','"."',".$adb->formatString("crmentity","createdtime",$date_var).",".$adb->formatString("crmentity","modifiedtime",$date_var).")"; + $sql1 = "insert into crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values(".$current_id.",".$current_user->id.",".$ownerid.",'".$module." Attachment','"."',".$date_var.",".$date_var.")"; $adb->query($sql1); //$this->id = $current_id; @@ -176,12 +176,12 @@ function insertIntoAttachment($id,$module) { - $date_var = date('YmdHis'); global $current_user; global $adb; global $root_directory; global $upload_badext; + $date_var = $adb->database->DBTimeStamp(date('YmdHis')); $ownerid = $this->column_fields['assigned_user_id']; $adb->println("insertattach ownerid=".$ownerid." mod=".$module); $adb->println($this->column_fields); @@ -226,7 +226,7 @@ $sql="update ".$tablename." set filename='".$filename."' where ".$idname."=".$id; $adb->query($sql); - $sql1 = "insert into crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values(".$current_id.",".$current_user->id.",".$ownerid.",'".$module." Attachment','".$this->column_fields['description']."',".$adb->formatString("crmentity","createdtime",$date_var).",".$adb->formatString("crmentity","modifiedtime",$date_var).")"; + $sql1 = "insert into crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values(".$current_id.",".$current_user->id.",".$ownerid.",'".$module." Attachment','".$this->column_fields['description']."',".$date_var.",".$date_var.")"; $adb->query($sql1); //$this->id = $current_id; @@ -261,7 +261,7 @@ global $current_user; global $vtlog; - $date_var = date('YmdHis'); + $date_var = $adb->database->DBTimeStamp(date('YmdHis')); if($_REQUEST['assigntype'] == 'T') { $ownerid= 0; @@ -284,7 +284,7 @@ if($this->mode == 'edit') { $description_val = from_html($adb->formatString("crmentity","description",$this->column_fields['description']),($insertion_mode == 'edit')?true:false); - $sql = "update crmentity set smownerid=".$ownerid.",modifiedby=".$current_user->id.",description=".$description_val.", modifiedtime=".$adb->formatString("crmentity","modifiedtime",$date_var)." where crmid=".$this->id; + $sql = "update crmentity set smownerid=".$ownerid.",modifiedby=".$current_user->id.",description=".$description_val.", modifiedtime=".$date_var." where crmid=".$this->id; $adb->query($sql); } @@ -325,7 +325,7 @@ else { $description_val = from_html($adb->formatString("crmentity","description",$this->column_fields['description']),($insertion_mode == 'edit')?true:false); - $sql = "insert into crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values('".$current_id."','".$current_user->id."','".$ownerid."','".$module."',".$description_val.",'".$date_var."','".$date_var."')"; + $sql = "insert into crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values('".$current_id."','".$current_user->id."','".$ownerid."','".$module."',".$description_val.",".$date_var.",".$date_var.")"; $adb->query($sql); $this->id = $current_id; } @@ -611,9 +611,10 @@ $sales_stage = $adb->query_result($adb->query($dbquery),0,'sales_stage'); if($sales_stage != $_REQUEST['sales_stage']) { - $date_var = date('YmdHis'); + $date_var = $adb->database->DBTimeStamp(date('YmdHis')); //$sql = "insert into potstagehistory values('',".$this->id.",".$_REQUEST['amount'].",'".$_REQUEST['sales_stage']."',".$_REQUEST['probability'].",".$_REQUEST['expectedrevenue'].",".$adb->formatString("potstagehistory","closedate",$_REQUEST['closingdate']).",".$adb->formatString("potstagehistory","lastmodified",$date_var).")"; - $sql = "insert into potstagehistory values('',".$this->id.",'".$_REQUEST['amount']."','".$sales_stage."','".$_REQUEST['probability']."',0,".$adb->formatString("potstagehistory","closedate",$_REQUEST['closingdate']).",".$adb->formatString("potstagehistory","lastmodified",$date_var).")"; + $id = $adb->getUniqueID('potstagehistory'); + $sql = "insert into potstagehistory values($id,".$this->id.",'".$_REQUEST['amount']."','".$sales_stage."','".$_REQUEST['probability']."',0,".$adb->formatString("potstagehistory","closedate",$_REQUEST['closingdate']).",".$date_var.")"; $adb->query($sql); } } @@ -742,8 +743,9 @@ else $ownertype = 'customer'; - $comment = addslashes($_REQUEST['comments']); - $sql = "insert into ticketcomments values('',".$this->id.",'".$comment."','".$current_user->id."','".$ownertype."','".$current_time."')"; + $comment = $adb->quote($_REQUEST['comments']); + $id = $adb->getUniqueID("ticketcomments_commentid"); + $sql = "insert into ticketcomments values(".$id.",".$this->id.",".$comment.",'".$current_user->id."','".$ownertype."','".$current_time."')"; $adb->query($sql); } function insertIntoFAQCommentTable($table_name, $module) @@ -754,8 +756,9 @@ $current_time = date('Y-m-d H:i:s'); - $comment = addslashes($_REQUEST['comments']); - $sql = "insert into faqcomments values('',".$this->id.",'".$comment."','".$current_time."')"; + $comment = $adb->quote($_REQUEST['comments']); + $id = $adb->getUniqueID("faqcomments_commentid"); + $sql = "insert into faqcomments values(".$id.",".$this->id.",".$comment.",'".$current_time."')"; $adb->query($sql); } function insertIntoReminderTable($table_name,$module,$recurid) @@ -817,7 +820,7 @@ { $activity_id=$this->id; - $sql='select min(recurringdate) min_date,max(recurringdate) max_date,recurringtype from recurringevents where activityid='. $activity_id.' group by activityid'; + $sql='select min(recurringdate) AS min_date, max(recurringdate) AS max_date, recurringtype from recurringevents where activityid='. $activity_id.' group by activityid, recurringtype'; $result = $adb->query($sql); $noofrows = $adb->num_rows($result); @@ -886,7 +889,7 @@ $tdate=$date_array[$k]; if($tdate <= $end_date) { - $max_recurid_qry = 'select max(recurringid) recurid from recurringevents;'; + $max_recurid_qry = 'select max(recurringid) AS recurid from recurringevents;'; $result = $adb->query($max_recurid_qry); $noofrows = $adb->num_rows($result); for($i=0; $i<$noofrows; $i++) @@ -894,7 +897,7 @@ $recur_id = $adb->query_result($result,$i,"recurid"); } $current_id =$recur_id+1; - $recurring_insert = 'insert into recurringevents values ("'.$current_id.'","'.$this->id.'","'.$tdate.'","'.$type.'")'; + $recurring_insert = "insert into recurringevents values (".$adb->quote($current_id).','.$adb->quote($this->id).','.$adb->quote($tdate).','.$adb->quote($type).')'; $adb->query($recurring_insert); if($_REQUEST['set_reminder'] == 'Yes') { Modified: vtigercrm/branches/4.2/data/SugarBean.php ============================================================================== --- vtigercrm/branches/4.2/data/SugarBean.php (original) +++ vtigercrm/branches/4.2/data/SugarBean.php Mon Apr 24 16:29:46 2006 @@ -185,6 +185,7 @@ if ($id == -1) { $id = $this->id; } + if('' == $id) return null; // GS porting crmentity $query = "SELECT * FROM $this->table_name WHERE $this->module_id = '$id'"; // $query = "SELECT * FROM $this->table_name WHERE ID = '$id'"; Modified: vtigercrm/branches/4.2/include/PopulateComboValues.php ============================================================================== --- vtigercrm/branches/4.2/include/PopulateComboValues.php (original) +++ vtigercrm/branches/4.2/include/PopulateComboValues.php Mon Apr 24 16:29:46 2006 @@ -28,13 +28,14 @@ $i=0; foreach ($values as $val => $cal) { + $id = $adb->getUniqueID($tableName); // horrible assumption on the name of the sequence for this table if($val != '') { - $adb->query("insert into ".$tableName. " values('','".$val."',".$i.",1)"); + $adb->query("insert into ".$tableName. " values($id,'".$val."',".$i.",1)"); } else { - $adb->query("insert into ".$tableName. " values('','--None--',".$i.",1)"); + $adb->query("insert into ".$tableName. " values($id,'--None--',".$i.",1)"); } $i++; } Modified: vtigercrm/branches/4.2/include/RelatedListView.php ============================================================================== --- vtigercrm/branches/4.2/include/RelatedListView.php (original) +++ vtigercrm/branches/4.2/include/RelatedListView.php Mon Apr 24 16:29:46 2006 @@ -78,7 +78,8 @@ } //Appending the group by for Jaguar/Don -if($relatedmodule == 'Activities') +// group by won't work this way in postgres +if($relatedmodule == 'Activities' && !$adb->isPostgres()) { $query .= ' group by crmentity.crmid'; } Modified: vtigercrm/branches/4.2/include/database/PearDatabase.php ============================================================================== --- vtigercrm/branches/4.2/include/database/PearDatabase.php (original) +++ vtigercrm/branches/4.2/include/database/PearDatabase.php Mon Apr 24 16:29:46 2006 @@ -35,8 +35,9 @@ var $lastmysqlrow = -1; var $enableSQLlog = false; - function isMySQL() { return dbType=='mysql'; } - function isOracle() { return dbType=='oci8'; } + function isMySQL() { return $this->dbType=='mysql'; } + function isOracle() { return $this->dbType=='oci8'; } + function isPostgres() { return $this->dbType=='pgsql'; } function println($msg) { @@ -59,8 +60,9 @@ function setDatabaseType($type){ $this->dbType = $type; - } - + $this->like = $this->isPostgres() ? 'ilike' : 'like'; + } + function setUserName($name){ $this->userName = $name; } @@ -86,6 +88,10 @@ function getDataSourceName(){ return $this->dbType. "://".$this->userName.":".$this->userPassword."@". $this->dbHostName . "/". $this->dbName; + } + + function getLike(){ + return $this->like; } function startTransaction() @@ -258,7 +264,14 @@ { $this->println("updateBlobFile t=".$tablename." c=".$colname." id=".$id." f=".$filename); $this->checkConnection(); - $result = $this->database->UpdateBlobFile($tablename, $colname, $filename, $id); + if($this->isPostgres()) { + $fp = fopen($filename, "r"); + $filecontent = fread($fp, filesize($filename)); + $result = $this->database->UpdateBlob($tablename, $colname, $filecontent, $id); + fclose($fp); + } else { + $result = $this->database->UpdateBlobFile($tablename, $colname, $filename, $id); + } $this->println("updateBlobFile t=".$tablename." c=".$colname." id=".$id." f=".$filename." status=".$result); return $result; } @@ -663,9 +676,9 @@ } $this->database = ADONewConnection($this->dbType); - //$this->database->debug = true; - - $this->database->PConnect($this->dbHostName, $this->userName, $this->userPassword, $this->dbName); + $this->database->debug = true; + + $this->database->Connect($this->dbHostName, $this->userName, $this->userPassword, $this->dbName); $this->database->LogSQL($this->enableSQLlog); //$this->database->SetFetchMode(ADODB_FETCH_ASSOC); //$this->println("ADODB type=".$this->dbType." host=".$this->dbHostName." dbname=".$this->dbName." user=".$this->userName." password=".$this->userPassword); @@ -924,11 +937,11 @@ return $date; } -function getDBDateString($datecolname) +function getDBDateString($datecolname, $format='Y-m-d, H:i:s') { $this->checkConnection(); $db = &$this->database; - $datestr = $db->SQLDate("Y-m-d, H:i:s" ,$datecolname); + $datestr = $db->SQLDate($format ,$datecolname); return $datestr; } Modified: vtigercrm/branches/4.2/include/utils.php ============================================================================== --- vtigercrm/branches/4.2/include/utils.php (original) +++ vtigercrm/branches/4.2/include/utils.php Mon Apr 24 16:29:46 2006 @@ -397,6 +397,8 @@ */ function append_where_clause(&$where_clauses, $variable_name, $SQL_name = null) { + global $adb; + if($SQL_name == null) { $SQL_name = $variable_name; @@ -404,7 +406,7 @@ if(isset($_REQUEST[$variable_name]) && $_REQUEST[$variable_name] != "") { - array_push($where_clauses, "$SQL_name like '$_REQUEST[$variable_name]%'"); + array_push($where_clauses, "$SQL_name ".$adb->getLike()." '$_REQUEST[$variable_name]%'"); } } @@ -2412,13 +2414,15 @@ global $adb; $column_fld = Array(); $tabid = getTabid($module); - $sql = "select * from field where tabid=".$tabid; - $result = $adb->query($sql); - $noofrows = $adb->num_rows($result); - for($i=0; $i<$noofrows; $i++) - { - $fieldname = $adb->query_result($result,$i,"fieldname"); - $column_fld[$fieldname] = ''; + if($tabid) { + $sql = "select * from field where tabid=".$tabid; + $result = $adb->query($sql); + $noofrows = $adb->num_rows($result); + for($i=0; $i<$noofrows; $i++) + { + $fieldname = $adb->query_result($result,$i,"fieldname"); + $column_fld[$fieldname] = ''; + } } return $column_fld; } @@ -3146,8 +3150,10 @@ elseif($module == 'Quotes' && $name == 'Potential Name') { $potential_id = $adb->query_result($list_result,$i-1,"potentialid"); - $potential_name = getPotentialName($potential_id); - $value = ''.$potential_name.''; + if('' != $potential_id) { + $potential_name = getPotentialName($potential_id); + $value = ''.$potential_name.''; + } } elseif($owner_id == 0 && $name == 'Assigned To') { @@ -3748,8 +3754,12 @@ } -function getListQuery($module,$where='') -{ +function getListQuery($module,$where='',$distincton='') +{ + if($distincton) { + $distincton = "DISTINCT ON ($distincton)"; + } + if($module == "HelpDesk") { $query = "select crmentity.crmid,troubletickets.title,troubletickets.status,troubletickets.priority,crmentity.smownerid, contactdetails.contactid, troubletickets.parent_id, contactdetails.firstname, contactdetails.lastname, account.accountid, account.accountname, ticketcf.* from troubletickets inner join ticketcf on ticketcf.ticketid = troubletickets.ticketid inner join crmentity on crmentity.crmid=troubletickets.ticketid left join contactdetails on troubletickets.parent_id=contactdetails.contactid left join account on account.accountid=troubletickets.parent_id left join users on crmentity.smownerid=users.id and troubletickets.ticketid = ticketcf.ticketid where crmentity.deleted=0"; @@ -3777,7 +3787,7 @@ } if($module == "Notes") { - $query="select crmentity.crmid, notes.title, notes.contact_id, notes.filename, crmentity.modifiedtime,senotesrel.crmid as relatedto, contactdetails.firstname, contactdetails.lastname, notes.* from notes inner join crmentity on crmentity.crmid=notes.notesid left join senotesrel on senotesrel.notesid=notes.notesid left join contactdetails on contactdetails.contactid = notes.contact_id where crmentity.deleted=0"; + $query="select $distincton crmentity.crmid, notes.title, notes.contact_id, notes.filename, crmentity.modifiedtime,senotesrel.crmid as relatedto, contactdetails.firstname, contactdetails.lastname, notes.* from notes inner join crmentity on crmentity.crmid=notes.notesid left join senotesrel on senotesrel.notesid=notes.notesid left join contactdetails on contactdetails.contactid = notes.contact_id where crmentity.deleted=0"; } if($module == "Calls") { @@ -3785,7 +3795,22 @@ } if($module == "Contacts") { - $query = "select crmentity.crmid, crmentity.smownerid, contactdetails.*, contactaddress.*, contactsubdetails.*, contactscf.*, account.accountname from contactdetails, contactaddress, contactsubdetails, contactscf inner join crmentity on crmentity.crmid=contactdetails.contactid and contactdetails.contactid=contactaddress.contactaddressid and contactdetails.contactid = contactscf.contactid and contactaddress.contactaddressid=contactsubdetails.contactsubscriptionid left join account on account.accountid = contactdetails.accountid where crmentity.deleted=0"; + $query = "SELECT crmentity.crmid, crmentity.smownerid, + contactdetails.*, contactaddress.*, + contactsubdetails.*, contactscf.*, + account.accountname + from contactdetails + INNER JOIN contactaddress + ON contactdetails.contactid=contactaddress.contactaddressid + INNER JOIN contactsubdetails + ON contactaddress.contactaddressid=contactsubdetails.contactsubscriptionid + INNER JOIN contactscf + ON contactdetails.contactid = contactscf.contactid + INNER JOIN crmentity + ON crmentity.crmid=contactdetails.contactid + LEFT JOIN account + ON account.accountid = contactdetails.accountid + WHERE crmentity.deleted=0"; //$query = "select crmentity.crmid, crmentity.smownerid, contactdetails.*, contactaddress.*, contactsubdetails.*, contactscf.*, account.accountname from contactdetails, contactaddress, contactsubdetails, contactscf,crmentity,account where crmentity.crmid=contactdetails.contactid and contactdetails.contactid=contactaddress.contactaddressid and contactdetails.contactid = contactscf.contactid and contactaddress.contactaddressid=contactsubdetails.contactsubscriptionid and account.accountid = contactdetails.accountid and crmentity.deleted=0"; } if($module == "Meetings") @@ -3794,7 +3819,7 @@ } if($module == "Activities") { - $query = " select crmentity.crmid,crmentity.smownerid,crmentity.setype, activity.*, contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, account.accountid, account.accountname, recurringevents.recurringtype from activity inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid= cntactivityrel.contactid left join seactivityrel on seactivityrel.activityid = activity.activityid left outer join account on account.accountid = contactdetails.accountid left outer join recurringevents on recurringevents.activityid=activity.activityid WHERE crmentity.deleted=0 and (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task') ".$where ; + $query = " select $distincton crmentity.crmid,crmentity.smownerid,crmentity.setype, activity.*, contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, account.accountid, account.accountname, recurringevents.recurringtype from activity inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid= cntactivityrel.contactid left join seactivityrel on seactivityrel.activityid = activity.activityid left outer join account on account.accountid = contactdetails.accountid left outer join recurringevents on recurringevents.activityid=activity.activityid WHERE crmentity.deleted=0 and (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task') ".$where ; //included by Jaguar } if($module == "Emails") @@ -4209,7 +4234,11 @@ } //echo $display_date; - $insert_date=$y.'-'.$m.'-'.$d; + if(!$y && !$m && !$d) { + $insert_date = ''; + } else { + $insert_date=$y.'-'.$m.'-'.$d; + } return $insert_date; } Modified: vtigercrm/branches/4.2/install/1checkSystem.php ============================================================================== --- vtigercrm/branches/4.2/install/1checkSystem.php (original) +++ vtigercrm/branches/4.2/install/1checkSystem.php Mon Apr 24 16:29:46 2006 @@ -174,7 +174,7 @@ Database - Available":"Not Available";?> + Available":"Not Available";?> Modified: vtigercrm/branches/4.2/install/2setConfig.php ============================================================================== --- vtigercrm/branches/4.2/install/2setConfig.php (original) +++ vtigercrm/branches/4.2/install/2setConfig.php Mon Apr 24 16:29:46 2006 @@ -340,14 +340,27 @@ Database Name * " /> - - + + + + Database Type * + + + + + + + + + + + Database Type * + ERROR: none detected + + intime=".$intime); - $query = "Insert into loginhistory values ('','$usname','$usip','',".$this->db->formatDate($intime).",'Signedin')"; + $query = "Insert into loginhistory (user_name, user_ip, logout_time, login_time, status) values ('$usname','$usip',null,".$this->db->formatDate($intime).",'Signedin')"; $result = $this->db->query($query) - or die("MySQL error: ".mysql_error()); + or die("SQL error: ".$this->db->database->ErrorMsg()); return $result; } function user_logout(&$usname,&$usip,&$outtime) { - $logid_qry = "SELECT max(login_id) login_id from loginhistory where user_name='$usname' and user_ip='$usip'"; + $logid_qry = "SELECT max(login_id) as login_id from loginhistory where user_name='$usname' and user_ip='$usip'"; $result = $this->db->query($logid_qry); //if($this->db->num_rows($result) !=1 ) return; $loginid = $this->db->query_result($result,0,"login_id"); @@ -126,7 +126,7 @@ // Determine if the account name is present in the where clause. // $query = "SELECT * from loginhistory order by login_time"; global $current_user; - $query = "SELECT user_name,user_ip,".$this->db->getDBDateString("login_time")." login_time,".$this->db->getDBDateString("logout_time")." logout_time,status FROM $this->table_name "; + $query = "SELECT user_name,user_ip,".$this->db->getDBDateString("login_time")." AS login_time,".$this->db->getDBDateString("logout_time")." AS logout_time,status FROM $this->table_name "; if($where != "") { if(!is_admin($current_user)) Modified: vtigercrm/branches/4.2/modules/Users/SaveOrgSharing.php ============================================================================== --- vtigercrm/branches/4.2/modules/Users/SaveOrgSharing.php (original) +++ vtigercrm/branches/4.2/modules/Users/SaveOrgSharing.php Mon Apr 24 16:29:46 2006 @@ -23,7 +23,7 @@ if($tabid != 8 && $tab_id != 14 && $tab_id != 15 && $tab_id != 18 && $tab_id != 19 && $tab_id != 16 & $tab_id != 22) { $reqval = $tabid.'_per'; - $permission=$_REQUEST[$reqval]; + $permission = (int) $_REQUEST[$reqval]; $sql7="update def_org_share set permission=".$permission." where tabid=".$tabid." and ruleid=".$ruleid; //echo $sql7; //echo '
    '; Modified: vtigercrm/branches/4.2/modules/Users/SaveProfile.php ============================================================================== --- vtigercrm/branches/4.2/modules/Users/SaveProfile.php (original) +++ vtigercrm/branches/4.2/modules/Users/SaveProfile.php Mon Apr 24 16:29:46 2006 @@ -15,7 +15,8 @@ $profilename = $_REQUEST['profileName']; $parentProfileId= $_REQUEST['parentProfileId']; //Inserting values into Profile Table -$sql1 = "insert into profile values('','".$profilename."')"; +$id = $adb->getUniqueID('profile'); +$sql1 = "insert into profile (profileid, profilename) values($id,'".$profilename."')"; $adb->query($sql1); //Retreiving the profileid Modified: vtigercrm/branches/4.2/modules/Users/SaveRole.php ============================================================================== --- vtigercrm/branches/4.2/modules/Users/SaveRole.php (original) +++ vtigercrm/branches/4.2/modules/Users/SaveRole.php Mon Apr 24 16:29:46 2006 @@ -25,7 +25,7 @@ } else { - $sql1 = "insert into role values('','".$rolename."','')"; + $sql1 = "insert into role (name) values('".$rolename."')"; $adb->query($sql1); //Retreiving the profileid Modified: vtigercrm/branches/4.2/modules/Users/Security.php ============================================================================== --- vtigercrm/branches/4.2/modules/Users/Security.php (original) +++ vtigercrm/branches/4.2/modules/Users/Security.php Mon Apr 24 16:29:46 2006 @@ -43,28 +43,28 @@ $table_name="user2role"; $table_name="role2tab"; - $this->db->query("INSERT INTO tab VALUES (3,'Home',0,1,'Home','','',1)"); - $this->db->query("INSERT INTO tab VALUES (7,'Leads',0,4,'Leads','','',1)"); - $this->db->query("INSERT INTO tab VALUES (6,'Accounts',0,5,'Accounts','','',1)"); - $this->db->query("INSERT INTO tab VALUES (4,'Contacts',0,6,'Contacts','','',1)"); - $this->db->query("INSERT INTO tab VALUES (2,'Potentials',0,7,'Potentials','','',1)"); - $this->db->query("INSERT INTO tab VALUES (8,'Notes',0,9,'Notes','','',1)"); - $this->db->query("INSERT INTO tab VALUES (9,'Activities',0,3,'Activities','','',1)"); - $this->db->query("INSERT INTO tab VALUES (10,'Emails',0,10,'Emails','','',1)"); - $this->db->query("INSERT INTO tab VALUES (13,'HelpDesk',0,11,'HelpDesk','','',1)"); - $this->db->query("INSERT INTO tab VALUES (14,'Products',0,8,'Products','','',1)"); - $this->db->query("INSERT INTO tab VALUES (1,'Dashboard',0,12,'Dashboards','','',1)"); - $this->db->query("INSERT INTO tab VALUES (15,'Faq',2,14,'Faq','','',1)"); - $this->db->query("INSERT INTO tab VALUES (16,'Events',2,13,'Events','','',1)"); - $this->db->query("INSERT INTO tab VALUES (17,'Calendar',0,2,'Calendar','','',1)"); - $this->db->query("INSERT INTO tab VALUES (18,'Vendor',2,15,'Vendor','','',1)"); - $this->db->query("INSERT INTO tab VALUES (19,'PriceBook',2,16,'PriceBook','','',1)"); - $this->db->query("INSERT INTO tab VALUES (20,'Quotes',0,17,'Quotes','','',1)"); - $this->db->query("INSERT INTO tab VALUES (21,'Orders',0,18,'Orders','','',1)"); - $this->db->query("INSERT INTO tab VALUES (22,'SalesOrder',2,19,'SalesOrder','','',1)"); - $this->db->query("INSERT INTO tab VALUES (23,'Invoice',0,20,'Invoice','','',1)"); - $this->db->query("INSERT INTO tab VALUES (24,'Rss',0,21,'Rss','','',1)"); - $this->db->query("INSERT INTO tab VALUES (25,'Reports',0,22,'Reports','','',1)"); + $this->db->query("INSERT INTO tab VALUES (3,'Home',0,1,'Home',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (7,'Leads',0,4,'Leads',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (6,'Accounts',0,5,'Accounts',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (4,'Contacts',0,6,'Contacts',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (2,'Potentials',0,7,'Potentials',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (8,'Notes',0,9,'Notes',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (9,'Activities',0,3,'Activities',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (10,'Emails',0,10,'Emails',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (13,'HelpDesk',0,11,'HelpDesk',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (14,'Products',0,8,'Products',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (1,'Dashboard',0,12,'Dashboards',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (15,'Faq',2,14,'Faq',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (16,'Events',2,13,'Events',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (17,'Calendar',0,2,'Calendar',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (18,'Vendor',2,15,'Vendor',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (19,'PriceBook',2,16,'PriceBook',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (20,'Quotes',0,17,'Quotes',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (21,'Orders',0,18,'Orders',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (22,'SalesOrder',2,19,'SalesOrder',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (23,'Invoice',0,20,'Invoice',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (24,'Rss',0,21,'Rss',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (25,'Reports',0,22,'Reports',null,null,1)"); //Account Details -- START //Block1 $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'accountname','account',1,'2','accountname','Account Name',1,0,0,100,1,1,1,'V~M')"); Modified: vtigercrm/branches/4.2/modules/Users/User.php ============================================================================== --- vtigercrm/branches/4.2/modules/Users/User.php (original) +++ vtigercrm/branches/4.2/modules/Users/User.php Mon Apr 24 16:29:46 2006 @@ -478,7 +478,11 @@ { global $mod_strings; - $query = "SELECT user_name from users where user_name='$this->user_name' AND id<>'$this->id' AND deleted=0"; + if('' == $this->id) { + $query = "SELECT user_name from users where user_name='$this->user_name' AND deleted=0"; + } else { + $query = "SELECT user_name from users where user_name='$this->user_name' AND id<>'$this->id' AND deleted=0"; + } $result =$this->db->query($query, true, "Error selecting possible duplicate users: "); $dup_users = $this->db->fetchByAssoc($result); Modified: vtigercrm/branches/4.2/modules/Users/UserInfoUtil.php ============================================================================== --- vtigercrm/branches/4.2/modules/Users/UserInfoUtil.php (original) +++ vtigercrm/branches/4.2/modules/Users/UserInfoUtil.php Mon Apr 24 16:29:46 2006 @@ -425,6 +425,7 @@ global $adb; $sqldelete = "delete from users2group where userid = '" .$userid ."'"; $result_delete = $adb->query($sqldelete); + if($groupname == '') return; $sql = "insert into users2group(groupname,userid) values('" .$groupname ."','" .$userid ."')"; $result = $adb->query($sql); } @@ -442,6 +443,7 @@ function insertUsers2GroupMapping($groupname,$userid) { global $adb; + if($groupname == '') return; $sql = "insert into users2group(groupname,userid) values('" .$groupname ."','" .$userid ."')"; $adb->query($sql); } @@ -527,6 +529,7 @@ function insert2LeadGroupRelation($leadid,$groupname) { global $adb; + if($groupname == '') return; $sql = "insert into leadgrouprelation values (" .$leadid .",'".$groupname."')"; $adb->query($sql); @@ -536,6 +539,7 @@ global $adb; $sqldelete = "delete from leadgrouprelation where leadid=".$leadid; $adb->query($sqldelete); + if($groupname == '') return; $sql = "insert into leadgrouprelation values (".$leadid .",'" .$groupname ."')"; $adb->query($sql); @@ -545,6 +549,7 @@ global $adb; $sqldelete = "delete from ticketgrouprelation where ticketid=".$ticketid; $adb->query($sqldelete); + if($groupname == '') return; $sql = "insert into ticketgrouprelation values (".$ticketid .",'" .$groupname ."')"; $adb->query($sql); @@ -553,6 +558,7 @@ function insert2ActivityGroupRelation($activityid,$groupname) { global $adb; + if($groupname == '') return; $sql = "insert into activitygrouprelation values (" .$activityid .",'".$groupname."')"; $adb->query($sql); @@ -561,6 +567,7 @@ function insert2TicketGroupRelation($ticketid,$groupname) { global $adb; + if($groupname == '') return; $sql = "insert into ticketgrouprelation values (" .$ticketid .",'".$groupname."')"; $adb->query($sql); Modified: vtigercrm/branches/4.2/modules/Users/massdelete.php ============================================================================== --- vtigercrm/branches/4.2/modules/Users/massdelete.php (original) +++ vtigercrm/branches/4.2/modules/Users/massdelete.php Mon Apr 24 16:29:46 2006 @@ -25,7 +25,8 @@ $storearray = explode(";",$idlist); foreach($storearray as $id) { - $sql="update crmentity set crmentity.deleted=1 where crmentity.crmid='" .$id ."'"; + if('' == $id) continue; + $sql="update crmentity set deleted=1 where crmid='" .$id ."'"; $result = $adb->query($sql); } if(isset($_REQUEST['smodule']) && ($_REQUEST['smodule']!='')) Modified: vtigercrm/branches/4.2/modules/Users/saveemailtemplate.php ============================================================================== --- vtigercrm/branches/4.2/modules/Users/saveemailtemplate.php (original) +++ vtigercrm/branches/4.2/modules/Users/saveemailtemplate.php Mon Apr 24 16:29:46 2006 @@ -27,13 +27,14 @@ $vtlog->logthis("the body is ".$body,'debug'); if ($body !='') { - $body = to_html($body); + $body = $adb->database->qstr(to_html($body)); + $description = $adb->database->qstr($description); $vtlog->logthis("the body value is set ",'info'); } if(isset($templateid) && $templateid !='') { $vtlog->logthis("the templateid is set",'info'); - $sql = "update emailtemplates set foldername = '".$folderName."', templatename ='".$templateName."', subject ='".$subject."', description ='".$description."', body ='".$body."' where templateid =".$templateid; + $sql = "update emailtemplates set foldername = '".$folderName."', templatename ='".$templateName."', subject ='".$subject."', description =".$description.", body =".$body." where templateid =".$templateid; $adb->query($sql); $vtlog->logthis("about to invoke the detailviewemailtemplate file",'info'); @@ -41,7 +42,7 @@ } else { - $sql = "insert into emailtemplates values ('". $folderName. "','".$templateName."','".$subject."','".$description."','".$body."',0,".$db->getUniqueID('emailtemplates').")"; + $sql = "insert into emailtemplates values ('". $folderName. "','".$templateName."','".$subject."',".$description.",".$body.",0,".$db->getUniqueID('emailtemplates').")"; $adb->query($sql); $vtlog->logthis("added to the db the emailtemplate",'info'); Modified: vtigercrm/branches/4.2/modules/Users/updateLeadDBStatus.php ============================================================================== --- vtigercrm/branches/4.2/modules/Users/updateLeadDBStatus.php (original) +++ vtigercrm/branches/4.2/modules/Users/updateLeadDBStatus.php Mon Apr 24 16:29:46 2006 @@ -21,6 +21,7 @@ global $adb; $storearray = explode(";",$idlist); +$storearray = array_filter($storearray); $date_var = date('YmdHis'); if(isset($_REQUEST['user_id']) && $_REQUEST['user_id']!='') 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 Mon Apr 24 16:29:46 2006 @@ -40,7 +40,7 @@ $current_id = $adb->getUniqueID("crmentity"); $desc = $_REQUEST['txtDescription']; $description = addslashes($desc); - $date_var = date('YmdHis'); + $date_var = $adb->database->DBTimeStamp(date('YmdHis')); //$data = addslashes(fread(fopen($uploaddir.$binFile, "r"), $filesize)); $filenameBase64 = $filename.".base64"; @@ -50,8 +50,8 @@ fwrite($wfh,base64_encode(fread($rfh, $filesize))); deleteFile($uploaddir,$filename); - $query = "insert into 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 = "insert into crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values('"; + $query .= $current_id."','".$current_user->id."','".$current_user->id."','".$_REQUEST['return_module'].' Attachment'."','".$description."',".$date_var.",".$date_var.")"; $result = $adb->query($query); $sql = "insert into attachments values("; Modified: vtigercrm/branches/4.2/schema/DatabaseSchema.xml ============================================================================== --- vtigercrm/branches/4.2/schema/DatabaseSchema.xml (original) +++ vtigercrm/branches/4.2/schema/DatabaseSchema.xml Mon Apr 24 16:29:46 2006 @@ -915,7 +915,6 @@ - @@ -2034,18 +2033,6 @@ - - - - ADD CONSTRAINT fk_SeTicketsRel1 FOREIGN KEY (crmid) REFERENCES crmentity(crmid) ON DELETE CASCADE - - Type=InnoDB - - - -
    - - ADD CONSTRAINT fk_SeTicketsRel2 FOREIGN KEY (ticketid) REFERENCES troubletickets(ticketid) ON DELETE CASCADE @@ -4077,13 +4064,6 @@
    ADD CONSTRAINT fk_Quotes2 FOREIGN KEY (potentialid) REFERENCES potential(potentialid) ON DELETE CASCADE - Type=InnoDB - - -
    - - - ADD CONSTRAINT fk_Quotes3 FOREIGN KEY (contactid) REFERENCES contactdetails(contactid) ON DELETE CASCADEType=InnoDB Modified: vtigercrm/branches/4.2/sendreminder.php ============================================================================== --- vtigercrm/branches/4.2/sendreminder.php (original) +++ vtigercrm/branches/4.2/sendreminder.php Mon Apr 24 16:29:46 2006 @@ -33,7 +33,7 @@ $vtlog->logthis(" invoked sendreminder ",'debug'); //modified query for recurring events -Jag - $query="select crmentity.crmid,activity.*,activity_reminder.reminder_time,activity_reminder.reminder_sent,activity_reminder.recurringid,recurringevents.recurringdate from activity inner join crmentity on crmentity.crmid=activity.activityid inner join activity_reminder on activity.activityid=activity_reminder.activity_id left outer join recurringevents on activity.activityid=recurringevents.activityid where DATE_FORMAT(activity.date_start,'%Y-%m-%d, %H:%i:%s') >= '".date('Y-m-d')."' and crmentity.crmid != 0 and activity.eventstatus = 'Planned' and activity_reminder.reminder_sent = 0 group by activity.activityid,recurringevents.recurringid ;"; +$query="select crmentity.crmid,activity.*,activity_reminder.reminder_time,activity_reminder.reminder_sent,activity_reminder.recurringid,recurringevents.recurringdate from activity inner join crmentity on crmentity.crmid=activity.activityid inner join activity_reminder on activity.activityid=activity_reminder.activity_id left outer join recurringevents on activity.activityid=recurringevents.activityid where ".$adb->getDBDateString('activity.date_start', 'Y-m-d, H:i:s')." >= '".date('Y-m-d')."' and crmentity.crmid != 0 and activity.eventstatus = 'Planned' and activity_reminder.reminder_sent = 0 group by activity.activityid,recurringevents.recurringid ;"; $result = $adb->query($query); Modified: vtigercrm/branches/4.2/soap.php ============================================================================== --- vtigercrm/branches/4.2/soap.php (original) +++ vtigercrm/branches/4.2/soap.php Mon Apr 24 16:29:46 2006 @@ -153,10 +153,10 @@ } function add_contacts_matching_email_address(&$output_list, $email_address, &$seed_contact, &$msi_id) { - global $log; + global $adb, $log; $safe_email_address = addslashes($email_address); - $where = "email1 like '$safe_email_address' OR email2 like '$safe_email_address'"; + $where = "email1 ".$adb->getLike()." '$safe_email_address' OR email2 ".$adb->getLike()." '$safe_email_address'"; $response = $seed_contact->get_list("first_name, last_name", $where, 0); $contactList = $response['list']; From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 20:15:21 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 03:15:21 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23737=3A_?= =?utf-8?q?kjhkkh?= Message-ID: <076.43fc6e336c84d81eac940a54ae49d43d@vtiger.fosslabs.com> #737: kjhkkh -----------------------------+---------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: new Priority: critical | Milestone: 4.2.5 Component: thunderbirdextn | Version: 5.0.0 Keywords: | -----------------------------+---------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 20:17:36 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 03:17:36 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23738=3A_?= =?utf-8?q?custom_date_field_does_not_work?= Message-ID: <076.a77c78c65d038159208fb0ccaed11ec1@vtiger.fosslabs.com> #738: custom date field does not work ---------------------------+------------------------------------------------ Reporter: anonymous | Owner: developer Type: defect | Status: new Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: custom, field | ---------------------------+------------------------------------------------ creating new date field does not populate the database field correctly -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 20:18:21 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 03:18:21 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23739=3A_?= =?utf-8?q?cannot_add_custom_number_field?= Message-ID: <076.dd0ac47d6c95fa39e3c1ceac2f415609@vtiger.fosslabs.com> #739: cannot add custom number field -----------------------+---------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- adding custom number field shows a blank page -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 20:19:24 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 03:19:24 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23740=3A_?= =?utf-8?q?date_field_does_not_show_correctly_in_list_view?= Message-ID: <076.ad87948531c823c55f0f8a3ed7250a14@vtiger.fosslabs.com> #740: date field does not show correctly in list view -----------------------+---------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- dates appear as 00/00/00 in the list view -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 20:32:31 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 03:32:31 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23737=3A_?= =?utf-8?q?kjhkkh?= In-Reply-To: <076.43fc6e336c84d81eac940a54ae49d43d@vtiger.fosslabs.com> References: <076.43fc6e336c84d81eac940a54ae49d43d@vtiger.fosslabs.com> Message-ID: <085.8653d1236e8b71fc71b840ebacf84028@vtiger.fosslabs.com> #737: kjhkkh ------------------------------+--------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: 4.2.5 Component: thunderbirdextn | Version: 5.0.0 Resolution: invalid | Keywords: ------------------------------+--------------------------------------------- Changes (by anonymous): * resolution: => invalid * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 21:32:05 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 04:32:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5307 - in /vtigercrm/branches/4.2: include/ modules/Invoice/ modules/Invoice/pdf_templates/ modules/Invoice/pdf_templates/lastpage/ modules/Orders/ modules/Orders/pdf_templates/ modules/Orders/pdf_templates/lastpage/ modules/Quotes/ modules/Quotes/pdf_templates/ modules/Quotes/pdf_templates/lastpage/ Message-ID: <20060425043206.E29C06D8FD4@vtiger.fosslabs.com> Author: mmbrich Date: Mon Apr 24 22:31:58 2006 New Revision: 5307 Log: initial check-in of new PDF code. Fixed errors resulting in the entityid's not being quoted in utils.php Added: vtigercrm/branches/4.2/include/VtigerPDF.php vtigercrm/branches/4.2/modules/Invoice/pdf_data.php vtigercrm/branches/4.2/modules/Invoice/pdf_templates/ vtigercrm/branches/4.2/modules/Invoice/pdf_templates/body.php vtigercrm/branches/4.2/modules/Invoice/pdf_templates/footer.php vtigercrm/branches/4.2/modules/Invoice/pdf_templates/header.php vtigercrm/branches/4.2/modules/Invoice/pdf_templates/lastpage/ vtigercrm/branches/4.2/modules/Invoice/pdf_templates/lastpage/body.php vtigercrm/branches/4.2/modules/Invoice/pdf_templates/lastpage/footer.php vtigercrm/branches/4.2/modules/Invoice/pdf_templates/license.txt vtigercrm/branches/4.2/modules/Orders/pdf_data.php vtigercrm/branches/4.2/modules/Orders/pdf_dataso.php vtigercrm/branches/4.2/modules/Orders/pdf_templates/ vtigercrm/branches/4.2/modules/Orders/pdf_templates/body.php vtigercrm/branches/4.2/modules/Orders/pdf_templates/lastpage/ vtigercrm/branches/4.2/modules/Orders/pdf_templates/lastpage/body.php vtigercrm/branches/4.2/modules/Orders/pdf_templates/lastpage/po_footer.php vtigercrm/branches/4.2/modules/Orders/pdf_templates/lastpage/so_footer.php vtigercrm/branches/4.2/modules/Orders/pdf_templates/license.txt vtigercrm/branches/4.2/modules/Orders/pdf_templates/po_footer.php vtigercrm/branches/4.2/modules/Orders/pdf_templates/po_header.php vtigercrm/branches/4.2/modules/Orders/pdf_templates/so_footer.php vtigercrm/branches/4.2/modules/Orders/pdf_templates/so_header.php vtigercrm/branches/4.2/modules/Quotes/pdf_data.php vtigercrm/branches/4.2/modules/Quotes/pdf_templates/ vtigercrm/branches/4.2/modules/Quotes/pdf_templates/body.php vtigercrm/branches/4.2/modules/Quotes/pdf_templates/footer.php vtigercrm/branches/4.2/modules/Quotes/pdf_templates/header.php vtigercrm/branches/4.2/modules/Quotes/pdf_templates/lastpage/ vtigercrm/branches/4.2/modules/Quotes/pdf_templates/lastpage/body.php vtigercrm/branches/4.2/modules/Quotes/pdf_templates/lastpage/footer.php vtigercrm/branches/4.2/modules/Quotes/pdf_templates/license.txt Modified: vtigercrm/branches/4.2/include/utils.php vtigercrm/branches/4.2/modules/Invoice/CreatePDF.php vtigercrm/branches/4.2/modules/Orders/CreatePDF.php vtigercrm/branches/4.2/modules/Orders/CreateSOPDF.php vtigercrm/branches/4.2/modules/Quotes/CreatePDF.php Modified: vtigercrm/branches/4.2/include/utils.php ============================================================================== --- vtigercrm/branches/4.2/include/utils.php (original) +++ vtigercrm/branches/4.2/include/utils.php Mon Apr 24 22:31:58 2006 @@ -2342,7 +2342,7 @@ global $vtlog; $vtlog->logthis("in getQuoteName ".$quote_id,'info'); global $adb; - $sql = "select * from quotes where quoteid=".$quote_id; + $sql = "select * from quotes where quoteid='".$quote_id."'"; $result = $adb->query($sql); $quote_name = $adb->query_result($result,0,"subject"); return $quote_name; @@ -2375,7 +2375,7 @@ global $vtlog; $vtlog->logthis("in getSoName ".$so_id,'info'); global $adb; - $sql = "select * from salesorder where salesorderid=".$so_id; + $sql = "select * from salesorder where salesorderid='".$so_id."'"; $result = $adb->query($sql); $so_name = $adb->query_result($result,0,"subject"); return $so_name; Modified: vtigercrm/branches/4.2/modules/Invoice/CreatePDF.php ============================================================================== --- vtigercrm/branches/4.2/modules/Invoice/CreatePDF.php (original) +++ vtigercrm/branches/4.2/modules/Invoice/CreatePDF.php Mon Apr 24 22:31:58 2006 @@ -1,433 +1,86 @@ + * + * Changes/Additions: + * + * (c) 2005 OpenCRM + * - Improved currency support + * - Fixed IE download bug + */ + +require_once('include/database/PearDatabase.php'); + +global $adb; +global $app_strings; +global $max_desc_size; +global $max_prod_desc_size; +global $products_per_page; $id = $_REQUEST['record']; -global $adb; -//retreiving the invoice info -$focus = new Invoice(); -$focus->retrieve_entity_info($_REQUEST['record'],"Invoice"); -$account_name = getAccountName($focus->column_fields[account_id]); -$iData[] = $account_name; -$iData[] = $id; -$iData[] = date('Y-m-d'); -//newly added for Sales Order No. -if($focus->column_fields["salesorder_id"] != '') + +$sql="select currency_symbol from currency_info"; +$result = $adb->query($sql); +$currency_symbol = $adb->query_result($result,0,'currency_symbol'); + +/* ************ BEGIN USER CONFIG **************** */ +$endpage="0"; +$products_per_page="9"; +$max_prod_desc_size="75"; +$max_desc_size="175"; +/* *********** END USER CONFIG ****************** */ + +require_once('include/VtigerPDF.php'); +require_once('pdf_data.php'); +$page_num='1'; +$pdf = new PDF( 'P', 'mm', 'A4' ); +$pdf->Open(); + +$num_pages=ceil(($num_products/$products_per_page)); +$current_product=0; + +for($l=0;$l<$num_pages;$l++) { - $so_name = getSoName($focus->column_fields["salesorder_id"]); -} -else -{ - $so_name = ' '; -} + $line=array(); + if($num_pages == $page_num) + $lastpage=1; + + while($current_product != $page_num*$products_per_page) + { + $line[]=$product_line[$current_product]; + $current_product++; + } -$iData[] = $so_name; + $pdf->AddPage(); + include("pdf_templates/header.php"); + include("pdf_templates/body.php"); + include("pdf_templates/footer.php"); -//setting the Customer Data -$iCustData[] = $account_name; + $page_num++; -if($focus->column_fields["purchaseorder"] != '') -{ - $po_name = $focus->column_fields["purchaseorder"]; -} -else -{ - $po_name = ' '; -} -$iCustData[] = $po_name; - -if($focus->column_fields["duedate"] != '') -{ - $due_date = $focus->column_fields["duedate"]; -} -else -{ - $due_date = ' '; -} -$iCustData[] = $due_date; - -//setting the billing address -$bdata[] = $account_name; -if($focus->column_fields["bill_street"] != '') -{ - $bill_street = $focus->column_fields["bill_street"]; - $bdata[] = $bill_street; - -} - -if($focus->column_fields["bill_city"] != '') -{ - $bill_city = $focus->column_fields["bill_city"]; - $bdata[] = $bill_city; -} - - -if($focus->column_fields["bill_state"] != '') -{ - $bill_state = $focus->column_fields["bill_state"]; - $bdata[] = $bill_state; -} - - -if($focus->column_fields["bill_code"] != '') -{ - $bill_code = $focus->column_fields["bill_code"]; - $bdata[] = $bill_code; -} - - -if($focus->column_fields["bill_country"] != '') -{ - $bill_country = $focus->column_fields["bill_country"]; - $bdata[] = $bill_country; -} - -for($i =0; $i <5; $i++) -{ - if(sizeof($bdata) < 6) + if (($endpage) && ($lastpage)) { - $bdata[] = ' '; + $pdf->AddPage(); + include("pdf_templates/header.php"); + include("pdf_templates/lastpage/body.php"); + include("pdf_templates/lastpage/footer.php"); } } -//setting the shipping address -$sdata[] = $account_name; -if($focus->column_fields["ship_street"] != '') -{ - $ship_street = $focus->column_fields["ship_street"]; - $sdata[] = $ship_street; -} - -if($focus->column_fields["ship_city"] != '') -{ - $ship_city = $focus->column_fields["ship_city"]; - $sdata[] = $ship_city; -} - - -if($focus->column_fields["ship_state"] != '') -{ - $ship_state = $focus->column_fields["ship_state"]; - $sdata[] = $ship_state; -} - - -if($focus->column_fields["ship_code"] != '') -{ - $ship_code = $focus->column_fields["ship_code"]; - $sdata[] = $ship_code; -} - - -if($focus->column_fields["ship_country"] != '') -{ - $ship_country = $focus->column_fields["ship_country"]; - $sdata[] = $ship_country; -} - -for($i =0; $i <5; $i++) -{ - if(sizeof($sdata) < 6) - { - $sdata[] = ' '; - } -} - -//Getting the terms_conditions - -if($focus->column_fields["terms_conditions"] != '') -{ - $conditions = $focus->column_fields["terms_conditions"]; -} -else -{ - $conditions = ' '; -} - -//Getting the Company Address -$add_query = "select * from organizationdetails"; -$result = $adb->query($add_query); -$num_rows = $adb->num_rows($result); -$org_field_array = Array('organizationame','address','city','state','country','code','phone','fax','website'); - -$companyaddress = Array(); -$logo_name = ''; - -if($num_rows == 1) -{ - $org_name = $adb->query_result($result,0,"organizationame"); - $org_address = $adb->query_result($result,0,"address"); - $org_city = $adb->query_result($result,0,"city"); - $org_state = $adb->query_result($result,0,"state"); - $org_country = $adb->query_result($result,0,"country"); - $org_code = $adb->query_result($result,0,"code"); - $org_phone = $adb->query_result($result,0,"phone"); - $org_fax = $adb->query_result($result,0,"fax"); - $org_website = $adb->query_result($result,0,"website"); - - if($org_name != '') - { - $companyaddress[] = $org_name; - } - if($org_address != '' || $org_city != '' || $org_state != '') - { - $companyaddress[] = $org_address.' '.$org_city.' '.$org_state; - } - if($org_country != '' || $org_code!= '') - { - $companyaddress[] = $org_country.' '.$org_code; - } - if($org_phone != '' || $org_fax != '') - { - $companyaddress[] = $org_phone.' '.$org_fax; - } - if($org_website != '') - { - $companyaddress[] = $org_website; - } - - for($i =0; $i < 4; $i++) - { - if(sizeof($companyaddress) < 5) - { - $companyaddress[] = ' '; - } - } - - $logo_name = $adb->query_result($result,0,"logoname"); -} -//Getting the logo - - -//getting the Product Data -$query="select products.productname,products.unit_price,invoiceproductrel.* from invoiceproductrel inner join products on products.productid=invoiceproductrel.productid where invoiceid=".$id; - -$result = $adb->query($query); -$num_rows=$adb->num_rows($result); -for($i=1;$i<=$num_rows;$i++) -{ - $temp_data = Array(); - $productname=$adb->query_result($result,$i-1,'productname'); - $unitprice=$adb->query_result($result,$i-1,'unit_price'); - $productid=$adb->query_result($result,$i-1,'productid'); - $qty=$adb->query_result($result,$i-1,'quantity'); - $listprice=$adb->query_result($result,$i-1,'listprice'); - $total = $qty*$listprice; - - $temp_data['productname'] = $productname; - $temp_data['qty'] = $qty; - $temp_data['unitprice'] = $unitprice; - $temp_data['listprice'] = $listprice; - $temp_data['total'] = $total; - $iDataDtls[] = $temp_data; - -} -//getting the Total Array -$price_total[] = $focus->column_fields["hdnSubTotal"]; -$price_total[] = $focus->column_fields["txtTax"]; -$price_total[] = $focus->column_fields["txtAdjustment"]; -$price_total[] = $focus->column_fields["hdnGrandTotal"]; - -class PDF extends FPDF -{ - -// Invoice Title -function setInvoiceTitle($title,$logo_name,$caddress) -{ - if($title != "") - { - if(isset($logo_name) && $logo_name != '') - { - $this->Image('test/logo/'.$logo_name,10,10,0,0); - } - else - { - //$this->Image('themes/Aqua/images/blank.jpg',10,10,0,0); - } - for($i=0;$iLn(); - $this->Cell(40); - $this->SetFont('','',10); - $this->Cell(0,5,$caddress[$i],0,0,'L',0); - } - $this->Ln(); - $this->SetFillColor(224,235,255); - $this->SetTextColor(0); - $this->SetFont('','B',18); - $this->Cell(0,10,$title,0,0,'C',0); - - } -} -//Invoice Address -function setAddress($billing="",$shipping="") -{ - - $this->Ln(); - $this->SetFillColor(224,235,255); - $this->SetTextColor(0); - $this->SetFont('','B',10); - $this->Cell(130,10,"Bill To:",0,0,'L',0); - $this->Cell(0,10,"Ship To:",0,0,'L',0); - for($i=0;$iCell(17); - $this->SetFont('','',10); - $this->Cell(130,5,$billing[$i],0,0,'L',0); - $this->Cell(0,5,$shipping[$i],0,0,'L',0); - $this->Ln(); - } - -} -//Invoice from -function setInvoiceDetails($iHeader,$iData) -{ - $this->Ln(); - $this->SetFillColor(162,200,243); - $this->SetTextColor(0); - $this->SetDrawColor(61,121,206); - //$this->SetLineWidth(.3); - $this->SetFont('Arial','B',10); - //Header - $this->Cell(15); - foreach($iHeader as $value) - { - $this->Cell(40,7,$value,1,0,'L',1); - } - $this->Ln(); - $this->SetFillColor(233,241,253); - $this->SetTextColor(0); - $this->SetFont(''); - //Data - $this->Cell(15); - $fill=0; - foreach($iData as $value) - { - $this->Cell(40,6,$value,1,0,'L',0); - } - $this->Ln(); -} - -//customer Details -function setCustomerDetails($iCHeader,$iCData) -{ - $this->Ln(); - //$this->Cell(0); - $this->SetFillColor(162,200,243); - $this->SetTextColor(0); - $this->SetDrawColor(61,121,206); - //$this->SetLineWidth(.3); - $this->SetFont('Arial','B',10); - //Header - //$this->Cell(15); - foreach($iCHeader as $value) - { - $this->Cell(63,7,$value,1,0,'L',1); - } - $this->Ln(); - $this->SetFillColor(233,241,253); - $this->SetTextColor(0); - $this->SetFont(''); - //Data - //$this->Cell(15); - $fill=0; - foreach($iCData as $value) - { - $this->Cell(63,6,$value,1,0,'L',0); - } - $this->Ln(); -} - -//Product Details -function setProductDetails($ivHeader,$ivData) -{ - $this->Ln(); - $this->Ln(); - $this->SetFillColor(162,200,243); - $this->SetTextColor(0); - $this->SetDrawColor(61,121,206); - $this->SetLineWidth(.3); - $this->SetFont('Arial','B',10); - //Header - foreach($ivHeader as $value) - { - $this->Cell(38,7,$value,0,0,'L',0); - } - $this->Ln(); - $this->SetDrawColor(0,0,0); - $this->SetLineWidth(.5); - $this->line(10,140,200,140); - $this->SetFillColor(233,241,253); - $this->SetTextColor(0); - $this->SetFont(''); - //Data - $fill=0; - if($ivData) foreach($ivData as $key=>$value) - { - $this->Cell(38,6,$value['productname'],0,0,'L',0); - $this->Cell(38,6,$value['qty'],0,0,'L',0); - $this->Cell(38,6,$value['unitprice'],0,0,'L',0); - $this->Cell(38,6,$value['listprice'],0,0,'L',0); - $this->Cell(38,6,$value['total'],0,0,'R',0); - $this->Ln(); - } - $this->Ln(); -} - -function setTotal($price_total="",$conditions="") -{ - $this->Ln(); - $this->SetDrawColor(0,0,0); - $this->SetLineWidth(.3); -// $this->line(10,200,200,200); - $this->SetFillColor(224,235,255); - $this->SetTextColor(0); - $this->SetFont('','B',10); - $this->Cell(140,6,"Sub Total: ",0,0,'R',0); - $this->Cell(0,6,$price_total[0],1,0,'R',0); - $this->Ln(4); - $this->Ln(4); - $this->Cell(140,6,"Tax: ",0,0,'R',0); - $this->Cell(0,6,$price_total[1],1,0,'R',0); - $this->Ln(4); - $this->Ln(4); - $this->Cell(140,6,"Adjustment: ",0,0,'R',0); - $this->Cell(0,6,$price_total[2],1,0,'R',0); - $this->Ln(4); - $this->Ln(4); - $this->Cell(140,6,"Grand total: ",0,0,'R',0); - $this->Cell(0,6,$price_total[3],1,0,'R',0); - $this->Ln(); - $this->Ln(); - $this->Cell(0,8,"Terms & Conditions: ",0,0,'L',0); - $this->Ln(); - $this->Cell(0,8,$conditions,0,0,'L',0); -} -} -$iHead = array("Company","Invoice No.","Date","Sales Order No."); -$iCustHeadDtls = array("Customer Name","Purchase Order","Due Date"); -$iHeadDtls = array("Product Name","Quantity","List Price","Unit Price","Total"); - -$pdf = new PDF('P','mm','A4'); -$pdf->SetFont('Arial','',10); -$pdf->AddPage(); -$pdf->setInvoiceTitle("Invoice",$logo_name,$companyaddress); -$pdf->Ln(); -$pdf->setInvoiceDetails($iHead,$iData); -$pdf->setAddress($bdata,$sdata); -$pdf->setCustomerDetails($iCustHeadDtls,$iCustData); -$pdf->setProductDetails($iHeadDtls,$iDataDtls); -$pdf->setTotal($price_total,$conditions); -$pdf->Output('Invoice.pdf','D'); +$pdf->Output('Invoice.pdf','D'); //added file name to make it work in IE, also forces the download giving the user the option to save exit; ?> Modified: vtigercrm/branches/4.2/modules/Orders/CreatePDF.php ============================================================================== --- vtigercrm/branches/4.2/modules/Orders/CreatePDF.php (original) +++ vtigercrm/branches/4.2/modules/Orders/CreatePDF.php Mon Apr 24 22:31:58 2006 @@ -1,434 +1,87 @@ + * + * Changes/Additions: + * + * (c) 2005 OpenCRM + * - Improved currency support + * - Fixed IE download bug + */ + +require_once('include/database/PearDatabase.php'); + +global $adb; +global $app_strings; +global $max_desc_size; +global $products_per_page; +global $max_prod_desc_size; $id = $_REQUEST['record']; -global $adb; -//retreiving the invoice info -$focus = new Order(); -$focus->retrieve_entity_info($_REQUEST['record'],"Orders"); -$vendor_name = getVendorName($focus->column_fields[vendor_id]); -$iData[] = $vendor_name; -$iData[] = $id; -$iData[] = date('Y-m-d'); -//newly added for Sales Order No. -if($focus->column_fields["requisition_no"] != '') +$sql="select currency_symbol from currency_info"; +$result = $adb->query($sql); +$currency_symbol = $adb->query_result($result,0,'currency_symbol'); + +/* ************ BEGIN USER CONFIG *************** */ +$endpage="0"; +$products_per_page="9"; +$max_desc_size="175"; +$max_prod_desc_size="75"; +/* ************ END USER CONFIG ***************** */ + +require_once('include/VtigerPDF.php'); +require_once('pdf_data.php'); + +$page_num='1'; +$pdf = new PDF( 'P', 'mm', 'A4' ); +$pdf->Open(); + +$num_pages=ceil(($num_products/$products_per_page)); +$current_product=0; + +for($l=0;$l<$num_pages;$l++) { - $reqno = $focus->column_fields["requisition_no"]; -} -else -{ - $reqno = ' '; -} + $line=array(); + if($num_pages == $page_num) + $lastpage=1; + + while($current_product != $page_num*$products_per_page) + { + $line[]=$product_line[$current_product]; + $current_product++; + } -$iData[] = $reqno; + $pdf->AddPage(); + include("pdf_templates/po_header.php"); + include("pdf_templates/body.php"); + include("pdf_templates/po_footer.php"); -//setting the Customer Data -$iCustData[] = $vendor_name; + $page_num++; -if($focus->column_fields["tracking_no"] != '') -{ - $trno = $focus->column_fields["tracking_no"]; -} -else -{ - $trno = ' '; -} -$iCustData[] = $trno; - -if($focus->column_fields["duedate"] != '') -{ - $due_date = $focus->column_fields["duedate"]; -} -else -{ - $due_date = ' '; -} -$iCustData[] = $due_date; - -//setting the billing address -$bdata[] = $vendor_name; -if($focus->column_fields["bill_street"] != '') -{ - $bill_street = $focus->column_fields["bill_street"]; - $bdata[] = $bill_street; - -} - -if($focus->column_fields["bill_city"] != '') -{ - $bill_city = $focus->column_fields["bill_city"]; - $bdata[] = $bill_city; + if (($endpage) && ($lastpage)) + { + $pdf->AddPage(); + include("pdf_templates/po_header.php"); + include("pdf_templates/lastpage/body.php"); + include("pdf_templates/lastpage/po_footer.php"); + } } -if($focus->column_fields["bill_state"] != '') -{ - $bill_state = $focus->column_fields["bill_state"]; - $bdata[] = $bill_state; -} - - -if($focus->column_fields["bill_code"] != '') -{ - $bill_code = $focus->column_fields["bill_code"]; - $bdata[] = $bill_code; -} - - -if($focus->column_fields["bill_country"] != '') -{ - $bill_country = $focus->column_fields["bill_country"]; - $bdata[] = $bill_country; -} - -for($i =0; $i <5; $i++) -{ - if(sizeof($bdata) < 6) - { - $bdata[] = ' '; - } -} - -//setting the shipping address -$sdata[] = $vendor_name; -if($focus->column_fields["ship_street"] != '') -{ - $ship_street = $focus->column_fields["ship_street"]; - $sdata[] = $ship_street; -} - -if($focus->column_fields["ship_city"] != '') -{ - $ship_city = $focus->column_fields["ship_city"]; - $sdata[] = $ship_city; -} - - -if($focus->column_fields["ship_state"] != '') -{ - $ship_state = $focus->column_fields["ship_state"]; - $sdata[] = $ship_state; -} - - -if($focus->column_fields["ship_code"] != '') -{ - $ship_code = $focus->column_fields["ship_code"]; - $sdata[] = $ship_code; -} - - -if($focus->column_fields["ship_country"] != '') -{ - $ship_country = $focus->column_fields["ship_country"]; - $sdata[] = $ship_country; -} - -for($i =0; $i <5; $i++) -{ - if(sizeof($sdata) < 6) - { - $sdata[] = ' '; - } -} - -//Getting the terms_conditions - -if($focus->column_fields["terms_conditions"] != '') -{ - $conditions = $focus->column_fields["terms_conditions"]; -} -else -{ - $conditions = ' '; -} - -//Getting the Company Address -$add_query = "select * from organizationdetails"; -$result = $adb->query($add_query); -$num_rows = $adb->num_rows($result); -$org_field_array = Array('organizationame','address','city','state','country','code','phone','fax','website'); - -$companyaddress = Array(); -$logo_name = ''; - -if($num_rows == 1) -{ - $org_name = $adb->query_result($result,0,"organizationame"); - $org_address = $adb->query_result($result,0,"address"); - $org_city = $adb->query_result($result,0,"city"); - $org_state = $adb->query_result($result,0,"state"); - $org_country = $adb->query_result($result,0,"country"); - $org_code = $adb->query_result($result,0,"code"); - $org_phone = $adb->query_result($result,0,"phone"); - $org_fax = $adb->query_result($result,0,"fax"); - $org_website = $adb->query_result($result,0,"website"); - - if($org_name != '') - { - $companyaddress[] = $org_name; - } - if($org_address != '' || $org_city != '' || $org_state != '') - { - $companyaddress[] = $org_address.' '.$org_city.' '.$org_state; - } - if($org_country != '' || $org_code!= '') - { - $companyaddress[] = $org_country.' '.$org_code; - } - if($org_phone != '' || $org_fax != '') - { - $companyaddress[] = $org_phone.' '.$org_fax; - } - if($org_website != '') - { - $companyaddress[] = $org_website; - } - - for($i =0; $i < 4; $i++) - { - if(sizeof($companyaddress) < 5) - { - $companyaddress[] = ' '; - } - } - - $logo_name = $adb->query_result($result,0,"logoname"); -} -//Getting the logo - - - -//getting the Product Data -$query="select products.productname,products.unit_price,poproductrel.* from poproductrel inner join products on products.productid=poproductrel.productid where purchaseorderid=".$id; - -$result = $adb->query($query); -$num_rows=$adb->num_rows($result); -for($i=1;$i<=$num_rows;$i++) -{ - $temp_data = Array(); - $productname=$adb->query_result($result,$i-1,'productname'); - $unitprice=$adb->query_result($result,$i-1,'unit_price'); - $productid=$adb->query_result($result,$i-1,'productid'); - $qty=$adb->query_result($result,$i-1,'quantity'); - $listprice=$adb->query_result($result,$i-1,'listprice'); - $total = $qty*$listprice; - - $temp_data['productname'] = $productname; - $temp_data['qty'] = $qty; - $temp_data['unitprice'] = $unitprice; - $temp_data['listprice'] = $listprice; - $temp_data['total'] = $total; - $iDataDtls[] = $temp_data; - -} -//getting the Total Array -$price_total[] = $focus->column_fields["hdnSubTotal"]; -$price_total[] = $focus->column_fields["txtTax"]; -$price_total[] = $focus->column_fields["txtAdjustment"]; -$price_total[] = $focus->column_fields["hdnGrandTotal"]; - -class PDF extends FPDF -{ - -// Invoice Title -function setInvoiceTitle($title,$logo_name,$caddress) -{ - if($title != "") - { - if(isset($logo_name) && $logo_name != '') - { - $this->Image('test/logo/'.$logo_name,10,10,0,0); - } - else - { - //$this->Image('themes/Aqua/images/blank.jpg',10,10,0,0); - } - for($i=0;$iLn(); - $this->Cell(40); - $this->SetFont('','',10); - $this->Cell(0,5,$caddress[$i],0,0,'L',0); - } - $this->Ln(); - $this->SetFillColor(224,235,255); - $this->SetTextColor(0); - $this->SetFont('','B',18); - $this->Cell(0,10,$title,0,0,'C',0); - - } -} -//Invoice Address -function setAddress($billing="",$shipping="") -{ - - $this->Ln(); - $this->SetFillColor(224,235,255); - $this->SetTextColor(0); - $this->SetFont('','B',10); - $this->Cell(130,10,"Bill To:",0,0,'L',0); - $this->Cell(0,10,"Ship To:",0,0,'L',0); - for($i=0;$iCell(17); - $this->SetFont('','',10); - $this->Cell(130,5,$billing[$i],0,0,'L',0); - $this->Cell(0,5,$shipping[$i],0,0,'L',0); - $this->Ln(); - } - -} -//Invoice from -function setInvoiceDetails($iHeader,$iData) -{ - $this->Ln(); - $this->SetFillColor(162,200,243); - $this->SetTextColor(0); - $this->SetDrawColor(61,121,206); - //$this->SetLineWidth(.3); - $this->SetFont('Arial','B',10); - //Header - $this->Cell(15); - foreach($iHeader as $value) - { - $this->Cell(40,7,$value,1,0,'L',1); - } - $this->Ln(); - $this->SetFillColor(233,241,253); - $this->SetTextColor(0); - $this->SetFont(''); - //Data - $this->Cell(15); - $fill=0; - foreach($iData as $value) - { - $this->Cell(40,6,$value,1,0,'L',0); - } - $this->Ln(); -} - -//customer Details -function setCustomerDetails($iCHeader,$iCData) -{ - $this->Ln(); - //$this->Cell(0); - $this->SetFillColor(162,200,243); - $this->SetTextColor(0); - $this->SetDrawColor(61,121,206); - //$this->SetLineWidth(.3); - $this->SetFont('Arial','B',10); - //Header - //$this->Cell(15); - foreach($iCHeader as $value) - { - $this->Cell(63,7,$value,1,0,'L',1); - } - $this->Ln(); - $this->SetFillColor(233,241,253); - $this->SetTextColor(0); - $this->SetFont(''); - //Data - //$this->Cell(15); - $fill=0; - foreach($iCData as $value) - { - $this->Cell(63,6,$value,1,0,'L',0); - } - $this->Ln(); -} - -//Product Details -function setProductDetails($ivHeader,$ivData) -{ - $this->Ln(); - $this->Ln(); - $this->SetFillColor(162,200,243); - $this->SetTextColor(0); - $this->SetDrawColor(61,121,206); - $this->SetLineWidth(.3); - $this->SetFont('Arial','B',10); - //Header - foreach($ivHeader as $value) - { - $this->Cell(38,7,$value,0,0,'L',0); - } - $this->Ln(); - $this->SetDrawColor(0,0,0); - $this->SetLineWidth(.5); - $this->line(10,140,200,140); - $this->SetFillColor(233,241,253); - $this->SetTextColor(0); - $this->SetFont(''); - //Data - $fill=0; - if($ivData) foreach($ivData as $key=>$value) - { - $this->Cell(38,6,$value['productname'],0,0,'L',0); - $this->Cell(38,6,$value['qty'],0,0,'L',0); - $this->Cell(38,6,$value['unitprice'],0,0,'L',0); - $this->Cell(38,6,$value['listprice'],0,0,'L',0); - $this->Cell(38,6,$value['total'],0,0,'R',0); - $this->Ln(); - } - $this->Ln(); -} - -function setTotal($price_total="",$conditions="") -{ - $this->Ln(); - $this->SetDrawColor(0,0,0); - $this->SetLineWidth(.3); -// $this->line(10,200,200,200); - $this->SetFillColor(224,235,255); - $this->SetTextColor(0); - $this->SetFont('','B',10); - $this->Cell(140,6,"Sub Total: ",0,0,'R',0); - $this->Cell(0,6,$price_total[0],1,0,'R',0); - $this->Ln(4); - $this->Ln(4); - $this->Cell(140,6,"Tax: ",0,0,'R',0); - $this->Cell(0,6,$price_total[1],1,0,'R',0); - $this->Ln(4); - $this->Ln(4); - $this->Cell(140,6,"Adjustment: ",0,0,'R',0); - $this->Cell(0,6,$price_total[2],1,0,'R',0); - $this->Ln(4); - $this->Ln(4); - $this->Cell(140,6,"Grand total: ",0,0,'R',0); - $this->Cell(0,6,$price_total[3],1,0,'R',0); - $this->Ln(); - $this->Ln(); - $this->Cell(0,8,"Terms & Conditions: ",0,0,'L',0); - $this->Ln(); - $this->Cell(0,8,$conditions,0,0,'L',0); -} -} -$iHead = array("Company","Purchase Order No.","Date","Requisition No."); -$iCustHeadDtls = array("Customer Name","Tracking No","Due Date"); -$iHeadDtls = array("Product Name","Quantity","List Price","Unit Price","Total"); - -$pdf = new PDF('P','mm','A4'); -$pdf->SetFont('Arial','',10); -$pdf->AddPage(); -$pdf->setInvoiceTitle("Purchase Order",$logo_name,$companyaddress); -$pdf->Ln(); -$pdf->setInvoiceDetails($iHead,$iData); -$pdf->setAddress($bdata,$sdata); -$pdf->setCustomerDetails($iCustHeadDtls,$iCustData); -$pdf->setProductDetails($iHeadDtls,$iDataDtls); -$pdf->setTotal($price_total,$conditions); -$pdf->Output('POOrder.pdf','D'); +$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; ?> Modified: vtigercrm/branches/4.2/modules/Orders/CreateSOPDF.php ============================================================================== --- vtigercrm/branches/4.2/modules/Orders/CreateSOPDF.php (original) +++ vtigercrm/branches/4.2/modules/Orders/CreateSOPDF.php Mon Apr 24 22:31:58 2006 @@ -1,435 +1,88 @@ + * + * Changes/Additions: + * + * (c) 2005 OpenCRM + * - Improved currency support + * - Fixed IE download bug + */ + +require_once('include/database/PearDatabase.php'); + +global $adb; +global $app_strings; +global $products_per_page; +global $max_desc_size; +global $max_prod_desc_size; $id = $_REQUEST['record']; -global $adb; -//retreiving the invoice info -$focus = new SalesOrder(); -$focus->retrieve_entity_info($_REQUEST['record'],"SalesOrder"); -$account_name = getAccountName($focus->column_fields[account_id]); -$iData[] = $account_name; -$iData[] = $id; -$iData[] = date('Y-m-d'); -//newly added for Sales Order No. -if($focus->column_fields["quote_id"] != '') + +$sql="select currency_symbol from currency_info"; +$result = $adb->query($sql); +$currency_symbol = $adb->query_result($result,0,'currency_symbol'); + +/* ************* BEGIN USER CONFIG *************** */ +$endpage="0"; +$products_per_page="9"; +$max_desc_size="75"; +$max_prod_desc_size="175"; +/* ************* END USER CONFIG ***************** */ + +require_once('include/VtigerPDF.php'); +require_once('pdf_dataso.php'); + +$page_num='1'; +$pdf = new PDF( 'P', 'mm', 'A4' ); +$pdf->Open(); + +$num_pages=ceil(($num_products/$products_per_page)); +$current_product=0; + +for($l=0;$l<$num_pages;$l++) { - $qt_name = getQuoteName($focus->column_fields["quote_id"]); -} -else -{ - $qt_name = ' '; -} + $line=array(); + if($num_pages == $page_num) + $lastpage=1; + + while($current_product != $page_num*$products_per_page) + { + $line[]=$product_line[$current_product]; + $current_product++; + } -$iData[] = $qt_name; + $pdf->AddPage(); + include("pdf_templates/so_header.php"); + include("pdf_templates/body.php"); + include("pdf_templates/so_footer.php"); -//$iData[] = $qtname; + $page_num++; -//setting the Customer Data -$iCustData[] = $account_name; - -if($focus->column_fields["purchaseorder"] != '') -{ - $po_name = $focus->column_fields["purchaseorder"]; -} -else -{ - $po_name = ' '; -} - -$iCustData[] = $po_name; - -if($focus->column_fields["duedate"] != '') -{ - $due_date = $focus->column_fields["duedate"]; -} -else -{ - $due_date = ' '; -} -$iCustData[] = $due_date; - -//setting the billing address -$bdata[] = $account_name; -if($focus->column_fields["bill_street"] != '') -{ - $bill_street = $focus->column_fields["bill_street"]; - $bdata[] = $bill_street; - -} - -if($focus->column_fields["bill_city"] != '') -{ - $bill_city = $focus->column_fields["bill_city"]; - $bdata[] = $bill_city; + if (($endpage) && ($lastpage)) + { + $pdf->AddPage(); + include("pdf_templates/so_header.php"); + include("pdf_templates/lastpage/body.php"); + include("pdf_templates/lastpage/so_footer.php"); + } } -if($focus->column_fields["bill_state"] != '') -{ - $bill_state = $focus->column_fields["bill_state"]; - $bdata[] = $bill_state; -} - - -if($focus->column_fields["bill_code"] != '') -{ - $bill_code = $focus->column_fields["bill_code"]; - $bdata[] = $bill_code; -} - - -if($focus->column_fields["bill_country"] != '') -{ - $bill_country = $focus->column_fields["bill_country"]; - $bdata[] = $bill_country; -} - -for($i =0; $i <5; $i++) -{ - if(sizeof($bdata) < 6) - { - $bdata[] = ' '; - } -} - -//setting the shipping address -$sdata[] = $account_name; -if($focus->column_fields["ship_street"] != '') -{ - $ship_street = $focus->column_fields["ship_street"]; - $sdata[] = $ship_street; -} - -if($focus->column_fields["ship_city"] != '') -{ - $ship_city = $focus->column_fields["ship_city"]; - $sdata[] = $ship_city; -} - - -if($focus->column_fields["ship_state"] != '') -{ - $ship_state = $focus->column_fields["ship_state"]; - $sdata[] = $ship_state; -} - - -if($focus->column_fields["ship_code"] != '') -{ - $ship_code = $focus->column_fields["ship_code"]; - $sdata[] = $ship_code; -} - - -if($focus->column_fields["ship_country"] != '') -{ - $ship_country = $focus->column_fields["ship_country"]; - $sdata[] = $ship_country; -} - -for($i =0; $i <5; $i++) -{ - if(sizeof($sdata) < 6) - { - $sdata[] = ' '; - } -} - -//Getting the terms_conditions - -if($focus->column_fields["terms_conditions"] != '') -{ - $conditions = $focus->column_fields["terms_conditions"]; -} -else -{ - $conditions = ' '; -} - -//Getting the Company Address -$add_query = "select * from organizationdetails"; -$result = $adb->query($add_query); -$num_rows = $adb->num_rows($result); -$org_field_array = Array('organizationame','address','city','state','country','code','phone','fax','website'); - -$companyaddress = Array(); -$logo_name = ''; - -if($num_rows == 1) -{ - $org_name = $adb->query_result($result,0,"organizationame"); - $org_address = $adb->query_result($result,0,"address"); - $org_city = $adb->query_result($result,0,"city"); - $org_state = $adb->query_result($result,0,"state"); - $org_country = $adb->query_result($result,0,"country"); - $org_code = $adb->query_result($result,0,"code"); - $org_phone = $adb->query_result($result,0,"phone"); - $org_fax = $adb->query_result($result,0,"fax"); - $org_website = $adb->query_result($result,0,"website"); - - if($org_name != '') - { - $companyaddress[] = $org_name; - } - if($org_address != '' || $org_city != '' || $org_state != '') - { - $companyaddress[] = $org_address.' '.$org_city.' '.$org_state; - } - if($org_country != '' || $org_code!= '') - { - $companyaddress[] = $org_country.' '.$org_code; - } - if($org_phone != '' || $org_fax != '') - { - $companyaddress[] = $org_phone.' '.$org_fax; - } - if($org_website != '') - { - $companyaddress[] = $org_website; - } - - for($i =0; $i < 4; $i++) - { - if(sizeof($companyaddress) < 5) - { - $companyaddress[] = ' '; - } - } - - $logo_name = $adb->query_result($result,0,"logoname"); -} -//Getting the logo - -//getting the Product Data -$query="select products.productname,products.unit_price,soproductrel.* from soproductrel inner join products on products.productid=soproductrel.productid where salesorderid=".$id; - -$result = $adb->query($query); -$num_rows=$adb->num_rows($result); -for($i=1;$i<=$num_rows;$i++) -{ - $temp_data = Array(); - $productname=$adb->query_result($result,$i-1,'productname'); - $unitprice=$adb->query_result($result,$i-1,'unit_price'); - $productid=$adb->query_result($result,$i-1,'productid'); - $qty=$adb->query_result($result,$i-1,'quantity'); - $listprice=$adb->query_result($result,$i-1,'listprice'); - $total = $qty*$listprice; - - $temp_data['productname'] = $productname; - $temp_data['qty'] = $qty; - $temp_data['unitprice'] = $unitprice; - $temp_data['listprice'] = $listprice; - $temp_data['total'] = $total; - $iDataDtls[] = $temp_data; - -} -//getting the Total Array -$price_total[] = $focus->column_fields["hdnSubTotal"]; -$price_total[] = $focus->column_fields["txtTax"]; -$price_total[] = $focus->column_fields["txtAdjustment"]; -$price_total[] = $focus->column_fields["hdnGrandTotal"]; - -class PDF extends FPDF -{ - -// Invoice Title -function setInvoiceTitle($title,$logo_name,$caddress) -{ - if($title != "") - { - if(isset($logo_name) && $logo_name != '') - { - $this->Image('test/logo/'.$logo_name,10,10,0,0); - } - else - { - //$this->Image('themes/Aqua/images/blank.jpg',10,10,0,0); - } - for($i=0;$iLn(); - $this->Cell(40); - $this->SetFont('','',10); - $this->Cell(0,5,$caddress[$i],0,0,'L',0); - } - $this->Ln(); - $this->SetFillColor(224,235,255); - $this->SetTextColor(0); - $this->SetFont('','B',18); - $this->Cell(0,10,$title,0,0,'C',0); - - } -} -//Invoice Address -function setAddress($billing="",$shipping="") -{ - - $this->Ln(); - $this->SetFillColor(224,235,255); - $this->SetTextColor(0); - $this->SetFont('','B',10); - $this->Cell(130,10,"Bill To:",0,0,'L',0); - $this->Cell(0,10,"Ship To:",0,0,'L',0); - for($i=0;$iCell(17); - $this->SetFont('','',10); - $this->Cell(130,5,$billing[$i],0,0,'L',0); - $this->Cell(0,5,$shipping[$i],0,0,'L',0); - $this->Ln(); - } - -} -//Invoice from -function setInvoiceDetails($iHeader,$iData) -{ - $this->Ln(); - $this->SetFillColor(162,200,243); - $this->SetTextColor(0); - $this->SetDrawColor(61,121,206); - //$this->SetLineWidth(.3); - $this->SetFont('Arial','B',10); - //Header - $this->Cell(15); - foreach($iHeader as $value) - { - $this->Cell(40,7,$value,1,0,'L',1); - } - $this->Ln(); - $this->SetFillColor(233,241,253); - $this->SetTextColor(0); - $this->SetFont(''); - //Data - $this->Cell(15); - $fill=0; - foreach($iData as $value) - { - $this->Cell(40,6,$value,1,0,'L',0); - } - $this->Ln(); -} - -//customer Details -function setCustomerDetails($iCHeader,$iCData) -{ - $this->Ln(); - //$this->Cell(0); - $this->SetFillColor(162,200,243); - $this->SetTextColor(0); - $this->SetDrawColor(61,121,206); - //$this->SetLineWidth(.3); - $this->SetFont('Arial','B',10); - //Header - //$this->Cell(15); - foreach($iCHeader as $value) - { - $this->Cell(63,7,$value,1,0,'L',1); - } - $this->Ln(); - $this->SetFillColor(233,241,253); - $this->SetTextColor(0); - $this->SetFont(''); - //Data - //$this->Cell(15); - $fill=0; - foreach($iCData as $value) - { - $this->Cell(63,6,$value,1,0,'L',0); - } - $this->Ln(); -} - -//Product Details -function setProductDetails($ivHeader,$ivData) -{ - $this->Ln(); - $this->Ln(); - $this->SetFillColor(162,200,243); - $this->SetTextColor(0); - $this->SetDrawColor(61,121,206); - $this->SetLineWidth(.3); - $this->SetFont('Arial','B',10); - //Header - foreach($ivHeader as $value) - { - $this->Cell(38,7,$value,0,0,'L',0); - } - $this->Ln(); - $this->SetDrawColor(0,0,0); - $this->SetLineWidth(.5); - $this->line(10,140,200,140); - $this->SetFillColor(233,241,253); - $this->SetTextColor(0); - $this->SetFont(''); - //Data - $fill=0; - if($ivData) foreach($ivData as $key=>$value) - { - $this->Cell(38,6,$value['productname'],0,0,'L',0); - $this->Cell(38,6,$value['qty'],0,0,'L',0); - $this->Cell(38,6,$value['unitprice'],0,0,'L',0); - $this->Cell(38,6,$value['listprice'],0,0,'L',0); - $this->Cell(38,6,$value['total'],0,0,'R',0); - $this->Ln(); - } - $this->Ln(); -} - -function setTotal($price_total="",$conditions="") -{ - $this->Ln(); - $this->SetDrawColor(0,0,0); - $this->SetLineWidth(.3); -// $this->line(10,200,200,200); - $this->SetFillColor(224,235,255); - $this->SetTextColor(0); - $this->SetFont('','B',10); - $this->Cell(140,6,"Sub Total: ",0,0,'R',0); - $this->Cell(0,6,$price_total[0],1,0,'R',0); - $this->Ln(4); - $this->Ln(4); - $this->Cell(140,6,"Tax: ",0,0,'R',0); - $this->Cell(0,6,$price_total[1],1,0,'R',0); - $this->Ln(4); - $this->Ln(4); - $this->Cell(140,6,"Adjustment: ",0,0,'R',0); - $this->Cell(0,6,$price_total[2],1,0,'R',0); - $this->Ln(4); - $this->Ln(4); - $this->Cell(140,6,"Grand total: ",0,0,'R',0); - $this->Cell(0,6,$price_total[3],1,0,'R',0); - $this->Ln(); - $this->Ln(); - $this->Cell(0,8,"Terms & Conditions: ",0,0,'L',0); - $this->Ln(); - $this->Cell(0,8,$conditions,0,0,'L',0); -} -} -$iHead = array("Company","Sales Order No.","Date","Quote Name."); -$iCustHeadDtls = array("Customer Name","Purchase Order","Due Date"); -$iHeadDtls = array("Product Name","Quantity","List Price","Unit Price","Total"); - -$pdf = new PDF('P','mm','A4'); -$pdf->SetFont('Arial','',10); -$pdf->AddPage(); -$pdf->setInvoiceTitle("Sales Order",$logo_name,$companyaddress); -$pdf->Ln(); -$pdf->setInvoiceDetails($iHead,$iData); -$pdf->setAddress($bdata,$sdata); -$pdf->setCustomerDetails($iCustHeadDtls,$iCustData); -$pdf->setProductDetails($iHeadDtls,$iDataDtls); -$pdf->setTotal($price_total,$conditions); -$pdf->Output('SOOrder.pdf','D'); +$pdf->Output('SalesOrder.pdf','D'); //added file name to make it work in IE, also forces the download giving the user the option to save exit; ?> Modified: vtigercrm/branches/4.2/modules/Quotes/CreatePDF.php ============================================================================== --- vtigercrm/branches/4.2/modules/Quotes/CreatePDF.php (original) +++ vtigercrm/branches/4.2/modules/Quotes/CreatePDF.php Mon Apr 24 22:31:58 2006 @@ -1,411 +1,88 @@ + * + * + * Changes/Additions: + * + * (c) 2005 OpenCRM + * - Improved currency support + * - Fixed IE download bug + */ + +require_once('include/database/PearDatabase.php'); + +global $adb; +global $app_strings; +global $max_desc_size; +global $max_prod_desc_size; +global $products_per_page; $id = $_REQUEST['record']; -global $adb; -//retreiving the invoice info -$focus = new Quote(); -$focus->retrieve_entity_info($_REQUEST['record'],"Quotes"); -$account_name = getAccountName($focus->column_fields[account_id]); -$iData[] = $account_name; -$iData[] = $id; -$iData[] = date('Y-m-d'); +$sql="select currency_symbol from currency_info"; +$result = $adb->query($sql); +$currency_symbol = $adb->query_result($result,0,'currency_symbol'); -//setting the Customer Data -$iCustData[] = $account_name; +/* ************* BEGIN USER CONFIG **************** */ +$endpage="0"; +$products_per_page="9"; +$max_prod_desc_size="75"; +$max_desc_size="175"; +/* ************ END USER CONFIG ******************* */ -if($focus->column_fields["validtill"] != '') +require_once('include/VtigerPDF.php'); +require_once('pdf_data.php'); + +$page_num='1'; +$pdf = new PDF( 'P', 'mm', 'A4' ); +$pdf->Open(); + +$num_pages=ceil(($num_products/$products_per_page)); +$current_product=0; + +for($l=0;$l<$num_pages;$l++) { - $due_date = $focus->column_fields["validtill"]; -} -else -{ - $due_date = ' '; -} -$iCustData[] = $due_date; + $line=array(); + if($num_pages == $page_num) + $lastpage=1; + + while($current_product != $page_num*$products_per_page) + { + $line[]=$product_line[$current_product]; + $current_product++; + } -//setting the billing address -$bdata[] = $account_name; -if($focus->column_fields["bill_street"] != '') -{ - $bill_street = $focus->column_fields["bill_street"]; - $bdata[] = $bill_street; - -} + $pdf->AddPage(); + include("pdf_templates/header.php"); + include("pdf_templates/body.php"); + include("pdf_templates/footer.php"); -if($focus->column_fields["bill_city"] != '') -{ - $bill_city = $focus->column_fields["bill_city"]; - $bdata[] = $bill_city; + $page_num++; + + if (($endpage) && ($lastpage)) + { + $pdf->AddPage(); + include("pdf_templates/header.php"); + include("pdf_templates/lastpage/body.php"); + include("pdf_templates/lastpage/footer.php"); + } } -if($focus->column_fields["bill_state"] != '') -{ - $bill_state = $focus->column_fields["bill_state"]; - $bdata[] = $bill_state; -} - - -if($focus->column_fields["bill_code"] != '') -{ - $bill_code = $focus->column_fields["bill_code"]; - $bdata[] = $bill_code; -} - - -if($focus->column_fields["bill_country"] != '') -{ - $bill_country = $focus->column_fields["bill_country"]; - $bdata[] = $bill_country; -} - -for($i =0; $i <5; $i++) -{ - if(sizeof($bdata) < 6) - { - $bdata[] = ' '; - } -} - -//setting the shipping address -$sdata[] = $account_name; -if($focus->column_fields["ship_street"] != '') -{ - $ship_street = $focus->column_fields["ship_street"]; - $sdata[] = $ship_street; -} - -if($focus->column_fields["ship_city"] != '') -{ - $ship_city = $focus->column_fields["ship_city"]; - $sdata[] = $ship_city; -} - - -if($focus->column_fields["ship_state"] != '') -{ - $ship_state = $focus->column_fields["ship_state"]; - $sdata[] = $ship_state; -} - - -if($focus->column_fields["ship_code"] != '') -{ - $ship_code = $focus->column_fields["ship_code"]; - $sdata[] = $ship_code; -} - - -if($focus->column_fields["ship_country"] != '') -{ - $ship_country = $focus->column_fields["ship_country"]; - $sdata[] = $ship_country; -} - -for($i =0; $i <5; $i++) -{ - if(sizeof($sdata) < 6) - { - $sdata[] = ' '; - } -} - -//Getting the terms_conditions - -if($focus->column_fields["terms_conditions"] != '') -{ - $conditions = $focus->column_fields["terms_conditions"]; -} -else -{ - $conditions = ' '; -} - -//Getting the Company Address -$add_query = "select * from organizationdetails"; -$result = $adb->query($add_query); -$num_rows = $adb->num_rows($result); -$org_field_array = Array('organizationame','address','city','state','country','code','phone','fax','website'); - -$companyaddress = Array(); -$logo_name = ''; - -if($num_rows == 1) -{ - $org_name = $adb->query_result($result,0,"organizationame"); - $org_address = $adb->query_result($result,0,"address"); - $org_city = $adb->query_result($result,0,"city"); - $org_state = $adb->query_result($result,0,"state"); - $org_country = $adb->query_result($result,0,"country"); - $org_code = $adb->query_result($result,0,"code"); - $org_phone = $adb->query_result($result,0,"phone"); - $org_fax = $adb->query_result($result,0,"fax"); - $org_website = $adb->query_result($result,0,"website"); - - if($org_name != '') - { - $companyaddress[] = $org_name; - } - if($org_address != '' || $org_city != '' || $org_state != '') - { - $companyaddress[] = $org_address.' '.$org_city.' '.$org_state; - } - if($org_country != '' || $org_code!= '') - { - $companyaddress[] = $org_country.' '.$org_code; - } - if($org_phone != '' || $org_fax != '') - { - $companyaddress[] = $org_phone.' '.$org_fax; - } - if($org_website != '') - { - $companyaddress[] = $org_website; - } - - for($i =0; $i < 4; $i++) - { - if(sizeof($companyaddress) < 5) - { - $companyaddress[] = ' '; - } - } - - $logo_name = $adb->query_result($result,0,"logoname"); -} -//Getting the logo - -//getting the Product Data -$query="select products.productname,products.unit_price,quotesproductrel.* from quotesproductrel inner join products on products.productid=quotesproductrel.productid where quoteid=".$id; - -$result = $adb->query($query); -$num_rows=$adb->num_rows($result); -for($i=1;$i<=$num_rows;$i++) -{ - $temp_data = Array(); - $productname=$adb->query_result($result,$i-1,'productname'); - $unitprice=$adb->query_result($result,$i-1,'unit_price'); - $productid=$adb->query_result($result,$i-1,'productid'); - $qty=$adb->query_result($result,$i-1,'quantity'); - $listprice=$adb->query_result($result,$i-1,'listprice'); - $total = $qty*$listprice; - - $temp_data['productname'] = $productname; - $temp_data['qty'] = $qty; - $temp_data['unitprice'] = $unitprice; - $temp_data['listprice'] = $listprice; - $temp_data['total'] = $total; - $iDataDtls[] = $temp_data; - -} -//getting the Total Array -$price_total[] = $focus->column_fields["hdnSubTotal"]; -$price_total[] = $focus->column_fields["txtTax"]; -$price_total[] = $focus->column_fields["txtAdjustment"]; -$price_total[] = $focus->column_fields["hdnGrandTotal"]; - -class PDF extends FPDF -{ - -// Invoice Title -function setInvoiceTitle($title,$logo_name,$caddress) -{ - if($title != "") - { - if(isset($logo_name) && $logo_name != '') - { - $this->Image('test/logo/'.$logo_name,10,10,0,0); - } - else - { - //$this->Image('themes/Aqua/images/blank.jpg',10,10,0,0); - } - for($i=0;$iLn(); - $this->Cell(40); - $this->SetFont('','',10); - $this->Cell(0,5,$caddress[$i],0,0,'L',0); - } - $this->Ln(); - $this->SetFillColor(224,235,255); - $this->SetTextColor(0); - $this->SetFont('','B',18); - $this->Cell(0,10,$title,0,0,'C',0); - - } -} -//Invoice Address -function setAddress($billing="",$shipping="") -{ - - $this->Ln(); - $this->SetFillColor(224,235,255); - $this->SetTextColor(0); - $this->SetFont('','B',10); - $this->Cell(130,10,"Bill To:",0,0,'L',0); - $this->Cell(0,10,"Ship To:",0,0,'L',0); - for($i=0;$iCell(17); - $this->SetFont('','',10); - $this->Cell(130,5,$billing[$i],0,0,'L',0); - $this->Cell(0,5,$shipping[$i],0,0,'L',0); - $this->Ln(); - } - -} -//Invoice from -function setInvoiceDetails($iHeader,$iData) -{ - $this->Ln(); - $this->SetFillColor(162,200,243); - $this->SetTextColor(0); - $this->SetDrawColor(61,121,206); - //$this->SetLineWidth(.3); - $this->SetFont('Arial','B',10); - //Header - $this->Cell(15); - foreach($iHeader as $value) - { - $this->Cell(40,7,$value,1,0,'L',1); - } - $this->Ln(); - $this->SetFillColor(233,241,253); - $this->SetTextColor(0); - $this->SetFont(''); - //Data - $this->Cell(15); - $fill=0; - foreach($iData as $value) - { - $this->Cell(40,6,$value,1,0,'L',0); - } - $this->Ln(); -} - -//customer Details -function setCustomerDetails($iCHeader,$iCData) -{ - $this->Ln(); - //$this->Cell(0); - $this->SetFillColor(162,200,243); - $this->SetTextColor(0); - $this->SetDrawColor(61,121,206); - //$this->SetLineWidth(.3); - $this->SetFont('Arial','B',10); - //Header - //$this->Cell(15); - foreach($iCHeader as $value) - { - $this->Cell(63,7,$value,1,0,'L',1); - } - $this->Ln(); - $this->SetFillColor(233,241,253); - $this->SetTextColor(0); - $this->SetFont(''); - //Data - //$this->Cell(15); - $fill=0; - foreach($iCData as $value) - { - $this->Cell(63,6,$value,1,0,'L',0); - } - $this->Ln(); -} - -//Product Details -function setProductDetails($ivHeader,$ivData) -{ - $this->Ln(); - $this->Ln(); - $this->SetFillColor(162,200,243); - $this->SetTextColor(0); - $this->SetDrawColor(61,121,206); - $this->SetLineWidth(.3); - $this->SetFont('Arial','B',10); - //Header - foreach($ivHeader as $value) - { - $this->Cell(38,7,$value,0,0,'L',0); - } - $this->Ln(); - $this->SetDrawColor(0,0,0); - $this->SetLineWidth(.5); - $this->line(10,140,200,140); - $this->SetFillColor(233,241,253); - $this->SetTextColor(0); - $this->SetFont(''); - //Data - $fill=0; - if($ivData) foreach($ivData as $key=>$value) - { - $this->Cell(38,6,$value['productname'],0,0,'L',0); - $this->Cell(38,6,$value['qty'],0,0,'L',0); - $this->Cell(38,6,$value['unitprice'],0,0,'L',0); - $this->Cell(38,6,$value['listprice'],0,0,'L',0); - $this->Cell(38,6,$value['total'],0,0,'R',0); - $this->Ln(); - } - $this->Ln(); -} - -function setTotal($price_total="",$conditions="") -{ - $this->Ln(); - $this->SetDrawColor(0,0,0); - $this->SetLineWidth(.3); -// $this->line(10,200,200,200); - $this->SetFillColor(224,235,255); - $this->SetTextColor(0); - $this->SetFont('','B',10); - $this->Cell(140,6,"Sub Total: ",0,0,'R',0); - $this->Cell(0,6,$price_total[0],1,0,'R',0); - $this->Ln(4); - $this->Ln(4); - $this->Cell(140,6,"Tax: ",0,0,'R',0); - $this->Cell(0,6,$price_total[1],1,0,'R',0); - $this->Ln(4); - $this->Ln(4); - $this->Cell(140,6,"Adjustment: ",0,0,'R',0); - $this->Cell(0,6,$price_total[2],1,0,'R',0); - $this->Ln(4); - $this->Ln(4); - $this->Cell(140,6,"Grand total: ",0,0,'R',0); - $this->Cell(0,6,$price_total[3],1,0,'R',0); - $this->Ln(); - $this->Ln(); - $this->Cell(0,8,"Terms & Conditions: ",0,0,'L',0); - $this->Ln(); - $this->Cell(0,8,$conditions,0,0,'L',0); -} -} -$iHead = array("Company","Quote No.","Date"); -$iCustHeadDtls = array("Customer Name","Valid Till"); -$iHeadDtls = array("Product Name","Quantity","List Price","Unit Price","Total"); - -$pdf = new PDF('P','mm','A4'); -$pdf->SetFont('Arial','',10); -$pdf->AddPage(); -$pdf->setInvoiceTitle("Quotes",$logo_name,$companyaddress); -$pdf->Ln(); -$pdf->setInvoiceDetails($iHead,$iData); -$pdf->setAddress($bdata,$sdata); -$pdf->setCustomerDetails($iCustHeadDtls,$iCustData); -$pdf->setProductDetails($iHeadDtls,$iDataDtls); -$pdf->setTotal($price_total,$conditions); -$pdf->Output('Quotes.pdf','D'); +$pdf->Output('Quote.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 Mon Apr 24 21:38:05 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 04:38:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5308 - /vtigercrm/branches/4.2/include/VtigerPDF.php Message-ID: <20060425043805.B73276D8FC6@vtiger.fosslabs.com> Author: mmbrich Date: Mon Apr 24 22:38:04 2006 New Revision: 5308 Log: stretchx typo in VtigerPDF.php Modified: vtigercrm/branches/4.2/include/VtigerPDF.php Modified: vtigercrm/branches/4.2/include/VtigerPDF.php ============================================================================== --- vtigercrm/branches/4.2/include/VtigerPDF.php (original) +++ vtigercrm/branches/4.2/include/VtigerPDF.php Mon Apr 24 22:38:04 2006 @@ -444,7 +444,7 @@ $x1 = $location[0]; $y1 = $location[1]; $stretchx = $location[2]; - $stretchx = $location[3]; + $stretchy = $location[3]; $this->Image('test/logo/'.$logo_name,$x1,$y1,$stretchx,$stretchy); } From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 22:34:35 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 05:34:35 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5309 - /vtigercrm/trunk/modules/Users/SaveGroup.php Message-ID: <20060425053435.F30D86D9011@vtiger.fosslabs.com> Author: don Date: Mon Apr 24 23:34:30 2006 New Revision: 5309 Log: parentab added for Save Group Modified: vtigercrm/trunk/modules/Users/SaveGroup.php Modified: vtigercrm/trunk/modules/Users/SaveGroup.php ============================================================================== --- vtigercrm/trunk/modules/Users/SaveGroup.php (original) +++ vtigercrm/trunk/modules/Users/SaveGroup.php Mon Apr 24 23:34:30 2006 @@ -87,7 +87,7 @@ $groupMemberArray=constructGroupMemberArray($member_array); updateGroup($groupId,$groupName,$groupMemberArray,$description); - $loc = "Location: index.php?action=".$returnaction."&module=Users&groupId=".$groupId; + $loc = "Location: index.php?action=".$returnaction."&module=Users&parenttab=Settings&groupId=".$groupId; } elseif(isset($_REQUEST['mode']) && $_REQUEST['mode'] == 'create') { From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 22:36:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 05:36:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5310 - /vtigercrm/trunk/modules/Users/DeleteGroup.php Message-ID: <20060425053648.BA7C66D9011@vtiger.fosslabs.com> Author: don Date: Mon Apr 24 23:36:44 2006 New Revision: 5310 Log: parenttab added for delete Group Modified: vtigercrm/trunk/modules/Users/DeleteGroup.php Modified: vtigercrm/trunk/modules/Users/DeleteGroup.php ============================================================================== --- vtigercrm/trunk/modules/Users/DeleteGroup.php (original) +++ vtigercrm/trunk/modules/Users/DeleteGroup.php Mon Apr 24 23:36:44 2006 @@ -16,5 +16,5 @@ //Updating the user2 role table deleteGroup($del_id); -header("Location: index.php?action=listgroups&module=Users"); +header("Location: index.php?action=listgroups&module=Users&parenttab=Settings"); ?> From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 22:39:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 05:39:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5311 - /vtigercrm/trunk/Smarty/templates/UserProfile.tpl Message-ID: <20060425053950.801EC40E7CF@vtiger.fosslabs.com> Author: don Date: Mon Apr 24 23:39:46 2006 New Revision: 5311 Log: parenttab issue in Profiles has been fixed Modified: vtigercrm/trunk/Smarty/templates/UserProfile.tpl Modified: vtigercrm/trunk/Smarty/templates/UserProfile.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserProfile.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserProfile.tpl Mon Apr 24 23:39:46 2006 @@ -43,9 +43,9 @@       {/if} - Edit + Edit   - + {/section} From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 23:13:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 06:13:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5312 - /vtigercrm/trunk/include/utils/ListViewUtils.php Message-ID: <20060425061343.951B36D9001@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 25 00:13:38 2006 New Revision: 5312 Log: where condition added for contact list query 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 Apr 25 00:13:38 2006 @@ -1409,7 +1409,7 @@ if($module == "Contacts") { //Query modified to sort by assigned to - $query = "select contactdetails.firstname,contactdetails.lastname,contactdetails.title,contactdetails.accountid,contactdetails.email,contactdetails.phone,crmentity.smownerid ,crmentity.crmid from contactdetails inner join crmentity on crmentity.crmid=contactdetails.contactid inner join contactaddress on contactdetails.contactid=contactaddress.contactaddressid inner join contactsubdetails on contactaddress.contactaddressid=contactsubdetails.contactsubscriptionid inner join contactscf on contactdetails.contactid = contactscf.contactid left join account on account.accountid = contactdetails.accountid left join contactgrouprelation on contactscf.contactid=contactgrouprelation.contactid left join groups on groups.groupname=contactgrouprelation.groupname inner join users on users.id=crmentity.smownerid where crmentity.deleted=0 "; + $query = "select contactdetails.firstname,contactdetails.lastname,contactdetails.title,contactdetails.accountid,contactdetails.email,contactdetails.phone,crmentity.smownerid ,crmentity.crmid from contactdetails inner join crmentity on crmentity.crmid=contactdetails.contactid inner join contactaddress on contactdetails.contactid=contactaddress.contactaddressid inner join contactsubdetails on contactaddress.contactaddressid=contactsubdetails.contactsubscriptionid inner join contactscf on contactdetails.contactid = contactscf.contactid left join account on account.accountid = contactdetails.accountid left join contactgrouprelation on contactscf.contactid=contactgrouprelation.contactid left join groups on groups.groupname=contactgrouprelation.groupname inner join users on users.id=crmentity.smownerid where crmentity.deleted=0 ".$where; if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3) { From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 23:25:42 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 06:25:42 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2386=3A_H?= =?utf-8?q?elpDesk_Assigned_To_field_pulls_only_user_data_in_Custom_Views?= In-Reply-To: <076.f9eb297f705149b7cfa25e948aa290f1@vtiger.fosslabs.com> References: <076.f9eb297f705149b7cfa25e948aa290f1@vtiger.fosslabs.com> Message-ID: <085.84ae93bb1a34d30ed07ed453abec2dc7@vtiger.fosslabs.com> #86: HelpDesk Assigned To field pulls only user data in Custom Views ------------------------------------+--------------------------------------- Reporter: james at jenxnetwork.com | Owner: allanbush Type: defect | Status: assigned Priority: critical | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.3 Resolution: | Keywords: helpdesk, custom views ------------------------------------+--------------------------------------- Changes (by allanbush): * milestone: 4.2.4 => 4.2.5 Comment: Moving to 4.2.5, and merging patch. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 23:29:47 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 06:29:47 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2386=3A_H?= =?utf-8?q?elpDesk_Assigned_To_field_pulls_only_user_data_in_Custom_Views?= In-Reply-To: <076.f9eb297f705149b7cfa25e948aa290f1@vtiger.fosslabs.com> References: <076.f9eb297f705149b7cfa25e948aa290f1@vtiger.fosslabs.com> Message-ID: <085.db13d629872a34391c2c29ccc80cef20@vtiger.fosslabs.com> #86: HelpDesk Assigned To field pulls only user data in Custom Views ------------------------------------+--------------------------------------- Reporter: james at jenxnetwork.com | Owner: allanbush Type: defect | Status: closed Priority: critical | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.3 Resolution: fixed | Keywords: helpdesk, custom views ------------------------------------+--------------------------------------- Changes (by allanbush): * resolution: => fixed * status: assigned => closed Comment: (In [5313]) Merged patch attached to ticket #86, to allow custom filters to match the groupname as well as the user name for Assigned To fields. Closes #86. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 23:29:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 06:29:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5313 - in /vtigercrm/branches/4.2: include/utils.php modules/CustomView/CustomView.php Message-ID: <20060425062949.9C0EB6D9026@vtiger.fosslabs.com> Author: allanbush Date: Tue Apr 25 00:29:29 2006 New Revision: 5313 Log: Merged patch attached to ticket #86, to allow custom filters to match the groupname as well as the user name for Assigned To fields. Closes #86. Modified: vtigercrm/branches/4.2/include/utils.php vtigercrm/branches/4.2/modules/CustomView/CustomView.php Modified: vtigercrm/branches/4.2/include/utils.php ============================================================================== --- vtigercrm/branches/4.2/include/utils.php (original) +++ vtigercrm/branches/4.2/include/utils.php Tue Apr 25 00:29:29 2006 @@ -3762,7 +3762,7 @@ if($module == "HelpDesk") { - $query = "select crmentity.crmid,troubletickets.title,troubletickets.status,troubletickets.priority,crmentity.smownerid, contactdetails.contactid, troubletickets.parent_id, contactdetails.firstname, contactdetails.lastname, account.accountid, account.accountname, ticketcf.* from troubletickets inner join ticketcf on ticketcf.ticketid = troubletickets.ticketid inner join crmentity on crmentity.crmid=troubletickets.ticketid left join contactdetails on troubletickets.parent_id=contactdetails.contactid left join account on account.accountid=troubletickets.parent_id left join users on crmentity.smownerid=users.id and troubletickets.ticketid = ticketcf.ticketid where crmentity.deleted=0"; + $query = "select crmentity.crmid,troubletickets.title,troubletickets.status,troubletickets.priority,crmentity.smownerid, contactdetails.contactid, troubletickets.parent_id, contactdetails.firstname, contactdetails.lastname, account.accountid, account.accountname, ticketcf.* from troubletickets inner join ticketcf on ticketcf.ticketid = troubletickets.ticketid inner join crmentity on crmentity.crmid=troubletickets.ticketid left join contactdetails on troubletickets.parent_id=contactdetails.contactid left join account on account.accountid=troubletickets.parent_id left join users on crmentity.smownerid=users.id and troubletickets.ticketid = ticketcf.ticketid LEFT OUTER JOIN ticketgrouprelation ON ticketgrouprelation.ticketid = troubletickets.ticketid where crmentity.deleted=0"; //$query = "select crmentity.crmid,troubletickets.title,troubletickets.status,troubletickets.priority,crmentity.smownerid, contactdetails.firstname, contactdetails.lastname, ticketcf.* from troubletickets inner join crmentity on crmentity.crmid=troubletickets.ticketid inner join ticketcf on ticketcf.ticketid = troubletickets.ticketid left join contactdetails on troubletickets.contact_id=contactdetails.contactid left join users on crmentity.smownerid=users.id where crmentity.deleted=0"; } if($module == "Accounts") @@ -3779,7 +3779,7 @@ if($module == "Leads") { //$query = "select crmentity.crmid, leaddetails.firstname, leaddetails.lastname, leaddetails.company, leadaddress.phone, leadsubdetails.website, leaddetails.email, crmentity.smownerid, leadscf.* from leaddetails, leadaddress, leadsubdetails, leadscf inner join crmentity on crmentity.crmid=leaddetails.leadid and leaddetails.leadid=leadaddressid and leaddetails.leadid = leadscf.leadid and leadaddress.leadaddressid=leadsubdetails.leadsubscriptionid where crmentity.deleted=0 and leaddetails.converted=0"; - $query = "select crmentity.crmid, leaddetails.firstname, leaddetails.lastname, leaddetails.company, leadaddress.phone, leadsubdetails.website, leaddetails.email, crmentity.smownerid, leadscf.* from leaddetails inner join crmentity on crmentity.crmid=leaddetails.leadid inner join leadsubdetails on leadsubdetails.leadsubscriptionid=leaddetails.leadid inner join leadaddress on leadaddress.leadaddressid=leadsubdetails.leadsubscriptionid inner join leadscf on leaddetails.leadid = leadscf.leadid where crmentity.deleted=0 and leaddetails.converted=0"; + $query = "select crmentity.crmid, leaddetails.firstname, leaddetails.lastname, leaddetails.company, leadaddress.phone, leadsubdetails.website, leaddetails.email, crmentity.smownerid, leadscf.* from leaddetails inner join crmentity on crmentity.crmid=leaddetails.leadid inner join leadsubdetails on leadsubdetails.leadsubscriptionid=leaddetails.leadid inner join leadaddress on leadaddress.leadaddressid=leadsubdetails.leadsubscriptionid inner join leadscf on leaddetails.leadid = leadscf.leadid LEFT OUTER JOIN leadgrouprelation ON leadgrouprelation.leadid = leaddetails.leadid where crmentity.deleted=0 and leaddetails.converted=0"; } if($module == "Products") { @@ -3819,13 +3819,13 @@ } if($module == "Activities") { - $query = " select $distincton crmentity.crmid,crmentity.smownerid,crmentity.setype, activity.*, contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, account.accountid, account.accountname, recurringevents.recurringtype from activity inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid= cntactivityrel.contactid left join seactivityrel on seactivityrel.activityid = activity.activityid left outer join account on account.accountid = contactdetails.accountid left outer join recurringevents on recurringevents.activityid=activity.activityid WHERE crmentity.deleted=0 and (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task') ".$where ; + $query = " select $distincton crmentity.crmid,crmentity.smownerid,crmentity.setype, activity.*, contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, account.accountid, account.accountname, recurringevents.recurringtype from activity inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid= cntactivityrel.contactid left join seactivityrel on seactivityrel.activityid = activity.activityid left outer join account on account.accountid = contactdetails.accountid left outer join recurringevents on recurringevents.activityid=activity.activityid LEFT OUTER JOIN activitygrouprelation ON activitygrouprelation.activityid = activity.activityid WHERE crmentity.deleted=0 and (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task') ".$where ; //included by Jaguar } if($module == "Emails") { //$query = "select crmentity.crmid,crmentity.smownerid, emails.emailid, emails.filename, activity.subject, activity.activityid, contactdetails.lastname, contactdetails.firstname, contactdetails.contactid , activity.date_start from emails inner join crmentity on crmentity.crmid=emails.emailid inner join activity on activity.activityid = crmentity.crmid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid= cntactivityrel.contactid WHERE crmentity.deleted=0"; - $query = "select crmentity.crmid,crmentity.smownerid, emails.emailid, emails.filename, activity.subject, activity.activityid, contactdetails.lastname, contactdetails.firstname, contactdetails.contactid , activity.date_start from emails inner join crmentity on crmentity.crmid=emails.emailid inner join activity on activity.activityid = crmentity.crmid left join seactivityrel on seactivityrel.activityid = activity.activityid left join contactdetails on contactdetails.contactid=seactivityrel.crmid left join cntactivityrel on cntactivityrel.activityid= activity.activityid and cntactivityrel.contactid=cntactivityrel.contactid WHERE crmentity.deleted=0"; + $query = "select crmentity.crmid,crmentity.smownerid, emails.emailid, emails.filename, activity.subject, activity.activityid, contactdetails.lastname, contactdetails.firstname, contactdetails.contactid , activity.date_start from emails inner join crmentity on crmentity.crmid=emails.emailid inner join activity on activity.activityid = crmentity.crmid left join seactivityrel on seactivityrel.activityid = activity.activityid left join contactdetails on contactdetails.contactid=seactivityrel.crmid left join cntactivityrel on cntactivityrel.activityid= activity.activityid and cntactivityrel.contactid=cntactivityrel.contactid LEFT OUTER JOIN activitygrouprelation ON activitygrouprelation.activityid = activity.activityid WHERE crmentity.deleted=0"; } if($module == "Faq") { Modified: vtigercrm/branches/4.2/modules/CustomView/CustomView.php ============================================================================== --- vtigercrm/branches/4.2/modules/CustomView/CustomView.php (original) +++ vtigercrm/branches/4.2/modules/CustomView/CustomView.php Tue Apr 25 00:29:29 2006 @@ -634,7 +634,17 @@ { if($fieldname == "smownerid" || $fieldname == "inventorymanager") { + // BUG this doesn't work with non equilvalent comparisons + $org_value = $value; $value = $tablename.".".$fieldname.$this->getAdvComparator($comparator,getUserId_Ol($value)); + // hack to get "assigned to" to check group name as well + if($_REQUEST['module'] == 'Activities' || $_REQUEST['module'] == 'Emails') { + $value = '(('.$value.' AND NOT '.$tablename.".".$fieldname.$this->getAdvComparator($comparator, 0).') OR activitygrouprelation.groupname'.$this->getAdvComparator($comparator, $org_value).')'; + } else if($_REQUEST['module'] == 'HelpDesk') { + $value = '(('.$value.' AND NOT '.$tablename.".".$fieldname.$this->getAdvComparator($comparator, 0).') OR ticketgrouprelation.groupname'.$this->getAdvComparator($comparator, $org_value).')'; + } else if($_REQUEST['module'] == 'Leads') { + $value = '(('.$value.' AND NOT '.$tablename.".".$fieldname.$this->getAdvComparator($comparator, 0).') OR leadgrouprelation.groupname'.$this->getAdvComparator($comparator, $org_value).')'; + } }else if($fieldname == "parentid") { $value = $tablename.".".$fieldname.$this->getAdvComparator($comparator,$this->getAccountId($value)); From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 23:38:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 06:38:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5314 - /vtigercrm/trunk/modules/Users/User.php Message-ID: <20060425063849.E09566D902E@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 25 00:38:44 2006 New Revision: 5314 Log: Made requisite changes to user list view (Proper Redirection for all links)- Ahmed 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 Apr 25 00:38:44 2006 @@ -512,20 +512,25 @@ $entries_list = array(); $roleinfo = getAllRoleDetails(); - //echo '
    '; print_r($roleinfo['H1']); '
    '; for($i = $navigation_array['start'];$i <= $navigation_array['end_val']; $i++) { $entries=array(); $id=$this->db->query_result($result,$i-1,'id'); $entries[]='Edit  Delete'; - $entries[]=$this->db->query_result($result,$i-1,'first_name').' '.$this->db->query_result($result,$i-1,'last_name'); $entries[]=''.$this->db->query_result($result,$i-1,'user_name').''; -// $entries[]=$this->db->query_result($result,$i-1,'department'); - $entries[]=$this->db->query_result($result,$i-1,'email1'); - $rolecode= fetchUserRole($this->db->query_result($result,$i-1,'id')); - $entries[]=''.$roleinfo[$rolecode][0]; + + $rolecode= fetchUserRole($this->db->query_result($result,$i-1,'id')); + $entries[]=''.$roleinfo[ +$rolecode][0]; + + $entries[]=''.$this->db->query_result($result,$i-1,'email1').' '; + + $entries[]=''. $this->db->query_result($result,$i-1,'first_name').' '.$this->db->query_result($result,$i-1,'last_name').''; + $entries[]=$this->db->query_result($result,$i-1,'is_admin'); + $entries_list[]=$entries; + } return $entries_list; } From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 23:55:06 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 06:55:06 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23697=3A_?= =?utf-8?q?Convert_Lead_Don=27t_Have_Security_checks?= In-Reply-To: <076.27f8cf078d0768eb2c2965a3503ace97@vtiger.fosslabs.com> References: <076.27f8cf078d0768eb2c2965a3503ace97@vtiger.fosslabs.com> Message-ID: <085.4e02d1eee074a035e4b6fc0cef7f1fc4@vtiger.fosslabs.com> #697: Convert Lead Don't Have Security checks ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: Don Type: defect | Status: closed Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Security ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 00:01:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 07:01:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5315 - /vtigercrm/trunk/modules/Emails/mail.php Message-ID: <20060425070159.391E96D903A@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 01:01:53 2006 New Revision: 5315 Log: Changed PearDatabase::qstr to $adb->qstr. Fixes #206. Modified: vtigercrm/trunk/modules/Emails/mail.php Modified: vtigercrm/trunk/modules/Emails/mail.php ============================================================================== --- vtigercrm/trunk/modules/Emails/mail.php (original) +++ vtigercrm/trunk/modules/Emails/mail.php Tue Apr 25 01:01:53 2006 @@ -88,7 +88,8 @@ if($val != '') { //$sql = "select email1, email2, yahoo_id from users where ".$name." = '".$val."'"; - $sql = "select email1, email2, yahoo_id from users where ".$name." = ".PearDatabase::quote($val); + //done to resolve the PHP5 specific behaviour + $sql = "select email1, email2, yahoo_id from users where ".$name." = ".$adb->quote($val); $res = $adb->query($sql); $email = $adb->query_result($res,0,'email1'); if($email == '') From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 00:01:58 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 07:01:58 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23206=3A_?= =?utf-8?q?unable_to_save_outgoing_mail_server_info?= In-Reply-To: <076.8e9907477ed00259bc1939ad6c9185b6@vtiger.fosslabs.com> References: <076.8e9907477ed00259bc1939ad6c9185b6@vtiger.fosslabs.com> Message-ID: <085.92013f0d62f07fedaf2f30775cfd4f6b@vtiger.fosslabs.com> #206: unable to save outgoing mail server info ------------------------+--------------------------------------------------- Reporter: richie | Owner: richie Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: outgoing mailserver info ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed Comment: (In [5315]) Changed PearDatabase::qstr to $adb->qstr. Fixes #206. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 00:21:46 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 07:21:46 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23290=3A_?= =?utf-8?q?Dashboard_amounts_not_proper?= In-Reply-To: <076.d32dd9695eb9aeb5d9c1a0d15e10d75a@vtiger.fosslabs.com> References: <076.d32dd9695eb9aeb5d9c1a0d15e10d75a@vtiger.fosslabs.com> Message-ID: <085.52efa8af6e705d31ed9fe2a221148156@vtiger.fosslabs.com> #290: Dashboard amounts not proper ------------------------+--------------------------------------------------- Reporter: richie | Owner: richie Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: dashboard ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed Comment: (In [5316]) Removed the K symbol so that the amounts are shown properly. Fixes #290 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 00:21:46 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 07:21:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5316 - /vtigercrm/trunk/modules/Potentials/Charts.php Message-ID: <20060425072147.104706D903D@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 01:21:41 2006 New Revision: 5316 Log: Removed the K symbol so that the amounts are shown properly. Fixes #290 Modified: vtigercrm/trunk/modules/Potentials/Charts.php Modified: vtigercrm/trunk/modules/Potentials/Charts.php ============================================================================== Binary files - no diff available. From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 00:34:21 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 07:34:21 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23503=3A_?= =?utf-8?q?Profile_Delete_Issue=28UI=29?= In-Reply-To: <076.2d750bd33c88cc25739f0c0a339fa6f0@vtiger.fosslabs.com> References: <076.2d750bd33c88cc25739f0c0a339fa6f0@vtiger.fosslabs.com> Message-ID: <085.087581536268e55aaaed141ca0fbe588@vtiger.fosslabs.com> #503: Profile Delete Issue(UI) ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed Comment: (In [5317]) Delete Option provided. Fixes #503 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 00:34:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 07:34:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5317 - /vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl Message-ID: <20060425073422.5F15B6D9048@vtiger.fosslabs.com> Author: don Date: Tue Apr 25 01:34:13 2006 New Revision: 5317 Log: Delete Option provided. Fixes #503 Modified: vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl Modified: vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl Tue Apr 25 01:34:13 2006 @@ -407,6 +407,10 @@     @@ -425,7 +429,25 @@
    {$LIST_ENTRIES[entries].profilename}{$LIST_ENTRIES[entries].profilename} {$LIST_ENTRIES[entries].description} 
       + { if $PROFILEID != 1 && $PROFILEID != 2 && $PROFILEID != 3 && $PROFILEID != 4 } + +    + {/if}
    +
    + {include file='SettingsSubMenu.tpl'} + + {/literal} -{/if} {if $MODULE eq 'Contacts'} {literal} @@ -504,14 +481,4 @@ {/literal} {/if} - + Modified: vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl Tue Apr 25 03:00:12 2006 @@ -16,13 +16,12 @@ {elseif $button_check eq 's_cmail'} - {elseif $button_check eq 'c_owner'} - {elseif $button_check eq 'c_status'} - + {/if} {/foreach} + {$RECORD_COUNTS} @@ -86,13 +85,12 @@ {elseif $button_check eq 's_cmail'} - {elseif $button_check eq 'c_owner'} - {elseif $button_check eq 'c_status'} - + {/if} {/foreach} + {$RECORD_COUNTS} From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 02:00:39 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 09:00:39 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23411=3A_?= =?utf-8?q?Issue_in_OrgSharing_Privileges?= In-Reply-To: <076.ed0dea6bdbb20e17a0f1cd92b8c0d970@vtiger.fosslabs.com> References: <076.ed0dea6bdbb20e17a0f1cd92b8c0d970@vtiger.fosslabs.com> Message-ID: <085.d409e7c6c7307e6a5d1ded12add6f7fa@vtiger.fosslabs.com> #411: Issue in OrgSharing Privileges ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: don Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Security ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 02:01:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 09:01:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5324 - /vtigercrm/trunk/modules/Users/updateLeadDBStatus.php Message-ID: <20060425090128.9661A6D904B@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 03:01:24 2006 New Revision: 5324 Log: redirect changed Modified: vtigercrm/trunk/modules/Users/updateLeadDBStatus.php Modified: vtigercrm/trunk/modules/Users/updateLeadDBStatus.php ============================================================================== --- vtigercrm/trunk/modules/Users/updateLeadDBStatus.php (original) +++ vtigercrm/trunk/modules/Users/updateLeadDBStatus.php Tue Apr 25 03:01:24 2006 @@ -17,6 +17,7 @@ $leadstatusval = $_REQUEST['leadval']; $idval=$_REQUEST['user_id']; $viewid = $_REQUEST['viewname']; +$return_module = $_REQUEST['return_module']; global $current_user; global $adb; $storearray = explode(";",$idlist); @@ -40,6 +41,6 @@ $result1 = $adb->query($query); } } -header("Location: index.php?module=Leads&action=LeadsAjax&file=ListView&ajax=changestate&viewname=".$viewid); +header("Location: index.php?module=$return_module&action=".$return_module."Ajax&file=ListView&ajax=changestate&viewname=".$viewid); ?> From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 02:02:29 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 09:02:29 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5325 - /vtigercrm/trunk/modules/Contacts/ListView.php Message-ID: <20060425090229.CD1196D904B@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 03:02:25 2006 New Revision: 5325 Log: function added to support mass change owner in listviews Modified: vtigercrm/trunk/modules/Contacts/ListView.php Modified: vtigercrm/trunk/modules/Contacts/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/ListView.php (original) +++ vtigercrm/trunk/modules/Contacts/ListView.php Tue Apr 25 03:02:25 2006 @@ -91,7 +91,7 @@ $customviewcombo_html = $oCustomView->getCustomViewCombo($viewid); $viewnamedesc = $oCustomView->getCustomViewByCvid($viewid); //<<<<>>>> - +$smarty->assign("CHANGE_OWNER",getUserslist()); // Buttons and View options if($viewid != 0) { From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 02:03:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 09:03:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5326 - /vtigercrm/trunk/modules/Accounts/ListView.php Message-ID: <20060425090317.1484B6D904B@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 03:03:13 2006 New Revision: 5326 Log: function added to support mass change owner in listviews Modified: vtigercrm/trunk/modules/Accounts/ListView.php Modified: vtigercrm/trunk/modules/Accounts/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/ListView.php (original) +++ vtigercrm/trunk/modules/Accounts/ListView.php Tue Apr 25 03:03:13 2006 @@ -60,7 +60,7 @@ $viewnamedesc = $oCustomView->getCustomViewByCvid($viewid); $groupid = $oCustomView->getGroupId($currentModule); //<<<<>>>> - +$smarty->assign("CHANGE_OWNER",getUserslist()); if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { $where = getWhereCondition($currentModule); From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 02:03:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 09:03:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5327 - /vtigercrm/trunk/modules/Activities/ListView.php Message-ID: <20060425090343.310546D905C@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 03:03:39 2006 New Revision: 5327 Log: function added to support mass change owner in listviews Modified: vtigercrm/trunk/modules/Activities/ListView.php Modified: vtigercrm/trunk/modules/Activities/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Activities/ListView.php (original) +++ vtigercrm/trunk/modules/Activities/ListView.php Tue Apr 25 03:03:39 2006 @@ -57,7 +57,7 @@ $customviewcombo_html = $oCustomView->getCustomViewCombo($viewid); $viewnamedesc = $oCustomView->getCustomViewByCvid($viewid); //<<<<>>>> - +$smarty->assign("CHANGE_OWNER",getUserslist()); $where = ""; $url_string = ''; // assigning http url string From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 02:04:08 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 09:04:08 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5328 - /vtigercrm/trunk/modules/Campaigns/ListView.php Message-ID: <20060425090408.537666D9053@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 03:04:04 2006 New Revision: 5328 Log: function added to support mass change owner in listviews Modified: vtigercrm/trunk/modules/Campaigns/ListView.php Modified: vtigercrm/trunk/modules/Campaigns/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/ListView.php (original) +++ vtigercrm/trunk/modules/Campaigns/ListView.php Tue Apr 25 03:04:04 2006 @@ -66,7 +66,7 @@ $viewid = $oCustomView->getViewId($currentModule); $customviewcombo_html = $oCustomView->getCustomViewCombo($viewid); $viewnamedesc = $oCustomView->getCustomViewByCvid($viewid); - +$smarty->assign("CHANGE_OWNER",getUserslist()); //<<<<>>>> $smarty = new vtigerCRM_Smarty; From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 02:04:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 09:04:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5329 - /vtigercrm/trunk/modules/HelpDesk/ListView.php Message-ID: <20060425090441.8284D6D9053@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 03:04:37 2006 New Revision: 5329 Log: function added to support mass change owner in listviews Modified: vtigercrm/trunk/modules/HelpDesk/ListView.php Modified: vtigercrm/trunk/modules/HelpDesk/ListView.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/ListView.php (original) +++ vtigercrm/trunk/modules/HelpDesk/ListView.php Tue Apr 25 03:04:37 2006 @@ -73,7 +73,7 @@ $customviewcombo_html = $oCustomView->getCustomViewCombo($viewid); $viewnamedesc = $oCustomView->getCustomViewByCvid($viewid); //<<<<>>>> - +$smarty->assign("CHANGE_OWNER",getUserslist()); if($viewid != 0) { $CActionDtls = $oCustomView->getCustomActionDetails($viewid); From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 02:05:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 09:05:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5330 - /vtigercrm/trunk/modules/Potentials/ListView.php Message-ID: <20060425090516.077D56D9053@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 03:05:11 2006 New Revision: 5330 Log: function added to support mass change owner in listviews Modified: vtigercrm/trunk/modules/Potentials/ListView.php Modified: vtigercrm/trunk/modules/Potentials/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/ListView.php (original) +++ vtigercrm/trunk/modules/Potentials/ListView.php Tue Apr 25 03:05:11 2006 @@ -96,7 +96,7 @@ $customviewcombo_html = $oCustomView->getCustomViewCombo($viewid); $viewnamedesc = $oCustomView->getCustomViewByCvid($viewid); //<<<<>>>> - +$smarty->assign("CHANGE_OWNER",getUserslist()); if(isPermitted('Potentials',2,'') == 'yes') { From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 02:05:46 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 09:05:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5331 - /vtigercrm/trunk/modules/Products/ListView.php Message-ID: <20060425090546.29DF46D9053@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 03:05:41 2006 New Revision: 5331 Log: function added to support mass change owner in listviews Modified: vtigercrm/trunk/modules/Products/ListView.php Modified: vtigercrm/trunk/modules/Products/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Products/ListView.php (original) +++ vtigercrm/trunk/modules/Products/ListView.php Tue Apr 25 03:05:41 2006 @@ -82,6 +82,8 @@ $customviewcombo_html = $oCustomView->getCustomViewCombo($viewid); $viewnamedesc = $oCustomView->getCustomViewByCvid($viewid); //<<<<>>>> + +$smarty->assign("CHANGE_OWNER",getUserslist()); if($viewnamedesc['viewname'] == 'All') { $smarty->assign("ALL", 'All'); From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 02:06:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 09:06:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5332 - /vtigercrm/trunk/modules/PurchaseOrder/ListView.php Message-ID: <20060425090607.3831D6D9053@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 03:06:02 2006 New Revision: 5332 Log: function added to support mass change owner in listviews Modified: vtigercrm/trunk/modules/PurchaseOrder/ListView.php Modified: vtigercrm/trunk/modules/PurchaseOrder/ListView.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/ListView.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/ListView.php Tue Apr 25 03:06:02 2006 @@ -68,7 +68,7 @@ $customviewcombo_html = $oCustomView->getCustomViewCombo($viewid); $viewnamedesc = $oCustomView->getCustomViewByCvid($viewid); //<<<<>>>> - +$smarty->assign("CHANGE_OWNER",getUserslist()); if(isPermitted('PurchaseOrder',2,'') == 'yes') { From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 02:06:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 09:06:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5333 - /vtigercrm/trunk/modules/Quotes/ListView.php Message-ID: <20060425090624.8F02C6D9053@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 03:06:20 2006 New Revision: 5333 Log: function added to support mass change owner in listviews Modified: vtigercrm/trunk/modules/Quotes/ListView.php Modified: vtigercrm/trunk/modules/Quotes/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/ListView.php (original) +++ vtigercrm/trunk/modules/Quotes/ListView.php Tue Apr 25 03:06:20 2006 @@ -74,7 +74,7 @@ $customviewcombo_html = $oCustomView->getCustomViewCombo($viewid); $viewnamedesc = $oCustomView->getCustomViewByCvid($viewid); //<<<<>>>> - +$smarty->assign("CHANGE_OWNER",getUserslist()); if(isPermitted('Quotes',2,'') == 'yes') { From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 02:07:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 09:07:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5334 - /vtigercrm/trunk/modules/SalesOrder/ListView.php Message-ID: <20060425090706.ADAC26D906F@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 03:07:02 2006 New Revision: 5334 Log: function added to support mass change owner in listviews Modified: vtigercrm/trunk/modules/SalesOrder/ListView.php Modified: vtigercrm/trunk/modules/SalesOrder/ListView.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/ListView.php (original) +++ vtigercrm/trunk/modules/SalesOrder/ListView.php Tue Apr 25 03:07:02 2006 @@ -102,7 +102,7 @@ $customviewcombo_html = $oCustomView->getCustomViewCombo($viewid); $viewnamedesc = $oCustomView->getCustomViewByCvid($viewid); //<<<<>>>> - +$smarty->assign("CHANGE_OWNER",getUserslist()); // Buttons and View options if(isPermitted('SalesOrder',2,'') == 'yes') { From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 02:07:47 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 09:07:47 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23436=3A_?= =?utf-8?q?Mass_Change_Owner_option_is_missing_in_contacts?= In-Reply-To: <076.2a85e9ca07304adbf6788d457c3f9084@vtiger.fosslabs.com> References: <076.2a85e9ca07304adbf6788d457c3f9084@vtiger.fosslabs.com> Message-ID: <085.f47ebdb64e4a2a35ae14a1904e8fe53b@vtiger.fosslabs.com> #436: Mass Change Owner option is missing in contacts ------------------------+--------------------------------------------------- Reporter: don | Owner: richie Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed Comment: Integrated -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 02:26:00 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 09:26:00 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23741=3A_?= =?utf-8?q?Create_Group_-_Default_filter_selection?= Message-ID: <076.2a6d5517e6c3b15c30ace383f35ae26b@vtiger.fosslabs.com> #741: Create Group - Default filter selection --------------------------+------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: Create group | --------------------------+------------------------------------------------- In Settings > Users & Access Management > Create New Group, in 'Filters' Select option box make the 'Users' as default selected, with the list of members available, in the 'Member Available' text area. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 02:41:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 09:41:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5335 - /vtigercrm/trunk/Smarty/templates/Settings/BackupServer.tpl Message-ID: <20060425094122.5D5916D9073@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 03:41:17 2006 New Revision: 5335 Log: server password field data check implemented. Fixes #219 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 Tue Apr 25 03:41:17 2006 @@ -117,6 +117,7 @@ function validate() { if (!emptyCheck("server","ftp Server Name","text")) return false if (!emptyCheck("server_username","ftp User Name","text")) return false + if (!emptyCheck("server_password","ftp Password","text")) return false return true; } From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 02:41:21 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 09:41:21 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23219=3A_?= =?utf-8?q?blank_ftp_password_but_accepts?= In-Reply-To: <076.6488771d9fd470785bb174b2504cccec@vtiger.fosslabs.com> References: <076.6488771d9fd470785bb174b2504cccec@vtiger.fosslabs.com> Message-ID: <085.f4e585369a0eb1797ec212dc69acb662@vtiger.fosslabs.com> #219: blank ftp password but accepts ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed Comment: (In [5335]) server password field data check implemented. Fixes #219 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 02:48:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 09:48:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5336 - in /vtigercrm/trunk: Smarty/templates/CreateView.tpl Smarty/templates/QuickCreate.tpl Smarty/templates/salesEditView.tpl include/utils/EditViewUtils.php Message-ID: <20060425094820.BDA1D6D9071@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 25 03:48:11 2006 New Revision: 5336 Log: Team changed to group Modified: vtigercrm/trunk/Smarty/templates/CreateView.tpl vtigercrm/trunk/Smarty/templates/QuickCreate.tpl vtigercrm/trunk/Smarty/templates/salesEditView.tpl vtigercrm/trunk/include/utils/EditViewUtils.php Modified: vtigercrm/trunk/Smarty/templates/CreateView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateView.tpl Tue Apr 25 03:48:11 2006 @@ -254,6 +254,411 @@ {/if} + + {if $uitype eq 2} + *{$fldlabel} + + {elseif $uitype eq 11 || $uitype eq 1 || $uitype eq 13 || $uitype eq 7 || $uitype eq 9} + {$fldlabel} + {if $fldname eq 'tickersymbol' && $MODULE eq 'Accounts'} + + {else} + + {/if} + {elseif $uitype eq 19 || $uitype eq 20} + + {if $uitype eq 20}*{/if} + {$fldlabel} + + + {elseif $uitype eq 21 || $uitype eq 24} + + {if $uitype eq 24} + * + {/if} + {$fldlabel} + + + {elseif $uitype eq 15 || $uitype eq 16} + + {if $uitype eq 16} + * + {/if} + {$fldlabel} + + + + + {elseif $uitype eq 33} + + {$fldlabel} + + + + + + {elseif $uitype eq 53} + + {$fldlabel} + + + {assign var=check value=1} + {foreach key=key_one item=arr from=$fldvalue} + {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} +  User + {if $secondvalue neq ''} +  Group + {/if} + + + {if $secondvalue neq ''} + + + {/if} + + {elseif $uitype eq 52 || $uitype eq 77} + + {$fldlabel} + + + {if $uitype eq 52} + + {else} + + + {elseif $uitype eq 51} + {if $MODULE eq 'Accounts'} + {assign var='popuptype' value = 'specific_account_address'} + {else} + {assign var='popuptype' value = 'specific_contact_account_address'} + {/if} + {$fldlabel} +  Select  + + {elseif $uitype eq 50} + *{$fldlabel} +  Select + {elseif $uitype eq 73} + *{$fldlabel} +  Select + + {elseif $uitype eq 75 || $uitype eq 81} + + {if $uitype eq 81} + * + {assign var="pop_type" value="specific_vendor_address"} + {else}{assign var="pop_type" value="specific"} + {/if} + {$fldlabel} + +  Select + {if $uitype eq 75} +   + {/if} + {elseif $uitype eq 57} + {$fldlabel} +  Select  + + {elseif $uitype eq 80} + {$fldlabel} +  Select  + + {elseif $uitype eq 78} + {$fldlabel} +  Select  + + {elseif $uitype eq 76} + {$fldlabel} +  Select  + + {elseif $uitype eq 17} + {$fldlabel} +   http://  + + {elseif $uitype eq 71 || $uitype eq 72} + + {if $uitype eq 72} + * + {/if} + {$fldlabel} + + + {elseif $uitype eq 56} + {$fldlabel} + {if $fldname eq 'notime' && $ACTIVITY_MODE eq 'Events'} + {if $fldvalue eq 1} + + {else} + + {/if} + {else} + {if $fldvalue eq 1} + + {else} + + {/if} + {/if} + {elseif $uitype eq 23 || $uitype eq 5 || $uitype eq 6} + {$fldlabel} + + {foreach key=date_value item=time_value from=$fldvalue} + {assign var=date_val value="$date_value"} + {assign var=time_val value="$time_value"} + {/foreach} + + + {if $uitype eq 6} + + {/if} + {foreach key=date_format item=date_str from=$secondvalue} + {assign var=dateFormat value="$date_format"} + {assign var=dateStr value="$date_str"} + {/foreach} + {if $uitype eq 5 || $uitype eq 23} +
    ({$dateStr}) + {else} +
    ({$dateStr}) + {/if} + + + + + + {elseif $uitype eq 63} + + {$fldlabel} + + +   + + + {elseif $uitype eq 68 || $uitype eq 66 || $uitype eq 62} + + + + + +  Select  + + {elseif $uitype eq 357} + To:  + + +   + +  Select  + + CC:  + + + BCC:  + + + + + {elseif $uitype eq 59} + + {$fldlabel} + +  Select  + + {elseif $uitype eq 55} + {$fldlabel} + + + + + {elseif $uitype eq 22} + *{$fldlabel} + + + + + {elseif $uitype eq 69} + {$fldlabel} + + {if $MODULE eq 'Products'} + +
    Files Maximum 6 + +
    + + + {else} + {$fldvalue} + {/if} + + {elseif $uitype eq 61} + {$fldlabel} + {$fldvalue} + {elseif $uitype eq 30} + {$fldlabel} + + {assign var=check value=$secondvalue[0]} + {assign var=yes_val value=$secondvalue[1]} + {assign var=no_val value=$secondvalue[2]} +  {$yes_val}  {$no_val}  + {foreach item=val_arr from=$fldvalue} + {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]"} + +  {$disp_text} + {/foreach} + + + {/if} + {/foreach} + + {/foreach} +   + {/foreach} + + + + +
    + {if $MODULE eq 'Emails'} + + + {/if} + + +
    + + + + + + + + +
    + + + +
    + {**} + + + + +
    + + + + + + {foreach key=header item=data from=$ADVBLOCKS} + + + + {foreach key=label item=subdata from=$data} + + {foreach key=mainlabel item=maindata from=$subdata} + {assign var="uitype" value="$maindata[0][0]"} + {assign var="fldlabel" value="$maindata[1][0]"} + {assign var="fldlabel_sel" value="$maindata[1][1]"} + {assign var="fldlabel_combo" value="$maindata[1][2]"} + {assign var="fldname" value="$maindata[2][0]"} + {assign var="fldvalue" value="$maindata[3][0]"} + {assign var="secondvalue" value="$maindata[3][1]"} + {if $uitype eq 2} @@ -566,10 +971,10 @@ {else} {$fldvalue} {/if} - {elseif $uitype eq 61} + {elseif $uitype eq 30} {/foreach} - - - - -
    +
    + + +
    +
    + {$header} +
    *{$fldlabel}{$fldlabel} {$fldvalue}{$fldlabel} @@ -601,411 +1006,6 @@ {/foreach}
     
    - -
    - {if $MODULE eq 'Emails'} - - - {/if} - - -
    -
    -
    -
    - -
    - -
    - - - -
    - {**} - - - - - From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 06:07:36 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 13:07:36 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23220=3A_?= =?utf-8?q?Events_Scheduled_after_more_than_1_hour_gets_displayed_only_at_?= =?utf-8?q?the_start_of_the_Hour_-_Calendar?= In-Reply-To: <076.106fba7ba90fc32941161e0f200a0e12@vtiger.fosslabs.com> References: <076.106fba7ba90fc32941161e0f200a0e12@vtiger.fosslabs.com> Message-ID: <085.8c150e7b7a228c7115171b0e4148fcb7@vtiger.fosslabs.com> #220: Events Scheduled after more than 1 hour gets displayed only at the start of the Hour - Calendar ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 06:07:57 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 13:07:57 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23271=3A_?= =?utf-8?q?Calendar_Day_View_-_Too_much_scrolling?= In-Reply-To: <076.3ecd9b4390d05ad93ba958d69bc9eb11@vtiger.fosslabs.com> References: <076.3ecd9b4390d05ad93ba958d69bc9eb11@vtiger.fosslabs.com> Message-ID: <085.ae79626b7b4df70589077290265a0e80@vtiger.fosslabs.com> #271: Calendar Day View - Too much scrolling ------------------------+--------------------------------------------------- Reporter: gopal | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 06:08:21 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 13:08:21 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23276=3A_?= =?utf-8?q?Calendar_Day_View_-_AM/PM_font_can_be_made_superscript?= In-Reply-To: <076.a606dddc26c965eb7959805dc46ce62b@vtiger.fosslabs.com> References: <076.a606dddc26c965eb7959805dc46ce62b@vtiger.fosslabs.com> Message-ID: <085.1b905f8997df4a6741c918473de62769@vtiger.fosslabs.com> #276: Calendar Day View - AM/PM font can be made superscript ------------------------+--------------------------------------------------- Reporter: gopal | Owner: mangai Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 06:08:55 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 13:08:55 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23280=3A_?= =?utf-8?q?Calendar_Day_View_-_Better_to_have_Month_Day=2C_Week_format?= In-Reply-To: <076.6291568ebf441727bcf8ab703b0d8ac6@vtiger.fosslabs.com> References: <076.6291568ebf441727bcf8ab703b0d8ac6@vtiger.fosslabs.com> Message-ID: <085.a5030e468d42ea056846e279ef01e994@vtiger.fosslabs.com> #280: Calendar Day View - Better to have Month Day, Week format ------------------------+--------------------------------------------------- Reporter: gopal | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 06:09:28 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 13:09:28 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23302=3A_?= =?utf-8?q?Day_View_-_Calendar_-_Better_to_avoid_Horizontal_scrolling?= In-Reply-To: <076.87a166e9322ff09c6faad1f0430280db@vtiger.fosslabs.com> References: <076.87a166e9322ff09c6faad1f0430280db@vtiger.fosslabs.com> Message-ID: <085.fe20b2fab76738365506c6c221b0751d@vtiger.fosslabs.com> #302: Day View - Calendar - Better to avoid Horizontal scrolling ------------------------+--------------------------------------------------- Reporter: gopal | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 06:09:48 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 13:09:48 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23337=3A_?= =?utf-8?q?Calendar_-_Week_View_-_Better_to_have_links_on_date?= In-Reply-To: <076.e086d49dbbce1782e4640ba674d7de03@vtiger.fosslabs.com> References: <076.e086d49dbbce1782e4640ba674d7de03@vtiger.fosslabs.com> Message-ID: <085.091f52d596f791ffd2791dcf4fa0cf33@vtiger.fosslabs.com> #337: Calendar - Week View - Better to have links on date ------------------------+--------------------------------------------------- Reporter: gopal | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 06:10:09 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 13:10:09 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23161=3A_?= =?utf-8?q?Next/Prev_Button_Click_in_Calendar_-_Week/Month_Tab_Having_Issu?= =?utf-8?q?es?= In-Reply-To: <076.09810a84fe8b30486fcb66ce567736a9@vtiger.fosslabs.com> References: <076.09810a84fe8b30486fcb66ce567736a9@vtiger.fosslabs.com> Message-ID: <085.ac52d84f9a5a16ae392f82cb1f952c20@vtiger.fosslabs.com> #161: Next/Prev Button Click in Calendar - Week/Month Tab Having Issues ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: mangai Type: defect | Status: new Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 06:15:17 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 13:15:17 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23466=3A_?= =?utf-8?q?def_org_field_access_screen_issue?= In-Reply-To: <076.7489aba2a3b2c94787d97f4e59654634@vtiger.fosslabs.com> References: <076.7489aba2a3b2c94787d97f4e59654634@vtiger.fosslabs.com> Message-ID: <085.27ac9277404c78f5a5c868e797a4b3f0@vtiger.fosslabs.com> #466: def org field access screen issue ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: def org ------------------------+--------------------------------------------------- Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 06:29:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 13:29:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5351 - /vtigercrm/trunk/modules/Migration/updateCurrency.php Message-ID: <20060425132917.B2A4A6D9405@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 25 07:29:10 2006 New Revision: 5351 Log: * Added file to do the currency updation for all records which have the amount values Added: vtigercrm/trunk/modules/Migration/updateCurrency.php From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 06:30:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 13:30:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5352 - /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Message-ID: <20060425133027.B9B0A6D9A73@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 25 07:30:23 2006 New Revision: 5352 Log: * Added code to get the conversion rate to convert the currency values and some issues fixed Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php ============================================================================== --- vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php (original) +++ vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Tue Apr 25 07:30:23 2006 @@ -1761,7 +1761,7 @@ $query_array = Array( "ALTER TABLE `accountgrouprelation` DROP INDEX `fk_accountgrouprelation2`", -"ALTER TABLE `accountscf` DROP COLUMN `cf_356`", +//"ALTER TABLE `accountscf` DROP COLUMN `cf_356`", "ALTER TABLE `activity` DROP INDEX `status`", "ALTER TABLE `attachments` DROP INDEX `attachmentsid`", "ALTER TABLE `carrier` DROP INDEX `carrier_UK0`", @@ -1781,9 +1781,9 @@ "ALTER TABLE `freetagged_objects` DROP INDEX `object_id_index`", "ALTER TABLE `groups` DROP INDEX `groupname`", "ALTER TABLE `invoicegrouprelation` DROP INDEX `fk_invoicegrouprelation2`", -"ALTER TABLE `leadscf` DROP COLUMN `cf_354`", -"ALTER TABLE `leadscf` DROP COLUMN `cf_358`", -"ALTER TABLE `leadscf` DROP COLUMN `cf_360`", +//"ALTER TABLE `leadscf` DROP COLUMN `cf_354`", +//"ALTER TABLE `leadscf` DROP COLUMN `cf_358`", +//"ALTER TABLE `leadscf` DROP COLUMN `cf_360`", "ALTER TABLE `pogrouprelation` DROP INDEX `fk_productgrouprelation2`", "ALTER TABLE `potential` DROP INDEX `potentialid`", "ALTER TABLE `potentialgrouprelation` DROP INDEX `fk_potentialgrouprelation2`", @@ -2616,7 +2616,42 @@ } - +$update_query3 = "update currency_info set conversion_rate=1, currency_status='Active', defaultid='-11' where id=1"; +Execute($update_query3); + +//Added to get the conversion rate and update for all records +//include("modules/Migration/ModifyDatabase/updateCurrency.php"); +?> + + References: <076.0987feb4ecde6ea77150c2c0ffdb501f@vtiger.fosslabs.com> Message-ID: <085.3f4535596a37d4ac3c05587fc10ebaf6@vtiger.fosslabs.com> #648: Migration Issues - Leads Module ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Migration ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * status: assigned => closed Comment: This issue has been fixed and has been checkedin in the svn. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 06:33:04 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 13:33:04 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23652=3A_?= =?utf-8?q?Migration_Issues_-_Exceptions_Thrown_in_Accounts_Module?= In-Reply-To: <076.4ac89b7447d55a55667ee546e6247d5e@vtiger.fosslabs.com> References: <076.4ac89b7447d55a55667ee546e6247d5e@vtiger.fosslabs.com> Message-ID: <085.08767d880b1be65473a46b1a6096eb37@vtiger.fosslabs.com> #652: Migration Issues - Exceptions Thrown in Accounts Module ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * status: assigned => closed Comment: This issue has been fixed and has been checkedin in the svn. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 06:37:18 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 13:37:18 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23676=3A_?= =?utf-8?q?Migration_Issues_-_Quick_Create_Potentials_Non_Functional?= In-Reply-To: <076.396c5f0dc651a29c5494394f2a4bac76@vtiger.fosslabs.com> References: <076.396c5f0dc651a29c5494394f2a4bac76@vtiger.fosslabs.com> Message-ID: <085.71c4c005a60e70b93dd3a3c744fe03f7@vtiger.fosslabs.com> #676: Migration Issues - Quick Create Potentials Non Functional ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * status: assigned => closed Comment: This issue has been fixed and has been checkedin in the svn. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 06:42:39 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 13:42:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5353 - /vtigercrm/trunk/Smarty/templates/UserListView.tpl Message-ID: <20060425134239.905186D9A73@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 25 07:42:34 2006 New Revision: 5353 Log: Navigation Buttons Organised in List view. ref #144. Modified: vtigercrm/trunk/Smarty/templates/UserListView.tpl Modified: vtigercrm/trunk/Smarty/templates/UserListView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserListView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserListView.tpl Tue Apr 25 07:42:34 2006 @@ -27,7 +27,11 @@ {/if} - +'; } $list_header .= ''; - foreach($focus->list_fields as $name=>$tableinfo) - { - $fieldname = $focus->list_fields_name[$name]; + $names = get_field_list($focus, $oCv, $tabid); - //added for customview 27/5 - if($oCv) - { - if(isset($oCv->list_fields_name)) - { - $fieldname = $oCv->list_fields_name[$name]; - } - } - - global $profile_id; - $query = "select profile2field.* from field inner join profile2field on field.fieldid=profile2field.fieldid where profile2field.tabid=".$tabid." and profile2field.profileid=".$profile_id." and field.fieldname='".$fieldname."'"; - $result = $adb->query($query); - - - //Getting the Entries from def_org_field table - $query1 = "select def_org_field.* from field inner join def_org_field on field.fieldid=def_org_field.fieldid where def_org_field.tabid=".$tabid." and field.fieldname='".$fieldname."'"; - $result_def = $adb->query($query1); - - if($adb->query_result($result,0,"visible") == 0 && $adb->query_result($result_def,0,"visible") == 0) - { - if($fieldname == '') - { - $table_name = ''; - $column_name = ''; - foreach($tableinfo as $tablename=>$colname) + + foreach($names as $fieldname=>$data) { + list($name, $is_column) = $data; + + if($is_column) { - $table_name=$tablename; - $column_name = $colname; - } - $value = $adb->query_result($list_result,$i-1,$colname); + $value = $adb->query_result($list_result,$i-1,$fieldname); } else { - if(($module == 'Activities' || $module == 'Tasks' || $module == 'Meetings' || $module == 'Emails' || $module == 'HelpDesk' || $module == 'Invoice') && (($name=='Related to') || ($name=='Contact Name') || ($name=='Close'))) { $status = $adb->query_result($list_result,$i-1,"status"); @@ -3071,6 +3072,7 @@ if ($name=='Related to') $value=getRelatedTo($module,$list_result,$i-1); if($name=='Contact Name') + { $first_name = $adb->query_result($list_result,$i-1,"firstname"); $last_name = $adb->query_result($list_result,$i-1,"lastname"); @@ -3091,6 +3093,7 @@ $value = "".$contact_name.""; } if ($name == 'Close') + { if($status =='Deferred' || $status == 'Completed' || $status == 'Held' || $status == '') { @@ -3105,6 +3108,7 @@ else $evt_status='&eventstatus=Held'; if(isPermitted("Activities",1,$activityid) == 'yes') + { $value = "X"; } @@ -3112,7 +3116,6 @@ { $value = ""; } - } } } @@ -3165,15 +3168,13 @@ { $value = getGroupName($entity_id, $module); } - else - { - - $query = "select * from field where tabid=".$tabid." and fieldname='".$fieldname."'"; - $field_result = $adb->query($query); - $list_result_count = $i-1; - - $value = getValue($field_result,$list_result,$fieldname,$focus,$module,$entity_id,$list_result_count,"list","",$returnset); - } + else + { + list($uitype, $colname) = get_uitype_colname($tabid, $fieldname); + $list_result_count = $i-1; + + $value = getValue($uitype, $colname,$list_result,$fieldname,$focus,$module,$entity_id,$list_result_count,"list","",$returnset); + } } //Added condition to hide the close symbol in Related Lists // if($relatedlist != '' && $value == "X") @@ -3192,8 +3193,6 @@ } } - } - if($returnset=='') $returnset = '&return_module='.$module.'&return_action=index'; @@ -3226,6 +3225,31 @@ return $list_header; } +function get_uitype_colname($tabid, $fieldname) +{ + static $last_tabid, $res = null; + + if(!is_null($res) && $last_tabid == $tabid) { + return $res[$fieldname]; + } + + global $adb; + $last_tabid = $tabid; + $res = null; + + $query = "select uitype, columnname, fieldname from field where tabid=".$tabid; + $result = $adb->query($query); + $num_rows=$adb->num_rows($result); + for($i=0;$i<$num_rows;$i++) { + $uitype = $adb->query_result($result,$i,"uitype"); + + $colname = $adb->query_result($result,$i,"columnname"); + $thisfieldname = $adb->query_result($result,$i,"fieldname"); + $res[$thisfieldname] = array($uitype, $colname); + } + + return $res[$fieldname]; +} function getSearchListViewEntries($focus, $module,$list_result,$navigation_array) { @@ -3316,11 +3340,10 @@ } else { - $query = "select * from field where tabid=".$tabid." and fieldname='".$fieldname."'"; - $field_result = $adb->query($query); + list($uitype, $colname) = get_uitype_colname($tabid, $fieldname); $list_result_count = $i-1; - $value = getValue($field_result,$list_result,$fieldname,$focus,$module,$entity_id,$list_result_count,"search",$focus->popup_type); + $value = getValue($uitype, $colname,$list_result,$fieldname,$focus,$module,$entity_id,$list_result_count,"search",$focus->popup_type); } } @@ -3334,12 +3357,9 @@ return $list_header; } -function getValue($field_result, $list_result,$fieldname,$focus,$module,$entity_id,$list_result_count,$mode,$popuptype,$returnset='') +function getValue($uitype, $colname, $list_result,$fieldname,$focus,$module,$entity_id,$list_result_count,$mode,$popuptype,$returnset='') { global $adb; - $uitype = $adb->query_result($field_result,0,"uitype"); - - $colname = $adb->query_result($field_result,0,"columnname"); $temp_val = $adb->query_result($list_result,$list_result_count,$colname); if(strlen($temp_val) > 40) From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 14:10:46 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 21:10:46 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23744=3A_?= =?utf-8?q?Remove_Duplicate_Queries?= In-Reply-To: <076.e0aa545b1227d61b497ea30577e03c97@vtiger.fosslabs.com> References: <076.e0aa545b1227d61b497ea30577e03c97@vtiger.fosslabs.com> Message-ID: <085.37df1e42b6a9dcf7babbacd44e06e8af@vtiger.fosslabs.com> #744: Remove Duplicate Queries ------------------------+--------------------------------------------------- Reporter: allanbush | Owner: allanbush Type: task | Status: new Priority: minor | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc3 Resolution: | Keywords: optimization database ------------------------+--------------------------------------------------- Comment (by allanbush): (In [5366]) Cached requests for user id. Refs #744. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 14:10:47 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 21:10:47 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5366 - /vtigercrm/branches/4.2/include/utils.php Message-ID: <20060425211047.CDFAF3FC421@vtiger.fosslabs.com> Author: allanbush Date: Tue Apr 25 15:10:44 2006 New Revision: 5366 Log: Cached requests for user id. Refs #744. Modified: vtigercrm/branches/4.2/include/utils.php Modified: vtigercrm/branches/4.2/include/utils.php ============================================================================== --- vtigercrm/branches/4.2/include/utils.php (original) +++ vtigercrm/branches/4.2/include/utils.php Tue Apr 25 15:10:44 2006 @@ -4034,11 +4034,15 @@ function getUserId($record) { + static $cache = array(); + if(isset($cache[$record])) return $cache[$record]; + global $vtlog; $vtlog->logthis("in getUserId ".$record,'info'); global $adb; - $user_id=$adb->query_result($adb->query("select * from crmentity where crmid = ".$record),0,'smownerid'); + $user_id=$adb->query_result($adb->query("select smownerid from crmentity where crmid = ".$record),0,'smownerid'); + $cache[$record] = $user_id; return $user_id; } From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 15:05:39 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 22:05:39 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23744=3A_?= =?utf-8?q?Remove_Duplicate_Queries?= In-Reply-To: <076.e0aa545b1227d61b497ea30577e03c97@vtiger.fosslabs.com> References: <076.e0aa545b1227d61b497ea30577e03c97@vtiger.fosslabs.com> Message-ID: <085.f822b282dd4e46d0e0c2a57d9384a63c@vtiger.fosslabs.com> #744: Remove Duplicate Queries ------------------------+--------------------------------------------------- Reporter: allanbush | Owner: allanbush Type: task | Status: new Priority: minor | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc3 Resolution: | Keywords: optimization database ------------------------+--------------------------------------------------- Comment (by allanbush): (In [5367]) Added a seperate query set for the mini calendar, reducing it to 3 queries (from 3 per day). Refs #744. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 15:05:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 22:05:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5367 - in /vtigercrm/branches/4.2/modules/Calendar: appointment.pinc minical.php Message-ID: <20060425220541.5918F6E4A9C@vtiger.fosslabs.com> Author: allanbush Date: Tue Apr 25 16:05:36 2006 New Revision: 5367 Log: Added a seperate query set for the mini calendar, reducing it to 3 queries (from 3 per day). Refs #744. Modified: vtigercrm/branches/4.2/modules/Calendar/appointment.pinc vtigercrm/branches/4.2/modules/Calendar/minical.php Modified: vtigercrm/branches/4.2/modules/Calendar/appointment.pinc ============================================================================== --- vtigercrm/branches/4.2/modules/Calendar/appointment.pinc (original) +++ vtigercrm/branches/4.2/modules/Calendar/appointment.pinc Tue Apr 25 16:05:36 2006 @@ -2048,57 +2048,7 @@ } unset($o); } - //} - // - - /* # - # First query ( non repeating appointments ) - # - $q = "SELECT * FROM ". $this->tablename." WHERE "; - $q .= " ("; - if(!is_admin($current_user)) - { - $q .= " ( "; - } - $q .= " (a_start < ". $x2 ." AND a_start >= ". $x1 .")"; - $q .= " OR (a_end < ". $x2 ." AND a_end >= ". $x1 .")"; - $q .= " OR (a_start < ". $x1 ." AND a_end >= ". $x2 .")"; - if(!is_admin($current_user)) - { - $q .= " ) AND ( creator = '".$current_user->id."' ) "; - } - $q .= " )"; - $q .= " ORDER by a_start"; - - //print("GS --> allowed ".is_admin($current_user)." q=".$q); - # always at the end of query - # check_dbacl( $q, $current_user->id); - - // srini cal appoint - $r = $this->db->query($q); - $n = $this->db->getRowCount($r); - $a = 0; - //print("GS --> ".$n." q=".$q); - while ( $a < $n ) - { - - $o = &new appointment(); - $result = mysql_fetch_assoc($r); - //$o->read_result($r,$a); - $o->read_result($result); - $a++; - if ( $o->see_ok() ) - { */ - /* Get all participants */ - /* //$o->read_participants(); - //print("GS --> see"); - $obj->callist[$o->id] = &$o; - } - unset($o); - } - //$r->free(); - - */ + $x = new DateTime(); $x->setDateTimeTS($from->ts); @@ -2114,72 +2064,100 @@ $ymd .= $pre ."'". Date("j/n",$x->getTimeStamp()) ."'"; $x->addDays(1); } - # - # Second query ( repeating appointments w/o end ) - # - /* $q = "SELECT c.* FROM ". $obj->dbconn->prefix .$table['appointment1'][name]." c WHERE "; - $q .= " r_ignore = 1 AND ("; - $q .= " ( repeat = 1 AND r_arg in (". $wd .") )"; - $q .= " OR ( repeat = 2 AND r_arg in (". $md .") )"; - $q .= " OR ( repeat = 3 AND r_arg in (". $ymd .") )"; - $q .= " OR ( repeat = 4 )"; - $q .= " ) AND ( a_start <= ". $x2 ." )"; - $q .= ""; - $q .= " ORDER by a_start"; - - */ - # always at the end of query - # check_dbacl( $q, $current_user->id); - - # $r = $obj->dbconn->Exec($q); - # $n = $r->numrows(); - # $a = 0; - # while ( $a < $n ) { - # $o = &new appointment($obj->dbconn); - # $o->read_result($r,$a); - # $a++; - # if ( $o->see_ok() ) { - /* Get all participants */ - # $o->read_participants(); - # $obj->callist[$o->id] = &$o; - # } - # unset($o); - # } - # $r->free(); - - # - # Third query ( repeating appointments with end ) - # - /* $q = "SELECT c.* FROM ". $obj->dbconn->prefix .$table['appointment1'][name]." c WHERE "; - $q .= " r_ignore = 0 AND ("; - $q .= " ( repeat = 1 AND r_arg in (". $wd .") )"; - $q .= " OR ( repeat = 2 AND r_arg in (". $md .") )"; - $q .= " OR ( repeat = 3 AND r_arg in (". $ymd .") )"; - $q .= " OR ( repeat = 4 )"; - $q .= ") AND ( (a_start < ". $x2 ." AND a_start >= ". $x1 .")"; - $q .= " OR (a_end < ". $x2 ." AND a_end >= ". $x1 .")"; - $q .= " OR (a_start < ". $x1 ." AND a_end >= ". $x2 .")"; - $q .= ")"; - $q .= " ORDER by a_start"; - */ - # $r = $obj->dbconn->Exec($q); - # $n = $r->numrows(); - # $a = 0; - # while ( $a < $n ) { - # $o = &new appointment($obj->dbconn); - # $o->read_result($r,$a); - # $a++; - # if ( $o->see_ok() ) { - /* Get all participants */ - # $o->read_participants(); - # $obj->callist[$o->id] = &$o; - # } - # unset($o); - # } - # $r->free(); return; } + + /** faster version of readCal which caches it's results and only returns the + * number of events on a given day + */ + function scanCal($from, $to) { + static $res = null; + global $msg, $current_user; + + $from = date("Y-m-d", $from); + $to = date("Y-m-d", $to); + + if(!is_null($res)) return $res[$from]; + + $res = array(); + + $q = "SELECT activity.date_start, count(*) AS count + FROM activity + INNER JOIN crmentity + ON activity.activityid = crmentity.crmid + INNER JOIN salesmanactivityrel + ON salesmanactivityrel.activityid=activity.activityid + WHERE activity.activitytype in ('Call','Meeting') + AND activity.date_start < '". $to ."' + AND activity.date_start >= '". $from."' + AND (activity.date_start like (activity.due_date) + OR (activity.date_start != null )) + AND crmentity.smownerid ='".$current_user->id."' + AND salesmanactivityrel.smid = '".$current_user->id."' + AND crmentity.deleted = 0 + GROUP BY activity.date_start"; + $r = $this->db->query($q); + $n = $this->db->getRowCount($r); + for($i=0; $i<$n; $i++) { + $date = $this->db->query_result($r, $i, 'date_start'); + $count = $this->db->query_result($r, $i, 'count'); + $res[$date] = $count; + } + + $q = "SELECT activity.date_start, count(*) AS count + FROM activity + INNER JOIN crmentity + ON activity.activityid = crmentity.crmid + INNER JOIN recurringevents + ON activity.activityid = recurringevents.activityid + INNER JOIN salesmanactivityrel + ON salesmanactivityrel.activityid = activity.activityid + WHERE activity.activitytype in ('Call','Meeting') + AND recurringdate < '". $to ."' + AND recurringdate >= '". $from."' + AND crmentity.smownerid ='".$current_user->id."' + AND salesmanactivityrel.smid = '".$current_user->id."' + AND crmentity.deleted = 0 + AND crmentity.deleted = 0 + GROUP BY activity.date_start"; + $r = $this->db->query($q); + $n = $this->db->getRowCount($r); + for($i=0; $i<$n; $i++) { + $date = $this->db->query_result($r, $i, 'date_start'); + $count = $this->db->query_result($r, $i, 'count'); + $res[$date] += $count; + } + + $q = "SELECT activity.date_start, count(*) AS count + FROM activity + INNER JOIN crmentity + ON activity.activityid = crmentity.crmid + INNER JOIN salesmanactivityrel + ON salesmanactivityrel.activityid=activity.activityid + INNER JOIN activitygrouprelation + ON activitygrouprelation.activityid=activity.activityid + INNER JOIN users2group + ON users2group.groupname=activitygrouprelation.groupname + WHERE activity.activitytype in ('Call','Meeting') + AND activity.date_start < '". $to ."' + AND activity.date_start >= '". $from."' + AND (activity.date_start like (activity.due_date) + OR (activity.date_start != null )) + AND crmentity.smownerid=0 + AND users2group.userid=".$current_user->id." + AND crmentity.deleted = 0 + GROUP BY activity.date_start"; + $r = $this->db->query($q); + $n = $this->db->getRowCount($r); + for($i=0; $i<$n; $i++) { + $date = $this->db->query_result($r, $i, 'date_start'); + $count = $this->db->query_result($r, $i, 'count'); + $res[$date] += $count; + } + return $res[$from]; + } + /** * get the help index */ Modified: vtigercrm/branches/4.2/modules/Calendar/minical.php ============================================================================== --- vtigercrm/branches/4.2/modules/Calendar/minical.php (original) +++ vtigercrm/branches/4.2/modules/Calendar/minical.php Tue Apr 25 16:05:36 2006 @@ -139,6 +139,9 @@ $today=Date("Ymd",time()); /* Back to last weekstart before ts */ +$te = $ts + 86400*31; +$app = new appointment(); +$app->scanCal($ts, $te); while ( Date("w",$ts) != $current_user->weekstart ) { $ts -= 86400; } @@ -203,10 +206,7 @@ $to->setDateTimeTS($ts - 12 * 3600); #$to->addDays(7); - $pref->callist = array(); - $app = new appointment(); - $app->readCal($pref,$from,$to); - // appointment::readCal($pref,$from,$to); + $app_count = $app->scanCal($ts, $te); $dd = new DateTime(); # $d = strftime($lang['DateFormatStr'],$ts); @@ -214,7 +214,7 @@ $d = $dd->getDate(); $tref = Date("Ymd",$ts); $eventclass=$col; - if(count($pref->callist)!=0) + if($app_count > 0) { //Classes are provided when events are created - Jaguar if($col == "today") From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 15:17:51 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 22:17:51 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23744=3A_?= =?utf-8?q?Remove_Duplicate_Queries?= In-Reply-To: <076.e0aa545b1227d61b497ea30577e03c97@vtiger.fosslabs.com> References: <076.e0aa545b1227d61b497ea30577e03c97@vtiger.fosslabs.com> Message-ID: <085.35f64f58a872a36ee59234617baab9b6@vtiger.fosslabs.com> #744: Remove Duplicate Queries ------------------------+--------------------------------------------------- Reporter: allanbush | Owner: allanbush Type: task | Status: new Priority: minor | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc3 Resolution: | Keywords: optimization database ------------------------+--------------------------------------------------- Comment (by allanbush): (In [5368]) Caching of ticket's related to information. Refs #744. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 15:17:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 22:17:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5368 - /vtigercrm/branches/4.2/modules/HelpDesk/ListTickets.php Message-ID: <20060425221752.9AC5D6E50D3@vtiger.fosslabs.com> Author: allanbush Date: Tue Apr 25 16:17:49 2006 New Revision: 5368 Log: Caching of ticket's related to information. Refs #744. Modified: vtigercrm/branches/4.2/modules/HelpDesk/ListTickets.php Modified: vtigercrm/branches/4.2/modules/HelpDesk/ListTickets.php ============================================================================== --- vtigercrm/branches/4.2/modules/HelpDesk/ListTickets.php (original) +++ vtigercrm/branches/4.2/modules/HelpDesk/ListTickets.php Tue Apr 25 16:17:49 2006 @@ -148,6 +148,9 @@ function getParentLink($parent_id) { + static $res = array(); + if(isset($res[$parent_id])) return $res[$parent_id]; + global $adb; $sql = "select setype from crmentity where crmid=".$parent_id; @@ -156,8 +159,9 @@ if($parent_module == 'Contacts') { $sql = "select firstname,lastname from contactdetails where contactid=".$parent_id; - $parentname = $adb->query_result($adb->query($sql),0,'firstname'); - $parentname .= ' '.$adb->query_result($adb->query($sql),0,'lastname'); + $result = $adb->query($sql); + $parentname = $adb->query_result($result,0,'firstname'); + $parentname .= ' '.$adb->query_result($result,0,'lastname'); $parent_name = ''.$parentname.''; } if($parent_module == 'Accounts') @@ -167,6 +171,7 @@ $parent_name = ''.$parentname.''; } + $res[$parent_id] = $parent_name; return $parent_name; } From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 15:24:44 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 22:24:44 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23744=3A_?= =?utf-8?q?Remove_Duplicate_Queries?= In-Reply-To: <076.e0aa545b1227d61b497ea30577e03c97@vtiger.fosslabs.com> References: <076.e0aa545b1227d61b497ea30577e03c97@vtiger.fosslabs.com> Message-ID: <085.0dd1a53777425ec923c4ff69bf748fd8@vtiger.fosslabs.com> #744: Remove Duplicate Queries ------------------------+--------------------------------------------------- Reporter: allanbush | Owner: allanbush Type: task | Status: new Priority: minor | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc3 Resolution: | Keywords: optimization database ------------------------+--------------------------------------------------- Comment (by allanbush): (In [5369]) Caching currency information. Refs #744. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 15:24:45 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 22:24:45 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5369 - /vtigercrm/branches/4.2/include/utils.php Message-ID: <20060425222445.BC4FC3FC42A@vtiger.fosslabs.com> Author: allanbush Date: Tue Apr 25 16:24:41 2006 New Revision: 5369 Log: Caching currency information. Refs #744. Modified: vtigercrm/branches/4.2/include/utils.php Modified: vtigercrm/branches/4.2/include/utils.php ============================================================================== --- vtigercrm/branches/4.2/include/utils.php (original) +++ vtigercrm/branches/4.2/include/utils.php Tue Apr 25 16:24:41 2006 @@ -4274,6 +4274,9 @@ function getDisplayCurrency() { + static $disp_curr = ''; + if($disp_curr) return $disp_curr; + global $adb; $sql1 = "select * from currency_info"; $result = $adb->query($sql1); @@ -4285,6 +4288,9 @@ function getCurrencySymbol() { + static $curr_symbol = ''; + if($curr_symbol) return $curr_symbol; + global $adb; $sql1 = "select * from currency_info"; $result = $adb->query($sql1); From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 15:42:06 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 22:42:06 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23744=3A_?= =?utf-8?q?Remove_Duplicate_Queries?= In-Reply-To: <076.e0aa545b1227d61b497ea30577e03c97@vtiger.fosslabs.com> References: <076.e0aa545b1227d61b497ea30577e03c97@vtiger.fosslabs.com> Message-ID: <085.9f576f5b00892a0de5ce66832b522d42@vtiger.fosslabs.com> #744: Remove Duplicate Queries ------------------------+--------------------------------------------------- Reporter: allanbush | Owner: allanbush Type: task | Status: new Priority: minor | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc3 Resolution: | Keywords: optimization database ------------------------+--------------------------------------------------- Comment (by allanbush): That's all I've found that looks worth fixing. I'll leave this open for a while to see if anyone else identifies some more redundant queries. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 23:44:07 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 06:44:07 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23745=3A_?= =?utf-8?q?New_=3CRecord=3E_Dorp-down_list_Change_Plural_to_Singular_form?= Message-ID: <076.c63c672b5c93dac045b955a9741b350d@vtiger.fosslabs.com> #745: New Dorp-down list Change Plural to Singular form -----------------------+---------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- In New Drop downlist, we have New Leads, New Contacts, New ... etc. All in plural form. It is better to change them to singular form i.e. '''New Lead''', '''New Contact''', etc. because only one record can be create at in single click. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 23:47:14 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 06:47:14 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23746=3A_?= =?utf-8?q?New_=3CRecord=3E_-_Handling_Tickets_and_FAQ?= Message-ID: <076.8a974f855c1ae2b8ba9418701ef5c2f7@vtiger.fosslabs.com> #746: New - Handling Tickets and FAQ -----------------------+---------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- We have Tickets and FAQ as a separate modules, but these two are put under "New HelpDesk". It is better to have New Ticket and New FAQ separately rather "New HelpDesk" Please get back to me if you need any clarifications. Thanks, Gopal -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 23:50:46 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 06:50:46 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23747=3A_?= =?utf-8?q?Handling_=3CNew=3ERecord=3A_Tasks_and_Events?= Message-ID: <076.2ad5054a596cd3d9eadad40186d30945@vtiger.fosslabs.com> #747: Handling Record: Tasks and Events -----------------------+---------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- We have Tasks and Events as a separate modules, but these two are put under "New Activities". It is better to have New Task and New Event separately rather "New Activities" Please get back to me if you need any clarifications. Thanks, Gopal -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 02:57:21 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 09:57:21 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23180=3A_?= =?utf-8?q?Basic_Search_fields_are_not_displayed_properly?= In-Reply-To: <076.5723a65820487e4af009b16310c3bc3d@vtiger.fosslabs.com> References: <076.5723a65820487e4af009b16310c3bc3d@vtiger.fosslabs.com> Message-ID: <085.9b48c419e131c20c4081cbd99b75c6a0@vtiger.fosslabs.com> #180: Basic Search fields are not displayed properly ------------------------+--------------------------------------------------- Reporter: don | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by saraj): * resolution: => fixed * status: new => closed Comment: (In [5370]) Search criteria and customview are retained after sorting in listview. Fixes #160and #180, and refs #160 -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 02:57:20 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 09:57:20 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23160=3A_?= =?utf-8?q?Sorting_not_working_in_search_List_view?= In-Reply-To: <076.dedd4d04a6dca9a90288861822f7ca9a@vtiger.fosslabs.com> References: <076.dedd4d04a6dca9a90288861822f7ca9a@vtiger.fosslabs.com> Message-ID: <085.4d28cb2c47421e6e6cadf780b4b42d47@vtiger.fosslabs.com> #160: Sorting not working in search List view ------------------------+--------------------------------------------------- Reporter: don | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by saraj): * resolution: => fixed * status: new => closed Comment: (In [5370]) Search criteria and customview are retained after sorting in listview. Fixes #160and #180, and refs #160 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 26 02:57:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 26 Apr 2006 09:57:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5370 - in /vtigercrm/trunk: include/utils/SearchUtils.php modules/Leads/ListView.php Message-ID: <20060426095721.C7F076E6494@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 26 03:57:11 2006 New Revision: 5370 Log: Search criteria and customview are retained after sorting in listview. Fixes #160and #180, and refs #160 Modified: vtigercrm/trunk/include/utils/SearchUtils.php vtigercrm/trunk/modules/Leads/ListView.php Modified: vtigercrm/trunk/include/utils/SearchUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/SearchUtils.php (original) +++ vtigercrm/trunk/include/utils/SearchUtils.php Wed Apr 26 03:57:11 2006 @@ -182,7 +182,7 @@ function Search($module) { - + $url_string=''; if(isset($_REQUEST['search_field']) && $_REQUEST['search_field'] !="") { $search_column=$_REQUEST['search_field']; @@ -207,8 +207,8 @@ else //Global Search { } - - return $where; + $url_string = "&search_field=".$search_column."&search_text=".$search_string."&searchtype=BasicSearch"; + return $where."#@@#".$url_string; } } @@ -410,14 +410,14 @@ if($_REQUEST['searchtype']=='advance') { $adv_string=''; + $url_string=''; if(isset($_REQUEST['search_cnt'])) $tot_no_criteria = $_REQUEST['search_cnt']; if($_REQUEST['matchtype'] == 'all') $matchtype = "and"; else $matchtype = "or"; - - for($i=0; $i<=$tot_no_criteria; $i++) + for($i=0; $i<$tot_no_criteria; $i++) { if($i == $tot_no_criteria-1) $matchtype= ""; @@ -429,6 +429,7 @@ $tab_col = str_replace('\'','',stripslashes($_REQUEST[$table_colname])); $srch_cond = str_replace('\'','',stripslashes($_REQUEST[$search_condition])); $srch_val = $_REQUEST[$search_value]; + $url_string .="&Fields".$i."=".$tab_col."&Condition".$i."=".$srch_cond."&Srch_value".$i."=".$srch_val; if($tab_col == "crmentity.smownerid") { $adv_string .= " (".getSearch_criteria($srch_cond,$srch_val,'users.user_name')." or"; @@ -439,7 +440,7 @@ $adv_string .= " ".getSearch_criteria($srch_cond,$srch_val,$tab_col)." ".$matchtype; } } - $where=$adv_string; + $where=$adv_string."#@@#".$url_string."&searchtype=advance&search_cnt=".$tot_no_criteria."&matchtype=".$_REQUEST['matchtype']; } else { Modified: vtigercrm/trunk/modules/Leads/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Leads/ListView.php (original) +++ vtigercrm/trunk/modules/Leads/ListView.php Wed Apr 26 03:57:11 2006 @@ -67,9 +67,9 @@ if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { - $where = getWhereCondition($currentModule); + list($where, $ustring) = split("#@@#",getWhereCondition($currentModule)); // we have a query - $url_string .="&query=true"; + $url_string .="&query=true".$ustring; $log->info("Here is the where clause for the list view: $where"); } From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 03:01:37 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 10:01:37 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23633=3A_?= =?utf-8?q?unInstallation_issue?= In-Reply-To: <076.51f5249c35374c687a3ee4d97ec59ede@vtiger.fosslabs.com> References: <076.51f5249c35374c687a3ee4d97ec59ede@vtiger.fosslabs.com> Message-ID: <085.7fba6f2cb6362a9d10f4692efcf20de6@vtiger.fosslabs.com> #633: unInstallation issue ------------------------+--------------------------------------------------- Reporter: mickie | Owner: richie Type: defect | Status: new Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.1 Resolution: | Keywords: install ------------------------+--------------------------------------------------- Changes (by richie): * priority: critical => minor * version: 5.0.0 => 5.0.1 * owner: developer => richie Comment: will not be handled for v5. Richie -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 26 03:18:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 26 Apr 2006 10:18:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5371 - /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Message-ID: <20060426101848.5093B6AB388@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 26 04:18:44 2006 New Revision: 5371 Log: * Modified the purchase order relatedlist label for vendors which do not show the Products in vendor relatedlist Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php ============================================================================== --- vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php (original) +++ vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Wed Apr 26 04:18:44 2006 @@ -2619,6 +2619,10 @@ $update_query3 = "update currency_info set conversion_rate=1, currency_status='Active', defaultid='-11' where id=1"; Execute($update_query3); +$update_query4 = "update relatedlists set label='Purchase Order' where tabid=18 and name='get_purchase_orders'"; +Execute($update_query4); + + //Added to get the conversion rate and update for all records //include("modules/Migration/ModifyDatabase/updateCurrency.php"); ?> From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 03:20:37 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 10:20:37 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23679=3A_?= =?utf-8?q?Migration_Issues_-_Exceptions_Thrown_in_Vendors?= In-Reply-To: <076.2af5095a13ae186cfdfff0e886a79dc2@vtiger.fosslabs.com> References: <076.2af5095a13ae186cfdfff0e886a79dc2@vtiger.fosslabs.com> Message-ID: <085.35aeb2b19436caa8763a19f88d16d1fa@vtiger.fosslabs.com> #679: Migration Issues - Exceptions Thrown in Vendors ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * status: assigned => closed Comment: This issue has been fixed and has been checkedin in the svn -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 03:31:46 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 10:31:46 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23160=3A_?= =?utf-8?q?Sorting_not_working_in_search_List_view?= In-Reply-To: <076.dedd4d04a6dca9a90288861822f7ca9a@vtiger.fosslabs.com> References: <076.dedd4d04a6dca9a90288861822f7ca9a@vtiger.fosslabs.com> Message-ID: <085.017a669caca209983ee36aad04c6e003@vtiger.fosslabs.com> #160: Sorting not working in search List view ------------------------+--------------------------------------------------- Reporter: don | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Comment (by saraj): (In [5372]) Search criteria and customview are retained after sorting in listview for all modules. Fixes #160and #180, and refs #160 -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 03:31:47 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 10:31:47 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23180=3A_?= =?utf-8?q?Basic_Search_fields_are_not_displayed_properly?= In-Reply-To: <076.5723a65820487e4af009b16310c3bc3d@vtiger.fosslabs.com> References: <076.5723a65820487e4af009b16310c3bc3d@vtiger.fosslabs.com> Message-ID: <085.6946104fbe956a68a7d33f01586379f1@vtiger.fosslabs.com> #180: Basic Search fields are not displayed properly ------------------------+--------------------------------------------------- Reporter: don | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Comment (by saraj): (In [5372]) Search criteria and customview are retained after sorting in listview for all modules. Fixes #160and #180, and refs #160 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 26 03:31:47 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 26 Apr 2006 10:31:47 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5372 - in /vtigercrm/trunk/modules: Accounts/ Activities/ Campaigns/ Contacts/ Faq/ HelpDesk/ Invoice/ Notes/ Potentials/ PriceBooks/ Products/ PurchaseOrder/ Quotes/ SalesOrder/ Vendors/ Message-ID: <20060426103147.B5CEB6E67EA@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 26 04:31:23 2006 New Revision: 5372 Log: Search criteria and customview are retained after sorting in listview for all modules. Fixes #160and #180, and refs #160 Modified: vtigercrm/trunk/modules/Accounts/ListView.php vtigercrm/trunk/modules/Activities/ListView.php vtigercrm/trunk/modules/Campaigns/ListView.php vtigercrm/trunk/modules/Contacts/ListView.php vtigercrm/trunk/modules/Faq/ListView.php vtigercrm/trunk/modules/HelpDesk/ListView.php vtigercrm/trunk/modules/Invoice/ListView.php vtigercrm/trunk/modules/Notes/ListView.php vtigercrm/trunk/modules/Potentials/ListView.php vtigercrm/trunk/modules/PriceBooks/ListView.php vtigercrm/trunk/modules/Products/ListView.php vtigercrm/trunk/modules/PurchaseOrder/ListView.php vtigercrm/trunk/modules/Quotes/ListView.php vtigercrm/trunk/modules/SalesOrder/ListView.php vtigercrm/trunk/modules/Vendors/ListView.php Modified: vtigercrm/trunk/modules/Accounts/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/ListView.php (original) +++ vtigercrm/trunk/modules/Accounts/ListView.php Wed Apr 26 04:31:23 2006 @@ -63,10 +63,11 @@ $smarty->assign("CHANGE_OWNER",getUserslist()); if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { - $where = getWhereCondition($currentModule); + list($where, $ustring) = split("#@@#",getWhereCondition($currentModule)); // we have a query - $url_string .="&query=true"; + $url_string .="&query=true".$ustring; $log->info("Here is the where clause for the list view: $where"); + } if($viewid != 0) { Modified: vtigercrm/trunk/modules/Activities/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Activities/ListView.php (original) +++ vtigercrm/trunk/modules/Activities/ListView.php Wed Apr 26 04:31:23 2006 @@ -64,12 +64,11 @@ if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { - $where=getWhereCondition($currentModule); + + list($where, $ustring) = split("#@@#",getWhereCondition($currentModule)); // we have a query - $url_string .="&query=true"; - + $url_string .="&query=true".$ustring; $log->info("Here is the where clause for the list view: $where"); - } Modified: vtigercrm/trunk/modules/Campaigns/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/ListView.php (original) +++ vtigercrm/trunk/modules/Campaigns/ListView.php Wed Apr 26 04:31:23 2006 @@ -49,16 +49,10 @@ if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { - $where=getWhereCondition($currentModule); - - $url_string .="&query=true"; - -/* if (isset($_REQUEST['campaignid'])) $campaignid = $_REQUEST['campaignid']; - if (isset($_REQUEST['campaignname'])) $campaignname = $_REQUEST['campaignname']; - if (isset($_REQUEST['campaigntype'])) $campaigntype = $_REQUEST['campaigntype']; - if (isset($_REQUEST['campaignstatus'])) $campaignstatus = $_REQUEST['campaignstatus']; - if (isset($_REQUEST['current_user_only'])) $current_user_only = $_REQUEST['current_user_only']; -*/ + list($where, $ustring) = split("#@@#",getWhereCondition($currentModule)); + // we have a query + $url_string .="&query=true".$ustring; + $log->info("Here is the where clause for the list view: $where"); } //<<<>>>>>> Modified: vtigercrm/trunk/modules/Contacts/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/ListView.php (original) +++ vtigercrm/trunk/modules/Contacts/ListView.php Wed Apr 26 04:31:23 2006 @@ -54,11 +54,13 @@ if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { + list($where, $ustring) = split("#@@#",getWhereCondition($currentModule)); // we have a query - $url_string .="&query=true"; - $where=getWhereCondition($currentModule); + $url_string .="&query=true".$ustring; + $log->info("Here is the where clause for the list view: $where"); + //Added for Custom Field Search -$sql="select * from field where tablename='contactscf' order by fieldlabel"; +/*$sql="select * from field where tablename='contactscf' order by fieldlabel"; $result=$adb->query($sql); for($i=0;$i<$adb->num_rows($result);$i++) { @@ -81,8 +83,7 @@ } //upto this added for Custom Field - $log->info("Here is the where clause for the list view: $where"); - +*/ } //<<<>>>>>> Modified: vtigercrm/trunk/modules/Faq/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Faq/ListView.php (original) +++ vtigercrm/trunk/modules/Faq/ListView.php Wed Apr 26 04:31:23 2006 @@ -71,7 +71,10 @@ $list_query = getListQuery("Faq"); if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { - $where=Search($currentModule); + list($where, $ustring) = split("#@@#",getWhereCondition($currentModule)); + // we have a query + $url_string .="&query=true".$ustring; + $log->info("Here is the where clause for the list view: $where"); } if(isset($where) && $where != '') { Modified: vtigercrm/trunk/modules/HelpDesk/ListView.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/ListView.php (original) +++ vtigercrm/trunk/modules/HelpDesk/ListView.php Wed Apr 26 04:31:23 2006 @@ -53,18 +53,11 @@ if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { - $where=Search($currentModule); - $url_string .="&query=true"; - - if (isset($_REQUEST['ticket_title'])) $name = $_REQUEST['ticket_title']; - if (isset($_REQUEST['ticket_id'])) $ticket_id_val = $_REQUEST['ticket_id']; - if (isset($_REQUEST['contact_name'])) $contact_name = $_REQUEST['contact_name']; - if (isset($_REQUEST['priority'])) $priority = $_REQUEST['priority']; - if (isset($_REQUEST['status'])) $status = $_REQUEST['status']; - if (isset($_REQUEST['category'])) $category = $_REQUEST['category']; - if (isset($_REQUEST['date'])) $date = $_REQUEST['date']; - if (isset($_REQUEST['current_user_only'])) $current_user_only = $_REQUEST['current_user_only']; - + list($where, $ustring) = split("#@@#",getWhereCondition($currentModule)); + // we have a query + $url_string .="&query=true".$ustring; + $log->info("Here is the where clause for the list view: $where"); + } //<<<>>>>>> Modified: vtigercrm/trunk/modules/Invoice/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/ListView.php (original) +++ vtigercrm/trunk/modules/Invoice/ListView.php Wed Apr 26 04:31:23 2006 @@ -54,11 +54,11 @@ if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { - $where=Search($currentModule); + list($where, $ustring) = split("#@@#",getWhereCondition($currentModule)); // we have a query - $url_string .="&query=true"; - + $url_string .="&query=true".$ustring; $log->info("Here is the where clause for the list view: $where"); + } //<<<>>>>>> Modified: vtigercrm/trunk/modules/Notes/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Notes/ListView.php (original) +++ vtigercrm/trunk/modules/Notes/ListView.php Wed Apr 26 04:31:23 2006 @@ -77,10 +77,9 @@ if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { - $where=Search($currentModule); + list($where, $ustring) = split("#@@#",getWhereCondition($currentModule)); // we have a query - $url_string .="&query=true"; - + $url_string .="&query=true".$ustring; $log->info("Here is the where clause for the list view: $where"); } Modified: vtigercrm/trunk/modules/Potentials/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/ListView.php (original) +++ vtigercrm/trunk/modules/Potentials/ListView.php Wed Apr 26 04:31:23 2006 @@ -56,15 +56,13 @@ if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { + list($where, $ustring) = split("#@@#",getWhereCondition($currentModule)); // we have a query - $url_string .="&query=true"; - - //Call for search function - Jaguar - $where=Search($currentModule); - - + $url_string .="&query=true".$ustring; + $log->info("Here is the where clause for the list view: $where"); + //Added for Custom Field Search - $sql="select * from field where tablename='potentialscf' order by fieldlabel"; +/* $sql="select * from field where tablename='potentialscf' order by fieldlabel"; $result=$adb->query($sql); for($i=0;$i<$adb->num_rows($result);$i++) { @@ -86,8 +84,7 @@ } } - $log->info("Here is the where clause for the list view: $where"); - +*/ } //<<<>>>>>> Modified: vtigercrm/trunk/modules/PriceBooks/ListView.php ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/ListView.php (original) +++ vtigercrm/trunk/modules/PriceBooks/ListView.php Wed Apr 26 04:31:23 2006 @@ -52,14 +52,11 @@ if(isset($_REQUEST['query']) && $_REQUEST['query'] != '' && $_REQUEST['query'] == 'true') { - $where=Search($currentModule); - - $url_string .="&query=true"; - if (isset($_REQUEST['bookname'])) $bookname = $_REQUEST['bookname']; - if (isset($_REQUEST['active'])) $active = $_REQUEST['active']; - + list($where, $ustring) = split("#@@#",getWhereCondition($currentModule)); + // we have a query + $url_string .="&query=true".$ustring; $log->info("Here is the where clause for the list view: $where"); - + } //<<<>>>>>> Modified: vtigercrm/trunk/modules/Products/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Products/ListView.php (original) +++ vtigercrm/trunk/modules/Products/ListView.php Wed Apr 26 04:31:23 2006 @@ -58,22 +58,10 @@ if(isset($_REQUEST['query']) && $_REQUEST['query'] != '' && $_REQUEST['query'] == 'true') { - $where=Search($currentModule); - - $url_string .="&query=true"; - - if (isset($_REQUEST['productname'])) $productname = $_REQUEST['productname']; - if (isset($_REQUEST['productcode'])) $productcode = $_REQUEST['productcode']; - if (isset($_REQUEST['commissionrate'])) $commissionrate = $_REQUEST['commissionrate']; - if (isset($_REQUEST['qtyperunit'])) $qtyperunit = $_REQUEST['qtyperunit']; - if (isset($_REQUEST['unitprice'])) $unitprice = $_REQUEST['unitprice']; - if (isset($_REQUEST['manufacturer'])) $manufacturer = $_REQUEST['manufacturer']; - if (isset($_REQUEST['productcategory'])) $productcategory = $_REQUEST['productcategory']; - if (isset($_REQUEST['start_date'])) $start_date = $_REQUEST['start_date']; - if (isset($_REQUEST['expiry_date'])) $expiry_date = $_REQUEST['expiry_date']; - if (isset($_REQUEST['purchase_date'])) $purchase_date = $_REQUEST['purchase_date']; - - $log->info("Here is the where clause for the list view: $where"); + list($where, $ustring) = split("#@@#",getWhereCondition($currentModule)); + // we have a query + $url_string .="&query=true".$ustring; + $log->info("Here is the where clause for the list view: $where"); } //<<<>>>>>> Modified: vtigercrm/trunk/modules/PurchaseOrder/ListView.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/ListView.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/ListView.php Wed Apr 26 04:31:23 2006 @@ -54,11 +54,9 @@ if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { - $where=Search($currentModule); - + list($where, $ustring) = split("#@@#",getWhereCondition($currentModule)); // we have a query - $url_string .="&query=true"; - + $url_string .="&query=true".$ustring; $log->info("Here is the where clause for the list view: $where"); } Modified: vtigercrm/trunk/modules/Quotes/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/ListView.php (original) +++ vtigercrm/trunk/modules/Quotes/ListView.php Wed Apr 26 04:31:23 2006 @@ -54,16 +54,9 @@ if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { - $where=Search($currentModule); - + list($where, $ustring) = split("#@@#",getWhereCondition($currentModule)); // we have a query - $url_string .="&query=true"; - - if (isset($_REQUEST['subject'])) $subject = $_REQUEST['subject']; - if (isset($_REQUEST['potentialname'])) $potentialname = $_REQUEST['potentialname']; - if (isset($_REQUEST['quotestage'])) $quotestage = $_REQUEST['quotestage']; - if (isset($_REQUEST['accountname'])) $accountname = $_REQUEST['accountname']; - + $url_string .="&query=true".$ustring; $log->info("Here is the where clause for the list view: $where"); } Modified: vtigercrm/trunk/modules/SalesOrder/ListView.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/ListView.php (original) +++ vtigercrm/trunk/modules/SalesOrder/ListView.php Wed Apr 26 04:31:23 2006 @@ -52,10 +52,13 @@ if(isset($_REQUEST['query']) && $_REQUEST['query'] != '' && $_REQUEST['query'] == 'true') { - $where=Search($currentModule); + + list($where, $ustring) = split("#@@#",getWhereCondition($currentModule)); + // we have a query + $url_string .="&query=true".$ustring; + $log->info("Here is the where clause for the list view: $where"); - $url_string .="&query=true"; - if (isset($_REQUEST['subject'])) $subject = $_REQUEST['subject']; +/* if (isset($_REQUEST['subject'])) $subject = $_REQUEST['subject']; if (isset($_REQUEST['accountname'])) $accountname = $_REQUEST['accountname']; if (isset($_REQUEST['quotename'])) $quotename = $_REQUEST['quotename']; @@ -90,7 +93,7 @@ $where .= " and "; $where .= $clause; } - +*/ $log->info("Here is the where clause for the list view: $where"); Modified: vtigercrm/trunk/modules/Vendors/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Vendors/ListView.php (original) +++ vtigercrm/trunk/modules/Vendors/ListView.php Wed Apr 26 04:31:23 2006 @@ -51,14 +51,9 @@ if(isset($_REQUEST['query']) && $_REQUEST['query'] != '' && $_REQUEST['query'] == 'true') { - $where=Search($currentModule); - - $url_string .="&query=true"; - - if (isset($_REQUEST['vendorname'])) $vendorname = $_REQUEST['vendorname']; - if (isset($_REQUEST['email'])) $email = $_REQUEST['email']; - if (isset($_REQUEST['category'])) $category = $_REQUEST['category']; - + list($where, $ustring) = split("#@@#",getWhereCondition($currentModule)); + // we have a query + $url_string .="&query=true".$ustring; $log->info("Here is the where clause for the list view: $where"); } From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 03:56:27 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 10:56:27 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23427=3A_?= =?utf-8?q?mailserver_details_fails?= In-Reply-To: <076.9e7e654229d664e748d9809d31b4de35@vtiger.fosslabs.com> References: <076.9e7e654229d664e748d9809d31b4de35@vtiger.fosslabs.com> Message-ID: <085.b6caaee3f4d7705a1447b100ec687f12@vtiger.fosslabs.com> #427: mailserver details fails ------------------------+--------------------------------------------------- Reporter: richie | Owner: richie Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: mailserver ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => duplicate * status: new => closed Comment: Duplicate 507 Richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 03:56:57 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 10:56:57 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23163=3A_?= =?utf-8?q?mailserver_details_throws_exception?= In-Reply-To: <076.e8c6a6b2b25f7031e102264397786cd6@vtiger.fosslabs.com> References: <076.e8c6a6b2b25f7031e102264397786cd6@vtiger.fosslabs.com> Message-ID: <085.b33a950deaef2ba4a01e5688bcdf131c@vtiger.fosslabs.com> #163: mailserver details throws exception ------------------------+--------------------------------------------------- Reporter: richie | Owner: ahmed Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: mailserver details ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => duplicate * status: new => closed Comment: Duplicate 507 Richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 03:57:08 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 10:57:08 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23507=3A_?= =?utf-8?q?My_Preference_Page_Error?= In-Reply-To: <076.369b9e9cf241d21998da449131304b7a@vtiger.fosslabs.com> References: <076.369b9e9cf241d21998da449131304b7a@vtiger.fosslabs.com> Message-ID: <085.508b355f12b6981729f4ed7fe804e657@vtiger.fosslabs.com> #507: My Preference Page Error ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by richie): * resolution: => fixed * status: new => closed Comment: (In [5373]) ID is properly passed. Fixes #507 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 26 03:57:08 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 26 Apr 2006 10:57:08 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5373 - /vtigercrm/trunk/Smarty/templates/MailAccountDetailView.tpl Message-ID: <20060426105708.E623C6E69A8@vtiger.fosslabs.com> Author: richie Date: Wed Apr 26 04:57:03 2006 New Revision: 5373 Log: ID is properly passed. Fixes #507 Modified: vtigercrm/trunk/Smarty/templates/MailAccountDetailView.tpl Modified: vtigercrm/trunk/Smarty/templates/MailAccountDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/MailAccountDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/MailAccountDetailView.tpl Wed Apr 26 04:57:03 2006 @@ -26,7 +26,7 @@ - + {* *} @@ -39,7 +39,7 @@
    - - - - - - {foreach key=header item=data from=$ADVBLOCKS} - - - - {foreach key=label item=subdata from=$data} - - {foreach key=mainlabel item=maindata from=$subdata} - {assign var="uitype" value="$maindata[0][0]"} - {assign var="fldlabel" value="$maindata[1][0]"} - {assign var="fldlabel_sel" value="$maindata[1][1]"} - {assign var="fldlabel_combo" value="$maindata[1][2]"} - {assign var="fldname" value="$maindata[2][0]"} - {assign var="fldvalue" value="$maindata[3][0]"} - {assign var="secondvalue" value="$maindata[3][1]"} - - - {if $uitype eq 2} - - - {elseif $uitype eq 11 || $uitype eq 1 || $uitype eq 13 || $uitype eq 7 || $uitype eq 9} - - {if $fldname eq 'tickersymbol' && $MODULE eq 'Accounts'} - - {else} - - {/if} - {elseif $uitype eq 19 || $uitype eq 20} - - - {elseif $uitype eq 21 || $uitype eq 24} - - - {elseif $uitype eq 15 || $uitype eq 16} - - - {elseif $uitype eq 33} - - - - {elseif $uitype eq 53} - - - {elseif $uitype eq 52 || $uitype eq 77} - - - {elseif $uitype eq 51} - {if $MODULE eq 'Accounts'} - {assign var='popuptype' value = 'specific_account_address'} - {else} - {assign var='popuptype' value = 'specific_contact_account_address'} - {/if} - - - - {elseif $uitype eq 50} - - - {elseif $uitype eq 73} - - - - {elseif $uitype eq 75 || $uitype eq 81} - - - {/if} - {elseif $uitype eq 57} - - - - {elseif $uitype eq 80} - - - - {elseif $uitype eq 78} - - - - {elseif $uitype eq 76} - - - - {elseif $uitype eq 17} - - - - {elseif $uitype eq 71 || $uitype eq 72} - - - - {elseif $uitype eq 56} - - {if $fldname eq 'notime' && $ACTIVITY_MODE eq 'Events'} - {if $fldvalue eq 1} - - {else} - - {/if} - {else} - {if $fldvalue eq 1} - - {else} - - {/if} - {/if} - {elseif $uitype eq 23 || $uitype eq 5 || $uitype eq 6} - - - - {elseif $uitype eq 63} - - - - - {elseif $uitype eq 357} - - - - - - - - - - {elseif $uitype eq 59} - - - - {elseif $uitype eq 55} - - - - {elseif $uitype eq 22} - - - - {elseif $uitype eq 69} - - - {else} - {$fldvalue} - {/if} - {elseif $uitype eq 61} - - - - {elseif $uitype eq 30} - - - - {/if} - {/foreach} - - {/foreach} - - {/foreach} From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 02:54:33 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 09:54:33 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23742=3A_?= =?utf-8?q?New_Ticket_screen?= Message-ID: <076.94e6b59f3e5bca0bd95e96ed6e6c80e3@vtiger.fosslabs.com> #742: New Ticket screen -----------------------+---------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: new Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- see screenshot attached -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 02:58:11 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 09:58:11 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23237=3A_?= =?utf-8?q?no_cancel_in_Notification_Scheduler?= In-Reply-To: <076.3524642d79ee15805889640bfe2f7854@vtiger.fosslabs.com> References: <076.3524642d79ee15805889640bfe2f7854@vtiger.fosslabs.com> Message-ID: <085.0ac0a0a6ff9b03a858a795a163212579@vtiger.fosslabs.com> #237: no cancel in Notification Scheduler ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.1 Resolution: fixed | Keywords: notification scheduler ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed Comment: (In [5338]) Cancel button added. Fixes #237 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 02:58:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 09:58:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5338 - /vtigercrm/trunk/Smarty/templates/Settings/EditEmailNotification.tpl Message-ID: <20060425095811.9CDC16D906D@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 03:58:06 2006 New Revision: 5338 Log: Cancel button added. Fixes #237 Modified: vtigercrm/trunk/Smarty/templates/Settings/EditEmailNotification.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings/EditEmailNotification.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/EditEmailNotification.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/EditEmailNotification.tpl Tue Apr 25 03:58:06 2006 @@ -40,6 +40,7 @@ From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 03:02:32 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 10:02:32 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23435=3A_?= =?utf-8?q?able_to_create_a_group_of_users_which_have_roles_too?= In-Reply-To: <076.3a388c4f43cdf08640bcff90db19520c@vtiger.fosslabs.com> References: <076.3a388c4f43cdf08640bcff90db19520c@vtiger.fosslabs.com> Message-ID: <085.e73fcfff1064c06daf395fb1b9105902@vtiger.fosslabs.com> #435: able to create a group of users which have roles too ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: group ------------------------+--------------------------------------------------- Changes (by don): * resolution: => invalid * status: new => closed Comment: This is not an issue. It is how groups work -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 03:07:05 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 10:07:05 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23643=3A_?= =?utf-8?q?DashBoard_not_working?= In-Reply-To: <076.5a765c13a09d13707d5ba6fefc0b886f@vtiger.fosslabs.com> References: <076.5a765c13a09d13707d5ba6fefc0b886f@vtiger.fosslabs.com> Message-ID: <085.55ec231beb663c6b6a265ecc8c2b2123@vtiger.fosslabs.com> #643: DashBoard not working ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: richie Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Dashboard ---------------------------+------------------------------------------------ -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 03:16:33 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 10:16:33 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23643=3A_?= =?utf-8?q?DashBoard_not_working?= In-Reply-To: <076.5a765c13a09d13707d5ba6fefc0b886f@vtiger.fosslabs.com> References: <076.5a765c13a09d13707d5ba6fefc0b886f@vtiger.fosslabs.com> Message-ID: <085.35f4d2be58f052d9430d491d10e0cd35@vtiger.fosslabs.com> #643: DashBoard not working ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: richie Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Dashboard ---------------------------+------------------------------------------------ -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 03:22:43 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 10:22:43 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23684=3A_?= =?utf-8?q?Security_Issue_in_Settings?= In-Reply-To: <076.102ee7f846edab9a85696e865ee56779@vtiger.fosslabs.com> References: <076.102ee7f846edab9a85696e865ee56779@vtiger.fosslabs.com> Message-ID: <085.5994511a75fd80b3b5d9f88fd6188737@vtiger.fosslabs.com> #684: Security Issue in Settings ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: Don Type: defect | Status: closed Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Security ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 03:25:45 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 10:25:45 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23674=3A_?= =?utf-8?q?Security_issue?= In-Reply-To: <076.69b68bee679ae1d33832d7dee1ea1f6f@vtiger.fosslabs.com> References: <076.69b68bee679ae1d33832d7dee1ea1f6f@vtiger.fosslabs.com> Message-ID: <085.9cee6b4eb1fd232d4ad81210c353f96d@vtiger.fosslabs.com> #674: Security issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: Don Type: defect | Status: closed Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Security ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 03:27:31 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 10:27:31 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23672=3A_?= =?utf-8?q?No_Security_for_Merge?= In-Reply-To: <076.7e14cd7ef58df8565de99d9517ad90d6@vtiger.fosslabs.com> References: <076.7e14cd7ef58df8565de99d9517ad90d6@vtiger.fosslabs.com> Message-ID: <085.4157e2aca25649d2179f09efc7e37228@vtiger.fosslabs.com> #672: No Security for Merge ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Security ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 03:31:44 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 10:31:44 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23640=3A_?= =?utf-8?q?Security_not_available_for_QuickCreate?= In-Reply-To: <076.cff216f20ffae325751ccb838d55bb16@vtiger.fosslabs.com> References: <076.cff216f20ffae325751ccb838d55bb16@vtiger.fosslabs.com> Message-ID: <085.d1599ecb928bc2d258790040b6821670@vtiger.fosslabs.com> #640: Security not available for QuickCreate ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: Don Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Security ---------------------------+------------------------------------------------ Changes (by saraj): * resolution: => fixed * status: new => closed Comment: (In [5340]) Added Security Check to Quick Create Module. Fixes #640. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 03:31:45 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 10:31:45 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5340 - /vtigercrm/trunk/include/utils/CommonUtils.php Message-ID: <20060425103145.4B0096D9082@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 25 04:31:40 2006 New Revision: 5340 Log: Added Security Check to Quick Create Module. Fixes #640. 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 Apr 25 04:31:40 2006 @@ -1532,11 +1532,24 @@ function QuickCreate($module) { global $adb; + global $current_user; global $mod_strings; $tabid = getTabid($module); + +//Adding Security Check +require('user_privileges/user_privileges_'.$current_user->id.'.php'); + if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0) + { + $quickcreate_query = "select * from field where quickcreate=0 and tabid = ".$tabid." order by quickcreatesequence"; + } + else + { + $profileList = getCurrentUserProfileList(); + $quickcreate_query = "select field.* from field inner join profile2field on profile2field.fieldid=field.fieldid inner join def_org_field on def_org_field.fieldid=field.fieldid where field.tabid=".$tabid." and quickcreate=0 and profile2field.visible=0 and def_org_field.visible=0 and profile2field.profileid in ".$profileList." order by quickcreatesequence"; + } + $category = getParentTab(); -$quickcreate_query = "select * from field where quickcreate=0 and tabid = ".$tabid." order by quickcreatesequence"; $result = $adb->query($quickcreate_query); $noofrows = $adb->num_rows($result); $fieldName_array = Array(); From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 03:34:17 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 10:34:17 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23671=3A_?= =?utf-8?q?Add_Bussiness_is_removed_so_we_have_to_remove_in_Security_too?= In-Reply-To: <076.9fd8391133d582286939a90b06fb8ffa@vtiger.fosslabs.com> References: <076.9fd8391133d582286939a90b06fb8ffa@vtiger.fosslabs.com> Message-ID: <085.c641b2dcf350839dac1b780f77a3be09@vtiger.fosslabs.com> #671: Add Bussiness is removed so we have to remove in Security too ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: don Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Security ---------------------------+------------------------------------------------ Changes (by don): * owner: developer => don -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 03:36:01 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 10:36:01 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23671=3A_?= =?utf-8?q?Add_Bussiness_is_removed_so_we_have_to_remove_in_Security_too?= In-Reply-To: <076.9fd8391133d582286939a90b06fb8ffa@vtiger.fosslabs.com> References: <076.9fd8391133d582286939a90b06fb8ffa@vtiger.fosslabs.com> Message-ID: <085.d8c48a11f9139775acc26a9029c0e3cb@vtiger.fosslabs.com> #671: Add Bussiness is removed so we have to remove in Security too ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: don Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Security ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 03:39:38 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 10:39:38 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23601=3A_?= =?utf-8?q?No_Security_Support_Faq=2CDashBoard=2CReports=2CRss=2CPortal?= In-Reply-To: <076.eec1eb209bc7f2f2f2e8cec1fd90cbdd@vtiger.fosslabs.com> References: <076.eec1eb209bc7f2f2f2e8cec1fd90cbdd@vtiger.fosslabs.com> Message-ID: <085.1f43fd1be3d4a0b1d6229d9976c6dcd2@vtiger.fosslabs.com> #601: No Security Support Faq,DashBoard,Reports,Rss,Portal ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: don Type: defect | Status: new Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Security ---------------------------+------------------------------------------------ Changes (by don): * owner: developer => don -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 03:39:53 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 10:39:53 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23601=3A_?= =?utf-8?q?No_Security_Support_Faq=2CDashBoard=2CReports=2CRss=2CPortal?= In-Reply-To: <076.eec1eb209bc7f2f2f2e8cec1fd90cbdd@vtiger.fosslabs.com> References: <076.eec1eb209bc7f2f2f2e8cec1fd90cbdd@vtiger.fosslabs.com> Message-ID: <085.3ab5009f08fc8458f33247a1382e154d@vtiger.fosslabs.com> #601: No Security Support Faq,DashBoard,Reports,Rss,Portal ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: don Type: defect | Status: closed Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Security ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 03:47:30 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 10:47:30 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23144=3A_?= =?utf-8?q?Statistics_not_in_the_same_plane_as_List_View_Users?= In-Reply-To: <076.6ff95a784ff00fd4b095cf6a1e5450fa@vtiger.fosslabs.com> References: <076.6ff95a784ff00fd4b095cf6a1e5450fa@vtiger.fosslabs.com> Message-ID: <085.a2aab1be2df1e95e4f514462bcedba00@vtiger.fosslabs.com> #144: Statistics not in the same plane as List View Users ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Statistics ------------------------+--------------------------------------------------- Comment (by saraj): (In [5341]) Made the User List View Proper with Proper Links including putting a check that the default admin and standarduser cannot be deleted. refs #144. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 03:47:31 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 10:47:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5341 - /vtigercrm/trunk/modules/Users/User.php Message-ID: <20060425104731.8BEF96D9084@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 25 04:47:26 2006 New Revision: 5341 Log: Made the User List View Proper with Proper Links including putting a check that the default admin and standarduser cannot be deleted. refs #144. 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 Apr 25 04:47:26 2006 @@ -505,8 +505,8 @@ function getUserListViewEntries($navigation_array) { global $theme; - $theme_path="themes/".$theme."/"; - $image_path=$theme_path."images/"; + $theme_path="themes/".$theme."/"; + $image_path=$theme_path."images/"; $query = "SELECT * from users where deleted=0"; $result =$this->db->query($query); $entries_list = array(); @@ -516,12 +516,19 @@ { $entries=array(); $id=$this->db->query_result($result,$i-1,'id'); - $entries[]='Edit  Delete'; + + if($this->db->query_result($result,$i-1,'user_name') == 'admin' || $this->db->query_result($result,$i-1,'user_name') == 'standarduser' ) + { + $entries[]='Edit  '; + } + else + + $entries[]='Edit  Delete'; + $entries[]=''.$this->db->query_result($result,$i-1,'user_name').''; $rolecode= fetchUserRole($this->db->query_result($result,$i-1,'id')); - $entries[]=''.$roleinfo[ -$rolecode][0]; + $entries[]=''.$roleinfo[$rolecode][0]; $entries[]=''.$this->db->query_result($result,$i-1,'email1').' '; From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 03:49:06 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 10:49:06 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23743=3A_?= =?utf-8?q?Unable_to_set_Password_for_Duplicate_User?= Message-ID: <076.ce9a4546c95b27a7ab5c308222e723b4@vtiger.fosslabs.com> #743: Unable to set Password for Duplicate User -----------------------+---------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- The password Fields are missing when clicking on Duplicate and creating Duplicate User -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 04:07:18 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 11:07:18 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23595=3A_?= =?utf-8?q?Profile_security_issue?= In-Reply-To: <076.c3cab07876ed32071c0d9389e5b0181e@vtiger.fosslabs.com> References: <076.c3cab07876ed32071c0d9389e5b0181e@vtiger.fosslabs.com> Message-ID: <085.a3c018c10a089d32f219d17f60b9d79c@vtiger.fosslabs.com> #595: Profile security issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: don Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Security ---------------------------+------------------------------------------------ Changes (by don): * owner: developer => don -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 04:13:29 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 11:13:29 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23743=3A_?= =?utf-8?q?Unable_to_set_Password_for_Duplicate_User?= In-Reply-To: <076.ce9a4546c95b27a7ab5c308222e723b4@vtiger.fosslabs.com> References: <076.ce9a4546c95b27a7ab5c308222e723b4@vtiger.fosslabs.com> Message-ID: <085.ce35d3977be74207e4d9d560a2996572@vtiger.fosslabs.com> #743: Unable to set Password for Duplicate User ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by saraj): * resolution: => fixed * status: new => closed Comment: (In [5342]) Added the password & confirm password field for Duplicate Users - Ahmed. Fixes #743. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 04:13:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 11:13:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5342 - /vtigercrm/trunk/modules/Users/EditView.php Message-ID: <20060425111330.7EDB76D908D@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 25 05:13:25 2006 New Revision: 5342 Log: Added the password & confirm password field for Duplicate Users - Ahmed. Fixes #743. Modified: vtigercrm/trunk/modules/Users/EditView.php Modified: vtigercrm/trunk/modules/Users/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Users/EditView.php (original) +++ vtigercrm/trunk/modules/Users/EditView.php Tue Apr 25 05:13:25 2006 @@ -54,6 +54,13 @@ if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') { $focus->id = ""; $focus->user_name = ""; + $mode='create'; + $password=' + + + + + '; } global $theme; @@ -151,7 +158,6 @@ $smarty->assign("DATE_FORMAT", $DATE_FORMAT_SELECT_OPTION); if (is_admin($current_user)) { - //$status = "\n"; $status = " {if $ALL eq 'All'} - {else} - + {$APP.LNK_CV_DELETE} {/if}
    -
    - - -
    -
    - {$header} -
    *{$fldlabel}{$fldlabel} - {if $uitype eq 20}*{/if} - {$fldlabel} - - {if $uitype eq 24} - * - {/if} - {$fldlabel} - - {if $uitype eq 16} - * - {/if} - {$fldlabel} - - - - {$fldlabel} - - - - {$fldlabel} - - {assign var=check value=1} - {foreach key=key_one item=arr from=$fldvalue} - {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} -  User - {if $secondvalue neq ''} -  Team - {/if} - - - {if $secondvalue neq ''} - - - {/if} - - {$fldlabel} - - {if $uitype eq 52} - - {else} - - {$fldlabel} Select *{$fldlabel} Select*{$fldlabel} Select - {if $uitype eq 81} - * - {assign var="pop_type" value="specific_vendor_address"} - {else}{assign var="pop_type" value="specific"} - {/if} - {$fldlabel} -  Select - {if $uitype eq 75} -  {$fldlabel} Select {$fldlabel} Select {$fldlabel} Select {$fldlabel} Select {$fldlabel}  http://  - {if $uitype eq 72} - * - {/if} - {$fldlabel}{$fldlabel}{$fldlabel} - {foreach key=date_value item=time_value from=$fldvalue} - {assign var=date_val value="$date_value"} - {assign var=time_val value="$time_value"} - {/foreach} - - - {if $uitype eq 6} - - {/if} - {foreach key=date_format item=date_str from=$secondvalue} - {assign var=dateFormat value="$date_format"} - {assign var=dateStr value="$date_str"} - {/foreach} - {if $uitype eq 5 || $uitype eq 23} -
    ({$dateStr}) - {else} -
    ({$dateStr}) - {/if} - - - -     		- {$fldlabel} - -   - - - {elseif $uitype eq 68 || $uitype eq 66 || $uitype eq 62} - - - - -  Select To:  - -   - -  Select 
    CC:  - BCC:  -
    - {$fldlabel} -  Select {$fldlabel} - - *{$fldlabel} - - {$fldlabel} - {if $MODULE eq 'Products'} - -
    Files Maximum 6 - -
    - -     		{$fldlabel}{$fldvalue}{$fldlabel} - {assign var=check value=$secondvalue[0]} - {assign var=yes_val value=$secondvalue[1]} - {assign var=no_val value=$secondvalue[2]} -  {$yes_val}  {$no_val}  - {foreach item=val_arr from=$fldvalue} - {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]"} - -  {$disp_text} - {/foreach} -
     
    Modified: vtigercrm/trunk/Smarty/templates/QuickCreate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/QuickCreate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/QuickCreate.tpl Tue Apr 25 03:48:11 2006 @@ -100,7 +100,7 @@ {/if}  User {if $secondvalue neq ''} -  Team +  Group {/if}  User {if $secondvalue neq ''} -  Team +  Group {/if} '.$app_strings['LBL_TEAM']; + onclick="toggleAssignType(this.value)">'.$app_strings['LBL_GROUP']; } $GROUP_SELECT_OPTION .='
    References: <076.5a765c13a09d13707d5ba6fefc0b886f@vtiger.fosslabs.com> Message-ID: <085.1fd4223727a5b1ccff1a3021bbc1d1e6@vtiger.fosslabs.com> #643: DashBoard not working ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: richie Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Dashboard ---------------------------+------------------------------------------------ Changes (by richie): * priority: blocker => major * owner: developer => richie Comment: Fixed. The issue has been fixed by compiling php with --with-ttf and --with-freetype-dir parameters -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 02:49:27 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 09:49:27 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23192=3A_?= =?utf-8?q?picklist_settings_great!?= In-Reply-To: <076.c5ae652b83bc6b62d10710cb09cab462@vtiger.fosslabs.com> References: <076.c5ae652b83bc6b62d10710cb09cab462@vtiger.fosslabs.com> Message-ID: <085.a4022bccaa85de13cabf45c2526ae7aa@vtiger.fosslabs.com> #192: picklist settings great! ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 02:52:31 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 09:52:31 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23235=3A_?= =?utf-8?q?no_cancel_button_in_edit_inventory_notifications?= In-Reply-To: <076.9acf1b6002f4a08921da403ba2e0b02a@vtiger.fosslabs.com> References: <076.9acf1b6002f4a08921da403ba2e0b02a@vtiger.fosslabs.com> Message-ID: <085.589e826203c9216a57c7b831144dea78@vtiger.fosslabs.com> #235: no cancel button in edit inventory notifications ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: inventory ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed Comment: (In [5337]) Cancel button added. Fixes #235 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 02:52:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 09:52:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5337 - /vtigercrm/trunk/Smarty/templates/Settings/EditInventoryNotify.tpl Message-ID: <20060425095232.301FA6D9033@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 03:52:27 2006 New Revision: 5337 Log: Cancel button added. Fixes #235 Modified: vtigercrm/trunk/Smarty/templates/Settings/EditInventoryNotify.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings/EditInventoryNotify.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/EditInventoryNotify.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/EditInventoryNotify.tpl Tue Apr 25 03:52:27 2006 @@ -27,6 +27,7 @@
    +
     
    +
     
    *Password*Confirm Password
    ".$app_strings['LBL_REQUIRED_SYMBOL']."".$mod_strings['LBL_STATUS']."  \n"; -echo " \n"; -echo " \n"; -echo " \n"; -echo "
    \n"; -echo " "; -echo " "; -echo " \n"; -echo " \n"; -echo "
    \n"; -echo "
    \n"; - -echo ""; -echo get_set_focus_js(); -echo get_validate_record_js(); -*/ ?> From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 04:16:20 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 11:16:20 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23595=3A_?= =?utf-8?q?Profile_security_issue?= In-Reply-To: <076.c3cab07876ed32071c0d9389e5b0181e@vtiger.fosslabs.com> References: <076.c3cab07876ed32071c0d9389e5b0181e@vtiger.fosslabs.com> Message-ID: <085.42f18e29b2eded2ba3ec7eae4e94b2e0@vtiger.fosslabs.com> #595: Profile security issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: don Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Security ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 04:19:02 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 11:19:02 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23568=3A_?= =?utf-8?q?unable_to_login_as_standard_user?= In-Reply-To: <076.a1184dedb1f8d5b602466923e6d467e3@vtiger.fosslabs.com> References: <076.a1184dedb1f8d5b602466923e6d467e3@vtiger.fosslabs.com> Message-ID: <085.7cfcd283161b5abb0c1c7d8b3b92310e@vtiger.fosslabs.com> #568: unable to login as standard user ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: don Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: security ---------------------------+------------------------------------------------ Changes (by don): * owner: developer => don -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 04:22:18 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 11:22:18 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23568=3A_?= =?utf-8?q?unable_to_login_as_standard_user?= In-Reply-To: <076.a1184dedb1f8d5b602466923e6d467e3@vtiger.fosslabs.com> References: <076.a1184dedb1f8d5b602466923e6d467e3@vtiger.fosslabs.com> Message-ID: <085.b4d13cec01e8edb12e064ce053946e0c@vtiger.fosslabs.com> #568: unable to login as standard user ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: don Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: security ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 04:24:21 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 11:24:21 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23551=3A_?= =?utf-8?q?Security_Issue?= In-Reply-To: <076.e7f9ecf93c9d82d4473e75022f2e9c49@vtiger.fosslabs.com> References: <076.e7f9ecf93c9d82d4473e75022f2e9c49@vtiger.fosslabs.com> Message-ID: <085.63ef571fe94324fcb4b4bb563282def6@vtiger.fosslabs.com> #551: Security Issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: don Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: security ---------------------------+------------------------------------------------ Changes (by don): * owner: developer => don -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 04:24:48 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 11:24:48 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23551=3A_?= =?utf-8?q?Security_Issue?= In-Reply-To: <076.e7f9ecf93c9d82d4473e75022f2e9c49@vtiger.fosslabs.com> References: <076.e7f9ecf93c9d82d4473e75022f2e9c49@vtiger.fosslabs.com> Message-ID: <085.ea79fb6b38c67598472da93cb66326bc@vtiger.fosslabs.com> #551: Security Issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: don Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: security ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 04:26:32 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 11:26:32 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23518=3A_?= =?utf-8?q?Title_should_be_changed_for_Field_access?= In-Reply-To: <076.f4c821006fca097924c1376dd04dc95b@vtiger.fosslabs.com> References: <076.f4c821006fca097924c1376dd04dc95b@vtiger.fosslabs.com> Message-ID: <085.da9b0d827eb9e740b7df117c5fca4343@vtiger.fosslabs.com> #518: Title should be changed for Field access ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: ela Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: assigned => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 04:27:46 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 11:27:46 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23514=3A_?= =?utf-8?q?Issue_in_Organisation_Sharing_Privileges?= In-Reply-To: <076.ee8bbe6e04ff829ca526590a1f507db7@vtiger.fosslabs.com> References: <076.ee8bbe6e04ff829ca526590a1f507db7@vtiger.fosslabs.com> Message-ID: <085.5bdc8990837ba34794dbfd472520e2b4@vtiger.fosslabs.com> #514: Issue in Organisation Sharing Privileges ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: don Type: defect | Status: new Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Security ---------------------------+------------------------------------------------ Changes (by don): * owner: developer => don -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 04:28:37 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 11:28:37 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23514=3A_?= =?utf-8?q?Issue_in_Organisation_Sharing_Privileges?= In-Reply-To: <076.ee8bbe6e04ff829ca526590a1f507db7@vtiger.fosslabs.com> References: <076.ee8bbe6e04ff829ca526590a1f507db7@vtiger.fosslabs.com> Message-ID: <085.d3113cdda796cc5664790c6f00a9ae4d@vtiger.fosslabs.com> #514: Issue in Organisation Sharing Privileges ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: don Type: defect | Status: closed Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: Security ---------------------------+------------------------------------------------ Changes (by don): * resolution: => invalid * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 04:29:41 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 11:29:41 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23509=3A_?= =?utf-8?q?Delete_not_available_for_Role_Detail_View?= In-Reply-To: <076.53e50073e405d488131b91c93a0e58ee@vtiger.fosslabs.com> References: <076.53e50073e405d488131b91c93a0e58ee@vtiger.fosslabs.com> Message-ID: <085.b71ad1501e5b91c21ad9f8842a4dda99@vtiger.fosslabs.com> #509: Delete not available for Role Detail View ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: don Type: defect | Status: new Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: UI ---------------------------+------------------------------------------------ Changes (by don): * owner: developer => don -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 04:30:27 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 11:30:27 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23509=3A_?= =?utf-8?q?Delete_not_available_for_Role_Detail_View?= In-Reply-To: <076.53e50073e405d488131b91c93a0e58ee@vtiger.fosslabs.com> References: <076.53e50073e405d488131b91c93a0e58ee@vtiger.fosslabs.com> Message-ID: <085.bf3e10b27e71943b24073ed6dd16fc3e@vtiger.fosslabs.com> #509: Delete not available for Role Detail View ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: don Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 04:33:33 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 11:33:33 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23402=3A_?= =?utf-8?q?delete_role_issue?= In-Reply-To: <076.a7a921d097b274cd819a3013954d7537@vtiger.fosslabs.com> References: <076.a7a921d097b274cd819a3013954d7537@vtiger.fosslabs.com> Message-ID: <085.55662e37c165da8739bcd10a3831479f@vtiger.fosslabs.com> #402: delete role issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: don Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Security ---------------------------+------------------------------------------------ Changes (by don): * owner: developer => don -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 04:51:55 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 11:51:55 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23266=3A_?= =?utf-8?q?editing_dashboard_throws_exceptions?= In-Reply-To: <076.04d3c577084250d38f421f8c39b6c528@vtiger.fosslabs.com> References: <076.04d3c577084250d38f421f8c39b6c528@vtiger.fosslabs.com> Message-ID: <085.b36d26ef7732082c15e9da710349e536@vtiger.fosslabs.com> #266: editing dashboard throws exceptions ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: dashboard ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed Comment: (In [5343]) Zero check added. Fixes #266 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 04:51:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 11:51:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5343 - /vtigercrm/trunk/include/utils/GraphUtils.php Message-ID: <20060425115155.D96786D9093@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 05:51:50 2006 New Revision: 5343 Log: Zero check added. Fixes #266 Modified: vtigercrm/trunk/include/utils/GraphUtils.php Modified: vtigercrm/trunk/include/utils/GraphUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/GraphUtils.php (original) +++ vtigercrm/trunk/include/utils/GraphUtils.php Tue Apr 25 05:51:50 2006 @@ -92,6 +92,12 @@ // normalize $max to get value between 1 and 10 $coef = pow(10,floor(log10($max))); + if($coef == 0) + { + $data=0; + echo "

    No data available with the specified time period

    "; + return $data; + } $normalized = $max / $coef; if($normalized < 1.5){ From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 05:02:22 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 12:02:22 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23587=3A_?= =?utf-8?q?redirection_of_website_adding?= In-Reply-To: <076.099e4c4e6754da2a40058cd1471b7ea5@vtiger.fosslabs.com> References: <076.099e4c4e6754da2a40058cd1471b7ea5@vtiger.fosslabs.com> Message-ID: <085.c18ae5e4b53a3f9b739ee28de34bec71@vtiger.fosslabs.com> #587: redirection of website adding --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: jeri Type: defect | Status: new Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: --------------------------------+------------------------------------------- Changes (by richie): * owner: developer => jeri -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 05:06:39 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 12:06:39 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23567=3A_?= =?utf-8?q?required_field_not_specified?= In-Reply-To: <076.9ce280e54e44bf68ffb1beabe00c03e2@vtiger.fosslabs.com> References: <076.9ce280e54e44bf68ffb1beabe00c03e2@vtiger.fosslabs.com> Message-ID: <085.1313b1f547f5de9d69150e60c716b51f@vtiger.fosslabs.com> #567: required field not specified --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: ahmed Type: defect | Status: new Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: --------------------------------+------------------------------------------- Changes (by richie): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 05:07:48 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 12:07:48 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23371=3A_?= =?utf-8?q?Cloud_Tag_under_the_Header_-Select_template_to_Mail_Merge_=28He?= =?utf-8?q?lpDesk=29?= In-Reply-To: <076.599a44b8a7a1b8ea9621b16f65b1d071@vtiger.fosslabs.com> References: <076.599a44b8a7a1b8ea9621b16f65b1d071@vtiger.fosslabs.com> Message-ID: <085.d73b210083ff0be8e91f13f7b7991e84@vtiger.fosslabs.com> #371: Cloud Tag under the Header -Select template to Mail Merge (HelpDesk) ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: ahmed Type: defect | Status: new Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 05:08:26 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 12:08:26 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23368=3A_?= =?utf-8?q?clearer_message_while_using_existing_mysql?= In-Reply-To: <076.5f20b029663faeb28a418bc08bd641ff@vtiger.fosslabs.com> References: <076.5f20b029663faeb28a418bc08bd641ff@vtiger.fosslabs.com> Message-ID: <085.737477950cb411948b217ebfd0aef1ab@vtiger.fosslabs.com> #368: clearer message while using existing mysql ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: installation ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed Comment: Fixed in the exe installation -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 05:10:30 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 12:10:30 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23352=3A_?= =?utf-8?q?unwanted_Emails_and_WebMails_link_in_top_of_emails_Create/EditV?= =?utf-8?q?iew?= In-Reply-To: <076.3cdb8f28ca7207c8b42fd535ef869264@vtiger.fosslabs.com> References: <076.3cdb8f28ca7207c8b42fd535ef869264@vtiger.fosslabs.com> Message-ID: <085.16eee4c662b8cf629bf4751b6b4f5db4@vtiger.fosslabs.com> #352: unwanted Emails and WebMails link in top of emails Create/EditView --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: jeri Type: defect | Status: new Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: --------------------------------+------------------------------------------- Changes (by richie): * owner: developer => jeri Comment: Fixed by the integration of the newer UI for Emails/Webmails Richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 05:10:55 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 12:10:55 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23349=3A_?= =?utf-8?q?getting_scroll_bar_in_email_edit/create_view?= In-Reply-To: <076.35e4502eeac2f7711edcaab632e8b357@vtiger.fosslabs.com> References: <076.35e4502eeac2f7711edcaab632e8b357@vtiger.fosslabs.com> Message-ID: <085.3143a40ee8038f6925fd85ae38a06409@vtiger.fosslabs.com> #349: getting scroll bar in email edit/create view --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: jeri Type: defect | Status: new Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: --------------------------------+------------------------------------------- Changes (by richie): * owner: developer => jeri Comment: Fixed by adding the new UI for Webmails/Emails. Richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 05:12:44 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 12:12:44 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23352=3A_?= =?utf-8?q?unwanted_Emails_and_WebMails_link_in_top_of_emails_Create/EditV?= =?utf-8?q?iew?= In-Reply-To: <076.3cdb8f28ca7207c8b42fd535ef869264@vtiger.fosslabs.com> References: <076.3cdb8f28ca7207c8b42fd535ef869264@vtiger.fosslabs.com> Message-ID: <085.f5b28b7b39f67b762f6bb92b63e03d3d@vtiger.fosslabs.com> #352: unwanted Emails and WebMails link in top of emails Create/EditView --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: jeri Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 05:12:54 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 12:12:54 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23349=3A_?= =?utf-8?q?getting_scroll_bar_in_email_edit/create_view?= In-Reply-To: <076.35e4502eeac2f7711edcaab632e8b357@vtiger.fosslabs.com> References: <076.35e4502eeac2f7711edcaab632e8b357@vtiger.fosslabs.com> Message-ID: <085.bb3d04fccf37a96cc6d21b8bba9b98d1@vtiger.fosslabs.com> #349: getting scroll bar in email edit/create view --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: jeri Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 05:20:16 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 12:20:16 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23732=3A_?= =?utf-8?q?Webmail_not_working?= In-Reply-To: <076.ed6c8148f21744174fe5c3975735bf62@vtiger.fosslabs.com> References: <076.ed6c8148f21744174fe5c3975735bf62@vtiger.fosslabs.com> Message-ID: <085.9262ba0409a9e165a42aa8df03e2b79e@vtiger.fosslabs.com> #732: Webmail not working -----------------------------+---------------------------------------------- Reporter: Pooh the tiger | Owner: richie Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.1 Resolution: | Keywords: -----------------------------+---------------------------------------------- Changes (by richie): * owner: developer => richie Comment: Hello! This is an issue in the demo as of now. This has been fixed and you will find the updated demo with this issue fixed soon. Kindly bear with us in the meanwhile. Richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 05:20:42 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 12:20:42 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23643=3A_?= =?utf-8?q?DashBoard_not_working?= In-Reply-To: <076.5a765c13a09d13707d5ba6fefc0b886f@vtiger.fosslabs.com> References: <076.5a765c13a09d13707d5ba6fefc0b886f@vtiger.fosslabs.com> Message-ID: <085.3d97ad6f92da629a39f1988b0028a14e@vtiger.fosslabs.com> #643: DashBoard not working ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: richie Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Dashboard ---------------------------+------------------------------------------------ Changes (by richie): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 05:36:11 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 12:36:11 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23190=3A_?= =?utf-8?q?Sharing_Issued_in_Calendar_Module?= In-Reply-To: <076.3c257ada412a9b3531914a206a12e87a@vtiger.fosslabs.com> References: <076.3c257ada412a9b3531914a206a12e87a@vtiger.fosslabs.com> Message-ID: <085.eddba28b48d10dba157cbaeaa59f2abb@vtiger.fosslabs.com> #190: Sharing Issued in Calendar Module ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 05:48:32 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 12:48:32 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23574=3A_?= =?utf-8?q?parenttab_is_not_parsed_in_Notes_CustomView?= In-Reply-To: <076.b31e86eae65dd3bc908e3030de9d3029@vtiger.fosslabs.com> References: <076.b31e86eae65dd3bc908e3030de9d3029@vtiger.fosslabs.com> Message-ID: <085.b5e81259bfe8ef05e8b47eb5d1226162@vtiger.fosslabs.com> #574: parenttab is not parsed in Notes CustomView --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed Comment: (In [5344]) passed parenttab and fixes #574 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 05:48:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 12:48:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5344 - /vtigercrm/trunk/Smarty/templates/ListView.tpl Message-ID: <20060425124834.0F6086D92E0@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 06:48:27 2006 New Revision: 5344 Log: passed parenttab and fixes #574 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 Apr 25 06:48:27 2006 @@ -298,17 +298,17 @@     		{$APP.LNK_CV_CREATEVIEW} + {$APP.LNK_CV_CREATEVIEW} | {$APP.LNK_CV_EDIT} | {$APP.LNK_CV_DELETE}{$APP.LNK_CV_CREATEVIEW} + {$APP.LNK_CV_CREATEVIEW} | - {$APP.LNK_CV_EDIT} + {$APP.LNK_CV_EDIT} | - {$APP.LNK_CV_DELETE}
    From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 05:49:28 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 12:49:28 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23574=3A_?= =?utf-8?q?parenttab_is_not_parsed_in_Notes_CustomView?= In-Reply-To: <076.b31e86eae65dd3bc908e3030de9d3029@vtiger.fosslabs.com> References: <076.b31e86eae65dd3bc908e3030de9d3029@vtiger.fosslabs.com> Message-ID: <085.1b18af63138028870c40c4cbc2a281e5@vtiger.fosslabs.com> #574: parenttab is not parsed in Notes CustomView --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Comment (by richie): (In [5345]) passed parenttab and fixes #574 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 05:49:29 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 12:49:29 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5345 - /vtigercrm/trunk/modules/CustomView/Delete.php Message-ID: <20060425124929.36F306D931C@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 06:49:24 2006 New Revision: 5345 Log: passed parenttab and fixes #574 Modified: vtigercrm/trunk/modules/CustomView/Delete.php Modified: vtigercrm/trunk/modules/CustomView/Delete.php ============================================================================== --- vtigercrm/trunk/modules/CustomView/Delete.php (original) +++ vtigercrm/trunk/modules/CustomView/Delete.php Tue Apr 25 06:49:24 2006 @@ -15,6 +15,7 @@ $cvid = $_REQUEST["record"]; $module = $_REQUEST["dmodule"]; $smodule = $REQUEST["smodule"]; +$parenttab = $_REQUEST["parenttab"]; if(isset($cvid) && $cvid != '') { @@ -27,5 +28,5 @@ $smodule_url = "&smodule=".$smodule; } -header("Location: index.php?action=index&module=$module".$smodule_url); +header("Location: index.php?action=index&parenttab=$parenttab&module=$module".$smodule_url); ?> From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 05:50:21 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 12:50:21 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23574=3A_?= =?utf-8?q?parenttab_is_not_parsed_in_Notes_CustomView?= In-Reply-To: <076.b31e86eae65dd3bc908e3030de9d3029@vtiger.fosslabs.com> References: <076.b31e86eae65dd3bc908e3030de9d3029@vtiger.fosslabs.com> Message-ID: <085.e237853fb0c6e527ad2f3a85b61070cb@vtiger.fosslabs.com> #574: parenttab is not parsed in Notes CustomView --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Comment (by richie): (In [5346]) passed parenttab and fixes #574 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 05:50:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 12:50:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5346 - /vtigercrm/trunk/modules/CustomView/EditView.php Message-ID: <20060425125021.9A8D06D9330@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 06:50:17 2006 New Revision: 5346 Log: passed parenttab and fixes #574 Modified: vtigercrm/trunk/modules/CustomView/EditView.php Modified: vtigercrm/trunk/modules/CustomView/EditView.php ============================================================================== --- vtigercrm/trunk/modules/CustomView/EditView.php (original) +++ vtigercrm/trunk/modules/CustomView/EditView.php Tue Apr 25 06:50:17 2006 @@ -33,6 +33,7 @@ $recordid = $_REQUEST['record']; $smarty->assign("MOD", $mod_strings); +$smarty->assign("CATEGORY", $_REQUEST['parenttab']); $smarty->assign("APP", $app_strings); $smarty->assign("IMAGE_PATH", $image_path); $smarty->assign("MODULE",$cv_module); From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 05:51:06 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 12:51:06 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23574=3A_?= =?utf-8?q?parenttab_is_not_parsed_in_Notes_CustomView?= In-Reply-To: <076.b31e86eae65dd3bc908e3030de9d3029@vtiger.fosslabs.com> References: <076.b31e86eae65dd3bc908e3030de9d3029@vtiger.fosslabs.com> Message-ID: <085.5cda1c641a46c70a818fe685babeed9e@vtiger.fosslabs.com> #574: parenttab is not parsed in Notes CustomView --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Comment (by richie): (In [5347]) passed parenttab and fixes #574 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 05:51:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 12:51:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5347 - /vtigercrm/trunk/Smarty/templates/CustomView.tpl Message-ID: <20060425125107.516326D90A1@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 06:51:02 2006 New Revision: 5347 Log: passed parenttab and fixes #574 Modified: vtigercrm/trunk/Smarty/templates/CustomView.tpl Modified: vtigercrm/trunk/Smarty/templates/CustomView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CustomView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CustomView.tpl Tue Apr 25 06:51:02 2006 @@ -17,6 +17,7 @@
    + From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 05:51:49 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 12:51:49 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23574=3A_?= =?utf-8?q?parenttab_is_not_parsed_in_Notes_CustomView?= In-Reply-To: <076.b31e86eae65dd3bc908e3030de9d3029@vtiger.fosslabs.com> References: <076.b31e86eae65dd3bc908e3030de9d3029@vtiger.fosslabs.com> Message-ID: <085.b41bcf3c4ab3217cbcfe7e4f5a7d2678@vtiger.fosslabs.com> #574: parenttab is not parsed in Notes CustomView --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Comment (by richie): (In [5348]) passed parenttab and fixes #574 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 05:51:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 12:51:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5348 - /vtigercrm/trunk/modules/CustomView/Save.php Message-ID: <20060425125150.0FFD96D9544@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 06:51:45 2006 New Revision: 5348 Log: passed parenttab and fixes #574 Modified: vtigercrm/trunk/modules/CustomView/Save.php Modified: vtigercrm/trunk/modules/CustomView/Save.php ============================================================================== --- vtigercrm/trunk/modules/CustomView/Save.php (original) +++ vtigercrm/trunk/modules/CustomView/Save.php Tue Apr 25 06:51:45 2006 @@ -15,7 +15,7 @@ $cvid = $_REQUEST["record"]; $cvmodule = $_REQUEST["cvmodule"]; - +$parenttab = $_REQUEST["parenttab"]; if($cvmodule != "") { $viewname = addslashes($_REQUEST["viewName"]); @@ -191,5 +191,5 @@ } } -header("Location: index.php?action=index&module=$cvmodule&viewname=$cvid"); +header("Location: index.php?action=index&parenttab=$parenttab&module=$cvmodule&viewname=$cvid"); ?> From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 05:53:01 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 12:53:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5349 - /vtigercrm/trunk/modules/Notes/ListView.php Message-ID: <20060425125301.5FF026D9544@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 06:52:56 2006 New Revision: 5349 Log: if check added for getting the parenttab first from the request else the db Modified: vtigercrm/trunk/modules/Notes/ListView.php Modified: vtigercrm/trunk/modules/Notes/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Notes/ListView.php (original) +++ vtigercrm/trunk/modules/Notes/ListView.php Tue Apr 25 06:52:56 2006 @@ -35,8 +35,14 @@ $log = LoggerManager::getLogger('note_list'); global $currentModule,$image_path,$theme; - -$category = getParentTab(); +if($_REQUEST['parenttab'] != '') +{ + $category = $_REQUEST['parenttab']; +} +else +{ + $category = getParentTab(); +} //<<<>>>>>> $oCustomView = new CustomView("Notes"); From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 05:55:15 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 12:55:15 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23312=3A_?= =?utf-8?q?Calendar_-_Week_View_-_No_Validation?= In-Reply-To: <076.f319964df0f32a86e0f9859bd56d3e0d@vtiger.fosslabs.com> References: <076.f319964df0f32a86e0f9859bd56d3e0d@vtiger.fosslabs.com> Message-ID: <085.b6a5114dd5a072ea09c6c03db41e126c@vtiger.fosslabs.com> #312: Calendar - Week View - No Validation ------------------------+--------------------------------------------------- Reporter: gopal | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 05:55:33 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 12:55:33 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23318=3A_?= =?utf-8?q?Calendar_UI_flow_is_not_clear?= In-Reply-To: <076.93149cf7bd184403a7279f250ea58607@vtiger.fosslabs.com> References: <076.93149cf7bd184403a7279f250ea58607@vtiger.fosslabs.com> Message-ID: <085.43b96ea51fa72048368d12805163cd63@vtiger.fosslabs.com> #318: Calendar UI flow is not clear ------------------------+--------------------------------------------------- Reporter: gopal | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 05:55:56 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 12:55:56 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23334=3A_?= =?utf-8?q?Calendar_-_Improper_Start/End_Dates?= In-Reply-To: <076.f812a2d1d9c939a7bfe098a25d7302e1@vtiger.fosslabs.com> References: <076.f812a2d1d9c939a7bfe098a25d7302e1@vtiger.fosslabs.com> Message-ID: <085.0b9ef77b4edee4e080737762660d387b@vtiger.fosslabs.com> #334: Calendar - Improper Start/End Dates ------------------------+--------------------------------------------------- Reporter: gopal | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 05:56:26 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 12:56:26 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23335=3A_?= =?utf-8?q?Calendar_Week_View_-_Time_filter_not_working?= In-Reply-To: <076.df63abff42de689ab316c61e005cbb56@vtiger.fosslabs.com> References: <076.df63abff42de689ab316c61e005cbb56@vtiger.fosslabs.com> Message-ID: <085.5f010fbe784683a514de0c3f0715c05f@vtiger.fosslabs.com> #335: Calendar Week View - Time filter not working ------------------------+--------------------------------------------------- Reporter: gopal | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 05:56:42 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 12:56:42 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23616=3A_?= =?utf-8?q?User_EditView_issue?= In-Reply-To: <076.37000080ebffa19975b7e7a8740a3420@vtiger.fosslabs.com> References: <076.37000080ebffa19975b7e7a8740a3420@vtiger.fosslabs.com> Message-ID: <085.c8e5f8b91329324070b0f0c7d14142d5@vtiger.fosslabs.com> #616: User EditView issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: richie Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Security ---------------------------+------------------------------------------------ Changes (by richie): * owner: developer => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 05:57:20 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 12:57:20 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23616=3A_?= =?utf-8?q?User_EditView_issue?= In-Reply-To: <076.37000080ebffa19975b7e7a8740a3420@vtiger.fosslabs.com> References: <076.37000080ebffa19975b7e7a8740a3420@vtiger.fosslabs.com> Message-ID: <085.2178605e75647ded0f90a91487f61330@vtiger.fosslabs.com> #616: User EditView issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: richie Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: wontfix | Keywords: Security ---------------------------+------------------------------------------------ Changes (by richie): * resolution: => wontfix * priority: major => minor * status: new => closed Comment: Unable to replicate. Downgrading to minor. Putting in abeyance. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 05:57:52 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 12:57:52 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23358=3A_?= =?utf-8?q?Calendar_Sharing_-_Available/Selected_Users_not_updated_properl?= =?utf-8?q?y?= In-Reply-To: <076.1198098523ca5d817d42dcb064b3d678@vtiger.fosslabs.com> References: <076.1198098523ca5d817d42dcb064b3d678@vtiger.fosslabs.com> Message-ID: <085.2fdaee4a27c67adcf64954caac63d8c0@vtiger.fosslabs.com> #358: Calendar Sharing - Available/Selected Users not updated properly ------------------------+--------------------------------------------------- Reporter: gopal | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 05:58:43 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 12:58:43 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23361=3A_?= =?utf-8?q?Calendar__Sharing_-_Save_double_click_not_working_properly?= In-Reply-To: <076.f277be639d017333d268dc12f69d4801@vtiger.fosslabs.com> References: <076.f277be639d017333d268dc12f69d4801@vtiger.fosslabs.com> Message-ID: <085.4d454705d265920610093448f7ef40db@vtiger.fosslabs.com> #361: Calendar Sharing - Save double click not working properly ------------------------+--------------------------------------------------- Reporter: gopal | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 06:01:43 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 13:01:43 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23148=3A_?= =?utf-8?q?Improper_Values_after_Saving_Events_thru_Calendar?= In-Reply-To: <076.fece241f99eca80394e606738c23177f@vtiger.fosslabs.com> References: <076.fece241f99eca80394e606738c23177f@vtiger.fosslabs.com> Message-ID: <085.b92361d1924940f984439836b99fc19b@vtiger.fosslabs.com> #148: Improper Values after Saving Events thru Calendar ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 06:02:33 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 13:02:33 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23149=3A_?= =?utf-8?q?Able_to_add_events_for_days_gone_by_without_any_check_in_Calend?= =?utf-8?q?ar?= In-Reply-To: <076.cf1907ebb39ce87940079993e8ae3424@vtiger.fosslabs.com> References: <076.cf1907ebb39ce87940079993e8ae3424@vtiger.fosslabs.com> Message-ID: <085.f7866301cb1c97783e9a17781122367d@vtiger.fosslabs.com> #149: Able to add events for days gone by without any check in Calendar ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 06:03:06 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 13:03:06 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23152=3A_?= =?utf-8?q?Time_Filter_Combo_Box_non_functional_in_Calendar_-_Week_Tab?= In-Reply-To: <076.f746c9f29152fef0cd48e6c12a634dac@vtiger.fosslabs.com> References: <076.f746c9f29152fef0cd48e6c12a634dac@vtiger.fosslabs.com> Message-ID: <085.d4be6332e3f16066fd0a2e2fc9d44672@vtiger.fosslabs.com> #152: Time Filter Combo Box non functional in Calendar - Week Tab ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Time Filter - Week Tab ------------------------+--------------------------------------------------- Changes (by mangai): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 06:03:31 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 13:03:31 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23154=3A_?= =?utf-8?q?Cannot_Create_Task_from_Calendar_Module?= In-Reply-To: <076.ea1c68f9f29d7dafb9a1eec31db3fabc@vtiger.fosslabs.com> References: <076.ea1c68f9f29d7dafb9a1eec31db3fabc@vtiger.fosslabs.com> Message-ID: <085.6b54c0ac2cc8abcd5b29817f25715d20@vtiger.fosslabs.com> #154: Cannot Create Task from Calendar Module ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 06:04:02 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 13:04:02 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23168=3A_?= =?utf-8?q?Multiple_Events_Not_Displayed_for_Particular_Day_in_Calendar_-_?= =?utf-8?q?Month_Tab?= In-Reply-To: <076.e1ee923196db4883b67e00116c5e092c@vtiger.fosslabs.com> References: <076.e1ee923196db4883b67e00116c5e092c@vtiger.fosslabs.com> Message-ID: <085.f80cb5571cfe6b0d91a9ab5e50c24315@vtiger.fosslabs.com> #168: Multiple Events Not Displayed for Particular Day in Calendar - Month Tab ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 06:04:44 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 13:04:44 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23187=3A_?= =?utf-8?q?Cannot_Disable_Share_Calendar_Feature_for_Single_User?= In-Reply-To: <076.4a8338ece8b8361dd08d6153e6e829c1@vtiger.fosslabs.com> References: <076.4a8338ece8b8361dd08d6153e6e829c1@vtiger.fosslabs.com> Message-ID: <085.12a8fe21d1ac331992f917c3e452ef8a@vtiger.fosslabs.com> #187: Cannot Disable Share Calendar Feature for Single User ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * milestone: => 5.0.0 * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 06:05:14 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 13:05:14 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23204=3A_?= =?utf-8?q?Inviting_Users=2C_Recurring_Events_=26_Reminder_Non_Functional_?= =?utf-8?q?-__Calendar?= In-Reply-To: <076.59442eec4e6153f731214192b8585aa8@vtiger.fosslabs.com> References: <076.59442eec4e6153f731214192b8585aa8@vtiger.fosslabs.com> Message-ID: <085.303b943c8868fbe6b0eb3607d2c95ee6@vtiger.fosslabs.com> #204: Inviting Users, Recurring Events & Reminder Non Functional - Calendar ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 06:05:44 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 13:05:44 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23209=3A_?= =?utf-8?q?Date_and_Time_Buttons_in_Add_Event_Non_Functional_-_Calendar?= In-Reply-To: <076.f869a371012c25e18f2dca1fd3fae5ec@vtiger.fosslabs.com> References: <076.f869a371012c25e18f2dca1fd3fae5ec@vtiger.fosslabs.com> Message-ID: <085.17e5f8433b840300063f681ba6335ade@vtiger.fosslabs.com> #209: Date and Time Buttons in Add Event Non Functional - Calendar ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 06:06:54 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 13:06:54 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23721=3A_?= =?utf-8?q?Parent_tab_shift?= In-Reply-To: <076.526e32eb34e2787149e3f31ae9ad3378@vtiger.fosslabs.com> References: <076.526e32eb34e2787149e3f31ae9ad3378@vtiger.fosslabs.com> Message-ID: <085.9e725cf3a927cf86df68cec86ac6d158@vtiger.fosslabs.com> #721: Parent tab shift ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Parent tab ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed Comment: (In [5350]) passed parenttab as parameter. Fixes #721 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 06:06:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 13:06:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5350 - /vtigercrm/trunk/Smarty/templates/ListView.tpl Message-ID: <20060425130655.E57486D9A33@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 07:06:50 2006 New Revision: 5350 Log: passed parenttab as parameter. Fixes #721 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 Apr 25 07:06:50 2006 @@ -90,7 +90,7 @@
    		{if $MODULE ne 'Notes' && $MODULE ne 'Emails'} - Import {$MODULE} | + Import {$MODULE} | {/if} Export {$MODULE} {$RECORD_COUNTS}{$NAVIGATION} + + {$NAVIGATION} +
    +
     
    From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 06:44:39 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 13:44:39 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23695=3A_?= =?utf-8?q?Migration_Issues_-_My_Preferences_throws_exception?= In-Reply-To: <076.d5c2f446b43753dbeb39d9660fb3e039@vtiger.fosslabs.com> References: <076.d5c2f446b43753dbeb39d9660fb3e039@vtiger.fosslabs.com> Message-ID: <085.edc9e0ecb545fd9ac19079878fd411ba@vtiger.fosslabs.com> #695: Migration Issues - My Preferences throws exception ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * status: assigned => closed Comment: This issue has been fixed and has been checkedin in the svn. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 06:47:01 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 13:47:01 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23687=3A_?= =?utf-8?q?Migration_Issues_-_Users_Link_in_Settings?= In-Reply-To: <076.fe8007d1417bdc1609b69fd5446e55e4@vtiger.fosslabs.com> References: <076.fe8007d1417bdc1609b69fd5446e55e4@vtiger.fosslabs.com> Message-ID: <085.ff17b59b3a3ea9d387b966987dfcb5a4@vtiger.fosslabs.com> #687: Migration Issues - Users Link in Settings ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * status: assigned => closed Comment: This issue has been fixed and has been checkedin in the svn. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 07:18:47 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 14:18:47 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5354 - in /vtigercrm/trunk: Smarty/templates/Portal.tpl modules/Portal/ListView.php modules/Portal/Popup.php Message-ID: <20060425141847.9E1EC6DA389@vtiger.fosslabs.com> Author: don Date: Tue Apr 25 08:18:40 2006 New Revision: 5354 Log: issue in adding portal has been fixed Modified: vtigercrm/trunk/Smarty/templates/Portal.tpl vtigercrm/trunk/modules/Portal/ListView.php vtigercrm/trunk/modules/Portal/Popup.php Modified: vtigercrm/trunk/Smarty/templates/Portal.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Portal.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Portal.tpl Tue Apr 25 08:18:40 2006 @@ -20,14 +20,14 @@ - + {$MOD.LBL_OPEN_IN_BROWSER}

    Modified: vtigercrm/trunk/modules/Portal/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Portal/ListView.php (original) +++ vtigercrm/trunk/modules/Portal/ListView.php Tue Apr 25 08:18:40 2006 @@ -19,7 +19,7 @@ global $current_language; $current_module_strings = return_module_language($current_language, 'Portal'); global $adb; - + $query="select * from portal"; $result=$adb->query($query); $no_of_portals=$adb->num_rows($result); @@ -34,6 +34,18 @@ $portal_info[]=$portal_array; } $smarty = new vtigerCRM_Smarty; +$portal_def = Array(); +if($_REQUEST['portalid'] != '') +{ + $query="select * from portal where portalid =".$_REQUEST['portalid']; +}else +{ + $query="select * from portal"; +} + $result=$adb->query($query); + $portal_def [] = $adb->query_result($result,0,'portalurl'); + $portal_def [] = $adb->query_result($result,0,'portalid'); + $smarty->assign("DEFPORTAL_DETAILS", $portal_def); $smarty->assign("IMAGEPATH", $image_path); $smarty->assign("MOD", $mod_strings); Modified: vtigercrm/trunk/modules/Portal/Popup.php ============================================================================== --- vtigercrm/trunk/modules/Portal/Popup.php (original) +++ vtigercrm/trunk/modules/Portal/Popup.php Tue Apr 25 08:18:40 2006 @@ -17,8 +17,15 @@ if(isset($_REQUEST['portalurl']) && $_REQUEST['portalurl']!='') { $result=SavePortal($_REQUEST['portalname'],$_REQUEST['portalurl']); - if($result == 'true') - $portal_inputs.=""; + if($result != '') + { + $portal_inputs.=""; + } } @@ -41,6 +48,6 @@ $portal_url=$_REQUEST['portalurl']; $query="insert into portal values(".$portalid.",'".$portal_name."','".$portal_url."',0)"; $result=$adb->query($query); -return true; +return $portalid; } ?> From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 07:19:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 14:19:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5355 - /vtigercrm/trunk/include/utils/ListViewUtils.php Message-ID: <20060425141928.7B3036DA529@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 25 08:19:24 2006 New Revision: 5355 Log: contact assigned to group is missing in listview - fixed 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 Apr 25 08:19:24 2006 @@ -1409,7 +1409,7 @@ if($module == "Contacts") { //Query modified to sort by assigned to - $query = "select contactdetails.firstname,contactdetails.lastname,contactdetails.title,contactdetails.accountid,contactdetails.email,contactdetails.phone,crmentity.smownerid ,crmentity.crmid from contactdetails inner join crmentity on crmentity.crmid=contactdetails.contactid inner join contactaddress on contactdetails.contactid=contactaddress.contactaddressid inner join contactsubdetails on contactaddress.contactaddressid=contactsubdetails.contactsubscriptionid inner join contactscf on contactdetails.contactid = contactscf.contactid left join account on account.accountid = contactdetails.accountid left join contactgrouprelation on contactscf.contactid=contactgrouprelation.contactid left join groups on groups.groupname=contactgrouprelation.groupname inner join users on users.id=crmentity.smownerid where crmentity.deleted=0 ".$where; + $query = "select contactdetails.firstname,contactdetails.lastname,contactdetails.title,contactdetails.accountid,contactdetails.email,contactdetails.phone,crmentity.smownerid ,crmentity.crmid from contactdetails inner join crmentity on crmentity.crmid=contactdetails.contactid inner join contactaddress on contactdetails.contactid=contactaddress.contactaddressid inner join contactsubdetails on contactaddress.contactaddressid=contactsubdetails.contactsubscriptionid inner join contactscf on contactdetails.contactid = contactscf.contactid left join account on account.accountid = contactdetails.accountid left join contactgrouprelation on contactscf.contactid=contactgrouprelation.contactid left join groups on groups.groupname=contactgrouprelation.groupname left join users on users.id=crmentity.smownerid where crmentity.deleted=0 ".$where; if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3) { From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 07:26:35 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 14:26:35 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23164=3A_?= =?utf-8?q?Search_Not_working_properly_in_leads?= In-Reply-To: <076.299d780297924bc255766ca33205d3ab@vtiger.fosslabs.com> References: <076.299d780297924bc255766ca33205d3ab@vtiger.fosslabs.com> Message-ID: <085.eddf3c33fc85a05f419e9f9ebad86d0e@vtiger.fosslabs.com> #164: Search Not working properly in leads ------------------------+--------------------------------------------------- Reporter: don | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by saraj): * resolution: => fixed * status: new => closed Comment: (In [5356]) Basic search - assigned to in lead. Fixes #164, and refs #164 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 07:26:35 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 14:26:35 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5356 - /vtigercrm/trunk/include/utils/SearchUtils.php Message-ID: <20060425142635.B84CF6DA65C@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 25 08:26:31 2006 New Revision: 5356 Log: Basic search - assigned to in lead. Fixes #164, and refs #164 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 Apr 25 08:26:31 2006 @@ -233,11 +233,12 @@ $where .= " or "; } } - $where.=")"; + $where.=" or groups.groupname like '%".$search_string."%')"; } else { - $where="$table_name.$column_name =''"; + //$where="$table_name.$column_name =''"; + $where="groups.groupname like '%".$search_string."%' "; } return $where; } @@ -428,7 +429,15 @@ $tab_col = str_replace('\'','',stripslashes($_REQUEST[$table_colname])); $srch_cond = str_replace('\'','',stripslashes($_REQUEST[$search_condition])); $srch_val = $_REQUEST[$search_value]; - $adv_string .= " ".getSearch_criteria($srch_cond,$srch_val,$tab_col)." ".$matchtype; + if($tab_col == "crmentity.smownerid") + { + $adv_string .= " (".getSearch_criteria($srch_cond,$srch_val,'users.user_name')." or"; + $adv_string .= " ".getSearch_criteria($srch_cond,$srch_val,'groups.groupname')." )".$matchtype; + } + else + { + $adv_string .= " ".getSearch_criteria($srch_cond,$srch_val,$tab_col)." ".$matchtype; + } } $where=$adv_string; } From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 07:27:56 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 14:27:56 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23164=3A_?= =?utf-8?q?Search_Not_working_properly_in_leads?= In-Reply-To: <076.299d780297924bc255766ca33205d3ab@vtiger.fosslabs.com> References: <076.299d780297924bc255766ca33205d3ab@vtiger.fosslabs.com> Message-ID: <085.ca7a0685ed27a0c15331479b38095faa@vtiger.fosslabs.com> #164: Search Not working properly in leads ------------------------+--------------------------------------------------- Reporter: don | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 07:29:52 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 14:29:52 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23295=3A_?= =?utf-8?q?Search_icon_in_emails_detail_view_is_not_working?= In-Reply-To: <076.6bb16a56ff3a92de013d911c98a43d27@vtiger.fosslabs.com> References: <076.6bb16a56ff3a92de013d911c98a43d27@vtiger.fosslabs.com> Message-ID: <085.ef0adb7f98993a17fb34d1c51d0ca247@vtiger.fosslabs.com> #295: Search icon in emails detail view is not working --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: search icon in email detailview --------------------------------+------------------------------------------- Changes (by saraj): * resolution: => invalid * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 07:32:17 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 14:32:17 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23189=3A_?= =?utf-8?q?recursive_search_not_working_in_basic_search?= In-Reply-To: <076.2705722651b5d2819f862de2836d4151@vtiger.fosslabs.com> References: <076.2705722651b5d2819f862de2836d4151@vtiger.fosslabs.com> Message-ID: <085.de6f599511cbb52df4e188eb1e61f236@vtiger.fosslabs.com> #189: recursive search not working in basic search ------------------------+--------------------------------------------------- Reporter: don | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: wontfix | Keywords: ------------------------+--------------------------------------------------- Changes (by saraj): * resolution: => wontfix * status: new => closed Comment: The current basic search design does not support this feature. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 07:32:31 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 14:32:31 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23689=3A_?= =?utf-8?q?Migration_Issues_-_Global_Access_Privileges_-_settings?= In-Reply-To: <076.3145637101ebdf830949cfecd724434c@vtiger.fosslabs.com> References: <076.3145637101ebdf830949cfecd724434c@vtiger.fosslabs.com> Message-ID: <085.60ddc126e354439133dced23d0e26fdf@vtiger.fosslabs.com> #689: Migration Issues - Global Access Privileges - settings ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * status: assigned => closed Comment: This issue has been fixed and has been checkedin in the svn. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 07:46:49 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 14:46:49 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23261=3A_?= =?utf-8?q?Delete_User__Pop-up_-_Typo?= In-Reply-To: <076.08912867dcb0f1ce45081a7806548cbf@vtiger.fosslabs.com> References: <076.08912867dcb0f1ce45081a7806548cbf@vtiger.fosslabs.com> Message-ID: <085.354f6edc89ba947449344cb19eafcc7e@vtiger.fosslabs.com> #261: Delete User Pop-up - Typo ------------------------+--------------------------------------------------- Reporter: gopal | Owner: richie Type: defect | Status: closed Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed Comment: (In [5357]) Changed spelling for delete. Fixes #261 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 07:46:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 14:46:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5357 - /vtigercrm/trunk/modules/Users/UserDeleteStep1.php Message-ID: <20060425144650.367866DA757@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 08:46:45 2006 New Revision: 5357 Log: Changed spelling for delete. Fixes #261 Modified: vtigercrm/trunk/modules/Users/UserDeleteStep1.php Modified: vtigercrm/trunk/modules/Users/UserDeleteStep1.php ============================================================================== Binary files - no diff available. From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 07:49:53 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 14:49:53 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23222=3A_?= =?utf-8?q?The_=22Create_Leads=2E=2E=22_button_caption_is_wrong=2E?= In-Reply-To: <076.7d40353e97e728747d657dc167467150@vtiger.fosslabs.com> References: <076.7d40353e97e728747d657dc167467150@vtiger.fosslabs.com> Message-ID: <085.54fb877bbea446fd5c761121da614dfe@vtiger.fosslabs.com> #222: The "Create Leads.." button caption is wrong. ------------------------+--------------------------------------------------- Reporter: don | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.1 Resolution: wontfix | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => wontfix * version: 5.0.0 => 5.0.1 * status: new => closed Comment: Impact for this fix is high as it involves changing the labels in the database. Will be handled in the next release. Richie -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 08:03:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 15:03:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5358 - /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Message-ID: <20060425150341.35A466DA759@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 25 09:03:37 2006 New Revision: 5358 Log: * Commented the queries which has modified the quoteid, vendorid, contactid as unique as they are wrong queries Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php ============================================================================== --- vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php (original) +++ vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Tue Apr 25 09:03:37 2006 @@ -2349,9 +2349,9 @@ "ALTER TABLE `profile2utility` MODIFY COLUMN `tabid` INTEGER(11) NOT NULL PRIMARY KEY", "ALTER TABLE `profile2utility` MODIFY COLUMN `activityid` INTEGER(11) NOT NULL PRIMARY KEY", "ALTER TABLE `profile_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL", -"ALTER TABLE `purchaseorder` MODIFY COLUMN `quoteid` INTEGER(19) DEFAULT NULL UNIQUE", -"ALTER TABLE `purchaseorder` MODIFY COLUMN `vendorid` INTEGER(19) DEFAULT NULL UNIQUE", -"ALTER TABLE `purchaseorder` MODIFY COLUMN `contactid` INTEGER(19) DEFAULT NULL UNIQUE", +//"ALTER TABLE `purchaseorder` MODIFY COLUMN `quoteid` INTEGER(19) DEFAULT NULL UNIQUE", +//"ALTER TABLE `purchaseorder` MODIFY COLUMN `vendorid` INTEGER(19) DEFAULT NULL UNIQUE", +//"ALTER TABLE `purchaseorder` MODIFY COLUMN `contactid` INTEGER(19) DEFAULT NULL UNIQUE", "ALTER TABLE `purchaseorder` MODIFY COLUMN `terms_conditions` TEXT COLLATE latin1_swedish_ci", "ALTER TABLE `quotegrouprelation` MODIFY COLUMN `quoteid` INTEGER(19) NOT NULL PRIMARY KEY", "ALTER TABLE `quotes` MODIFY COLUMN `potentialid` INTEGER(19) DEFAULT NULL UNIQUE", From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 08:06:12 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 15:06:12 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23682=3A_?= =?utf-8?q?Migration_Issues_-_Duplication_of_Purchase_Order_Returns_No_Val?= =?utf-8?q?ues?= In-Reply-To: <076.260f3255a06e7eaa5036495341824543@vtiger.fosslabs.com> References: <076.260f3255a06e7eaa5036495341824543@vtiger.fosslabs.com> Message-ID: <085.98f43f0202fa95855d6238d7c2125582@vtiger.fosslabs.com> #682: Migration Issues - Duplication of Purchase Order Returns No Values ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * status: assigned => closed Comment: This issue has been fixed and has been checkedin in the svn. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 08:13:20 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 15:13:20 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23346=3A_?= =?utf-8?q?parenttab_error?= In-Reply-To: <076.114b8f31260f9ed39d7e15498b1461d0@vtiger.fosslabs.com> References: <076.114b8f31260f9ed39d7e15498b1461d0@vtiger.fosslabs.com> Message-ID: <085.ea971a7bf694d67076b0abf63a1bc1ff@vtiger.fosslabs.com> #346: parenttab error ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: parenttab ---------------------------+------------------------------------------------ Changes (by richie): * resolution: => fixed * status: new => closed Comment: (In [5359]) passed parenttab parameter. Fixes #346 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 08:13:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 15:13:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5359 - /vtigercrm/trunk/include/utils/ListViewUtils.php Message-ID: <20060425151320.C4E5E6DA898@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 09:13:16 2006 New Revision: 5359 Log: passed parenttab parameter. Fixes #346 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 Apr 25 09:13:16 2006 @@ -401,6 +401,7 @@ //parameter added for customview $oCv 27/5 function getListViewEntries($focus, $module,$list_result,$navigation_array,$relatedlist='',$returnset='',$edit_action='EditView',$del_action='Delete',$oCv='') { + $tabname = getParentTab(); global $adb,$current_user; global $app_strings; $noofrows = $adb->num_rows($list_result); @@ -607,13 +608,13 @@ $account_id = $adb->query_result($list_result,$i-1,"crmid"); $account_name = getAccountName($account_id); // Fredy Klammsteiner, 4.8.2005: changes from 4.0.1 migrated to 4.2 - $value = ''.$account_name.''; // Armando L??scher 05.07.2005 -> ??priority -> Desc: inserted style="$P_FONT_COLOR" + $value = ''.$account_name.''; // Armando L??scher 05.07.2005 -> ??priority -> Desc: inserted style="$P_FONT_COLOR" }else { $account_id = $adb->query_result($list_result,$i-1,"accountid"); $account_name = getAccountName($account_id); // Fredy Klammsteiner, 4.8.2005: changes from 4.0.1 migrated to 4.2 - $value = ''.$account_name.''; // Armando L??scher 05.07.2005 -> ??priority -> Desc: inserted style="$P_FONT_COLOR" + $value = ''.$account_name.''; // Armando L??scher 05.07.2005 -> ??priority -> Desc: inserted style="$P_FONT_COLOR" } } elseif(( $module == 'HelpDesk' || $module == 'PriceBook' || $module == 'Quotes' || $module == 'PurchaseOrder' || $module == 'Faq') && $name == 'Product Name') From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 08:17:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 15:17:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5360 - /vtigercrm/trunk/pkg/bin/startvTiger.bat Message-ID: <20060425151734.9E4BE6DA898@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 09:17:30 2006 New Revision: 5360 Log: message changed and directions given to handle the apache port change Modified: vtigercrm/trunk/pkg/bin/startvTiger.bat Modified: vtigercrm/trunk/pkg/bin/startvTiger.bat ============================================================================== --- vtigercrm/trunk/pkg/bin/startvTiger.bat (original) +++ vtigercrm/trunk/pkg/bin/startvTiger.bat Tue Apr 25 09:17:30 2006 @@ -150,7 +150,9 @@ echo "" echo "" echo "********* Service not started as port # %apache_port% occupied ******* " -echo "********* Kindly free port %apache_port% and restart again ******* " +echo "********* Kindly free port %apache_port% and restart again or give a different port which is free******* " +echo "********* You need to open the apache/conf/httpd.conf file, search for the word Listen and change the port number given******* " +echo "********* Please make the apache port number change in the startvTiger.bat file and the stopvTiger.bat file too******* " echo "" echo "" echo "" From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 08:29:39 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 15:29:39 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23348=3A_?= =?utf-8?q?Account_always_points_to_Support_primary_tab?= In-Reply-To: <076.4fc89fe2de8cc4c1f965c3b9d4c0cff4@vtiger.fosslabs.com> References: <076.4fc89fe2de8cc4c1f965c3b9d4c0cff4@vtiger.fosslabs.com> Message-ID: <085.44e26b0a8d62586d5d5266612ee4d6f9@vtiger.fosslabs.com> #348: Account always points to Support primary tab ------------------------+--------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => duplicate * status: new => closed Comment: Duplicate issue. Hence closing this. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 11:33:43 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 18:33:43 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23744=3A_?= =?utf-8?q?Remove_Duplicate_Queries?= Message-ID: <076.e0aa545b1227d61b497ea30577e03c97@vtiger.fosslabs.com> #744: Remove Duplicate Queries -----------------------------------+---------------------------------------- Reporter: allanbush | Owner: allanbush Type: task | Status: new Priority: minor | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc3 Keywords: optimization database | -----------------------------------+---------------------------------------- If you look at the queries performed on every page load you'll see that lots of them are duplicates or predictably similar. I propose we eliminate as many of these redundant queries as possible which should offer a significant decrease in page loading times. You can view all the queries used to create a page by turning on adodb's debugging and reloading the page in question. To do this uncomment line 679 of source:/vtigercrm/branches/4.2/include/database/PearDatabase.php ($this->database->debug = true;). If the code from ticket #69 is checked in you'll also have to comment out line 936 of source:/vtigercrm/branches/4.2/adodb/adodb-lib.inc.php (// /*). -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 11:44:30 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 18:44:30 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23744=3A_?= =?utf-8?q?Remove_Duplicate_Queries?= In-Reply-To: <076.e0aa545b1227d61b497ea30577e03c97@vtiger.fosslabs.com> References: <076.e0aa545b1227d61b497ea30577e03c97@vtiger.fosslabs.com> Message-ID: <085.c7605bdeeac5d98bf60eec051b0968d9@vtiger.fosslabs.com> #744: Remove Duplicate Queries ------------------------+--------------------------------------------------- Reporter: allanbush | Owner: allanbush Type: task | Status: new Priority: minor | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc3 Resolution: | Keywords: optimization database ------------------------+--------------------------------------------------- Comment (by allanbush): (In [5361]) Fetch all the tab ids in one query and cache the results for subsequent requests. Refs #744. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 11:44:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 18:44:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5361 - /vtigercrm/branches/4.2/include/utils.php Message-ID: <20060425184432.883EB6DAFFA@vtiger.fosslabs.com> Author: allanbush Date: Tue Apr 25 12:44:28 2006 New Revision: 5361 Log: Fetch all the tab ids in one query and cache the results for subsequent requests. Refs #744. Modified: vtigercrm/branches/4.2/include/utils.php Modified: vtigercrm/branches/4.2/include/utils.php ============================================================================== --- vtigercrm/branches/4.2/include/utils.php (original) +++ vtigercrm/branches/4.2/include/utils.php Tue Apr 25 12:44:28 2006 @@ -866,15 +866,21 @@ function getTabid($module) { - global $vtlog; + global $adb, $vtlog; + static $res = null; $vtlog->logthis("module is ".$module,'info'); - global $adb; - $sql = "select tabid from tab where name='".$module."'"; + if(!is_null($res)) return $res[$module]; + + $sql = "select tabid, name from tab"; $result = $adb->query($sql); - $tabid= $adb->query_result($result,0,"tabid"); - return $tabid; - + $tab_count = $adb->num_rows($result); + for($i=0; $i<$tab_count; $i++) { + $tabid = $adb->query_result($result,$i,"tabid"); + $tabname = $adb->query_result($result, $i, "name"); + $res[$tabname] = $tabid; + } + return $res[$module]; } function getOutputHtml($uitype, $fieldname, $fieldlabel, $maxlength, $col_fields,$generatedtype) From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 12:14:23 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 19:14:23 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23744=3A_?= =?utf-8?q?Remove_Duplicate_Queries?= In-Reply-To: <076.e0aa545b1227d61b497ea30577e03c97@vtiger.fosslabs.com> References: <076.e0aa545b1227d61b497ea30577e03c97@vtiger.fosslabs.com> Message-ID: <085.e50e6c32a5327af53684f75d446f4cae@vtiger.fosslabs.com> #744: Remove Duplicate Queries ------------------------+--------------------------------------------------- Reporter: allanbush | Owner: allanbush Type: task | Status: new Priority: minor | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc3 Resolution: | Keywords: optimization database ------------------------+--------------------------------------------------- Comment (by allanbush): (In [5362]) Cache all the tab permissions for all profiles in one query. Modified from mikecrowe's optimizations (http://forums.vtiger.com/viewtopic.php?t=3804). Refs #744. Also removed the special case for the global MAX_TAB_PER variable as I don't know where this gets set or what it's suppost to do. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 12:14:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 19:14:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5362 - /vtigercrm/branches/4.2/modules/Users/UserInfoUtil.php Message-ID: <20060425191423.C369F6DB6F3@vtiger.fosslabs.com> Author: allanbush Date: Tue Apr 25 13:14:20 2006 New Revision: 5362 Log: Cache all the tab permissions for all profiles in one query. Modified from mikecrowe's optimizations (http://forums.vtiger.com/viewtopic.php?t=3804). Refs #744. Also removed the special case for the global MAX_TAB_PER variable as I don't know where this gets set or what it's suppost to do. Modified: vtigercrm/branches/4.2/modules/Users/UserInfoUtil.php Modified: vtigercrm/branches/4.2/modules/Users/UserInfoUtil.php ============================================================================== --- vtigercrm/branches/4.2/modules/Users/UserInfoUtil.php (original) +++ vtigercrm/branches/4.2/modules/Users/UserInfoUtil.php Tue Apr 25 13:14:20 2006 @@ -79,45 +79,39 @@ return $groupname; } -function getAllTabsPermission($profileid) -{ - global $adb,$MAX_TAB_PER; - $sql = "select * from profile2tab where profileid=" .$profileid ; +function loadAllPerms() +{ + global $adb; + static $persistPermArray = Array(); + + if($persistPermArray) return $persistPermArray; + + $sql = "select tabid, permissions, profileid from profile2tab"; $result = $adb->query($sql); - $tab_perr_array = Array(); - if($MAX_TAB_PER !='') - { - $tab_perr_array = array_fill(0,$MAX_TAB_PER,0); - } $num_rows = $adb->num_rows($result); for($i=0; $i<$num_rows; $i++) { - $tabid= $adb->query_result($result,$i,'tabid'); - $tab_per= $adb->query_result($result,$i,'permissions'); - $tab_perr_array[$tabid] = $tab_per; - } + $tabid = $adb->query_result($result, $i, 'tabid'); + $tab_per = $adb->query_result($result, $i, 'permissions'); + $profileid = $adb->query_result($result, $i, 'profileid'); + $persistPermArray[$profileid][$tabid] = $tab_per; + } + return $persistPermArray; +} + +function getAllTabsPermission($profileid) +{ + $perm = loadAllPerms(); + return $perm[$profileid]; +} + +function getTabsPermission($profileid) +{ + $perm = loadAllPerms(); + $tab_perr_array = $perm[$profileid]; + foreach( array(1,3,16,15,17,18,19,22) as $tabid ) + $tab_perr_array[$tabid] = 0; return $tab_perr_array; - -} - -function getTabsPermission($profileid) -{ - global $adb; - $sql = "select * from profile2tab where profileid=" .$profileid ; - $result = $adb->query($sql); - $tab_perr_array = Array(); - $num_rows = $adb->num_rows($result); - for($i=0; $i<$num_rows; $i++) - { - $tabid= $adb->query_result($result,$i,'tabid'); - $tab_per= $adb->query_result($result,$i,'permissions'); - if($tabid != 1 && $tabid != 3 && $tabid != 16 && $tab_id != 15 && $tab_id != 17 && $tab_id != 18 && $tab_id != 19 && $tab_id != 22) - { - $tab_perr_array[$tabid] = $tab_per; - } - } - return $tab_perr_array; - } function getTabsActionPermission($profileid) From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 12:25:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 19:25:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5363 - /vtigercrm/branches/4.2/vtigerlogger.php Message-ID: <20060425192515.F32686DAB84@vtiger.fosslabs.com> Author: allanbush Date: Tue Apr 25 13:25:13 2006 New Revision: 5363 Log: Only create the logging object once and reuse it everytime as suggested by mikecrowe (http://forums.vtiger.com/viewtopic.php?t=3804). I measured an approximate half second page loading time improvement on my system (3.5 -> 3 seconds to load the home tab) with this change. Modified: vtigercrm/branches/4.2/vtigerlogger.php Modified: vtigercrm/branches/4.2/vtigerlogger.php ============================================================================== --- vtigercrm/branches/4.2/vtigerlogger.php (original) +++ vtigercrm/branches/4.2/vtigerlogger.php Tue Apr 25 13:25:13 2006 @@ -11,17 +11,17 @@ class vtigerLogger { var $debug_status; + var $log1; function logthis($msg,$loglevel) { if($this->debug_status) { require_once('include/logging.php'); - $log1 =& LoggerManager::getLogger('VT'); if(is_array($msg)) - $log1->$loglevel("Message".print_r($msg,true)); + $this->log1->$loglevel("Message".print_r($msg,true)); else - $log1->$loglevel("Message ->".$msg); + $this->log1->$loglevel("Message ->".$msg); return $msg; } @@ -29,6 +29,7 @@ function vtigerLogger() { $this->debug_status= true; + $this->log1 =& LoggerManager::getLogger('VT'); } } From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 12:52:09 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 19:52:09 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2335=3A_C?= =?utf-8?q?alls_to_adoSchema-=3Eprintln=28=29_produce_logging_output_of_?= =?utf-8?q?=22FATAL_VT=22_type_instead_of_=22INFO_VT=22?= In-Reply-To: <076.f178b3fc1e0f0b7c80263af2fdeb0cd0@vtiger.fosslabs.com> References: <076.f178b3fc1e0f0b7c80263af2fdeb0cd0@vtiger.fosslabs.com> Message-ID: <085.0c99e62beadda64d84dc1f9fedc307ed@vtiger.fosslabs.com> #35: Calls to adoSchema->println() produce logging output of "FATAL VT" type instead of "INFO VT" ------------------------+--------------------------------------------------- Reporter: mfedyk | Owner: developer Type: defect | Status: closed Priority: trivial | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.3 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by allanbush): * resolution: => fixed * status: new => closed Comment: (In [5364]) Cleaned up the logging levels. Closes #35. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 12:52:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 19:52:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5364 - /vtigercrm/branches/4.2/include/database/PearDatabase.php Message-ID: <20060425195212.2721E6DBF1B@vtiger.fosslabs.com> Author: allanbush Date: Tue Apr 25 13:52:07 2006 New Revision: 5364 Log: Cleaned up the logging levels. Closes #35. Modified: vtigercrm/branches/4.2/include/database/PearDatabase.php Modified: vtigercrm/branches/4.2/include/database/PearDatabase.php ============================================================================== --- vtigercrm/branches/4.2/include/database/PearDatabase.php (original) +++ vtigercrm/branches/4.2/include/database/PearDatabase.php Tue Apr 25 13:52:07 2006 @@ -41,15 +41,14 @@ function println($msg) { - require_once('include/logging.php'); - $log1 =& LoggerManager::getLogger('VT'); + global $vtlog; if(is_array($msg)) { - $log1->fatal("PearDatabse ->".print_r($msg,true)); + $vtlog->logthis("PearDatabse ->".print_r($msg,true), 'info'); } else { - $log1->fatal("PearDatabase ->".$msg); + $vtlog->logthis("PearDatabase ->".$msg, 'info'); } return $msg; } @@ -149,27 +148,16 @@ function checkError($msg='', $dieOnError=false) { - /*if($this->database->ErrorNo()) - { - if($this->dieOnError || $dieOnError) - { - $this->println("ADODB error ".$this->database->ErrorNo()); - die ($msg."ADODB error ".$this->database->ErrorNo()); - - }else{ - $this->log->error("MySQL error ".mysql_errno().": ".mysql_error()); - } - return true; - }*/ - + global $vtlog; + if($this->dieOnError || $dieOnError) { - $this->println("ADODB error ".$msg."->[".$this->database->ErrorNo()."]".$this->database->ErrorMsg()); + $vtlog->logthis("ADODB error ".$msg."->[".$this->database->ErrorNo()."]".$this->database->ErrorMsg(), 'fatal'); die ($msg."ADODB error ".$msg."->".$this->database->ErrorMsg()); } else { - $this->println("ADODB error ".$msg."->[".$this->database->ErrorNo()."]".$this->database->ErrorMsg()); + $vtlog->logthis("ADODB error ".$msg."->[".$this->database->ErrorNo()."]".$this->database->ErrorMsg(), 'error'); } return false; From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 14:05:11 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 21:05:11 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23744=3A_?= =?utf-8?q?Remove_Duplicate_Queries?= In-Reply-To: <076.e0aa545b1227d61b497ea30577e03c97@vtiger.fosslabs.com> References: <076.e0aa545b1227d61b497ea30577e03c97@vtiger.fosslabs.com> Message-ID: <085.3b73098a3d3d4fea5660520f961559b9@vtiger.fosslabs.com> #744: Remove Duplicate Queries ------------------------+--------------------------------------------------- Reporter: allanbush | Owner: allanbush Type: task | Status: new Priority: minor | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc3 Resolution: | Keywords: optimization database ------------------------+--------------------------------------------------- Comment (by allanbush): (In [5365]) Caching of field permissions (from http://forums.vtiger.com/viewtopic.php?p=15163#15163). Refs #744. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 14:05:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 21:05:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5365 - /vtigercrm/branches/4.2/include/utils.php Message-ID: <20060425210513.90FAA3FC3C3@vtiger.fosslabs.com> Author: allanbush Date: Tue Apr 25 15:05:04 2006 New Revision: 5365 Log: Caching of field permissions (from http://forums.vtiger.com/viewtopic.php?p=15163#15163). Refs #744. Modified: vtigercrm/branches/4.2/include/utils.php Modified: vtigercrm/branches/4.2/include/utils.php ============================================================================== --- vtigercrm/branches/4.2/include/utils.php (original) +++ vtigercrm/branches/4.2/include/utils.php Tue Apr 25 15:05:04 2006 @@ -103,7 +103,7 @@ { require_once('include/database/PearDatabase.php'); $db = new PearDatabase(); - $temp_result = Array(); + $user_array = Array(); // Including deleted users for now. if (empty($status)) { $query = "SELECT id, user_name from users"; @@ -131,16 +131,14 @@ if ($add_blank==true){ // Add in a blank row - $temp_result[''] = ''; + $user_array[''] = ''; } // Get the id and the name. while($row = $db->fetchByAssoc($result)) { - $temp_result[$row['id']] = $row['user_name']; - } - - $user_array = &$temp_result; + $user_array[$row['id']] = $row['user_name']; + } } return $user_array; @@ -2435,15 +2433,20 @@ function getUserName($userid) { -global $vtlog; -$vtlog->logthis("in getUserName ".$userid,'info'); + static $cache = array(); + if(isset($cache[$userid])) return $cache[$userid]; + + global $vtlog; + $vtlog->logthis("in getUserName ".$userid,'info'); global $adb; + $user_name = ''; if($userid != '') { $sql = "select user_name from users where id=".$userid; $result = $adb->query($sql); $user_name = $adb->query_result($result,0,"user_name"); + $cache[$userid] = $user_name; } return $user_name; } @@ -2626,40 +2629,13 @@ } } - //modified for customview 27/5 - $app_strings change to $mod_strings - foreach($focus->list_fields as $name=>$tableinfo) - { - //$fieldname = $focus->list_fields_name[$name]; //commented for customview 27/5 - //added for customview 27/5 - if($oCv) - { - if(isset($oCv->list_fields_name)) - { - $fieldname = $oCv->list_fields_name[$name]; - }else - { - $fieldname = $focus->list_fields_name[$name]; - } - }else - { - $fieldname = $focus->list_fields_name[$name]; - } - - //Getting the Entries from Profile2 field table - $query = "select profile2field.* from field inner join profile2field on field.fieldid=profile2field.fieldid where profile2field.tabid=".$tabid." and profile2field.profileid=".$profile_id." and field.fieldname='".$fieldname."'"; - $result = $adb->query($query); - - //Getting the Entries from def_org_field table - $query1 = "select def_org_field.* from field inner join def_org_field on field.fieldid=def_org_field.fieldid where def_org_field.tabid=".$tabid." and field.fieldname='".$fieldname."'"; - $result_def = $adb->query($query1); - - - if($adb->query_result($result,0,"visible") == 0 && $adb->query_result($result_def,0,"visible") == 0) - { - + $names = get_field_list($focus, $oCv, $tabid); + foreach($names as $fieldname=>$data) { + list($name, $is_column) = $data; if(isset($focus->sortby_fields) && $focus->sortby_fields !='') { - foreach($focus->list_fields[$name] as $tab=>$col) + + if($focus->list_fields[$name]) foreach($focus->list_fields[$name] as $tab=>$col) { if(in_array($col,$focus->sortby_fields)) { @@ -2717,7 +2693,8 @@ $name .=': (in '.$curr_symbol.')'; } else - { if($app_strings[$name]) + { + if($app_strings[$name]) { $name = $app_strings[$name]; } @@ -2726,8 +2703,6 @@ $name = $mod_strings[$name]; } } - - } } //Added condition to hide the close column in Related Lists if($name == $app_strings['Close'] && $relatedlist != '') @@ -2976,6 +2951,58 @@ } +function get_field_list($focus, $oCv, $tabid) +{ + static $names = null, $last_tabid = null; + if(!is_null($names) && $tabid == $last_tabid) return $names; + + $names = null; + $last_tabid = $tabid; + + foreach($focus->list_fields as $name=>$tableinfo) + { + $fieldname = $focus->list_fields_name[$name]; + + //added for customview 27/5 + if($oCv && isset($oCv->list_fields_name)) { + $fieldname = $oCv->list_fields_name[$name]; + } + if($fieldname == '') { + foreach($tableinfo as $tablename=>$colname); + $fieldname = $colname; + $is_column = true; + } else { + $is_column = false; + } + $fieldnames[] = $fieldname; + $namelist[$fieldname] = array($name, $is_column); + } + + $fieldnamelist = implode($fieldnames, '\', \''); + + global $profile_id, $adb; + if($profile_id == '') + { + global $current_user; + $profile_id = fetchUserProfileId($current_user->id); + } + + $query = "select distinct field.fieldname from field inner join profile2field on field.fieldid=profile2field.fieldid inner join def_org_field on field.fieldid=def_org_field.fieldid where profile2field.tabid=".$tabid." and profile2field.profileid=".$profile_id." and field.fieldname in ('".$fieldnamelist."') and profile2field.visible = 0 and def_org_field.visible = 0"; + $result = $adb->query($query); + $noofrows = $adb->num_rows($result); + for($j=0; $j<$noofrows; $j++) { + $visible_fields[] = $adb->query_result($result, $j, 'fieldname'); + } + + foreach($fieldnames as $fieldname) { + if(is_null($visible_fields) || in_array($fieldname, $visible_fields)) { + $names[$fieldname] = $namelist[$fieldname]; + } + } + + return $names; +} + //parameter added for customview $oCv 27/5 function getListViewEntries($focus, $module,$list_result,$navigation_array,$relatedlist='',$returnset='',$edit_action='EditView',$del_action='Delete',$oCv='') { @@ -3025,44 +3052,18 @@ $list_header .= '
    - + From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 03:57:35 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 10:57:35 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23633=3A_?= =?utf-8?q?unInstallation_issue?= In-Reply-To: <076.51f5249c35374c687a3ee4d97ec59ede@vtiger.fosslabs.com> References: <076.51f5249c35374c687a3ee4d97ec59ede@vtiger.fosslabs.com> Message-ID: <085.3ef34ba45b66b99e25a1c20c1819f362@vtiger.fosslabs.com> #633: unInstallation issue ------------------------+--------------------------------------------------- Reporter: mickie | Owner: richie Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.1 Resolution: wontfix | Keywords: install ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => wontfix * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 04:01:50 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 11:01:50 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23194=3A_?= =?utf-8?q?massdelete_in_ListView_shows_hacking_attempt?= In-Reply-To: <076.1ca2595c177e192b1f562a9749f81d8c@vtiger.fosslabs.com> References: <076.1ca2595c177e192b1f562a9749f81d8c@vtiger.fosslabs.com> Message-ID: <085.5a7945a74313bdeda3ff1a2600775d3e@vtiger.fosslabs.com> #194: massdelete in ListView shows hacking attempt ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: philip Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: massdelete ---------------------------+------------------------------------------------ Changes (by anonymous): * owner: developer => philip -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 04:03:01 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 11:03:01 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23507=3A_?= =?utf-8?q?My_Preference_Page_Error?= In-Reply-To: <076.369b9e9cf241d21998da449131304b7a@vtiger.fosslabs.com> References: <076.369b9e9cf241d21998da449131304b7a@vtiger.fosslabs.com> Message-ID: <085.c2396b3b6f4fd3b412f1039952c0498b@vtiger.fosslabs.com> #507: My Preference Page Error ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Comment (by richie): (In [5374]) ID is properly passed. Fixes #507 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 26 04:03:02 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 26 Apr 2006 11:03:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5374 - /vtigercrm/trunk/Smarty/templates/MyPrefDetailView.tpl Message-ID: <20060426110302.2C3D66E6FC6@vtiger.fosslabs.com> Author: richie Date: Wed Apr 26 05:02:56 2006 New Revision: 5374 Log: ID is properly passed. Fixes #507 Modified: vtigercrm/trunk/Smarty/templates/MyPrefDetailView.tpl Modified: vtigercrm/trunk/Smarty/templates/MyPrefDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/MyPrefDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/MyPrefDetailView.tpl Wed Apr 26 05:02:56 2006 @@ -39,7 +39,7 @@ - + From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 04:11:40 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 11:11:40 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23176=3A_?= =?utf-8?q?no_cancel_button_in_announcements?= In-Reply-To: <076.4d8917f257e17267aa179d1e98cf854e@vtiger.fosslabs.com> References: <076.4d8917f257e17267aa179d1e98cf854e@vtiger.fosslabs.com> Message-ID: <085.896cbb129a2c2ecdd84db7252672e651@vtiger.fosslabs.com> #176: no cancel button in announcements ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: cancel ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed Comment: (In [5375]) Cancel button added. Fixes #176 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 26 04:11:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 26 Apr 2006 11:11:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5375 - /vtigercrm/trunk/Smarty/templates/Settings/Announcements.tpl Message-ID: <20060426111140.98DDA6E7318@vtiger.fosslabs.com> Author: richie Date: Wed Apr 26 05:11:35 2006 New Revision: 5375 Log: Cancel button added. Fixes #176 Modified: vtigercrm/trunk/Smarty/templates/Settings/Announcements.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings/Announcements.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/Announcements.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/Announcements.tpl Wed Apr 26 05:11:35 2006 @@ -63,6 +63,7 @@
     My DetailsMy Details My Mail Server Details  
      My Details My Mail Server Details My Mail Server Details  
      +
    From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 04:12:06 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 11:12:06 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23106=3A_?= =?utf-8?q?Delete_not_Working?= In-Reply-To: <076.e43921d946ab38d7ed71adef5e06927b@vtiger.fosslabs.com> References: <076.e43921d946ab38d7ed71adef5e06927b@vtiger.fosslabs.com> Message-ID: <085.61ca533328a90003e921951e0a61308c@vtiger.fosslabs.com> #106: Delete not Working ------------------------+--------------------------------------------------- Reporter: jeri | Owner: philip Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Accounts ------------------------+--------------------------------------------------- Changes (by anonymous): * owner: developer => philip -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 26 04:33:01 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 26 Apr 2006 11:33:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5376 - /vtigercrm/trunk/Smarty/templates/ListView.tpl Message-ID: <20060426113301.BD6006E6FC6@vtiger.fosslabs.com> Author: richie Date: Wed Apr 26 05:32:49 2006 New Revision: 5376 Log: Cancel button added 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 Wed Apr 26 05:32:49 2006 @@ -403,6 +403,7 @@     		   +
    From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 04:40:08 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 11:40:08 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23177=3A_?= =?utf-8?q?assign_module_owner_cancel_takes_me_to_Settings_home_page?= In-Reply-To: <076.5013290f7e31546c744208c1d923ab5e@vtiger.fosslabs.com> References: <076.5013290f7e31546c744208c1d923ab5e@vtiger.fosslabs.com> Message-ID: <085.40e849fd8b71027a6d378c425dacc2c2@vtiger.fosslabs.com> #177: assign module owner cancel takes me to Settings home page ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Cancel ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed Comment: (In [5377]) Made proper redirection on cancel. Fixes #177 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 26 04:40:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 26 Apr 2006 11:40:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5377 - /vtigercrm/trunk/Smarty/templates/Settings/ModuleOwnersContents.tpl Message-ID: <20060426114009.5C9D8638F98@vtiger.fosslabs.com> Author: richie Date: Wed Apr 26 05:40:00 2006 New Revision: 5377 Log: Made proper redirection on cancel. Fixes #177 Modified: vtigercrm/trunk/Smarty/templates/Settings/ModuleOwnersContents.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings/ModuleOwnersContents.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/ModuleOwnersContents.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/ModuleOwnersContents.tpl Wed Apr 26 05:40:00 2006 @@ -12,7 +12,7 @@ {else} - + {/if}
    From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 04:42:48 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 11:42:48 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23356=3A_?= =?utf-8?q?My_Mail_Server_Details_link_is_broken?= In-Reply-To: <076.4278d8a764c99e1c7fce31d0bb54bc43@vtiger.fosslabs.com> References: <076.4278d8a764c99e1c7fce31d0bb54bc43@vtiger.fosslabs.com> Message-ID: <085.11ad7010b7d9e5a158e5b37e77e8b490@vtiger.fosslabs.com> #356: My Mail Server Details link is broken ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: Mail Server ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => duplicate * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 04:43:05 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 11:43:05 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23419=3A_?= =?utf-8?q?Redundant_buttons?= In-Reply-To: <076.6de71d424e67da126d5c147a0d1f2701@vtiger.fosslabs.com> References: <076.6de71d424e67da126d5c147a0d1f2701@vtiger.fosslabs.com> Message-ID: <085.59fb2315e3470c22ed0b89d2c1276142@vtiger.fosslabs.com> #419: Redundant buttons ------------------------+--------------------------------------------------- Reporter: richie | Owner: ela Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: profile ------------------------+--------------------------------------------------- Changes (by anonymous): * owner: developer => ela -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 04:44:55 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 11:44:55 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23728=3A_?= =?utf-8?q?Add_accounts_and_contacts_links_to_Marketing_tab?= In-Reply-To: <076.2b0185f2a18c096fb40efbfe665effd3@vtiger.fosslabs.com> References: <076.2b0185f2a18c096fb40efbfe665effd3@vtiger.fosslabs.com> Message-ID: <085.92622b16db00f9caebc584404c7c2c37@vtiger.fosslabs.com> #728: Add accounts and contacts links to Marketing tab --------------------------+------------------------------------------------- Reporter: OnwealdTim | Owner: developer Type: enhancement | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------+------------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 04:45:27 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 11:45:27 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23121=3A_?= =?utf-8?q?Issue_in_Mass_Delete?= In-Reply-To: <076.534509f43245a3f9190f86720e967f9d@vtiger.fosslabs.com> References: <076.534509f43245a3f9190f86720e967f9d@vtiger.fosslabs.com> Message-ID: <085.8ffb9b7b5ab1860e09f034c658d07c3f@vtiger.fosslabs.com> #121: Issue in Mass Delete ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: philip Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: massdelete ------------------------+--------------------------------------------------- Changes (by anonymous): * owner: developer => philip -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 04:45:44 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 11:45:44 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23122=3A_?= =?utf-8?q?Issue_in_Mass_Delete?= In-Reply-To: <076.89726d02571017484d27333203347a97@vtiger.fosslabs.com> References: <076.89726d02571017484d27333203347a97@vtiger.fosslabs.com> Message-ID: <085.8cf09db11885c4191abca3dfec9c0a6a@vtiger.fosslabs.com> #122: Issue in Mass Delete ------------------------+--------------------------------------------------- Reporter: jeri | Owner: philip Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: massdelete ------------------------+--------------------------------------------------- Changes (by anonymous): * owner: developer => philip -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 26 04:46:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 26 Apr 2006 11:46:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5378 - /vtigercrm/trunk/modules/Users/Security.php Message-ID: <20060426114653.04E2A6E6A58@vtiger.fosslabs.com> Author: don Date: Wed Apr 26 05:46:44 2006 New Revision: 5378 Log: Contacts and Accounts added under Marketing Modified: vtigercrm/trunk/modules/Users/Security.php Modified: vtigercrm/trunk/modules/Users/Security.php ============================================================================== --- vtigercrm/trunk/modules/Users/Security.php (original) +++ vtigercrm/trunk/modules/Users/Security.php Wed Apr 26 05:46:44 2006 @@ -2105,7 +2105,9 @@ (7,24,1), (7,27,2), (7,8,3), - (2,26,1)"); + (2,26,1), + (2,6,2), + (2,4,3)"); } From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 04:49:52 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 11:49:52 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23174=3A_?= =?utf-8?q?Announcements?= In-Reply-To: <076.a87ce118b91cea66bd5f5d6bb21edb63@vtiger.fosslabs.com> References: <076.a87ce118b91cea66bd5f5d6bb21edb63@vtiger.fosslabs.com> Message-ID: <085.a0de234093c9670c6c8c789a6d2d2b85@vtiger.fosslabs.com> #174: Announcements ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Announcement ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed Comment: The default update time period is 300 seconds. The result will be seen after that period alone or upon a page refresh. Jeri -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 04:54:04 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 11:54:04 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23662=3A_?= =?utf-8?q?Calculator_/_world_time_on_every_page_is_bandwidth_intensive?= In-Reply-To: <076.effa1b25ccc4464b7b5f7b7df566c9a0@vtiger.fosslabs.com> References: <076.effa1b25ccc4464b7b5f7b7df566c9a0@vtiger.fosslabs.com> Message-ID: <085.aef079252a7ac7b2a889e47789e883bc@vtiger.fosslabs.com> #662: Calculator / world time on every page is bandwidth intensive --------------------------+------------------------------------------------- Reporter: ncrossland | Owner: ela Type: enhancement | Status: new Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.1 Resolution: | Keywords: --------------------------+------------------------------------------------- Changes (by richie): * version: 5.0.0 => 5.0.1 * owner: developer => ela Comment: Will take up post 5GA. Richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 04:54:31 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 11:54:31 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23410=3A_?= =?utf-8?q?Improper_redirection_on_clicking_cancel?= In-Reply-To: <076.04eee924b1ab2c373eba75721188a75f@vtiger.fosslabs.com> References: <076.04eee924b1ab2c373eba75721188a75f@vtiger.fosslabs.com> Message-ID: <085.c785b35ad47f02e4d8501546364e0374@vtiger.fosslabs.com> #410: Improper redirection on clicking cancel ------------------------+--------------------------------------------------- Reporter: saraj | Owner: richie Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Settings Assign Moudle Owners ------------------------+--------------------------------------------------- Changes (by anonymous): * owner: jerrydgeorge => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 04:55:02 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 11:55:02 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23410=3A_?= =?utf-8?q?Improper_redirection_on_clicking_cancel?= In-Reply-To: <076.04eee924b1ab2c373eba75721188a75f@vtiger.fosslabs.com> References: <076.04eee924b1ab2c373eba75721188a75f@vtiger.fosslabs.com> Message-ID: <085.c440e868a0b96101f88bac65a48b5459@vtiger.fosslabs.com> #410: Improper redirection on clicking cancel ------------------------+--------------------------------------------------- Reporter: saraj | Owner: richie Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: Settings Assign Moudle Owners ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => duplicate * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 04:56:29 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 11:56:29 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23185=3A_?= =?utf-8?q?Scroll_Message_in_Home_page_-_displays_SQL_query?= In-Reply-To: <076.847231a7bde0a077c86ff3bbc7b76176@vtiger.fosslabs.com> References: <076.847231a7bde0a077c86ff3bbc7b76176@vtiger.fosslabs.com> Message-ID: <085.6911afdbc5cc0c66a99fd1a79b103a37@vtiger.fosslabs.com> #185: Scroll Message in Home page - displays SQL query ------------------------+--------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => invalid * status: new => closed Comment: It seems there are some other debug tools installed in the system due to which you are getting this exception in the pages. Richie -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 26 05:51:01 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 26 Apr 2006 12:51:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5379 - /vtigercrm/trunk/modules/Invoice/DetailView.php Message-ID: <20060426125101.881C86AB419@vtiger.fosslabs.com> Author: don Date: Wed Apr 26 06:50:55 2006 New Revision: 5379 Log: Removed call to tabPerData Modified: vtigercrm/trunk/modules/Invoice/DetailView.php Modified: vtigercrm/trunk/modules/Invoice/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/DetailView.php (original) +++ vtigercrm/trunk/modules/Invoice/DetailView.php Wed Apr 26 06:50:55 2006 @@ -67,7 +67,6 @@ $category = getParentTab(); $smarty->assign("CATEGORY",$category); -$permissionData = $_SESSION['action_permission_set']; if(isPermitted("Invoice",1,$_REQUEST['record']) == 'yes') $smarty->assign("EDIT_DUPLICATE","permitted"); @@ -76,11 +75,6 @@ if(isPermitted("Invoice",2,$_REQUEST['record']) == 'yes') $smarty->assign("DELETE","permitted"); -//Security check for related list -global $profile_id; -$tab_per_Data = getAllTabsPermission($profile_id); -$permissionData = $_SESSION['action_permission_set']; - //Get the associated Products and then display above Terms and Conditions $smarty->assign("ASSOCIATED_PRODUCTS",getDetailAssociatedProducts('Invoice',$focus)); From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 26 05:53:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 26 Apr 2006 12:53:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5380 - /vtigercrm/trunk/modules/Products/DetailView.php Message-ID: <20060426125328.803996AB419@vtiger.fosslabs.com> Author: don Date: Wed Apr 26 06:53:24 2006 New Revision: 5380 Log: Removed call to tabPerData Modified: vtigercrm/trunk/modules/Products/DetailView.php Modified: vtigercrm/trunk/modules/Products/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Products/DetailView.php (original) +++ vtigercrm/trunk/modules/Products/DetailView.php Wed Apr 26 06:53:24 2006 @@ -50,7 +50,6 @@ $smarty->assign("CUSTOMFIELD", $cust_fld); $smarty->assign("SINGLE_MOD","Product"); -$permissionData = $_SESSION['action_permission_set']; if(isPermitted("Products",1,$_REQUEST['record']) == 'yes') $smarty->assign("EDIT_DUPLICATE","permitted"); @@ -62,9 +61,6 @@ $smarty->assign("ID", $_REQUEST['record']); //Security check for related list -global $profile_id; -$tab_per_Data = getAllTabsPermission($profile_id); -$permissionData = $_SESSION['action_permission_set']; $smarty->assign("MODULE", $module); $smarty->display("DetailView.tpl"); From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 26 05:59:05 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 26 Apr 2006 12:59:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5381 - /vtigercrm/trunk/modules/HelpDesk/DetailView.php Message-ID: <20060426125905.CD22B6AB419@vtiger.fosslabs.com> Author: don Date: Wed Apr 26 06:59:02 2006 New Revision: 5381 Log: Removed call to tabPerData Modified: vtigercrm/trunk/modules/HelpDesk/DetailView.php Modified: vtigercrm/trunk/modules/HelpDesk/DetailView.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 26 06:00:31 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 26 Apr 2006 13:00:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5382 - /vtigercrm/trunk/modules/Emails/DetailView.php Message-ID: <20060426130031.CAB2D6AB419@vtiger.fosslabs.com> Author: don Date: Wed Apr 26 07:00:27 2006 New Revision: 5382 Log: Removed call to tabPerData Modified: vtigercrm/trunk/modules/Emails/DetailView.php Modified: vtigercrm/trunk/modules/Emails/DetailView.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 26 06:02:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 26 Apr 2006 13:02:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5383 - /vtigercrm/trunk/modules/Emails/Save.php Message-ID: <20060426130258.55E426AB419@vtiger.fosslabs.com> Author: richie Date: Wed Apr 26 07:02:53 2006 New Revision: 5383 Log: PearDatabase::quote replaced with $adb->quote Modified: vtigercrm/trunk/modules/Emails/Save.php Modified: vtigercrm/trunk/modules/Emails/Save.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 26 06:04:14 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 26 Apr 2006 13:04:14 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5384 - in /vtigercrm/trunk/modules/Emails: mail.php mailsend.php Message-ID: <20060426130415.25AE36E789B@vtiger.fosslabs.com> Author: richie Date: Wed Apr 26 07:04:09 2006 New Revision: 5384 Log: PearDatabase::quote replaced with $adb->quote Modified: vtigercrm/trunk/modules/Emails/mail.php vtigercrm/trunk/modules/Emails/mailsend.php Modified: vtigercrm/trunk/modules/Emails/mail.php ============================================================================== --- vtigercrm/trunk/modules/Emails/mail.php (original) +++ vtigercrm/trunk/modules/Emails/mail.php Wed Apr 26 07:04:09 2006 @@ -119,7 +119,7 @@ global $adb; $adb->println("Inside the function addSignature"); - $sign = $adb->query_result($adb->query("select signature from users where user_name=".PearDatabase::quote($fromname)),0,"signature"); + $sign = $adb->query_result($adb->query("select signature from users where user_name=".$adb->quote($fromname)),0,"signature"); if($sign != '') { $contents .= '

    '.$sign.''; @@ -339,7 +339,7 @@ if($parentid != '') { //$query = 'select * from '.$tablename.' where '.$idname.' = '.$parentid; - $query = 'select * from '.$tablename.' where '. $idname.' = '.PearDatabase::quote($parentid); + $query = 'select * from '.$tablename.' where '. $idname.' = '.$adb->quote($parentid); $mailid = $adb->query_result($adb->query($query),0,$first_email); $mailid2 = $adb->query_result($adb->query($query),0,$second_email); } Modified: vtigercrm/trunk/modules/Emails/mailsend.php ============================================================================== --- vtigercrm/trunk/modules/Emails/mailsend.php (original) +++ vtigercrm/trunk/modules/Emails/mailsend.php Wed Apr 26 07:04:09 2006 @@ -103,7 +103,7 @@ { $temp=$realid[$j]; //$myquery='Select columnname from field where fieldid='.$temp; - $myquery='Select columnname from field where fieldid='.PearDatabase::quote($temp); + $myquery='Select columnname from field where fieldid='.$adb->quote($temp); $fresult=$adb->query($myquery); if ($pmodule=='Contacts') { From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 26 06:07:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 26 Apr 2006 13:07:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5385 - /vtigercrm/trunk/modules/Quotes/DetailView.php Message-ID: <20060426130749.26B1A6E789B@vtiger.fosslabs.com> Author: don Date: Wed Apr 26 07:07:45 2006 New Revision: 5385 Log: Removed call to tabPerData Modified: vtigercrm/trunk/modules/Quotes/DetailView.php Modified: vtigercrm/trunk/modules/Quotes/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/DetailView.php (original) +++ vtigercrm/trunk/modules/Quotes/DetailView.php Wed Apr 26 07:07:45 2006 @@ -66,7 +66,6 @@ $category = getParentTab(); $smarty->assign("CATEGORY",$category); -$permissionData = $_SESSION['action_permission_set']; if(isPermitted("Quotes",1,$_REQUEST['record']) == 'yes') $smarty->assign("EDIT_DUPLICATE","permitted"); @@ -83,9 +82,6 @@ $smarty->assign("DELETE","permitted"); -//Security check for related list -$tab_per_Data = getAllTabsPermission($profile_id); -$permissionData = $_SESSION['action_permission_set']; $smarty->assign("CONVERTMODE",'quotetoinvoice'); $smarty->assign("MODULE", $currentModule); From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 26 06:25:45 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 26 Apr 2006 13:25:45 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5386 - /vtigercrm/trunk/include/utils/ListViewUtils.php Message-ID: <20060426132545.6A12A5C73EC@vtiger.fosslabs.com> Author: richie Date: Wed Apr 26 07:25:41 2006 New Revision: 5386 Log: subject passed as parameter 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 Wed Apr 26 07:25:41 2006 @@ -1317,7 +1317,7 @@ } elseif($module == 'Emails') { - $value = ''.$temp_val.''; + $value = ''.$temp_val.''; } else { From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 26 06:27:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 26 Apr 2006 13:27:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5387 - /vtigercrm/trunk/Smarty/templates/Emails.tpl Message-ID: <20060426132730.B55B76DA65C@vtiger.fosslabs.com> Author: richie Date: Wed Apr 26 07:27:26 2006 New Revision: 5387 Log: subject passed to the td and shown on top. Hardcoded inbox and sent counts removed Modified: vtigercrm/trunk/Smarty/templates/Emails.tpl Modified: vtigercrm/trunk/Smarty/templates/Emails.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Emails.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Emails.tpl Wed Apr 26 07:27:26 2006 @@ -5,7 +5,10 @@ hide("status"); document.getElementById("EmailDetails").innerHTML=response.responseText; {rdelim} - +function setSubject(subject) +{ldelim} +document.getElementById("subjectsetter").innerHTML=subject +{rdelim} function getEmailContents(id) {ldelim} show("status"); @@ -64,10 +67,10 @@  All Mails
    •    - Inbox (121) + Inbox 
    •    - Sent (21) + Sent 
    •    Trash  @@ -76,10 +79,10 @@  Qualified Mails
      •    - Inbox (221) + Inbox 
      •    - Sent (521) + Sent 
      •    Trash  @@ -129,7 +132,7 @@   - Network world : WiFiTech Introduces new gen WiFi Router +   From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 26 06:34:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 26 Apr 2006 13:34:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5388 - /vtigercrm/trunk/modules/Campaigns/DetailView.php Message-ID: <20060426133428.8E2346E7ABE@vtiger.fosslabs.com> Author: don Date: Wed Apr 26 07:34:24 2006 New Revision: 5388 Log: Removed call to tabPerData Modified: vtigercrm/trunk/modules/Campaigns/DetailView.php Modified: vtigercrm/trunk/modules/Campaigns/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/DetailView.php (original) +++ vtigercrm/trunk/modules/Campaigns/DetailView.php Wed Apr 26 07:34:24 2006 @@ -45,7 +45,6 @@ $category = getParentTab(); $smarty->assign("CATEGORY",$category); -$permissionData = $_SESSION['action_permission_set']; if(isPermitted("Campaigns",1,$_REQUEST['record']) == 'yes') $smarty->assign("EDIT_DUPLICATE","permitted"); @@ -58,9 +57,6 @@ $smarty->assign("MODULE","Campaigns"); $smarty->display("DetailView.tpl"); -//Security check for related list -$tab_per_Data = getAllTabsPermission($profile_id); -$permissionData = $_SESSION['action_permission_set']; $focus->id = $_REQUEST['record']; ?> From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 26 06:37:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 26 Apr 2006 13:37:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5389 - /vtigercrm/trunk/modules/Leads/DetailView.php Message-ID: <20060426133703.6026E6E7ABE@vtiger.fosslabs.com> Author: don Date: Wed Apr 26 07:36:57 2006 New Revision: 5389 Log: Removed call to tabPerData Modified: vtigercrm/trunk/modules/Leads/DetailView.php Modified: vtigercrm/trunk/modules/Leads/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Leads/DetailView.php (original) +++ vtigercrm/trunk/modules/Leads/DetailView.php Wed Apr 26 07:36:57 2006 @@ -68,14 +68,8 @@ $val = isPermitted("Leads",1,$_REQUEST['record']); -$permissionData = $_SESSION['action_permission_set']; if(isPermitted("Leads",1,$_REQUEST['record']) == 'yes') $smarty->assign("EDIT_DUPLICATE","permitted"); - -//Security check for Convert Lead Button -global $profile_id; -$tab_per_Data = getAllTabsPermission($profile_id); -$permissionData = $_SESSION['action_permission_set']; if(isPermitted("Leads","ConvertLead") =='yes' && isPermitted("Accounts","EditView") =='yes' && isPermitted("Contacts","EditView")) From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 26 06:43:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 26 Apr 2006 13:43:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5390 - /vtigercrm/trunk/modules/Contacts/DetailView.php Message-ID: <20060426134332.52C956E7EE9@vtiger.fosslabs.com> Author: don Date: Wed Apr 26 07:43:28 2006 New Revision: 5390 Log: Removed call to tabPerData Modified: vtigercrm/trunk/modules/Contacts/DetailView.php Modified: vtigercrm/trunk/modules/Contacts/DetailView.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 26 06:45:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 26 Apr 2006 13:45:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5391 - /vtigercrm/trunk/modules/PurchaseOrder/DetailView.php Message-ID: <20060426134542.61FAA6E7EE9@vtiger.fosslabs.com> Author: don Date: Wed Apr 26 07:45:38 2006 New Revision: 5391 Log: Removed call to tabPerData Modified: vtigercrm/trunk/modules/PurchaseOrder/DetailView.php Modified: vtigercrm/trunk/modules/PurchaseOrder/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/DetailView.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/DetailView.php Wed Apr 26 07:45:38 2006 @@ -67,7 +67,6 @@ $category = getParentTab(); $smarty->assign("CATEGORY",$category); -$permissionData = $_SESSION['action_permission_set']; if(isPermitted("PurchaseOrder",1,$_REQUEST['record']) == 'yes') $smarty->assign("EDIT_DUPLICATE","permitted"); @@ -76,9 +75,6 @@ if(isPermitted("PurchaseOrder",2,$_REQUEST['record']) == 'yes') $smarty->assign("DELETE","permitted"); -//Security check for related list -$tab_per_Data = getAllTabsPermission($profile_id); -$permissionData = $_SESSION['action_permission_set']; //Get the associated Products and then display above Terms and Conditions $smarty->assign("ASSOCIATED_PRODUCTS",getDetailAssociatedProducts('PurchaseOrder',$focus)); From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 26 06:56:35 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 26 Apr 2006 13:56:35 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5392 - /vtigercrm/trunk/Smarty/templates/Buttons_List.tpl Message-ID: <20060426135635.DA5246E7E0E@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 26 07:56:31 2006 New Revision: 5392 Log: Added new tpl for enabling security for 'Add/Search/Import/Export' Links - Ahmed Added: vtigercrm/trunk/Smarty/templates/Buttons_List.tpl From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 26 07:04:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 26 Apr 2006 14:04:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5393 - in /vtigercrm/trunk/Smarty/templates: CreateView.tpl DetailView.tpl ListView.tpl salesEditView.tpl Message-ID: <20060426140432.88A216E81CD@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 26 08:04:24 2006 New Revision: 5393 Log: Included the file Buttons_List.tpl for security check in List/Detail/Edit/Create View - Ahmed Modified: vtigercrm/trunk/Smarty/templates/CreateView.tpl vtigercrm/trunk/Smarty/templates/DetailView.tpl vtigercrm/trunk/Smarty/templates/ListView.tpl vtigercrm/trunk/Smarty/templates/salesEditView.tpl Modified: vtigercrm/trunk/Smarty/templates/CreateView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateView.tpl Wed Apr 26 08:04:24 2006 @@ -45,50 +45,7 @@ - - - - - - - - - - -
        {$CATEGORY} > {$MODULE} - - - - - - - - -
        - - - - - - -
        Create {$SINGLE_MOD}...Search in {$MODULE}...
        -         		  - - - - - - - -
        Open Calendar...Show World Clock...Open Calculator...
        -         		  - - - - -
        -
        -
        + {include file='Buttons_List.tpl'} {**} Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/DetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/DetailView.tpl Wed Apr 26 08:04:24 2006 @@ -57,66 +57,7 @@ {include file='DetailViewHidden.tpl'}
        - - - - - - - - - - {if $MODULE eq 'Contacts' || $MODULE eq 'Leads' || $MODULE eq 'Accounts' || $MODULE eq 'Potentials' || $MODULE eq 'Products' || $MODULE eq 'Notes' || $MODULE eq 'Emails'} - - - {else} - - {/if} - - - - -
        {$CATEGORY} > {$MODULE} - - - - - - - - -
        - - - {if $MODULE eq 'Activities'} - - {else} - - {/if} - - - -
        Create {$ACTIVITY_MODE}...Create {$SINGLE_MOD}...Search in {$SINGLE_MOD}...
        -         		  - - - - - - -
        Open Calendar...Show World Clock...Open Calculator...
        -         		- - - -
        -
        -         		- {if $MODULE ne 'Notes' && $MODULE ne 'Emails'} - Import {$MODULE} | - {/if} - Export {$MODULE} -  
        + {include file='Buttons_List.tpl'} Modified: vtigercrm/trunk/Smarty/templates/ListView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListView.tpl Wed Apr 26 08:04:24 2006 @@ -38,69 +38,8 @@ - - -
        - - - - - - - {if $MODULE eq 'Contacts' || $MODULE eq 'Leads' || $MODULE eq 'Accounts' || $MODULE eq 'Potentials' || $MODULE eq 'Products' || $MODULE eq 'Notes' || $MODULE eq 'Emails'} - - - {else} - - {/if} - - - -
        {$CATEGORY} > {$MODULE} - - - - - - - - -
        - - - - {if $MODULE eq 'Activities'} - - {else} - - {/if} - - - -
        Create {$MODULE}...Create {$MODULE}...Search in {$MODULE}...Chat... -
        -         		  - - - - - - - -
        Open Calendar...Show World Clock...Open Calculator...
        -         		- - - - -
        -
        -         		- {if $MODULE ne 'Notes' && $MODULE ne 'Emails'} - Import {$MODULE} | - {/if} - Export {$MODULE} -  
        + {include file='Buttons_List.tpl'} + '; } + $log->debug("Exiting getValue method ..."); return $value; } function getListQuery($module,$where='') { + global $log; + $log->debug("Entering getListQuery(".$module.",".$where.") method ..."); global $current_user; require('user_privileges/user_privileges_'.$current_user->id.'.php'); @@ -1513,12 +1535,15 @@ } */ + $log->debug("Exiting getListQuery method ..."); return $query; } function getReadEntityIds($module) { + global $log; + $log->debug("Entering getReadEntityIds(".$module.") method ..."); global $current_user; require('user_privileges/user_privileges_'.$current_user->id.'.php'); require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); @@ -1616,6 +1641,7 @@ } } + $log->debug("Exiting getReadEntityIds method ..."); return $query; } @@ -1624,6 +1650,8 @@ //parameter $viewid added for customview 27/5 function AlphabeticalSearch($module,$action,$fieldname,$query,$type,$popuptype='',$recordid='',$return_module='',$append_url='',$viewid='',$groupid='') { + global $log; + $log->debug("Entering AlphabeticalSearch(".$module.",".$action.",".$fieldname.",".$query.",".$type.",".$popuptype.",".$recordid.",".$return_module.",".$append_url.",".$viewid.",".$groupid.") method ..."); if($type=='advanced') $flag='&advanced=true'; @@ -1639,12 +1667,15 @@ // Mike Crowe Mod --------------------------------------------------------added groupid to url $list .= ''.$var.''; + $log->debug("Exiting AlphabeticalSearch method ..."); return $list; } function getRelatedToEntity($module,$list_result,$rset) { + global $log; + $log->debug("Entering getRelatedToEntity(".$module.",".$list_result.",".$rset.") method ..."); global $adb; $seid = $adb->query_result($list_result,$rset,"relatedto"); @@ -1712,6 +1743,7 @@ { $parent_value = ''; } + $log->debug("Exiting getRelatedToEntity method ..."); return $parent_value; } @@ -1720,6 +1752,8 @@ //used in home page listTop files function getRelatedTo($module,$list_result,$rset) { + global $log; + $log->debug("Entering getRelatedTo(".$module.",".$list_result.",".$rset.") method ..."); global $adb; global $app_strings; @@ -1830,6 +1864,7 @@ $parent_value = $module_icon."".$parent_name.""; } //code added by raju ends + $log->debug("Exiting getRelatedTo method ..."); return $parent_value; @@ -1838,6 +1873,8 @@ function getTableHeaderNavigation($navigation_array, $url_qry,$module='',$action_val='index',$viewid='') { + global $log; + $log->debug("Entering getTableHeaderNavigation(".$navigation_array.",". $url_qry.",".$module.",".$action_val.",".$viewid.") method ..."); global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; @@ -1873,6 +1910,7 @@ $output .= ' '; } $output .= ''; + $log->debug("Exiting getTableHeaderNavigation method ..."); return $output; } @@ -1885,6 +1923,8 @@ function getRelCheckquery($currentmodule,$returnmodule,$recordid) { + global $log; + $log->debug("Entering getRelCheckquery(".$currentmodule.",".$returnmodule.",".$recordid.") method ..."); global $adb; $skip_id = Array(); $where_relquery = ""; @@ -1911,6 +1951,7 @@ $where_relquery = "and contactdetails.contactid not in ".$skipids; } } + $log->debug("Exiting getRelCheckquery method ..."); return $where_relquery; } From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 08:19:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 15:19:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5503 - /vtigercrm/trunk/include/utils/UserInfoUtil.php Message-ID: <20060427151907.62A7040E7BB@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 09:19:01 2006 New Revision: 5503 Log: log entries have been inserted in all functions 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 Thu Apr 27 09:19:01 2006 @@ -23,10 +23,13 @@ */ function getMailServerInfo($user) { + global $log; + $log->debug("Entering getMailServerInfo(".$user.") method ..."); global $adb; //$sql= "select rolename from user2role where userid='" .$userid ."'"; $sql = "select * from mail_accounts where status=1 and user_id=".$user->id; $result = $adb->query($sql); + $log->debug("Exiting getMailServerInfo method ..."); return $result; } @@ -36,11 +39,14 @@ */ function fetchUserRole($userid) { + global $log; + $log->debug("Entering fetchUserRole(".$userid.") method ..."); global $adb; //$sql= "select rolename from user2role where userid='" .$userid ."'"; $sql = "select roleid from user2role where userid='" .$userid ."'"; $result = $adb->query($sql); $roleid= $adb->query_result($result,0,"roleid"); + $log->debug("Exiting fetchUserRole method ..."); return $roleid; } @@ -50,6 +56,8 @@ */ function fetchUserProfileId($userid) { + global $log; + $log->debug("Entering fetchUserProfileId(".$userid.") method ..."); global $adb; $sql = "select roleid from user2role where userid=" .$userid; $result = $adb->query($sql); @@ -59,6 +67,7 @@ $sql1 = "select profileid from role2profile where roleid='" .$roleid."'"; $result1 = $adb->query($sql1); $profileid= $adb->query_result($result1,0,"profileid"); + $log->debug("Exiting fetchUserProfileId method ..."); return $profileid; } @@ -69,10 +78,13 @@ */ function fetchUserGroupids($userid) { + global $log; + $log->debug("Entering fetchUserGroupids(".$userid.") method ..."); global $adb; $focus = new GetUserGroups(); $focus->getAllUserGroups($userid); $groupidlists = implode(",",$focus->user_groups); + $log->debug("Exiting fetchUserGroupids method ..."); return $groupidlists; } @@ -82,6 +94,8 @@ */ function loadAllPerms() { + global $log; + $log->debug("Entering loadAllPerms() method ..."); global $adb,$MAX_TAB_PER; global $persistPermArray; @@ -110,6 +124,7 @@ $persistPermArray[$profileid][$tabid] = $tab_per; } } + $log->debug("Exiting loadAllPerms method ..."); } /** Function to get all the tab permission for the specified profile @@ -123,6 +138,8 @@ */ function getAllTabsPermission($profileid) { + global $log; + $log->debug("Entering getAllTabsPermission(".$profileid.") method ..."); global $persistPermArray; global $adb,$MAX_TAB_PER; // Mike Crowe Mod -------------------------------------------------------- @@ -130,6 +147,7 @@ { if ( count($persistPermArray) == 0 ) loadAllPerms(); + $log->debug("Exiting getAllTabsPermission method ..."); return $persistPermArray[$profileid]; } else @@ -148,6 +166,7 @@ $tab_per= $adb->query_result($result,$i,'permissions'); $tab_perr_array[$tabid] = $tab_per; } + $log->debug("Exiting getAllTabsPermission method ..."); return $tab_perr_array; } // Mike Crowe Mod ---------------------------------------------------------------- @@ -165,6 +184,8 @@ */ function getTabsPermission($profileid) { + global $log; + $log->debug("Entering getTabsPermission(".$profileid.") method ..."); global $persistPermArray; global $adb; // Mike Crowe Mod ------------------------------------------------------- @@ -175,6 +196,7 @@ $tab_perr_array = $persistPermArray; foreach( array(1,3,16,15) as $tabid ) $tab_perr_array[$tabid] = 0; + $log->debug("Exiting getTabsPermission method ..."); return $tab_perr_array; } else @@ -192,6 +214,7 @@ $tab_perr_array[$tabid] = $tab_per; } } + $log->debug("Exiting getTabsPermission method ..."); return $tab_perr_array; } @@ -208,6 +231,8 @@ */ function getTabsActionPermission($profileid) { + global $log; + $log->debug("Entering getTabsActionPermission(".$profileid.") method ..."); global $adb; $check = Array(); $temp_tabid = Array(); @@ -228,11 +253,8 @@ $per_id = $adb->query_result($result1,$i,'permissions'); $access[$action_id] = $per_id; $check[$tab_id] = $access; - - - } - - + } + $log->debug("Exiting getTabsActionPermission method ..."); return $check; } @@ -248,6 +270,8 @@ function getTabsUtilityActionPermission($profileid) { + global $log; + $log->debug("Entering getTabsUtilityActionPermission(".$profileid.") method ..."); global $adb; $check = Array(); @@ -273,6 +297,7 @@ } + $log->debug("Exiting getTabsUtilityActionPermission method ..."); return $check; } @@ -288,6 +313,8 @@ function getDefaultSharingEditAction() { + global $log; + $log->debug("Entering getDefaultSharingEditAction() method ..."); global $adb; //retreiving the standard permissions $sql= "select * from def_org_share where editstatus=0"; @@ -302,6 +329,7 @@ }while($permissionRow=$adb->fetch_array($result)); + $log->debug("Exiting getDefaultSharingEditAction method ..."); return $copy; } @@ -316,6 +344,8 @@ */ function getDefaultSharingAction() { + global $log; + $log->debug("Entering getDefaultSharingAction() method ..."); global $adb; //retreiving the standard permissions $sql= "select * from def_org_share where editstatus in(0,1)"; @@ -329,6 +359,7 @@ } }while($permissionRow=$adb->fetch_array($result)); + $log->debug("Exiting getDefaultSharingAction method ..."); return $copy; } @@ -345,6 +376,8 @@ */ function getAllDefaultSharingAction() { + global $log; + $log->debug("Entering getAllDefaultSharingAction() method ..."); global $adb; $copy=Array(); //retreiving the standard permissions @@ -360,6 +393,7 @@ } + $log->debug("Exiting getAllDefaultSharingAction method ..."); return $copy; } @@ -370,6 +404,8 @@ */ function setPermittedTabs2Session($profileid) { + global $log; + $log->debug("Entering setPermittedTabs2Session(".$profileid.") method ..."); global $adb; $sql = "select tabid from profile2tab where profileid=" .$profileid ." and permissions =0" ; $result = $adb->query($sql); @@ -387,7 +423,7 @@ }while($tabPermission=$adb->fetch_array($result)); $_SESSION['tab_permission_set']=$copy; - + $log->debug("Exiting setPermittedTabs2Session method ..."); } /* Deprecated Function. To be removed @@ -396,6 +432,8 @@ */ function setPermittedActions2Session($profileid) { + global $log; + $log->debug("Entering setPermittedActions2Session(".$profileid.") method ..."); global $adb; $check = Array(); $sql1 = "select tabid from profile2tab where profileid=" .$profileid ." and permissions =0" ; @@ -445,6 +483,7 @@ } $_SESSION['action_permission_set']=$check; + $log->debug("Entering setPermittedActions2Session method ..."); } /* Deprecated Function. To be removed @@ -453,6 +492,8 @@ */ function setPermittedDefaultSharingAction2Session($profileid) { + global $log; + $log->debug("Entering setPermittedDefaultSharingAction2Session(".$profileid.") method ..."); global $adb; //retreiving the standard permissions //$sql= "select default_org_sharingrule.* from default_org_sharingrule inner join profile2tab on profile2tab.tabid = default_org_sharingrule.tabid where profile2tab.permissions =0 and profile2tab.profileid=".$profileid; @@ -469,7 +510,7 @@ }while($permissionRow=$adb->fetch_array($result)); $_SESSION['defaultaction_sharing_permission_set']=$copy; - + $log->debug("Entering setPermittedDefaultSharingAction2Session method ..."); } @@ -483,6 +524,8 @@ function createRole($roleName,$parentRoleId,$roleProfileArray) { + global $log; + $log->debug("Entering createRole(".$roleName.",".$parentRoleId.",".$roleProfileArray.") method ..."); global $adb; $parentRoleDetails=getRoleInformation($parentRoleId); $parentRoleInfo=$parentRoleDetails[$parentRoleId]; @@ -506,6 +549,7 @@ } } + $log->debug("Exiting createRole method ..."); return $roleId; } @@ -518,6 +562,8 @@ */ function updateRole($roleId,$roleName,$roleProfileArray) { + global $log; + $log->debug("Entering updateRole(".$roleId.",".$roleName.",".$roleProfileArray.") method ..."); global $adb; $sql1 = "update role set rolename='".$roleName."' where roleid='".$roleId."'"; $adb->query($sql1); @@ -532,7 +578,7 @@ insertRole2ProfileRelation($roleId,$profileId); } } - + $log->debug("Exiting updateRole method ..."); } @@ -543,9 +589,12 @@ */ function insertRole2ProfileRelation($roleId,$profileId) { + global $log; + $log->debug("Entering insertRole2ProfileRelation(".$roleId.",".$profileId.") method ..."); global $adb; $query="insert into role2profile values('".$roleId."',".$profileId.")"; $adb->query($query); + $log->debug("Exiting insertRole2ProfileRelation method ..."); } @@ -557,10 +606,14 @@ */ function createNewGroup($groupName,$groupDescription) { - global $adb; - $sql = "insert into groups(name,description) values('" .$groupName ."','". $groupDescription ."')"; - $result = $adb->query($sql); - header("Location: index.php?module=Users&action=listgroups"); + global $log; + $log->debug("Entering createNewGroup(".$groupName.",".$groupDescription.") method ..."); + global $adb; + $sql = "insert into groups(name,description) values('" .$groupName ."','". $groupDescription ."')"; + $result = $adb->query($sql); + $log->debug("Exiting createNewGroup method ..."); + header("Location: index.php?module=Users&action=listgroups"); + } @@ -571,11 +624,14 @@ */ function fetchTabId($moduleName) { - global $adb; - $sql = "select id from tabu where name ='" .$moduleName ."'"; - $result = $adb->query($sql); - $tabid = $adb->query_result($result,0,"id"); - return $tabid; + global $log; + $log->debug("Entering fetchTabId(".$moduleName.") method ..."); + global $adb; + $sql = "select id from tabu where name ='" .$moduleName ."'"; + $result = $adb->query($sql); + $tabid = $adb->query_result($result,0,"id"); + $log->debug("Exiting fetchTabId method ..."); + return $tabid; } @@ -586,6 +642,8 @@ */ function populatePermissions4NewRole($parentroleName,$roleName) { + global $log; + $log->debug("Entering populatePermissions4NewRole(".$parentroleName.",".$roleName.") method ..."); global $adb; //fetch the permissions for the parent role $referenceValues = fetchTabReferenceEntityValues($parentroleName); @@ -605,6 +663,7 @@ //echo $sql_insert; $adb->query($sql_insert); } + $log->debug("Exiting populatePermissions4NewRole method ..."); } @@ -615,10 +674,13 @@ */ function fetchTabReferenceEntityValues($parentrolename) { + global $log; + $log->debug("Entering fetchTabReferenceEntityValues(".$parentrolename.") method ..."); global $adb; $sql = "select tabid,module_permission,description from role2tab where rolename='" .$parentrolename ."'"; //echo $sql; $result=$adb->query($sql); +$log->debug("Exiting fetchTabReferenceEntityValues method ..."); return $result; } @@ -631,9 +693,12 @@ */ function fetchActionReferenceEntityValues($parentrolename) { + global $log; +$log->debug("Entering fetchActionReferenceEntityValues(".$parentrolename.") method ..."); global $adb; $sql = "select tabid,actionname,action_permission,description from role2action where rolename='" .$parentrolename ."'"; $result=$adb->query($sql); +$log->debug("Exiting fetchActionReferenceEntityValues method ..."); return $result; } @@ -644,11 +709,14 @@ */ function fetchRoleId($rolename) { +global $log; +$log->debug("Entering fetchRoleId(".$rolename.") method ..."); global $adb; $sqlfetchroleid = "select roleid from role where rolename='".$rolename ."'"; $resultroleid = $adb->query($sqlfetchroleid); $role_id = $adb->query_result($resultroleid,0,"roleid"); +$log->debug("Exiting fetchRoleId method ..."); return $role_id; } @@ -659,6 +727,8 @@ */ function updateUser2RoleMapping($roleid,$userid) { +global $log; +$log->debug("Entering updateUser2RoleMapping(".$roleid.",".$userid.") method ..."); global $adb; //Check if row already exists $sqlcheck = "select * from user2role where userid=".$userid; @@ -670,6 +740,7 @@ } $sql = "insert into user2role(userid,roleid) values(" .$userid .",'" .$roleid ."')"; $result = $adb->query($sql); + $log->debug("Exiting updateUser2RoleMapping method ..."); } @@ -681,11 +752,14 @@ */ function updateUsers2GroupMapping($groupname,$userid) { +global $log; +$log->debug("Entering updateUsers2GroupMapping(".$groupname.",".$userid.") method ..."); global $adb; $sqldelete = "delete from users2group where userid = '" .$userid ."'"; $result_delete = $adb->query($sqldelete); $sql = "insert into users2group(groupname,userid) values('" .$groupname ."','" .$userid ."')"; $result = $adb->query($sql); + $log->debug("Exiting updateUsers2GroupMapping method ..."); } /** Function to add user to role mapping @@ -695,10 +769,13 @@ */ function insertUser2RoleMapping($roleid,$userid) { +global $log; +$log->debug("Entering insertUser2RoleMapping(".$roleid.",".$userid.") method ..."); global $adb; $sql = "insert into user2role(userid,roleid) values('" .$userid ."','" .$roleid ."')"; $adb->query($sql); +$log->debug("Exiting insertUser2RoleMapping method ..."); } @@ -709,9 +786,12 @@ */ function insertUsers2GroupMapping($groupname,$userid) { +global $log; +$log->debug("Entering insertUsers2GroupMapping(".$groupname.",".$userid.") method ..."); global $adb; $sql = "insert into users2group(groupname,userid) values('" .$groupname ."','" .$userid ."')"; $adb->query($sql); +$log->debug("Exiting insertUsers2GroupMapping method ..."); } /** Function to get the word template resultset @@ -721,9 +801,12 @@ */ function fetchWordTemplateList($module) { +global $log; +$log->debug("Entering fetchWordTemplateList(".$module.") method ..."); global $adb; $sql_word = "select templateid, filename from wordtemplates where module ='".$module."'" ; $result=$adb->query($sql_word); +$log->debug("Exiting fetchWordTemplateList method ..."); return $result; } @@ -736,9 +819,12 @@ */ function fetchEmailTemplateInfo($templateName) { +global $log; +$log->debug("Entering fetchEmailTemplateInfo(".$templateName.") method ..."); global $adb; $sql= "select * from emailtemplates where templatename='" .$templateName ."'"; $result = $adb->query($sql); +$log->debug("Exiting fetchEmailTemplateInfo method ..."); return $result; } @@ -749,7 +835,8 @@ */ function substituteTokens($filename,$globals) { - global $log; +global $log; +$log->debug("Entering substituteTokens(".$filename.",".$globals.") method ..."); $log->debug("in substituteTokens method with filename ".$filename.' and content globals as '.$globals); global $root_directory; @@ -766,6 +853,7 @@ if (!$dump = file ($filename)) { $log->debug("not able to create the file or get access to the file with filename ".$filename." so returning 0"); + $log->debug("Exiting substituteTokens method ..."); return 0; } @@ -786,6 +874,7 @@ } $log->debug("the replacedString is ".$replacedString); + $log->debug("Exiting substituteTokens method ..."); return $replacedString; } @@ -796,9 +885,12 @@ */ function insert2LeadGroupRelation($leadid,$groupname) { + global $log; + $log->debug("Entering insert2LeadGroupRelation(".$leadid.",".$groupname.") method ..."); global $adb; $sql = "insert into leadgrouprelation values (" .$leadid .",'".$groupname."')"; $adb->query($sql); + $log->debug("Exiting insert2LeadGroupRelation method ..."); } @@ -809,11 +901,14 @@ */ function updateLeadGroupRelation($leadid,$groupname) { +global $log; +$log->debug("Entering updateLeadGroupRelation(".$leadid.",".$groupname.") method ..."); global $adb; $sqldelete = "delete from leadgrouprelation where leadid=".$leadid; $adb->query($sqldelete); $sql = "insert into leadgrouprelation values (".$leadid .",'" .$groupname ."')"; $adb->query($sql); + $log->debug("Exiting updateLeadGroupRelation method ..."); } @@ -824,9 +919,12 @@ */ function insert2AccountGroupRelation($accountid,$groupname) { +global $log; +$log->debug("Entering insert2AccountGroupRelation(".$accountid.",".$groupname.") method ..."); global $adb; $sql = "insert into accountgrouprelation values (" .$accountid .",'".$groupname."')"; $adb->query($sql); +$log->debug("Exiting insert2AccountGroupRelation method ..."); } @@ -838,11 +936,14 @@ function updateAccountGroupRelation($accountid,$groupname) { +global $log; +$log->debug("Entering updateAccountGroupRelation(".$accountid.",".$groupname.") method ..."); global $adb; $sqldelete = "delete from accountgrouprelation where accountid=".$accountid; $adb->query($sqldelete); $sql = "insert into accountgrouprelation values (".$accountid .",'" .$groupname ."')"; $adb->query($sql); +$log->debug("Exiting updateAccountGroupRelation method ..."); } @@ -853,9 +954,12 @@ */ function insert2ContactGroupRelation($contactid,$groupname) { +global $log; +$log->debug("Entering insert2ContactGroupRelation(".$contactid.",".$groupname.") method ..."); global $adb; $sql = "insert into contactgrouprelation values (" .$contactid .",'".$groupname."')"; $adb->query($sql); +$log->debug("Exiting insert2ContactGroupRelation method ..."); } @@ -867,11 +971,14 @@ function updateContactGroupRelation($contactid,$groupname) { +global $log; +$log->debug("Entering updateContactGroupRelation(".$contactid.",".$groupname.") method ..."); global $adb; $sqldelete = "delete from contactgrouprelation where contactid=".$contactid; $adb->query($sqldelete); $sql = "insert into contactgrouprelation values (".$contactid .",'" .$groupname ."')"; $adb->query($sql); +$log->debug("Exiting updateContactGroupRelation method ..."); } /** Function to add Potential group relation @@ -881,9 +988,12 @@ */ function insert2PotentialGroupRelation($potentialid,$groupname) { +global $log; +$log->debug("Entering insert2PotentialGroupRelation(".$potentialid.",".$groupname.") method ..."); global $adb; $sql = "insert into potentialgrouprelation values (" .$potentialid .",'".$groupname."')"; $adb->query($sql); + $log->debug("Exiting insert2PotentialGroupRelation method ..."); } @@ -895,11 +1005,14 @@ function updatePotentialGroupRelation($potentialid,$groupname) { +global $log; +$log->debug("Entering updatePotentialGroupRelation(".$potentialid.",".$groupname.") method ..."); global $adb; $sqldelete = "delete from potentialgrouprelation where potentialid=".$potentialid; $adb->query($sqldelete); $sql = "insert into potentialgrouprelation values (".$potentialid .",'" .$groupname ."')"; $adb->query($sql); + $log->debug("Exiting updatePotentialGroupRelation method ..."); } @@ -910,9 +1023,12 @@ */ function insert2QuoteGroupRelation($quoteid,$groupname) { +global $log; +$log->debug("Entering insert2QuoteGroupRelation(".$quoteid.",".$groupname.") method ..."); global $adb; $sql = "insert into quotegrouprelation values (" .$quoteid .",'".$groupname."')"; $adb->query($sql); +$log->debug("Exiting insert2QuoteGroupRelation method ..."); } @@ -924,11 +1040,14 @@ function updateQuoteGroupRelation($quoteid,$groupname) { +global $log; +$log->debug("Entering updateQuoteGroupRelation(".$quoteid.",".$groupname.") method ..."); global $adb; $sqldelete = "delete from quotegrouprelation where quoteid=".$quoteid; $adb->query($sqldelete); $sql = "insert into quotegrouprelation values (".$quoteid .",'" .$groupname ."')"; $adb->query($sql); +$log->debug("Exiting updateQuoteGroupRelation method ..."); } /** Function to add Salesorder group relation @@ -938,9 +1057,12 @@ */ function insert2SoGroupRelation($salesorderid,$groupname) { +global $log; +$log->debug("Entering insert2SoGroupRelation(".$salesorderid.",".$groupname.") method ..."); global $adb; $sql = "insert into sogrouprelation values (" .$salesorderid .",'".$groupname."')"; $adb->query($sql); +$log->debug("Exiting insert2SoGroupRelation method ..."); } @@ -952,11 +1074,14 @@ function updateSoGroupRelation($salesorderid,$groupname) { +global $log; +$log->debug("Entering updateSoGroupRelation(".$salesorderid.",".$groupname.") method ..."); global $adb; $sqldelete = "delete from sogrouprelation where salesorderid=".$salesorderid; $adb->query($sqldelete); $sql = "insert into sogrouprelation values (".$salesorderid .",'" .$groupname ."')"; $adb->query($sql); +$log->debug("Exiting updateSoGroupRelation method ..."); } @@ -967,9 +1092,12 @@ */ function insert2InvoiceGroupRelation($invoiceid,$groupname) { +global $log; +$log->debug("Entering insert2InvoiceGroupRelation(".$invoiceid.",".$groupname.") method ..."); global $adb; $sql = "insert into invoicegrouprelation values (" .$invoiceid .",'".$groupname."')"; $adb->query($sql); +$log->debug("Exiting insert2InvoiceGroupRelation method ..."); } @@ -981,11 +1109,14 @@ function updateInvoiceGroupRelation($invoiceid,$groupname) { +global $log; +$log->debug("Entering updateInvoiceGroupRelation(".$invoiceid.",".$groupname.") method ..."); global $adb; $sqldelete = "delete from invoicegrouprelation where invoiceid=".$invoiceid; $adb->query($sqldelete); $sql = "insert into invoicegrouprelation values (".$invoiceid .",'" .$groupname ."')"; $adb->query($sql); +$log->debug("Exiting updateInvoiceGroupRelation method ..."); } @@ -996,9 +1127,12 @@ */ function insert2PoGroupRelation($poid,$groupname) { +global $log; +$log->debug("Entering insert2PoGroupRelation(".$poid.",".$groupname.") method ..."); global $adb; $sql = "insert into pogrouprelation values (" .$poid .",'".$groupname."')"; $adb->query($sql); +$log->debug("Exiting insert2PoGroupRelation method ..."); } @@ -1010,11 +1144,14 @@ function updatePoGroupRelation($poid,$groupname) { +global $log; +$log->debug("Entering updatePoGroupRelation(".$poid.",".$groupname.") method ..."); global $adb; $sqldelete = "delete from pogrouprelation where purchaseorderid=".$poid; $adb->query($sqldelete); $sql = "insert into pogrouprelation values (".$poid .",'" .$groupname ."')"; $adb->query($sql); +$log->debug("Exiting updatePoGroupRelation method ..."); } @@ -1026,11 +1163,14 @@ */ function updateTicketGroupRelation($ticketid,$groupname) { +global $log; +$log->debug("Entering updateTicketGroupRelation(".$ticketid.",".$groupname.") method ..."); global $adb; $sqldelete = "delete from ticketgrouprelation where ticketid=".$ticketid; $adb->query($sqldelete); $sql = "insert into ticketgrouprelation values (".$ticketid .",'" .$groupname ."')"; $adb->query($sql); +$log->debug("Exiting updateTicketGroupRelation method ..."); } @@ -1042,9 +1182,12 @@ */ function insert2ActivityGroupRelation($activityid,$groupname) { +global $log; +$log->debug("Entering insert2ActivityGroupRelation(".$activityid.",".$groupname.") method ..."); global $adb; $sql = "insert into activitygrouprelation values (" .$activityid .",'".$groupname."')"; $adb->query($sql); +$log->debug("Exiting insert2ActivityGroupRelation method ..."); } @@ -1056,9 +1199,12 @@ */ function insert2TicketGroupRelation($ticketid,$groupname) { +global $log; +$log->debug("Entering insert2TicketGroupRelation(".$ticketid.",".$groupname.") method ..."); global $adb; $sql = "insert into ticketgrouprelation values (" .$ticketid .",'".$groupname."')"; $adb->query($sql); +$log->debug("Exiting insert2TicketGroupRelation method ..."); } @@ -1069,11 +1215,14 @@ */ function updateActivityGroupRelation($activityid,$groupname) { +global $log; +$log->debug("Entering updateActivityGroupRelation(".$activityid.",".$groupname.") method ..."); global $adb; $sqldelete = "delete from activitygrouprelation where activityid=".$activityid; $adb->query($sqldelete); $sql = "insert into activitygrouprelation values (".$activityid .",'" .$groupname ."')"; $adb->query($sql); + $log->debug("Exiting updateActivityGroupRelation method ..."); } @@ -1086,6 +1235,8 @@ */ function getFieldList($fld_module, $profileid) { + global $log; + $log->debug("Entering getFieldList(".$fld_module.",". $profileid.") method ..."); global $adb; if($fld_module == "Accounts") { @@ -1094,6 +1245,7 @@ $query = "select * from profile2field where profileid =".$profileid." and tabid=".$tabid; //echo $query; $result = $adb->query($query); + $log->debug("Exiting getFieldList method ..."); return $result; } @@ -1105,6 +1257,8 @@ */ function getFieldVisibilityArray($fld_module, $profileid) { + global $log; + $log->debug("Entering getFieldVisibilityArray(".$fld_module.",". $profileid.") method ..."); global $adb; if($fld_module == "Accounts") { @@ -1120,6 +1274,7 @@ $fld_name = $adb->query_result($fieldListResult,$i,"fieldname"); $fldVisbArray[$fld_name] = $adb->query_result($fieldListResult,$i,"visible"); } + $log->debug("Exiting getFieldVisibilityArray method ..."); return $fldVisbArray; } @@ -1132,6 +1287,8 @@ */ function getFieldReadOnlyArray($fld_module, $profileid) { + global $log; + $log->debug("Entering getFieldReadOnlyArray(".$fld_module.",". $profileid.") method ..."); global $adb; if($fld_module == "Accounts") { @@ -1148,6 +1305,7 @@ $fldReadOnlyArray[$fld_name] = $adb->query_result($fieldListResult,$i,"readonly"); } + $log->debug("Exiting getFieldReadOnlyArray method ..."); return $fldReadOnlyArray; } @@ -1159,10 +1317,13 @@ */ function getRoleName($roleid) { + global $log; + $log->debug("Entering getRoleName(".$roleid.") method ..."); global $adb; $sql1 = "select * from role where roleid='".$roleid."'"; $result = $adb->query($sql1); $rolename = $adb->query_result($result,0,"rolename"); + $log->debug("Exiting getRoleName method ..."); return $rolename; } @@ -1173,10 +1334,13 @@ */ function getProfileName($profileid) { + global $log; + $log->debug("Entering getProfileName(".$profileid.") method ..."); global $adb; $sql1 = "select * from profile where profileid=".$profileid; $result = $adb->query($sql1); $profilename = $adb->query_result($result,0,"profilename"); + $log->debug("Exiting getProfileName method ..."); return $profilename; } @@ -1189,6 +1353,8 @@ */ function isPermitted($module,$actionname,$record_id='') { + global $log; + $log->debug("Entering isPermitted(".$module.",".$actionname.",".$record_id.") method ..."); global $adb; global $current_user; @@ -1200,6 +1366,7 @@ { //These modules dont have security right now $permission = "yes"; + $log->debug("Exiting isPermitted method ..."); return $permission; } @@ -1215,6 +1382,7 @@ { $permission = "yes"; } + $log->debug("Exiting isPermitted method ..."); return $permission; } @@ -1222,6 +1390,7 @@ if($is_admin) { $permission ="yes"; + $log->debug("Exiting isPermitted method ..."); return $permission; } //Retreiving the Tabid and Action Id @@ -1233,6 +1402,7 @@ if($profileTabsPermission[$tabid] ==0) { $permission = "yes"; + $log->debug("Exiting isPermitted method ..."); return $permission; } else @@ -1249,6 +1419,7 @@ if($actionid == 3 || $actionid == 4) { $permission = "yes"; + $log->debug("Exiting isPermitted method ..."); return $permission; } @@ -1259,6 +1430,7 @@ if($actionid == 3 || $actionid == 4 || $actionid ==0 || $actionid ==1) { $permission = "yes"; + $log->debug("Exiting isPermitted method ..."); return $permission; } @@ -1267,6 +1439,7 @@ if($profileTabsPermission[$tabid] !=0) { $permission = "no"; + $log->debug("Exiting isPermitted method ..."); return $permission; } //Checking for Action Permission @@ -1274,12 +1447,14 @@ if($profileActionPermission[$tabid][$actionid] != 0) { $permission = "no"; + $log->debug("Exiting isPermitted method ..."); return $permission; } //Checking and returning true if recorid is null if($record_id == '') { $permission = "yes"; + $log->debug("Exiting isPermitted method ..."); return $permission; } @@ -1289,6 +1464,7 @@ if($module == 'Notes' || $module == 'Products' || $module == 'Faq' || $module == 'Vendor' || $module == 'PriceBook') { $permission = "yes"; + $log->debug("Exiting isPermitted method ..."); return $permission; } } @@ -1310,6 +1486,7 @@ if($current_user->id == $recOwnId) { $permission = "yes"; + $log->debug("Exiting isPermitted method ..."); return $permission; } //Checking if the Record Owner is the Subordinate User @@ -1318,6 +1495,7 @@ if(in_array($recOwnId,$userids)) { $permission='yes'; + $log->debug("Exiting isPermitted method ..."); return $permission; } @@ -1331,6 +1509,7 @@ if(in_array($recOwnId,$current_user_groups)) { $permission='yes'; + $log->debug("Exiting isPermitted method ..."); return $permission; } } @@ -1342,16 +1521,19 @@ { $permission = isReadWritePermittedBySharing($module,$tabid,$actionid,$record_id); + $log->debug("Exiting isPermitted method ..."); return $permission; } elseif($actionid == 2) { $permission = "no"; + $log->debug("Exiting isPermitted method ..."); return $permission; } else { $permission = "yes"; + $log->debug("Exiting isPermitted method ..."); return $permission; } } @@ -1360,11 +1542,13 @@ if($actionid == 2) { $permission = "no"; + $log->debug("Exiting isPermitted method ..."); return $permission; } else { $permission = "yes"; + $log->debug("Exiting isPermitted method ..."); return $permission; } } @@ -1372,6 +1556,7 @@ { $permission = "yes"; + $log->debug("Exiting isPermitted method ..."); return $permission; } elseif($others_permission_id == 3) @@ -1380,11 +1565,13 @@ if($actionid == 3 || $actionid == 4) { $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); + $log->debug("Exiting isPermitted method ..."); return $permission; } } @@ -1393,6 +1580,7 @@ $permission = "yes"; } + $log->debug("Exiting isPermitted method ..."); return $permission; } @@ -1406,6 +1594,8 @@ */ function isReadPermittedBySharing($module,$tabid,$actionid,$record_id) { + global $log; + $log->debug("Entering isReadPermittedBySharing(".$module.",".$tabid.",".$actionid.",".$record_id.") method ..."); global $adb; global $current_user; require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); @@ -1430,6 +1620,7 @@ if(in_array($ownerid,$userids)) { $sharePer='yes'; + $log->debug("Exiting isReadPermittedBySharing method ..."); return $sharePer; } @@ -1442,6 +1633,7 @@ if(in_array($ownerid,$userids)) { $sharePer='yes'; + $log->debug("Exiting isReadPermittedBySharing method ..."); return $sharePer; } @@ -1454,6 +1646,7 @@ if(array_key_exists($ownerid,$read_grp_per)) { $sharePer='yes'; + $log->debug("Exiting isReadPermittedBySharing method ..."); return $sharePer; } } @@ -1486,6 +1679,7 @@ if(in_array($rel_owner_id,$userids)) { $sharePer='yes'; + $log->debug("Exiting isReadPermittedBySharing method ..."); return $sharePer; } @@ -1497,6 +1691,7 @@ if(in_array($rel_owner_id,$userids)) { $sharePer='yes'; + $log->debug("Exiting isReadPermittedBySharing method ..."); return $sharePer; } @@ -1509,6 +1704,7 @@ if(array_key_exists($rel_owner_id,$read_related_grp_per)) { $sharePer='yes'; + $log->debug("Exiting isReadPermittedBySharing method ..."); return $sharePer; } @@ -1516,6 +1712,7 @@ } } } + $log->debug("Exiting isReadPermittedBySharing method ..."); return $sharePer; } @@ -1530,6 +1727,8 @@ */ function isReadWritePermittedBySharing($module,$tabid,$actionid,$record_id) { + global $log; + $log->debug("Entering isReadWritePermittedBySharing(".$module.",".$tabid.",".$actionid.",".$record_id.") method ..."); global $adb; global $current_user; require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); @@ -1554,6 +1753,7 @@ if(in_array($ownerid,$userids)) { $sharePer='yes'; + $log->debug("Exiting isReadWritePermittedBySharing method ..."); return $sharePer; } @@ -1565,6 +1765,7 @@ if(in_array($ownerid,$userids)) { $sharePer='yes'; + $log->debug("Exiting isReadWritePermittedBySharing method ..."); return $sharePer; } @@ -1577,6 +1778,7 @@ if(array_key_exists($ownerid,$write_grp_per)) { $sharePer='yes'; + $log->debug("Exiting isReadWritePermittedBySharing method ..."); return $sharePer; } } @@ -1608,6 +1810,7 @@ if(in_array($rel_owner_id,$userids)) { $sharePer='yes'; + $log->debug("Exiting isReadWritePermittedBySharing method ..."); return $sharePer; } @@ -1619,6 +1822,7 @@ if(in_array($rel_owner_id,$userids)) { $sharePer='yes'; + $log->debug("Exiting isReadWritePermittedBySharing method ..."); return $sharePer; } @@ -1631,6 +1835,7 @@ if(array_key_exists($rel_owner_id,$write_related_grp_per)) { $sharePer='yes'; + $log->debug("Exiting isReadWritePermittedBySharing method ..."); return $sharePer; } @@ -1639,6 +1844,7 @@ } } + $log->debug("Exiting isReadWritePermittedBySharing method ..."); return $sharePer; } @@ -1651,6 +1857,8 @@ */ function isAllowed_Outlook($module,$action,$user_id,$record_id) { + global $log; + $log->debug("Entering isAllowed_Outlook(".$module.",".$action.",".$user_id.",".$record_id.") method ..."); $permission = "no"; if($module == 'Users' || $module == 'Home' || $module == 'Administration' || $module == 'uploads' || $module == 'Settings' || $module == 'Calendar') @@ -1747,6 +1955,7 @@ $permission = "no"; } } + $log->debug("Exiting isAllowed_Outlook method ..."); return $permission; } @@ -1758,6 +1967,8 @@ */ function setGlobalProfilePermission2Session($profileid) { + global $log; + $log->debug("Entering setGlobalProfilePermission2Session(".$profileid.") method ..."); global $adb; $sql = "select * from profile2globalpermissions where profileid=".$profileid ; $result = $adb->query($sql); @@ -1771,6 +1982,7 @@ } $_SESSION['global_permission_set']=$copy; + $log->debug("Exiting setGlobalProfilePermission2Session method ..."); } @@ -1783,6 +1995,8 @@ */ function getProfileGlobalPermission($profileid) { +global $log; +$log->debug("Entering getProfileGlobalPermission(".$profileid.") method ..."); global $adb; $sql = "select * from profile2globalpermissions where profileid=".$profileid ; $result = $adb->query($sql); @@ -1795,6 +2009,7 @@ $copy[$act_id] = $per_id; } + $log->debug("Exiting getProfileGlobalPermission method ..."); return $copy; } @@ -1806,6 +2021,8 @@ */ function getProfileTabsPermission($profileid) { +global $log; +$log->debug("Entering getProfileTabsPermission(".$profileid.") method ..."); global $adb; $sql = "select * from profile2tab where profileid=".$profileid ; $result = $adb->query($sql); @@ -1818,6 +2035,7 @@ $copy[$tab_id] = $per_id; } +$log->debug("Exiting getProfileTabsPermission method ..."); return $copy; } @@ -1833,6 +2051,8 @@ */ function getProfileActionPermission($profileid) { +global $log; +$log->debug("Entering getProfileActionPermission(".$profileid.") method ..."); global $adb; $check = Array(); $temp_tabid = Array(); @@ -1858,6 +2078,7 @@ } +$log->debug("Exiting getProfileActionPermission method ..."); return $check; } @@ -1873,6 +2094,8 @@ */ function getProfileAllActionPermission($profileid) { +global $log; +$log->debug("Entering getProfileAllActionPermission(".$profileid.") method ..."); global $adb; $actionArr=getProfileActionPermission($profileid); $utilArr=getTabsUtilityActionPermission($profileid); @@ -1885,6 +2108,7 @@ } $actionArr[$tabid]=$act_tab_arr; } +$log->debug("Exiting getProfileAllActionPermission method ..."); return $actionArr; } @@ -1895,6 +2119,8 @@ */ function createProfile($profilename,$parentProfileId,$description) { +global $log; +$log->debug("Entering createProfile(".$profilename.",".$parentProfileId.",".$description.") method ..."); global $adb; //Inserting values into Profile Table $sql1 = "insert into profile values('','".$profilename."','".$description."')"; @@ -1968,6 +2194,7 @@ $sql11="insert into profile2field values(".$current_profile_id.", ".$tab_id.", ".$fieldid.", ".$permissions." ,".$readonly.")"; $adb->query($sql11); } + $log->debug("Exiting createProfile method ..."); } /** Function to delete profile @@ -1976,6 +2203,8 @@ */ function deleteProfile($prof_id,$transfer_profileid='') { + global $log; +$log->debug("Entering deleteProfile(".$prof_id.",".$transfer_profileid.") method ..."); global $adb; //delete from profile2global permissions $sql4 = "delete from profile2globalpermissions where profileid=".$prof_id; @@ -2028,7 +2257,8 @@ //delete from profile table; $sql9 = "delete from profile where profileid=".$prof_id; - $adb->query($sql9); + $adb->query($sql9); + $log->debug("Exiting deleteProfile method ..."); } @@ -2037,6 +2267,8 @@ */ function getAllRoleDetails() { +global $log; +$log->debug("Entering getAllRoleDetails() method ..."); global $adb; $role_det = Array(); $query = "select * from role"; @@ -2078,6 +2310,7 @@ $role_det[$roleid]=$each_role_det; } + $log->debug("Exiting getAllRoleDetails method ..."); return $role_det; } @@ -2087,6 +2320,8 @@ */ function getAllProfileInfo() { + global $log; + $log->debug("Entering getAllProfileInfo() method ..."); global $adb; $query="select * from profile"; $result = $adb->query($query); @@ -2099,6 +2334,7 @@ $prof_details[$profileid]=$profilename; } + $log->debug("Exiting getAllProfileInfo method ..."); return $prof_details; } @@ -2109,6 +2345,8 @@ */ function getRoleInformation($roleid) { + global $log; + $log->debug("Entering getRoleInformation(".$roleid.") method ..."); global $adb; $query = "select * from role where roleid='".$roleid."'"; $result = $adb->query($query); @@ -2124,6 +2362,7 @@ $roleDet[]=$immediateParent; $roleInfo=Array(); $roleInfo[$roleid]=$roleDet; + $log->debug("Exiting getRoleInformation method ..."); return $roleInfo; } @@ -2135,6 +2374,8 @@ */ function getRoleRelatedProfiles($roleId) { + global $log; + $log->debug("Entering getRoleRelatedProfiles(".$roleId.") method ..."); global $adb; $query = "select role2profile.*,profile.profilename from role2profile inner join profile on profile.profileid=role2profile.profileid where roleid='".$roleId."'"; $result = $adb->query($query); @@ -2144,6 +2385,7 @@ { $roleRelatedProfiles[$adb->query_result($result,$i,'profileid')]=$adb->query_result($result,$i,'profilename'); } + $log->debug("Exiting getRoleRelatedProfiles method ..."); return $roleRelatedProfiles; } @@ -2155,6 +2397,8 @@ */ function getRoleUsers($roleId) { + global $log; + $log->debug("Entering getRoleUsers(".$roleId.") method ..."); global $adb; $query = "select user2role.*,users.user_name from user2role inner join users on users.id=user2role.userid where roleid='".$roleId."'"; $result = $adb->query($query); @@ -2164,6 +2408,7 @@ { $roleRelatedUsers[$adb->query_result($result,$i,'userid')]=$adb->query_result($result,$i,'user_name'); } + $log->debug("Exiting getRoleUsers method ..."); return $roleRelatedUsers; @@ -2178,6 +2423,8 @@ function getRoleUserIds($roleId) { + global $log; + $log->debug("Entering getRoleUserIds(".$roleId.") method ..."); global $adb; $query = "select user2role.*,users.user_name from user2role inner join users on users.id=user2role.userid where roleid='".$roleId."'"; $result = $adb->query($query); @@ -2187,6 +2434,7 @@ { $roleRelatedUsers[]=$adb->query_result($result,$i,'userid'); } + $log->debug("Exiting getRoleUserIds method ..."); return $roleRelatedUsers; @@ -2199,6 +2447,8 @@ */ function getRoleAndSubordinateUsers($roleId) { + global $log; + $log->debug("Entering getRoleAndSubordinateUsers(".$roleId.") method ..."); global $adb; $roleInfoArr=getRoleInformation($roleId); $parentRole=$roleInfoArr[$roleId][1]; @@ -2210,6 +2460,7 @@ { $roleRelatedUsers[$adb->query_result($result,$i,'userid')]=$adb->query_result($result,$i,'user_name'); } + $log->debug("Exiting getRoleAndSubordinateUsers method ..."); return $roleRelatedUsers; @@ -2223,6 +2474,8 @@ */ function getRoleAndSubordinateUserIds($roleId) { + global $log; + $log->debug("Entering getRoleAndSubordinateUserIds(".$roleId.") method ..."); global $adb; $roleInfoArr=getRoleInformation($roleId); $parentRole=$roleInfoArr[$roleId][1]; @@ -2234,6 +2487,7 @@ { $roleRelatedUsers[]=$adb->query_result($result,$i,'userid'); } + $log->debug("Exiting getRoleAndSubordinateUserIds method ..."); return $roleRelatedUsers; @@ -2246,6 +2500,8 @@ */ function getRoleAndSubordinatesInformation($roleId) { + global $log; + $log->debug("Entering getRoleAndSubordinatesInformation(".$roleId.") method ..."); global $adb; $roleDetails=getRoleInformation($roleId); $roleInfo=$roleDetails[$roleId]; @@ -2268,6 +2524,7 @@ $roleInfo[$roleid]=$roleDet; } + $log->debug("Exiting getRoleAndSubordinatesInformation method ..."); return $roleInfo; } @@ -2280,6 +2537,8 @@ */ function getRoleAndSubordinatesRoleIds($roleId) { + global $log; + $log->debug("Entering getRoleAndSubordinatesRoleIds(".$roleId.") method ..."); global $adb; $roleDetails=getRoleInformation($roleId); $roleInfo=$roleDetails[$roleId]; @@ -2295,6 +2554,7 @@ $roleInfo[]=$roleid; } + $log->debug("Exiting getRoleAndSubordinatesRoleIds method ..."); return $roleInfo; } @@ -2305,6 +2565,8 @@ */ function deleteRole($roleId,$transferRoleId) { + global $log; + $log->debug("Entering deleteRole(".$roleId.",".$transferRoleId.") method ..."); global $adb; $roleInfo=getRoleAndSubordinatesInformation($roleId); foreach($roleInfo as $roleid=>$roleDetArr) @@ -2336,6 +2598,7 @@ } + $log->debug("Exiting deleteRole method ..."); } @@ -2344,6 +2607,8 @@ */ function deleteRoleRelatedSharingRules($roleId) { + global $log; + $log->debug("Entering deleteRoleRelatedSharingRules(".$roleId.") method ..."); global $adb; $dataShareTableColArr=Array('datashare_grp2role'=>'to_roleid', 'datashare_grp2rs'=>'to_roleandsubid', @@ -2373,6 +2638,7 @@ } } + $log->debug("Exiting deleteRoleRelatedSharingRules method ..."); } /** Function to delete the group related sharing rules @@ -2380,6 +2646,8 @@ */ function deleteGroupRelatedSharingRules($grpId) { + global $log; + $log->debug("Entering deleteGroupRelatedSharingRules(".$grpId.") method ..."); global $adb; $dataShareTableColArr=Array('datashare_grp2grp'=>'share_groupid::to_groupid', @@ -2408,6 +2676,7 @@ } } + $log->debug("Exiting deleteGroupRelatedSharingRules method ..."); } @@ -2417,6 +2686,8 @@ */ function getAllUserName() { + global $log; + $log->debug("Entering getAllUserName() method ..."); global $adb; $query="select * from users where deleted=0"; $result = $adb->query($query); @@ -2429,6 +2700,7 @@ $user_details[$userid]=$username; } + $log->debug("Exiting getAllUserName method ..."); return $user_details; } @@ -2440,6 +2712,8 @@ */ function getAllGroupName() { + global $log; + $log->debug("Entering getAllGroupName() method ..."); global $adb; $query="select * from groups"; $result = $adb->query($query); @@ -2452,6 +2726,7 @@ $group_details[$grpid]=$grpname; } + $log->debug("Exiting getAllGroupName method ..."); return $group_details; } @@ -2462,6 +2737,8 @@ */ function getAllGroupInfo() { + global $log; + $log->debug("Entering getAllGroupInfo() method ..."); global $adb; $query="select * from groups"; $result = $adb->query($query); @@ -2478,6 +2755,7 @@ $group_details[$grpid]=$grpInfo; } + $log->debug("Exiting getAllGroupInfo method ..."); return $group_details; } @@ -2489,7 +2767,9 @@ * @returns $groupId -- Group Id :: Type integer */ function createGroup($groupName,$groupMemberArray,$description) -{ +{ + global $log; + $log->debug("Entering createGroup(".$groupName.",".$groupMemberArray.",".$description.") method ..."); global $adb; $groupId=$adb->getUniqueId("groups"); //Insert into group table @@ -2524,6 +2804,7 @@ { insertGroupToUserRelation($groupId,$userId); } + $log->debug("Exiting createGroup method ..."); return $groupId; } @@ -2534,9 +2815,12 @@ */ function insertGroupToGroupRelation($groupId,$containsGroupId) { + global $log; + $log->debug("Entering insertGroupToGroupRelation(".$groupId.",".$containsGroupId.") method ..."); global $adb; $query="insert into group2grouprel values(".$groupId.",".$containsGroupId.")"; $adb->query($query); + $log->debug("Exiting insertGroupToGroupRelation method ..."); } @@ -2546,9 +2830,12 @@ */ function insertGroupToRoleRelation($groupId,$roleId) { + global $log; + $log->debug("Entering insertGroupToRoleRelation(".$groupId.",".$roleId.") method ..."); global $adb; $query="insert into group2role values(".$groupId.",'".$roleId."')"; $adb->query($query); + $log->debug("Exiting insertGroupToRoleRelation method ..."); } @@ -2558,9 +2845,12 @@ */ function insertGroupToRsRelation($groupId,$rsId) { + global $log; + $log->debug("Entering insertGroupToRsRelation(".$groupId.",".$rsId.") method ..."); global $adb; $query="insert into group2rs values(".$groupId.",'".$rsId."')"; $adb->query($query); + $log->debug("Exiting insertGroupToRsRelation method ..."); } /** Function to insert group to user relation @@ -2569,9 +2859,12 @@ */ function insertGroupToUserRelation($groupId,$userId) { + global $log; + $log->debug("Entering insertGroupToUserRelation(".$groupId.",".$userId.") method ..."); global $adb; $query="insert into users2group values(".$groupId.",".$userId.")"; $adb->query($query); + $log->debug("Exiting insertGroupToUserRelation method ..."); } @@ -2582,6 +2875,8 @@ */ function getGroupInfo($groupId) { + global $log; + $log->debug("Entering getGroupInfo(".$groupId.") method ..."); global $adb; $groupDetailArr=Array(); $groupMemberArr=Array(); @@ -2598,6 +2893,7 @@ $groupDetailArr[]=$groupMemberArr; //Returning the Group Detail Array + $log->debug("Exiting getGroupInfo method ..."); return $groupDetailArr; @@ -2609,12 +2905,15 @@ */ function fetchGroupName($groupId) { + global $log; + $log->debug("Entering fetchGroupName(".$groupId.") method ..."); global $adb; //Retreving the group Info $query="select * from groups where groupid=".$groupId; $result = $adb->query($query); $groupName=$adb->query_result($result,0,'groupname'); + $log->debug("Exiting fetchGroupName method ..."); return $groupName; } @@ -2629,6 +2928,8 @@ */ function getGroupMembers($groupId) { + global $log; + $log->debug("Entering getGroupMembers(".$groupId.") method ..."); $groupMemberArr=Array(); $roleGroupArr=getGroupRelatedRoles($groupId); $rsGroupArr=getGroupRelatedRoleSubordinates($groupId); @@ -2640,6 +2941,7 @@ $groupMemberArr['rs']=$rsGroupArr; $groupMemberArr['users']=$userGroupArr; + $log->debug("Exiting getGroupMembers method ..."); return($groupMemberArr); } @@ -2650,6 +2952,8 @@ */ function getGroupRelatedRoles($groupId) { + global $log; + $log->debug("Entering getGroupRelatedRoles(".$groupId.") method ..."); global $adb; $roleGroupArr=Array(); $query="select * from group2role where groupid=".$groupId; @@ -2660,6 +2964,7 @@ $roleId=$adb->query_result($result,$i,'roleid'); $roleGroupArr[]=$roleId; } + $log->debug("Exiting getGroupRelatedRoles method ..."); return $roleGroupArr; } @@ -2672,6 +2977,8 @@ */ function getGroupRelatedRoleSubordinates($groupId) { + global $log; + $log->debug("Entering getGroupRelatedRoleSubordinates(".$groupId.") method ..."); global $adb; $rsGroupArr=Array(); $query="select * from group2rs where groupid=".$groupId; @@ -2682,6 +2989,7 @@ $roleSubId=$adb->query_result($result,$i,'roleandsubid'); $rsGroupArr[]=$roleSubId; } + $log->debug("Exiting getGroupRelatedRoleSubordinates method ..."); return $rsGroupArr; } @@ -2693,6 +3001,8 @@ */ function getGroupRelatedGroups($groupId) { + global $log; + $log->debug("Entering getGroupRelatedGroups(".$groupId.") method ..."); global $adb; $groupGroupArr=Array(); $query="select * from group2grouprel where groupid=".$groupId; @@ -2703,6 +3013,7 @@ $relGroupId=$adb->query_result($result,$i,'containsgroupid'); $groupGroupArr[]=$relGroupId; } + $log->debug("Exiting getGroupRelatedGroups method ..."); return $groupGroupArr; } @@ -2714,6 +3025,8 @@ */ function getGroupRelatedUsers($groupId) { + global $log; + $log->debug("Entering getGroupRelatedUsers(".$groupId.") method ..."); global $adb; $userGroupArr=Array(); $query="select * from users2group where groupid=".$groupId; @@ -2724,6 +3037,7 @@ $userId=$adb->query_result($result,$i,'userid'); $userGroupArr[]=$userId; } + $log->debug("Exiting getGroupRelatedUsers method ..."); return $userGroupArr; } @@ -2736,6 +3050,8 @@ */ function updateGroup($groupId,$groupName,$groupMemberArray,$description) { + global $log; + $log->debug("Entering updateGroup(".$groupId.",".$groupName.",".$groupMemberArray.",".$description.") method ..."); global $adb; $query="update groups set groupname='".$groupName."',description='".$description."' where groupid=".$groupId; $adb->query($query); @@ -2774,7 +3090,7 @@ { insertGroupToUserRelation($groupId,$userId); } - + $log->debug("Exiting updateGroup method ..."); } @@ -2783,6 +3099,8 @@ */ function deleteGroup($groupId) { + global $log; + $log->debug("Entering deleteGroup(".$groupId.") method ..."); global $adb; deleteGroupRelatedSharingRules($groupId); $query="delete from groups where groupid=".$groupId; @@ -2792,6 +3110,7 @@ deleteGroupRelatedRoles($groupId); deleteGroupRelatedRolesAndSubordinates($groupId); deleteGroupRelatedUsers($groupId); + $log->debug("Exiting deleteGroup method ..."); } @@ -2800,9 +3119,12 @@ */ function deleteGroupRelatedGroups($groupId) { + global $log; + $log->debug("Entering deleteGroupRelatedGroups(".$groupId.") method ..."); global $adb; $query="delete from group2grouprel where groupid=".$groupId; $adb->query($query); + $log->debug("Exiting deleteGroupRelatedGroups method ..."); } @@ -2811,9 +3133,12 @@ */ function deleteGroupRelatedRoles($groupId) { + global $log; + $log->debug("Entering deleteGroupRelatedRoles(".$groupId.") method ..."); global $adb; $query="delete from group2role where groupid=".$groupId; $adb->query($query); + $log->debug("Exiting deleteGroupRelatedRoles method ..."); } @@ -2822,9 +3147,12 @@ */ function deleteGroupRelatedRolesAndSubordinates($groupId) { + global $log; + $log->debug("Entering deleteGroupRelatedRolesAndSubordinates(".$groupId.") method ..."); global $adb; $query="delete from group2rs where groupid=".$groupId; $adb->query($query); + $log->debug("Exiting deleteGroupRelatedRolesAndSubordinates method ..."); } @@ -2833,9 +3161,12 @@ */ function deleteGroupRelatedUsers($groupId) { + global $log; + $log->debug("Entering deleteGroupRelatedUsers(".$groupId.") method ..."); global $adb; $query="delete from users2group where groupid=".$groupId; $adb->query($query); + $log->debug("Exiting deleteGroupRelatedUsers method ..."); } /** This function returns the Default Organisation Sharing Action Name @@ -2844,10 +3175,13 @@ */ function getDefOrgShareActionName($share_action_id) { + global $log; + $log->debug("Entering getDefOrgShareActionName(".$share_action_id.") method ..."); global $adb; $query="select * from org_share_action_mapping where share_action_id=".$share_action_id; $result=$adb->query($query); $share_action_name=$adb->query_result($result,0,"share_action_name"); + $log->debug("Exiting getDefOrgShareActionName method ..."); return $share_action_name; @@ -2864,6 +3198,8 @@ */ function getModuleSharingActionArray($tabid) { + global $log; + $log->debug("Entering getModuleSharingActionArray(".$tabid.") method ..."); global $adb; $share_action_arr=Array(); $query = "select org_share_action_mapping.share_action_name,org_share_action2tab.share_action_id from org_share_action2tab inner join org_share_action_mapping on org_share_action2tab.share_action_id=org_share_action_mapping.share_action_id where org_share_action2tab.tabid=".$tabid; @@ -2875,6 +3211,7 @@ $share_action_id=$adb->query_result($result,$i,"share_action_id"); $share_action_arr[$share_action_id] = $share_action_name; } + $log->debug("Exiting getModuleSharingActionArray method ..."); return $share_action_arr; } @@ -2893,6 +3230,8 @@ */ function addSharingRule($tabid,$shareEntityType,$toEntityType,$shareEntityId,$toEntityId,$sharePermission) { + global $log; + $log->debug("Entering addSharingRule(".$tabid.",".$shareEntityType.",".$toEntityType.",".$shareEntityId.",".$toEntityId.",".$sharePermission.") method ..."); global $adb; $shareid=$adb->getUniqueId("datashare_module_rel"); @@ -2954,6 +3293,7 @@ $query1 = "insert into datashare_module_rel values(".$shareid.",".$tabid.",'".$type_string."')"; $adb->query($query1); $adb->query($query); + $log->debug("Exiting addSharingRule method ..."); return $shareid; } @@ -2974,6 +3314,8 @@ */ function updateSharingRule($shareid,$tabid,$shareEntityType,$toEntityType,$shareEntityId,$toEntityId,$sharePermission) { + global $log; + $log->debug("Entering updateSharingRule(".$shareid.",".$tabid.",".$shareEntityType.",".$toEntityType.",".$shareEntityId.",".$toEntityId.",".$sharePermission.") method ..."); global $adb; $query2="select * from datashare_module_rel where shareid=".$shareid; @@ -3041,6 +3383,7 @@ $query1 = "update datashare_module_rel set relationtype='".$type_string."' where shareid=".$shareid; $adb->query($query1); $adb->query($query); + $log->debug("Exiting updateSharingRule method ..."); return $shareid; } @@ -3052,6 +3395,8 @@ */ function deleteSharingRule($shareid) { + global $log; + $log->debug("Entering deleteSharingRule(".$shareid.") method ..."); global $adb; $query2="select * from datashare_module_rel where shareid=".$shareid; $res=$adb->query($query2); @@ -3065,6 +3410,7 @@ //deleting the releated module sharing permission $query5="delete from datashare_relatedmodule_permission where shareid=".$shareid; $adb->query($query5); + $log->debug("Exiting deleteSharingRule method ..."); } @@ -3082,6 +3428,8 @@ */ function getDataShareTableandColumnArray() { + global $log; + $log->debug("Entering getDataShareTableandColumnArray() method ..."); $dataShareTableColArr=Array('datashare_grp2grp'=>'share_groupid::to_groupid', 'datashare_grp2role'=>'share_groupid::to_roleid', 'datashare_grp2rs'=>'share_groupid::to_roleandsubid', @@ -3091,6 +3439,7 @@ 'datashare_rs2grp'=>'share_roleandsubid::to_groupid', 'datashare_rs2role'=>'share_roleandsubid::to_roleid', 'datashare_rs2rs'=>'share_roleandsubid::to_roleandsubid'); + $log->debug("Exiting getDataShareTableandColumnArray method ..."); return $dataShareTableColArr; } @@ -3104,10 +3453,13 @@ */ function getDSTableColumns($tableName) { + global $log; + $log->debug("Entering getDSTableColumns(".$tableName.") method ..."); $dataShareTableColArr=getDataShareTableandColumnArray(); $dsTableCols=$dataShareTableColArr[$tableName]; $dsTableColsArr=explode('::',$dsTableCols); + $log->debug("Exiting getDSTableColumns method ..."); return $dsTableColsArr; } @@ -3127,6 +3479,8 @@ */ function getDataShareTableName() { + global $log; + $log->debug("Entering getDataShareTableName() method ..."); $dataShareTableColArr=Array('GRP::GRP'=>'datashare_grp2grp', 'GRP::ROLE'=>'datashare_grp2role', 'GRP::RS'=>'datashare_grp2rs', @@ -3136,6 +3490,7 @@ 'RS::GRP'=>'datashare_rs2grp', 'RS::ROLE'=>'datashare_rs2role', 'RS::RS'=>'datashare_rs2rs'); + $log->debug("Exiting getDataShareTableName method ..."); return $dataShareTableColArr; } @@ -3147,8 +3502,11 @@ */ function getDSTableNameForType($typeString) { + global $log; + $log->debug("Entering getDSTableNameForType(".$typeString.") method ..."); $dataShareTableColArr=getDataShareTableName(); $tableName=$dataShareTableColArr[$typeString]; + $log->debug("Exiting getDSTableNameForType method ..."); return $tableName; } @@ -3159,6 +3517,8 @@ */ function getEntityTypeFromCol($colName) { + global $log; + $log->debug("Entering getEntityTypeFromCol(".$colName.") method ..."); if($colName == 'share_groupid' || $colName == 'to_groupid') { @@ -3173,6 +3533,7 @@ $entity_type='rs'; } + $log->debug("Exiting getEntityTypeFromCol method ..."); return $entity_type; } @@ -3184,6 +3545,8 @@ */ function getEntityDisplayLink($entityType,$entityid) { + global $log; + $log->debug("Entering getEntityDisplayLink(".$entityType.",".$entityid.") method ..."); if($entityType == 'groups') { $groupNameArr = getGroupInfo($entityid); @@ -3199,6 +3562,7 @@ $roleName=getRoleName($entityid); $display_out = "RoleAndSubordinate::".$roleName. ""; } + $log->debug("Exiting getEntityDisplayLink method ..."); return $display_out; } @@ -3211,8 +3575,9 @@ */ function getSharingRuleInfo($shareId) { - global $adb; - global $log; + global $log; + $log->debug("Entering getSharingRuleInfo(".$shareId.") method ..."); + global $adb; $shareRuleInfoArr=Array(); $query="select * from datashare_module_rel where shareid=".$shareId; $result=$adb->query($query); @@ -3249,6 +3614,7 @@ $shareRuleInfoArr[]=$to_id; $shareRuleInfoArr[]=$permission; + $log->debug("Exiting getSharingRuleInfo method ..."); return $shareRuleInfoArr; @@ -3262,6 +3628,8 @@ function getRelatedSharingModules($tabid) { + global $log; + $log->debug("Entering getRelatedSharingModules(".$tabid.") method ..."); global $adb; $relatedSharingModuleArray=Array(); $query="select * from datashare_relatedmodules where tabid=".$tabid; @@ -3274,6 +3642,7 @@ $relatedSharingModuleArray[$rel_tabid]=$ds_relmod_id; } + $log->debug("Exiting getRelatedSharingModules method ..."); return $relatedSharingModuleArray; } @@ -3291,10 +3660,13 @@ function addRelatedModuleSharingPermission($shareid,$tabid,$relatedtabid,$sharePermission) { + global $log; + $log->debug("Entering addRelatedModuleSharingPermission(".$shareid.",".$tabid.",".$relatedtabid.",".$sharePermission.") method ..."); global $adb; $relatedModuleSharingId=getRelatedModuleSharingId($tabid,$relatedtabid); $query="insert into datashare_relatedmodule_permission values(".$shareid.", ".$relatedModuleSharingId.", ".$sharePermission.")" ; $result=$adb->query($query); + $log->debug("Exiting addRelatedModuleSharingPermission method ..."); } /** This function is to update the related module sharing permission for a particulare Sharing Rule @@ -3309,10 +3681,13 @@ function updateRelatedModuleSharingPermission($shareid,$tabid,$relatedtabid,$sharePermission) { + global $log; + $log->debug("Entering updateRelatedModuleSharingPermission(".$shareid.",".$tabid.",".$relatedtabid.",".$sharePermission.") method ..."); global $adb; $relatedModuleSharingId=getRelatedModuleSharingId($tabid,$relatedtabid); $query="update datashare_relatedmodule_permission set permission=".$sharePermission." where shareid=".$shareid." and datashare_relatedmodule_id=".$relatedModuleSharingId; $result=$adb->query($query); + $log->debug("Exiting updateRelatedModuleSharingPermission method ..."); } /** This function is to retreive the Related Module Sharing Id @@ -3324,10 +3699,13 @@ function getRelatedModuleSharingId($tabid,$related_tabid) { + global $log; + $log->debug("Entering getRelatedModuleSharingId(".$tabid.",".$related_tabid.") method ..."); global $adb; $query="select datashare_relatedmodule_id from datashare_relatedmodules where tabid=".$tabid." and relatedto_tabid=".$related_tabid ; $result=$adb->query($query); $relatedModuleSharingId=$adb->query_result($result,0,'datashare_relatedmodule_id'); + $log->debug("Exiting getRelatedModuleSharingId method ..."); return $relatedModuleSharingId; } @@ -3344,6 +3722,8 @@ */ function getRelatedModuleSharingPermission($shareid) { + global $log; + $log->debug("Entering getRelatedModuleSharingPermission(".$shareid.") method ..."); global $adb; $relatedSharingModulePermissionArray=Array(); $query="select datashare_relatedmodules.*,datashare_relatedmodule_permission.permission from datashare_relatedmodules inner join datashare_relatedmodule_permission on datashare_relatedmodule_permission.datashare_relatedmodule_id=datashare_relatedmodules.datashare_relatedmodule_id where datashare_relatedmodule_permission.shareid=".$shareid; @@ -3357,6 +3737,7 @@ } + $log->debug("Exiting getRelatedModuleSharingPermission method ..."); return $relatedSharingModulePermissionArray; } @@ -3370,6 +3751,8 @@ */ function getUserProfile($userId) { + global $log; + $log->debug("Entering getUserProfile(".$userId.") method ..."); global $adb; $roleId=fetchUserRole($userId); $profArr=Array(); @@ -3382,6 +3765,7 @@ $profileid= $adb->query_result($result1,$i,"profileid"); $profArr[]=$profileid; } + $log->debug("Exiting getUserProfile method ..."); return $profArr; } @@ -3394,6 +3778,8 @@ */ function getCombinedUserGlobalPermissions($userId) { + global $log; + $log->debug("Entering getCombinedUserGlobalPermissions(".$userId.") method ..."); global $adb; $profArr=getUserProfile($userId); $no_of_profiles=sizeof($profArr); @@ -3425,6 +3811,7 @@ } + $log->debug("Exiting getCombinedUserGlobalPermissions method ..."); return $userGlobalPerrArr; } @@ -3437,6 +3824,8 @@ */ function getCombinedUserTabsPermissions($userId) { + global $log; + $log->debug("Entering getCombinedUserTabsPermissions(".$userId.") method ..."); global $adb; $profArr=getUserProfile($userId); $no_of_profiles=sizeof($profArr); @@ -3467,6 +3856,7 @@ } } + $log->debug("Exiting getCombinedUserTabsPermissions method ..."); return $userTabPerrArr; } @@ -3479,6 +3869,8 @@ */ function getCombinedUserActionPermissions($userId) { + global $log; + $log->debug("Entering getCombinedUserActionPermissions(".$userId.") method ..."); global $adb; $profArr=getUserProfile($userId); $no_of_profiles=sizeof($profArr); @@ -3512,6 +3904,7 @@ } } + $log->debug("Exiting getCombinedUserActionPermissions method ..."); return $actionPerrArr; } @@ -3523,6 +3916,8 @@ */ function getParentRole($roleId) { + global $log; + $log->debug("Entering getParentRole(".$roleId.") method ..."); $roleInfo=getRoleInformation($roleId); $parentRole=$roleInfo[$roleId][1]; $tempParentRoleArr=explode('::',$parentRole); @@ -3534,6 +3929,7 @@ $parentRoleArr[]=$role_id; } } + $log->debug("Exiting getParentRole method ..."); return $parentRoleArr; } @@ -3545,6 +3941,7 @@ */ function getRoleSubordinates($roleId) { + $log->debug("Entering getRoleSubordinates(".$roleId.") method ..."); global $adb; $roleDetails=getRoleInformation($roleId); $roleInfo=$roleDetails[$roleId]; @@ -3561,6 +3958,7 @@ $roleSubordinates[]=$roleid; } + $log->debug("Exiting getRoleSubordinates method ..."); return $roleSubordinates; } @@ -3576,6 +3974,8 @@ */ function getSubordinateRoleAndUsers($roleId) { + global $log; + $log->debug("Entering getSubordinateRoleAndUsers(".$roleId.") method ..."); global $adb; $subRoleAndUsers=Array(); $subordinateRoles=getRoleSubordinates($roleId); @@ -3585,12 +3985,15 @@ $subRoleAndUsers[$subRoleId]=$userArray; } + $log->debug("Exiting getSubordinateRoleAndUsers method ..."); return $subRoleAndUsers; } function getCurrentUserProfileList() { + global $log; + $log->debug("Entering getCurrentUserProfileList() method ..."); global $current_user; require('user_privileges/user_privileges_'.$current_user->id.'.php'); $profList ='('; @@ -3605,6 +4008,7 @@ $i++; } $profList .=')'; + $log->debug("Exiting getCurrentUserProfileList method ..."); return $profList; } @@ -3612,6 +4016,8 @@ function getCurrentUserGroupList() { + global $log; + $log->debug("Entering getCurrentUserGroupList() method ..."); global $current_user; require('user_privileges/user_privileges_'.$current_user->id.'.php'); $grpList=''; @@ -3630,11 +4036,14 @@ } $grpList .=')'; } + $log->debug("Exiting getCurrentUserGroupList method ..."); return $grpList; } function getSubordinateUsersList() { + global $log; + $log->debug("Entering getSubordinateUsersList() method ..."); global $current_user; $user_array=Array(); require('user_privileges/user_privileges_'.$current_user->id.'.php'); @@ -3653,12 +4062,15 @@ } } $subUserList = constructList($user_array,'INTEGER'); + $log->debug("Exiting getSubordinateUsersList method ..."); return $subUserList; } function getReadSharingUsersList($module) { + global $log; + $log->debug("Entering getReadSharingUsersList(".$module.") method ..."); global $adb; global $current_user; $user_array=Array(); @@ -3672,11 +4084,14 @@ $user_array[]=$user_id; } $shareUserList=constructList($user_array,'INTEGER'); + $log->debug("Exiting getReadSharingUsersList method ..."); return $shareUserList; } function getReadSharingGroupsList($module) { + global $log; + $log->debug("Entering getReadSharingGroupsList(".$module.") method ..."); global $adb; global $current_user; $grp_array=Array(); @@ -3690,11 +4105,14 @@ $grp_array[]=$grp_id; } $shareGrpList=constructList($grp_array,'INTEGER'); + $log->debug("Exiting getReadSharingGroupsList method ..."); return $shareGrpList; } function getWriteSharingGroupsList($module) { + global $log; + $log->debug("Entering getWriteSharingGroupsList(".$module.") method ..."); global $adb; global $current_user; $grp_array=Array(); @@ -3708,11 +4126,14 @@ $grp_array[]=$grp_id; } $shareGrpList=constructList($grp_array,'INTEGER'); + $log->debug("Exiting getWriteSharingGroupsList method ..."); return $shareGrpList; } function constructList($array,$data_type) { + global $log; + $log->debug("Entering constructList(".$array.",".$data_type.") method ..."); $list=""; if(sizeof($array) > 0) { @@ -3736,11 +4157,14 @@ } $list.=")"; } + $log->debug("Exiting constructList method ..."); return $list; } function getListViewSecurityParameter($module) { + global $log; + $log->debug("Entering getListViewSecurityParameter(".$module.") method ..."); global $adb; global $current_user; @@ -3952,11 +4376,14 @@ $sec_query .=") "; } + $log->debug("Exiting getListViewSecurityParameter method ..."); return $sec_query; } function get_current_user_access_groups($module) { + global $log; + $log->debug("Entering get_current_user_access_groups(".$module.") method ..."); global $adb,$noof_group_rows; $current_user_group_list=getCurrentUserGroupList(); $sharing_write_group_list=getWriteSharingGroupsList($module); @@ -3975,6 +4402,7 @@ } $result = $adb->query($query); $noof_group_rows=$adb->num_rows($result); + $log->debug("Exiting get_current_user_access_groups method ..."); return $result; } /** Function to get the Group Id for a given group groupname @@ -3984,10 +4412,13 @@ function getGrpId($groupname) { + global $log; + $log->debug("Entering getGrpId(".$groupname.") method ..."); global $adb; $result = $adb->query("select groupid from groups where groupname='".$groupname."'"); $groupid = $adb->query_result($result,0,'groupid'); + $log->debug("Exiting getGrpId method ..."); return $groupid; } @@ -4000,6 +4431,8 @@ */ function getFieldVisibilityPermission($fld_module, $userid, $fieldname) { + global $log; + $log->debug("Entering getFieldVisibilityPermission(".$fld_module.",". $userid.",". $fieldname.") method ..."); global $adb; global $current_user; @@ -4008,8 +4441,11 @@ require('user_privileges/user_privileges_'.$userid.'.php'); if($is_admin) - { return 0; - } else + { + $log->debug("Exiting getFieldVisibilityPermission method ..."); + return 0; + } + else { //get profile list using userid $profilelist = getCurrentUserProfileList(); @@ -4020,6 +4456,7 @@ $query="select profile2field.* from field inner join profile2field on profile2field.fieldid=field.fieldid inner join def_org_field on def_org_field.fieldid=field.fieldid where field.tabid=".$tabid." and profile2field.visible=0 and def_org_field.visible=0 and profile2field.profileid in".$profilelist." and field.fieldname='".$fieldname."' group by field.fieldid"; $result = $adb->query($query); + $log->debug("Exiting getFieldVisibilityPermission method ..."); return $adb->query_result($result,"0","visible"); } } @@ -4030,6 +4467,8 @@ */ function getFieldModuleAccessArray() { + global $log; + $log->debug("Entering getFieldModuleAccessArray() method ..."); $fldModArr=Array('Leads'=>'LBL_LEAD_FIELD_ACCESS', 'Accounts'=>'LBL_ACCOUNT_FIELD_ACCESS', @@ -4049,6 +4488,7 @@ 'Invoice'=>'LBL_INVOICE_FIELD_ACCESS' ); + $log->debug("Exiting getFieldModuleAccessArray method ..."); return $fldModArr; } @@ -4058,6 +4498,8 @@ */ function getPermittedModuleNames() { + global $log; + $log->debug("Entering getPermittedModuleNames() method ..."); global $current_user; $permittedModules=Array(); require('user_privileges/user_privileges_'.$current_user->id.'.php'); @@ -4087,6 +4529,7 @@ } } + $log->debug("Exiting getPermittedModuleNames method ..."); return $permittedModules; } @@ -4098,6 +4541,8 @@ */ function RecalculateSharingRules() { + global $log; + $log->debug("Entering RecalculateSharingRules() method ..."); global $adb; require_once('modules/Users/CreateUserPrivilegeFile.php'); $query="select id from users where deleted=0"; @@ -4108,7 +4553,8 @@ $id=$adb->query_result($result,$i,'id'); createUserPrivilegesfile($id); createUserSharingPrivilegesfile($id); - } + } + $log->debug("Exiting RecalculateSharingRules method ..."); } @@ -4121,9 +4567,12 @@ */ function insert2CampaignGroupRelation($campaignid,$groupname) { + global $log; + $log->debug("Entering insert2CampaignGroupRelation(".$campaignid.",".$groupname.") method ..."); global $adb; $sql = "insert into campaigngrouprelation values (" .$campaignid .",'".$groupname."')"; $adb->query($sql); + $log->debug("Exiting insert2CampaignGroupRelation method ..."); } @@ -4134,11 +4583,14 @@ */ function updateCampaignGroupRelation($campaignid,$groupname) { + global $log; + $log->debug("Entering updateCampaignGroupRelation(".$campaignid.",".$groupname.") method ..."); global $adb; $sqldelete = "delete from campaigngrouprelation where campaignid=".$campaignid; $adb->query($sqldelete); $sql = "insert into campaigngrouprelation values (".$campaignid .",'" .$groupname ."')"; $adb->query($sql); + $log->debug("Exiting updateCampaignGroupRelation method ..."); } //end From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 08:23:25 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 15:23:25 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5504 - /vtigercrm/trunk/include/utils/utils.php Message-ID: <20060427152325.8F2DA40E7BB@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 09:23:20 2006 New Revision: 5504 Log: log entries have been inserted in all functions 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 Apr 27 09:23:20 2006 @@ -43,6 +43,8 @@ function return_name(&$row, $first_column, $last_column) { + global $log; + $log->debug("Entering return_name(".$row.",".$first_column.",".$last_column.") method ..."); $first_name = ""; $last_name = ""; $full_name = ""; @@ -72,31 +74,42 @@ $full_name .= $last_name; } + $log->debug("Exiting return_name method ..."); return $full_name; } //login utils function get_languages() { + global $log; + $log->debug("Entering get_languages() method ..."); global $languages; + $log->debug("Exiting get_languages method ..."); return $languages; } //seems not used function get_language_display($key) { + global $log; + $log->debug("Entering get_language_display(".$key.") method ..."); global $languages; + $log->debug("Exiting get_language_display method ..."); return $languages[$key]; } function get_assigned_user_name(&$assigned_user_id) { + global $log; + $log->debug("Entering get_assigned_user_name(".$assigned_user_id.") method ..."); $user_list = &get_user_array(false,""); if(isset($user_list[$assigned_user_id])) { + $log->debug("Exiting get_assigned_user_name method ..."); return $user_list[$assigned_user_id]; } + $log->debug("Exiting get_assigned_user_name method ..."); return ""; } @@ -104,6 +117,7 @@ function get_user_array($add_blank=true, $status="Active", $assigned_user="",$private="") { global $log; + $log->debug("Entering get_user_array(".$add_blank.",". $status.",".$assigned_user.",".$private.") method ..."); global $current_user; if(isset($current_user) && $current_user->id != '') { @@ -111,7 +125,6 @@ require('user_privileges/user_privileges_'.$current_user->id.'.php'); } static $user_array = null; - global $log; $module=$_REQUEST['module']; if($user_array == null) @@ -158,12 +171,16 @@ $user_array = &$temp_result; } + $log->debug("Exiting get_user_array method ..."); return $user_array; } function clean($string, $maxLength) { + global $log; + $log->debug("Entering clean(".$string.",". $maxLength.") method ..."); $string = substr($string, 0, $maxLength); + $log->debug("Exiting clean method ..."); return escapeshellcmd($string); } @@ -176,7 +193,10 @@ */ function safe_map($request_var, & $focus, $always_copy = false) { + global $log; + $log->debug("Entering safe_map(".$request_var.",".$focus.",".$always_copy.") method ..."); safe_map_named($request_var, $focus, $request_var, $always_copy); + $log->debug("Exiting safe_map method ..."); } /** @@ -189,10 +209,12 @@ function safe_map_named($request_var, & $focus, $member_var, $always_copy) { global $log; + $log->debug("Entering safe_map_named(".$request_var.",".$focus.",".$member_var.",".$always_copy.") method ..."); if (isset($_REQUEST[$request_var]) && ($always_copy || is_null($focus->$member_var))) { $log->debug("safe map named called assigning '{$_REQUEST[$request_var]}' to $member_var"); $focus->$member_var = $_REQUEST[$request_var]; } + $log->debug("Exiting safe_map_named method ..."); } /** This function retrieves an application language file and returns the array of strings included in the $app_list_strings var. @@ -203,6 +225,8 @@ function return_app_list_strings_language($language) { + global $log; + $log->debug("Entering return_app_list_strings_language(".$language.") method ..."); global $app_list_strings, $default_language, $log, $translation_string_prefix; $temp_app_list_strings = $app_list_strings; $language_used = $language; @@ -218,6 +242,7 @@ if(!isset($app_list_strings)) { $log->fatal("Unable to load the application language file for the selected language($language) or the default language($default_language)"); + $log->debug("Exiting return_app_list_strings_language method ..."); return null; } @@ -225,6 +250,7 @@ $return_value = $app_list_strings; $app_list_strings = $temp_app_list_strings; + $log->debug("Exiting return_app_list_strings_language method ..."); return $return_value; } @@ -235,6 +261,8 @@ * If you are using the current language, do not call this function unless you are loading it for the first time */ function return_application_language($language) { + global $log; + $log->debug("Entering return_application_language(".$language.") method ..."); global $app_strings, $default_language, $log, $translation_string_prefix; $temp_app_strings = $app_strings; $language_used = $language; @@ -250,6 +278,7 @@ if(!isset($app_strings)) { $log->fatal("Unable to load the application language file for the selected language($language) or the default language($default_language)"); + $log->debug("Exiting return_application_language method ..."); return null; } @@ -265,6 +294,7 @@ $return_value = $app_strings; $app_strings = $temp_app_strings; + $log->debug("Exiting return_application_language method ..."); return $return_value; } @@ -275,11 +305,14 @@ * If you are in the current module, do not call this function unless you are loading it for the first time */ function return_module_language($language, $module) { + global $log; + $log->debug("Entering return_module_language(".$language.",". $module.") method ..."); global $mod_strings, $default_language, $log, $currentModule, $translation_string_prefix; if($currentModule == $module && isset($mod_strings) && $mod_strings != null) { // We should have already loaded the array. return the current one. + $log->debug("Exiting return_module_language method ..."); return $mod_strings; } @@ -297,6 +330,7 @@ if(!isset($mod_strings)) { $log->fatal("Unable to load the module($module) language file for the selected language($language) or the default language($default_language)"); + $log->debug("Exiting return_module_language method ..."); return null; } @@ -312,6 +346,7 @@ $return_value = $mod_strings; $mod_strings = $temp_mod_strings; + $log->debug("Exiting return_module_language method ..."); return $return_value; } @@ -322,6 +357,8 @@ * If you are using the current language, do not call this function unless you are loading it for the first time */ function return_mod_list_strings_language($language,$module) { + global $log; + $log->debug("Entering return_mod_list_strings_language(".$language.",".$module.") method ..."); global $mod_list_strings, $default_language, $log, $currentModule,$translation_string_prefix; $language_used = $language; @@ -329,6 +366,7 @@ if($currentModule == $module && isset($mod_list_strings) && $mod_list_strings != null) { + $log->debug("Exiting return_mod_list_strings_language method ..."); return $mod_list_strings; } @@ -337,12 +375,14 @@ if(!isset($mod_list_strings)) { $log->fatal("Unable to load the application list language file for the selected language($language) or the default language($default_language)"); + $log->debug("Exiting return_mod_list_strings_language method ..."); return null; } $return_value = $mod_list_strings; $mod_list_strings = $temp_mod_list_strings; + $log->debug("Exiting return_mod_list_strings_language method ..."); return $return_value; } @@ -353,6 +393,8 @@ */ function return_theme_language($language, $theme) { + global $log; + $log->debug("Entering return_theme_language(".$language.",". $theme.") method ..."); global $mod_strings, $default_language, $log, $currentModule, $translation_string_prefix; $language_used = $language; @@ -368,6 +410,7 @@ if(!isset($theme_strings)) { $log->fatal("Unable to load the theme($theme) language file for the selected language($language) or the default language($default_language)"); + $log->debug("Exiting return_theme_language method ..."); return null; } @@ -380,6 +423,7 @@ } } + $log->debug("Exiting return_theme_language method ..."); return $theme_strings; } @@ -392,11 +436,15 @@ */ function return_session_value_or_default($varname, $default) { + global $log; + $log->debug("Entering return_session_value_or_default(".$varname.",". $default.") method ..."); if(isset($_SESSION[$varname]) && $_SESSION[$varname] != "") { + $log->debug("Exiting return_session_value_or_default method ..."); return $_SESSION[$varname]; } + $log->debug("Exiting return_session_value_or_default method ..."); return $default; } @@ -412,6 +460,8 @@ */ function append_where_clause(&$where_clauses, $variable_name, $SQL_name = null) { + global $log; + $log->debug("Entering append_where_clause(".$where_clauses.",".$variable_name.",".$SQL_name.") method ..."); if($SQL_name == null) { $SQL_name = $variable_name; @@ -421,6 +471,7 @@ { array_push($where_clauses, "$SQL_name like '$_REQUEST[$variable_name]%'"); } + $log->debug("Exiting append_where_clause method ..."); } /** @@ -434,6 +485,7 @@ function generate_where_statement($where_clauses) { global $log; + $log->debug("Entering generate_where_statement(".$where_clauses.") method ..."); $where = ""; foreach($where_clauses as $clause) { @@ -443,6 +495,7 @@ } $log->info("Here is the where clause for the list view: $where"); + $log->debug("Exiting generate_where_statement method ..."); return $where; } @@ -456,7 +509,9 @@ */ function create_guid() { - $microTime = microtime(); + global $log; + $log->debug("Entering create_guid() method ..."); + $microTime = microtime(); list($a_dec, $a_sec) = explode(" ", $microTime); $dec_hex = sprintf("%x", $a_dec* 1000000); @@ -478,22 +533,28 @@ $guid .= $sec_hex; $guid .= create_guid_section(6); + $log->debug("Exiting create_guid method ..."); return $guid; } function create_guid_section($characters) { + global $log; + $log->debug("Entering create_guid_section(".$characters.") method ..."); $return = ""; for($i=0; $i<$characters; $i++) { $return .= sprintf("%x", rand(0,15)); } + $log->debug("Exiting create_guid_section method ..."); return $return; } function ensure_length(&$string, $length) { + global $log; + $log->debug("Entering ensure_length(".$string.",". $length.") method ..."); $strlen = strlen($string); if($strlen < $length) { @@ -503,12 +564,16 @@ { $string = substr($string, 0, $length); } + $log->debug("Exiting ensure_length method ..."); } function microtime_diff($a, $b) { - list($a_dec, $a_sec) = explode(" ", $a); - list($b_dec, $b_sec) = explode(" ", $b); - return $b_sec - $a_sec + $b_dec - $a_dec; + global $log; + $log->debug("Entering microtime_diff(".$a.",". $b.") method ..."); + list($a_dec, $a_sec) = explode(" ", $a); + list($b_dec, $b_sec) = explode(" ", $b); + $log->debug("Exiting microtime_diff method ..."); + return $b_sec - $a_sec + $b_dec - $a_dec; } @@ -519,6 +584,8 @@ * Contributor(s): ______________________________________.. */ function get_theme_display($theme) { + global $log; + $log->debug("Entering get_theme_display(".$theme.") method ..."); global $theme_name, $theme_description; $temp_theme_name = $theme_name; $temp_theme_description = $theme_description; @@ -533,6 +600,7 @@ $theme_name = $temp_theme_name; $theme_description = $temp_theme_description; + $log->debug("Exiting get_theme_display method ..."); return $return_theme_value; } @@ -543,6 +611,8 @@ * Contributor(s): ______________________________________.. */ function get_themes() { + global $log; + $log->debug("Entering get_themes() method ..."); if ($dir = @opendir("./themes")) { while (($file = readdir($dir)) !== false) { if ($file != ".." && $file != "." && $file != "CVS" && $file != "Attic" && $file != "akodarkgem" && $file != "bushtree" && $file != "coolblue" && $file != "Amazon" && $file != "busthree" && $file != "Aqua" && $file != "nature" && $file != "orange") { @@ -570,6 +640,7 @@ } ksort($filelist); + $log->debug("Exiting get_themes method ..."); return $filelist; } @@ -582,6 +653,8 @@ * Contributor(s): ______________________________________.. */ function get_clear_form_js () { +global $log; +$log->debug("Entering get_clear_form_js () method ..."); $the_script = << Modified: vtigercrm/branches/4.2/modules/CustomView/EditView.php ============================================================================== --- vtigercrm/branches/4.2/modules/CustomView/EditView.php (original) +++ vtigercrm/branches/4.2/modules/CustomView/EditView.php Thu Apr 27 16:57:39 2006 @@ -48,6 +48,7 @@ $xtpl->assign("APP", $app_strings); $xtpl->assign("IMAGE_PATH", $image_path); $xtpl->assign("MODULE",$cv_module); +$xtpl->assign("MODULENAME",$app_strings[$cv_module]); $xtpl->assign("CVMODULE", $cv_module); $xtpl->assign("CUSTOMVIEWID",$recordid); $xtpl->assign("DATAFORMAT",$current_user->date_format); Modified: vtigercrm/branches/4.2/modules/HelpDesk/ListView.html ============================================================================== --- vtigercrm/branches/4.2/modules/HelpDesk/ListView.html (original) +++ vtigercrm/branches/4.2/modules/HelpDesk/ListView.html Thu Apr 27 16:57:39 2006 @@ -104,7 +104,7 @@ {MOD.LBL_STATISTICS}{MOD.LBL_COLON} - + Modified: vtigercrm/branches/4.2/modules/Invoice/DetailView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Invoice/DetailView.php (original) +++ vtigercrm/branches/4.2/modules/Invoice/DetailView.php Thu Apr 27 16:57:39 2006 @@ -116,7 +116,7 @@ $xtpl->assign("DUPLICATEBUTTON",""); } - $xtpl->assign("CREATEPDF",""); + $xtpl->assign("CREATEPDF",""); if(isPermitted("Invoice",2,$_REQUEST['record']) == 'yes') { Modified: vtigercrm/branches/4.2/modules/Orders/SalesOrderDetailView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Orders/SalesOrderDetailView.php (original) +++ vtigercrm/branches/4.2/modules/Orders/SalesOrderDetailView.php Thu Apr 27 16:57:39 2006 @@ -119,7 +119,7 @@ $xtpl->assign("DUPLICATEBUTTON",""); } - $xtpl->assign("CREATEPDF",""); + $xtpl->assign("CREATEPDF",""); if(isPermitted("Invoice",1,$_REQUEST['record']) == 'yes') Modified: vtigercrm/branches/4.2/modules/Potentials/Forms.php ============================================================================== --- vtigercrm/branches/4.2/modules/Potentials/Forms.php (original) +++ vtigercrm/branches/4.2/modules/Potentials/Forms.php Thu Apr 27 16:57:39 2006 @@ -243,7 +243,7 @@
        $lbl_required_symbol$lbl_account_name
        -   +  
        $lbl_required_symbol$lbl_date_closed
        ($current_user->date_format)
        Modified: vtigercrm/branches/4.2/modules/Quotes/DetailView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Quotes/DetailView.php (original) +++ vtigercrm/branches/4.2/modules/Quotes/DetailView.php Thu Apr 27 16:57:39 2006 @@ -125,7 +125,7 @@ } - $xtpl->assign("CREATEPDF",""); + $xtpl->assign("CREATEPDF",""); if(isPermitted("SalesOrder",1,$_REQUEST['record']) == 'yes') { Modified: vtigercrm/branches/4.2/modules/Users/OrgSharingDetailView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Users/OrgSharingDetailView.php (original) +++ vtigercrm/branches/4.2/modules/Users/OrgSharingDetailView.php Thu Apr 27 16:57:39 2006 @@ -15,7 +15,7 @@ global $app_list_strings; echo '
        '; -echo get_module_title("Security", "Default Organisation Sharing Privileges", true); +echo get_module_title("Security", $mod_strings['LBL_ORG_SHARING_PRIVILEGES_HEADER'], true); global $theme; $theme_path="themes/".$theme."/"; @@ -31,7 +31,7 @@ $output .= ''; $output .= ''; $output .= ''; -$output .= ''; +$output .= ''; $output .= ''; $row=1; Modified: vtigercrm/branches/4.2/modules/Users/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/4.2/modules/Users/language/en_us.lang.php (original) +++ vtigercrm/branches/4.2/modules/Users/language/en_us.lang.php Thu Apr 27 16:57:39 2006 @@ -211,6 +211,8 @@ //Added fields in OrgSharingDetailsView.php 'LBL_ORG_SHARING_PRIVILEGES'=>'Organisation Sharing Privileges', +'LBL_ORG_SHARING_PRIVILEGES_HEADER' => 'Setup: Organisation Sharing Privileges', +'LBL_ACCESS_PRIVILEGE' =>'Access Privilege', 'LBL_EDIT_PERMISSIONS'=>'Edit Permissions', 'LBL_SAVE_PERMISSIONS'=>'Save Permissions', 'LBL_READ_ONLY'=>'Public: Read Only', From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 15:59:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 22:59:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5515 - in /vtigercrm/trunk/Smarty/templates: EditProfile.tpl GroupDetailview.tpl GroupEditView.tpl ListGroup.tpl Message-ID: <20060427225913.2813659B7E9@vtiger.fosslabs.com> Author: don Date: Thu Apr 27 16:59:06 2006 New Revision: 5515 Log: Modified the UI Modified: vtigercrm/trunk/Smarty/templates/EditProfile.tpl vtigercrm/trunk/Smarty/templates/GroupDetailview.tpl vtigercrm/trunk/Smarty/templates/GroupEditView.tpl vtigercrm/trunk/Smarty/templates/ListGroup.tpl Modified: vtigercrm/trunk/Smarty/templates/EditProfile.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/EditProfile.tpl (original) +++ vtigercrm/trunk/Smarty/templates/EditProfile.tpl Thu Apr 27 16:59:06 2006 @@ -1,461 +1,480 @@ - - -
        '.$mod_strings['LBL_ORG_SHARING_PRIVILEGES'].'Access Privilege'.$mod_strings['LBL_ACCESS_PRIVILEGE'].'
        - - {include file='SettingsMenu.tpl'} - - -
        - - - - - - - - - -

        -{$MOD.LBL_SETTINGS} > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_PROFILES} -
        -
        - - - - - - - - - - - - - - - - -
        Details of Profile
        - - - - - -
        - - - - - - -
        - - - - - - - - - - - - - - - -
        - - - - - - - - - -
        Global PrivilegesTab PrivilegesStandard PrivilegesField PrivilegesUtilities
        -
        - - - - - -
        - - - - - - -
        - - - - - - - -
        Global Privileges for "{$PROFILE_NAME}"
        - Select the options below to change global privileges
        		2 enabled, 0 disabled
        - - - - - -
        - - - - -
        - - - - - -
          - - - - - - - - - - - - - - - - - - - - -
        {$GLOBAL_PRIV.0}View all
        Allows "{$PROFILE_NAME}" to view all information / modules of vtiger CRM
         
        {$GLOBAL_PRIV.1}Edit all
        Allows "{$PROFILE_NAME}" to edit all information / modules of vtiger CRM
        -
        -
        - - - - - - - - - - -
        - - - - - - -
         
         
        -    - {if $ACTION eq 'SaveProfile'} -    - {else} -    - {/if} - - -
         
         
        - -        		 
        -
        - - - - {include file='SettingsSubMenu.tpl'} - - + + + + + {include file='SettingsMenu.tpl'} + + +
        + + + + + + {if $MODE neq "edit"} + + +

        + + {$MOD.LBL_SETTINGS} + > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_PROFILES} +
        +
        + + + + + + + {else} + + + +
        + + + Profile Privileges
        + Step 3 Of 3 +
        + + + + + + + {/if} + + + + + + + + +
        + + + Profile Privileges
        + {$PROFILE_NAME} +
        + + + + +
        + + + + + + +
        + + + + + + + + + + + + + + + +
        + + + + + + + + + +
        Global PrivilegesTab PrivilegesStandard PrivilegesField PrivilegesUtilities
        +
        + + + + + +
        + + + + + +
        + + + + + + +
        Global Privileges for "{$PROFILE_NAME}"
        + Select the options below to change global privileges
        +         		 
        + + + + + +
        + + + + +
        + + + + + +
          + + + + + + + + + + + + + + + + + + + + +
        {$GLOBAL_PRIV.0}View all
        Allows "{$PROFILE_NAME}" to view all information / modules of vtiger CRM
         
        {$GLOBAL_PRIV.1}Edit all
        Allows "{$PROFILE_NAME}" to edit all information / modules of vtiger CRM
        +
        +
        + + + + + + + + + + +
        + + + + + + +
        +
        +
         
        + {if $MODE neq "edit"} +    + {/if} + {if $ACTION eq 'SaveProfile'} +    + {else} +    + {/if} + +
        +         		 
        +
        +
        + {include file='SettingsSubMenu.tpl'} + + Modified: vtigercrm/trunk/Smarty/templates/GroupDetailview.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/GroupDetailview.tpl (original) +++ vtigercrm/trunk/Smarty/templates/GroupDetailview.tpl Thu Apr 27 16:59:06 2006 @@ -1,92 +1,118 @@ - - - - - {include file='SettingsMenu.tpl'} - - -
        - - - - - - - - - - - - - - - -

        -{$MOD.LBL_SETTINGS} > {$MOD.LBL_USER_MANAGEMENT} > {$CMOD.LBL_GROUP_MEMBERS_LIST} -
        -
        - - - - - - - - - - - - - - - - - - - - - - - - - - - -
         
        - -    -    -
         
        Group Name : {$GROUPINFO.0.groupname}
        Description : {$GROUPINFO.0.description}
          
        Member List : -
        - - {foreach key=type item=details from=$GROUPINFO.1} - {if $details.0 neq ''} -
      • {$type} - -
        • - {/if} - {/foreach} - -
        -
        - -        		 
        -
        - - - - - {include file='SettingsSubMenu.tpl'} - + + + + + {include file='SettingsMenu.tpl'} + + +
        + + + + + + + + + + + + + + + + +

        + {$MOD.LBL_SETTINGS} > {$MOD.LBL_USER_MANAGEMENT} > {$CMOD.LBL_GROUP_MEMBERS_LIST} +
        +
         
        + + + + + + + + + + + + + +
        {$GROUPINFO.0.groupname} Group
        + Detail view of {$GROUPINFO.0.groupname} Group
         
        + + + + + + + + + + + + + + + + + + + + + + {foreach key=type item=details from=$GROUPINFO.1} + {if $details.0 neq ''} + + {if $type == "User"} + + {/if} + {if $type == "Role" } + + {/if} + {if $type == "Role and Subordinates" } + + {/if} + {if $type == "Group" } + + {/if} + + + + {/if} + {/foreach} + + + +
        Group Details
         Group Name :{$GROUPINFO.0.groupname} 
         Description :{$GROUPINFO.0.description}
         
        Member List
        + + + + + + + + {$type} : + {foreach item=element from=$details} + {$element.membername}
        + {/foreach} +
        + + +   +
         
        + + + + + {include file='SettingsSubMenu.tpl'} + Modified: vtigercrm/trunk/Smarty/templates/GroupEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/GroupEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/GroupEditView.tpl Thu Apr 27 16:59:06 2006 @@ -1,310 +1,307 @@ - - - - - - - {include file='SettingsMenu.tpl'} - - - -
        - - - - - - - - - - - - - - -

        -{$MOD.LBL_SETTINGS} > {$MOD.LBL_USER_MANAGEMENT} > {$CMOD.LBL_CREATE_NEW_GROUP} -
        -
        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
         
          
        Group Name - -
        Description - -
        - - - - - - - -
        Filters - - - - -
        -
        - - - - - - - -
        Member Available
        - - -         		-

        - -         		Selected Member
        - - -
         
           - - -    - -
         
        - -        		 
        - -
        - - -  - - - - - - - - - - {include file='SettingsSubMenu.tpl'} - + + + + + + + {include file='SettingsMenu.tpl'} + + + +
        + +
        + + + + + + + + + + + +

        +{$MOD.LBL_SETTINGS} > {$MOD.LBL_USER_MANAGEMENT} > {$CMOD.LBL_CREATE_NEW_GROUP} +
        +
        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        + + {$CMOD.LBL_CREATE_NEW_GROUP} +
          
        + Group Name : + +
         
        + Description : + +
         
        + Filters :    +   + +
         
        + + + + + + + +
        Member Available
        + + +         		+

        + +         		Selected Member
        + + +
         
        + +    + +
        + +
        +
        +
        + + +  + + + + + + + + + + {include file='SettingsSubMenu.tpl'} + Modified: vtigercrm/trunk/Smarty/templates/ListGroup.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListGroup.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListGroup.tpl Thu Apr 27 16:59:06 2006 @@ -1,70 +1,96 @@ - - - - - {include file='SettingsMenu.tpl'} - - -
        - - - - - - - - - - - - - - -

        -{$MOD.LBL_SETTINGS} > {$MOD.LBL_USER_MANAGEMENT} > {$CMOD.LBL_GROUP_NAME} -
        -
        - - - - - - - - - - - - - - - - {section name=entries loop=$LIST_ENTRIES} - - - - - - {/section} - -
         
         
         
        {$LIST_HEADER.0}{$LIST_HEADER.1}{$LIST_HEADER.2}
          - - Edit -  {$LIST_ENTRIES[entries].groupname}{$LIST_ENTRIES[entries].description} 
        - -        		 
        -
        - - - - - {include file='SettingsSubMenu.tpl'} - + + + + + {include file='SettingsMenu.tpl'} + + +
        + + + + + + + + + + + + + + +

        +{$MOD.LBL_SETTINGS} > {$MOD.LBL_USER_MANAGEMENT} > {$CMOD.LBL_GROUP_NAME} +

        +
        + + + + + + + + + +
        +  {$CMOD.LBL_GROUP_NAME} + + +
         
        + + + + + + + + {section name=entries loop=$LIST_ENTRIES} + + + + + + {/section} + +
        {$LIST_HEADER.1}{$LIST_HEADER.2}{$LIST_HEADER.0}
        {$LIST_ENTRIES[entries].groupname}{$LIST_ENTRIES[entries].description} + + Edit | + +
        +
        + +
        +
        + + + + + {include file='SettingsSubMenu.tpl'} + + From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 16:01:14 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 23:01:14 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5516 - /vtigercrm/trunk/include/utils/CommonUtils.php Message-ID: <20060427230114.5B3F359B7E9@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 17:01:09 2006 New Revision: 5516 Log: Added the function to add security check for each deleted record from ListView using massdelete button-Ahmed 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 Apr 27 17:01:09 2006 @@ -1872,4 +1872,232 @@ } +/** + * Function to Check whether the User is allowed to delete a particular record from listview of each module using + * mass delete button. + * @param string $module -- module name + * @param array $ids_list -- Record id + * Returns the Record Names of each module that is not permitted to delete +**/ +function getEntityName($module, $ids_list) +{ + $list = implode(",",$ids_list); + global $adb; + global $log; + $log->debug("Entering getEntityName(".$module.") method ..."); + + switch ($module) + { + case "Accounts" : $query = "select accountname from account where accountid in (".$list.")"; + $result = $adb->query($query); + $numrows = $adb->num_rows($result); + $account_name = array(); + for ($i = 0; $i < $numrows; $i++) + { + $acc_id = $ids_list[$i]; + $account_name[$acc_id] = $adb->query_result($result,$i,'accountname'); + } + return $account_name; + break; + + case "Leads" : $query = "select concat(firstname,' ',lastname) as leadname from leaddetails where leadid in (".$list.")"; + $result = $adb->query($query); + $numrows = $adb->num_rows($result); + $lead_name = array(); + for($i = 0; $i < $numrows; $i++) + { + $lead_id = $ids_list[$i]; + $lead_name[$lead_id] = $adb->query_result($result,$i,'leadname'); + } + + return $lead_name; + break; + + case "Contacts" : $query = "select concat(firstname,' ',lastname) as contactname from contactdetails where contactid in (".$list.")"; + $result = $adb->query($query); + $numrows = $adb->num_rows($result); + $contact_name = array(); + for($i=0; $i < $numrows; $i++) + { + $cont_id = $ids_list[$i]; + $contact_name[$cont_id] = $adb->query_result($result,$i,'contactname'); + } + + return $contact_name; + break; + + case "Potentials" : $query = "select potentialname from potential where potentialid in (".$list.")"; + $result = $adb->query($query); + $numrows = $adb->num_rows($result); + $potential_name = array(); + for($i=0; $i < $numrows; $i++) + { + $pot_id = $ids_list[$i]; + $potential_name[$pot_id] = $adb->query_result($result,$i,'potentialname'); + } + + return $potential_name; + break; + + case "Quotes" : $query = "select subject from quotes where quoteid in (".$list.")"; + $result = $adb->query($query); + $numrows = $adb->num_rows($result); + $quote_subject = array(); + for($i=0; $i < $numrows; $i++) + { + $quote_id = $ids_list[$i]; + $quote_subject[$quote_id] = $adb->query_result($result,$i,'subject'); + } + + return $quote_subject; + break; + + case "SalesOrder" : $query = "select subject from salesorder where salesorderid in (".$list.")"; + $result = $adb->query($query); + $numrows = $adb->num_rows($result); + $so_subject = array(); + for($i=0; $i < $numrows; $i++) + { + $so_id = $ids_list[$i]; + $so_subject[$so_id] = $adb->query_result($result,$i,'subject'); + } + + return $so_subject; + break; + + case "Invoice" : $query = "select subject from invoice where invoiceid in (".$list.")"; + $result = $adb->query($query); + $numrows = $adb->num_rows($result); + $inv_subject = array(); + for($i=0; $i < $numrows; $i++) + { + $inv_id = $ids_list[$i]; + $inv_subject[$inv_id] = $adb->query_result($result,$i,'subject'); + } + + return $inv_subject; + break; + + case "Products" : $query = "select productname from products where productid in (".$list.")"; + $result = $adb->query($query); + $numrows = $adb->num_rows($result); + $product_name = array(); + for($i=0; $i < $numrows; $i++) + { + $prod_id = $ids_list[$i]; + $product_name[$prod_id] = $adb->query_result($result,$i,'productname'); + } + + return $product_name; + break; + + case "PriceBooks" : $query = "select bookname from pricebook where pricebookid in (".$list.")"; + $result = $adb->query($query); + $numrows = $adb->num_rows($result); + $pbook_name = array(); + for($i=0; $i < $numrows; $i++) + { + $pbook_id = $ids_list[$i]; + $pbook_name[$pbook_id] = $adb->query_result($result,$i,'bookname'); + } + + return $pbook_name; + break; + + case "Notes" : $query = "select title from notes where notesid in (".$list.")"; + $result = $adb->query($query); + $numrows = $adb->num_rows($result); + $notes_title = array(); + for($i=0; $i < $numrows; $i++) + { + $note_id = $ids_list[$i]; + $notes_title[$note_id] = $adb->query_result($result,$i,'title'); + } + + return $notes_title; + break; + + case "Activities" : $query = "select subject from activity where activityid in (".$list.")"; + $result = $adb->query($query); + $numrows = $adb->num_rows($result); + $activity_subject = array(); + for($i=0; $i < $numrows; $i++) + { + $act_id = $ids_list[$i]; + $activity_subject[$act_id] = $adb->query_result($result,$i,'subject'); + } + + return $activity_subject; + break; + + case "Campaigns" : $query = "select campaignname from campaign where campaignid in (".$list.")"; + $result = $adb->query($query); + $numrows = $adb->num_rows($result); + $campaign_name = array(); + for($i=0; $i < $numrows; $i++) + { + $cmpn_id = $ids_list[$i]; + $campaign_name[$cmpn_id] = $adb->query_result($result,$i,'campaignname'); + } + + return $campaign_name; + break; + + case "Faq" : $query = "select question from faq where id in (".$list.")"; + $result = $adb->query($query); + $numrows = $adb->num_rows($result); + $faq_name = array(); + for($i=0; $i < $numrows; $i++) + { + $faq_id = $ids_list[$i]; + $faq_name[$faq_id] = $adb->query_result($result,$i,'question'); + } + + return $faq_name; + break; + + case "Vendors" : $query = "select vendorname from vendor where vendorid in (".$list.")"; + $result = $adb->query($query); + $numrows = $adb->num_rows($result); + $vendor_name = array(); + for($i=0; $i < $numrows; $i++) + { + $ven_id = $ids_list[$i]; + $vendor_name[$ven_id] = $adb->query_result($result,$i,'vendorname'); + } + + return $vendor_name; + break; + + case "PurchaseOrder" : $query = "select subject from purchaseorder where purchaseorderid in (".$list.")"; + $result = $adb->query($query); + $numrows = $adb->num_rows($result); + $po_name = array(); + for($i=0; $i < $numrows; $i++) + { + $po_id = $ids_list[$i]; + $po_name[$po_id] = $adb->query_result($result,$i,'subject'); + } + + return $po_name; + break; + + case "HelpDesk" : $query = "select title from troubletickets where ticketid in (".$list.")"; + $result = $adb->query($query); + $numrows = $adb->num_rows($result); + $ticket_name = array(); + for($i=0; $i < $numrows; $i++) + { + $tick_id = $ids_list[$i]; + $ticket_name[$tick_id] = $adb->query_result($result,$i,'title'); + } + + return $ticket_name; + break; + } + $log->debug("Exiting getEntityName method ..."); +} + + + ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 16:02:14 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 23:02:14 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5517 - in /vtigercrm/trunk/Smarty/templates: ProfileDetailView.tpl RoleDetailView.tpl RoleEditView.tpl Message-ID: <20060427230214.599AE59B7E9@vtiger.fosslabs.com> Author: don Date: Thu Apr 27 17:02:08 2006 New Revision: 5517 Log: fixed the UI issues Modified: vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl vtigercrm/trunk/Smarty/templates/RoleDetailView.tpl vtigercrm/trunk/Smarty/templates/RoleEditView.tpl Modified: vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl Thu Apr 27 17:02:08 2006 @@ -1,477 +1,457 @@ - - - - - {include file='SettingsMenu.tpl'} - - -
        - - - - - - - - - -

        -{$MOD.LBL_SETTINGS} > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_PROFILES} -
        -
        - - - - - - - - - - - - - - - - -
        Details of Profile
        - - - - - -
        - - - - - - -
        - - - - - - - - - - - - - -
        - - - - - - - - - -
        Global PrivilegesTab PrivilegesStandard PrivilegesField PrivilegesUtilities
        -
        - - - - - -
        - - - - - - -
        - - - - - - - -
        Global Privileges for "{$PROFILE_NAME}"
        - Select the options below to change global privileges
        		2 enabled, 0 disabled
        - - - - - -
        - - - - -
        - - - - - -
          - - - - - - - - - - - - - - - - - - - - -
        {$GLOBAL_PRIV.0}View all
        Allows "{$PROFILE_NAME}" to view all information / modules of vtiger CRM
         
        {$GLOBAL_PRIV.1}Edit all
        Allows "{$PROFILE_NAME}" to edit all information / modules of vtiger CRM
        -
        -
        - - - - - - - - - - -
        - - - - - - -
         
         
        -    - { if $PROFILEID != 1 && $PROFILEID != 2 && $PROFILEID != 3 && $PROFILEID != 4 } - -    - {/if} - - -
         
         
        - -        		 
        -
        - - - -
        - - {include file='SettingsSubMenu.tpl'} - - - - + + + + + {include file='SettingsMenu.tpl'} + + + +
        + + + + + + + + + + + + + + + +

        +{$MOD.LBL_SETTINGS} > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_PROFILES} +
        +
        + + + + + + + + + + +
        + + + Detail View of Profile
        + {$PROFILE_NAME} +
        + + + + + + +
        + + + + + + + + + + + + + +
        + + + + + + + + + +
        Global PrivilegesTab PrivilegesStandard PrivilegesField PrivilegesUtilities
        +
        + + + + + +
        + + + + + + +
        + + + + + + + +
        Global Privileges for "{$PROFILE_NAME}"
        + Select the options below to change global privileges
        		 
        + + + + + +
        + + + + +
        + + + + + +
          + + + + + + + + + + + + + + + + + + + + +
        {$GLOBAL_PRIV.0}View all
        Allows "{$PROFILE_NAME}" to view all information / modules of vtiger CRM
         
        {$GLOBAL_PRIV.1}Edit all
        Allows "{$PROFILE_NAME}" to edit all information / modules of vtiger CRM
        +
        +
        + + + + + + + + + + +
        + + + + + + +
         
         
        +    + + +
         
         
        + +        		 
        + + + + + + + {include file='SettingsSubMenu.tpl'} + + Modified: vtigercrm/trunk/Smarty/templates/RoleDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/RoleDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/RoleDetailView.tpl Thu Apr 27 17:02:08 2006 @@ -1,118 +1,116 @@ - - - - - - {include file='SettingsMenu.tpl'} - - - -
        - - - - - - - - - - - - - - - - - -

        -{$MOD.LBL_SETTINGS} > {$MOD.LBL_USER_MANAGEMENT} > {$CMOD.LBL_CREATE_NEW_GROUP} -
        -
        - - - - - - - - - - - - - - - - - - - - -
         
        {$ROLE_NAME} -   -
          
        -
        - - - - - - - - - - - - - - -
        Associated Users : -
          - {foreach item=elements from=$ROLEINFO.userinfo} -
        • {$elements.1}
          • - {/foreach} -
        -
        Associated profiles : -
          - {foreach item=elements from=$ROLEINFO.profileinfo} -
        • {$elements.1}
          • - {/foreach} -
        -
        -
        -
        - -
        - -        		 
        - -
        - -  - - - - - - - - - - {include file='SettingsSubMenu.tpl'} -
        - - + + + + + + {include file='SettingsMenu.tpl'} + + + +
        + +
        + + + + + + + + + + + + + + + + +

        + {$MOD.LBL_SETTINGS} > {$MOD.LBL_USER_MANAGEMENT} > Role of {$ROLE_NAME} +
        +
         
        + + + + + + + + + +
        {$ROLE_NAME} Role
        + Detail view of {$ROLE_NAME} Role
         
        + + + + + + + + + + + + + + + + + + + + + {if $ROLEINFO.userinfo.0 neq ''} + + + + + + {/if} + + + + + +
        Group Details
         Role Name :{$ROLE_NAME} 
         
        Member List
        Associated profiles : + {foreach item=elements from=$ROLEINFO.profileinfo} + {$elements.1}
        + {/foreach} +
        Associated Users : + {foreach item=elements from=$ROLEINFO.userinfo} + {$elements.1}
        + {/foreach} +
         
        + + +   + +
         
        + +
        +
        		 
        + + + + + + + + {include file='SettingsSubMenu.tpl'} +
        + + Modified: vtigercrm/trunk/Smarty/templates/RoleEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/RoleEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/RoleEditView.tpl Thu Apr 27 17:02:08 2006 @@ -1,210 +1,212 @@ - - - - - - - - {include file='SettingsMenu.tpl'} - - - -
        - -
        - - - - - - - - - - - - - - - -

        -{$MOD.LBL_SETTINGS} > {$MOD.LBL_USER_MANAGEMENT} > {$CMOD.LBL_CREATE_NEW_GROUP} -
        -
        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
         
        Step 1 : Role Name
        - Specify a name for new role - - -
         
        Step 2 : Assign Profile(s)
        - Select the Profiles below and click on assign button
          
          - - - - - - -
        Profiles Available
        - -         		- - -
        -
        - -         		Assigned Profiles
        - -
        Reports to:{$PARENTNAME}
         
           -    - -
         
        - -        		 
        -
        -
        - - - - -  - - - - - - - - - {include file='SettingsSubMenu.tpl'} - + + + + + + {include file='SettingsMenu.tpl'} + + +
        +
        + + + + + + + + + + + + + + + +

        + + {$MOD.LBL_SETTINGS} + > {$MOD.LBL_USER_MANAGEMENT} > {$CMOD.LBL_CREATE_NEW_ROLE} +
        +
        + + + + +
        + + {$CMOD.LBL_CREATE_NEW_ROLE} +
        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
         
        + + Role Name
        + Specify a name for new role :  + +
         
        + + Assign Profile(s)
        Select the Profiles below and click on assign button
          
          + + + + + + + + +
        Profiles Available
        + +         		+ + +

        + +         		Assigned Profiles
        + +
        +
          
        Reports to Role
        {$PARENTNAME}
         
           +    + +
        +
        +
        +
        + + + + +  + + + + + + + + + {include file='SettingsSubMenu.tpl'} + From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 16:03:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 23:03:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5518 - /vtigercrm/trunk/Smarty/templates/UserProfile.tpl Message-ID: <20060427230303.1985959AEFA@vtiger.fosslabs.com> Author: don Date: Thu Apr 27 17:02:58 2006 New Revision: 5518 Log: fixed the UI issues Modified: vtigercrm/trunk/Smarty/templates/UserProfile.tpl Modified: vtigercrm/trunk/Smarty/templates/UserProfile.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserProfile.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserProfile.tpl Thu Apr 27 17:02:58 2006 @@ -1,84 +1,84 @@ - - - - - {include file='SettingsMenu.tpl'} - - -
        - - - - - - - - - - - - - - - -

        -{$MOD.LBL_SETTINGS} > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_PROFILES} -
        -
        - - - - - - - - - - - - - - - - {section name=entries loop=$LIST_ENTRIES} - - - - - - {/section} - -
         
         
         
        {$LIST_HEADER.0}{$LIST_HEADER.1}{$LIST_HEADER.2}
          - {if $LIST_ENTRIES[entries].del_permission eq 'yes'} - - {else} -       - {/if} - - Edit -  {$LIST_ENTRIES[entries].profilename}{$LIST_ENTRIES[entries].description} 
        - -        		 
        -
        - - - -
        - - -{include file='SettingsSubMenu.tpl'} - + + + + + {include file='SettingsMenu.tpl'} + + +
        + + + + + + + + + + + + + + + +

        +{$MOD.LBL_SETTINGS} > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_PROFILES} +

        +
        + + + + + + + +
        +   + {$MOD.LBL_PROFILES} +
         
        + + + + + + + {section name=entries loop=$LIST_ENTRIES} + + + + + + {/section} +
        {$LIST_HEADER.1}{$LIST_HEADER.2}{$LIST_HEADER.0}
        {$LIST_ENTRIES[entries].profilename}{$LIST_ENTRIES[entries].description}  + Edit + {if $LIST_ENTRIES[entries].del_permission eq 'yes'} +  |  + + {else} + {/if} +
        +
        +        		 
        +
        + + + +
        + + +{include file='SettingsSubMenu.tpl'} + From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 16:08:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 23:08:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5519 - in /vtigercrm/trunk/themes/blue/images: groups_icon.gif profile_icon.gif roles_icon.gif three.gif user_icon.gif Message-ID: <20060427230841.673A359D476@vtiger.fosslabs.com> Author: don Date: Thu Apr 27 17:08:32 2006 New Revision: 5519 Log: setting user mgmt images Added: vtigercrm/trunk/themes/blue/images/groups_icon.gif (with props) vtigercrm/trunk/themes/blue/images/profile_icon.gif (with props) vtigercrm/trunk/themes/blue/images/roles_icon.gif (with props) vtigercrm/trunk/themes/blue/images/three.gif (with props) vtigercrm/trunk/themes/blue/images/user_icon.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 16:09:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 23:09:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5520 - /vtigercrm/trunk/Smarty/templates/ListView.tpl Message-ID: <20060427230958.8446F59B789@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 17:09:54 2006 New Revision: 5520 Log: Added the split feature to get an alert for error when deleting non permissible records in ListView - Ahmed 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 Thu Apr 27 17:09:54 2006 @@ -24,7 +24,10 @@ function ajaxSaveResponse(response) {ldelim} hide("status"); - document.getElementById("ListViewContents").innerHTML=response.responseText; + result = response.responseText.split('&#&#&#'); + document.getElementById("ListViewContents").innerHTML= result[2]; + if(result[1] != '') + alert(result[1]); {rdelim} function callSearch(searchtype) From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 16:14:01 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 23:14:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5521 - /vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl Message-ID: <20060427231401.7C54E59B789@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 17:13:57 2006 New Revision: 5521 Log: Added the split feature to get an alert for error when deleting non permissible records in ListView - Ahmed 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 Thu Apr 27 17:13:57 2006 @@ -1,4 +1,5 @@ - +&#&#&#{$ERROR}&#&#&# +
        @@ -11,7 +12,7 @@ {foreach key=button_check item=button_label from=$BUTTONS} {if $button_check eq 'del'} - + {elseif $button_check eq 's_mail'} {elseif $button_check eq 's_cmail'} @@ -80,8 +81,8 @@ {foreach key=button_check item=button_label from=$BUTTONS} {if $button_check eq 'del'} - - {elseif $button_check eq 's_mail'} + + ` {elseif $button_check eq 's_mail'} {elseif $button_check eq 's_cmail'} From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 16:19:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 23:19:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5522 - /vtigercrm/trunk/themes/blue/style.css Message-ID: <20060427231927.D319059B789@vtiger.fosslabs.com> Author: don Date: Thu Apr 27 17:19:23 2006 New Revision: 5522 Log: changed styles Modified: vtigercrm/trunk/themes/blue/style.css Modified: vtigercrm/trunk/themes/blue/style.css ============================================================================== --- vtigercrm/trunk/themes/blue/style.css (original) +++ vtigercrm/trunk/themes/blue/style.css Thu Apr 27 17:19:23 2006 @@ -38,20 +38,6 @@ line-height: 12px; color: #ABABAB; } -#PopupLay{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - width:500px; - border:3px solid #CCCCCC; - background-color:#FFFFFF; - padding:5px; - display:none; - position:absolute; - left:100px; - top:100px; -} - .hdrNameBg { background:url(images/topBg.gif); @@ -88,8 +74,8 @@ .level2text { background:#bbbbbb url(images/level2Bg.gif) repeat-x; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; padding-left:20px; padding-right:20px; padding-top:5px; @@ -110,6 +96,18 @@ } +.level2text a sel{ + text-decoration:none; + color:#000000; + +} + +.level2text a.sel:hover { + text-decoration:underline; + color:white; + +} + .level2Bg { background:#bbbbbb url(images/level2Bg.gif) repeat-x; font-family: Arial, Helvetica, sans-serif; @@ -127,6 +125,7 @@ .showPanelBg { background:url(images/showPanelTopBg.gif) repeat-x; + background-position:top; } a { @@ -250,6 +249,7 @@ .dvtCellLabel { background-color:#f6f6f6; padding-right:10px; + padding-left:10px; border-bottom:1px solid #eaeaea; color:#737373; white-space:nowrap; @@ -257,6 +257,7 @@ .dvtCellInfo { padding-left:10px; + padding-right:10px; border-bottom:1px solid #eaeaea; white-space:nowrap; } @@ -591,109 +592,109 @@ .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; + 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:Verdana, Arial, Helvetica, sans-serif; font-size:12px; font-weight:bold; -color:white; - background-color:#DDDDDD; - border-bottom:1px solid #BBBBBB; - text-decoration:none; -width:100%; + color:white; + background-color:#DDDDDD; + border-bottom:1px solid #BBBBBB; + text-decoration:none; + width:100%; } .lftMnuHdr tr td{ font-family:Verdana, 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:20px; - padding-right:5px; - padding-left:0px; + color:white; + background-color:#DDDDDD; + border-bottom:1px solid #BBBBBB; + text-align:left; + text-decoration:none; + height:20px; + padding-right:5px; + padding-left:0px; } a.lftMnuHdr{ font-family:Verdana, 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:20px; - padding-left:5px; - padding-top:3px; -width:100%; -display:block; + color:white; + background-color:#666666; + border-top:1px solid #BBBBBB; + border-bottom:1px solid #999999; + text-align:left; + text-decoration:none; + height:20px; + padding-left:5px; + padding-top:3px; + width:100%; + display:block; } a.lftMnuHdr:Hover{ font-family:Verdana, 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:20px; - padding-left:5px; - padding-top:3px; -width:100%; -display:block; + color:white; + background-color:#666666; + border-top:1px solid #BBBBBB; + border-bottom:1px solid #999999; + text-align:left; + text-decoration:none; + height:20px; + padding-left:5px; + padding-top:3px; + width:100%; + display:block; } a.lftSubMnu{ font-family:Verdana, Arial, Helvetica, sans-serif; font-size:11px; font-weight:normal; -display:block; -color:#666666; -height:20px; -width:95%; - text-align:left; - padding-left:15px; - text-decoration:none; - border-bottom:1px solid #BBBBBB; - padding-top:2px; - white-space:nowrap; + display:block; + color:#666666; + height:20px; + width:95%; + 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:Verdana, Arial, Helvetica, sans-serif; font-size:11px; font-weight:normal; -display:block; -color:#666666; -height:20px; -width:95%; - text-align:left; - padding-left:15px; - text-decoration:none; - border-bottom:1px solid #BBBBBB; - padding-top:2px; - white-space:nowrap; - background-color:#CCCCCC; + display:block; + color:#666666; + height:20px; + width:95%; + text-align:left; + padding-left:15px; + text-decoration:none; + border-bottom:1px solid #BBBBBB; + padding-top:2px; + white-space:nowrap; + background-color:#CCCCCC; } .padTab{ @@ -702,7 +703,7 @@ padding-left:10px; padding-bottom:0px; vertical-align:top; - text-align:left; + background-color:#FFFFFF; } .controlTab{ @@ -711,8 +712,8 @@ text-align:center; font-weight:bold; text-decoration:none; -width:100%; -border:0px; + width:100%; + border:0px; } .controlTab tr td{ @@ -771,14 +772,11 @@ } #mnuTab{ - - position:relative; - - overflow:auto; - - width:100%; - - display:block; + position:relative; + overflow:auto; + width:100%; + display:block; + top: 1px; } @@ -835,6 +833,7 @@ } /*Added for Advance Seearch*/ + #scrollTab{ position:relative; width:100%; @@ -854,10 +853,9 @@ cursor:pointer; border:0px; } - #slideMnu{ background-color:#BBBBBB; - vertical-align:top; + vertical-align:top; } #one{ @@ -873,7 +871,7 @@ width:100%; border-left:0px solid #CCCCCC; border-right:0px solid #CCCCCC; - border-collapse: collapse; + border-collapse:collapse; } .prdTab tr th{ @@ -982,6 +980,8 @@ font-size:11px; background-color:#EBEBEB; width:640px; + height:425px; + overflow:auto; padding-left:5px; padding-top:10px; position:relative; @@ -994,28 +994,17 @@ color:#000000; } -a.tagLink{ - color:#333333; - text-decoration:none; - font-family:arial, Helvetica, sans-serif; -} - -a.tagLink:Hover{ - color:#000000; - text-decoration:underline; - -} - - -/*slide menu css*/ + +/* menu */ #mnuSlide{ position:absolute; left:0px; top:100px; -} - -a.submenu { +/* width:110px;*/ +} + +a.submenu{ font-family:Verdana, Arial, Helvetica, sans-serif; font-size:11px; width:100px; @@ -1030,7 +1019,7 @@ display:block; } -a.submenu:Hover { +a.submenu:Hover{ background-color:#DDDDDD; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:11px; @@ -1046,9 +1035,17 @@ } #mnuKey{ - width:20px; + 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; - height:20px; + vertical-align:top; + height:100px; position:relative; top:0px; left:0px; @@ -1064,135 +1061,6 @@ display:none; } - -/* New Home Page Css */ - -.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; -} - -a.imageTab{ - background-color:#F5F5F5; - border:0px solid #EBEBEB; - width:30px; - height:30px; - display:block; - padding-top:3px; -} - -a.imageTab:Hover{ - background-color:#BFBFFF; - border:0px solid #EBEBEB; - width:30px; - height:30px; - display:block; - opacity:.5; -} - -.mnuTabH{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:12px; - color:#000000; - width:100%; - border:0px solid #000000; -} - -.mnuTabH tr td{ - border-bottom:1px solid #EBEBEB; - padding-left:5px; - 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:Verdana, 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:Verdana, 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; -} - -.padTab1{ - border-bottom:15px solid #EBEBEB; - border-left:15px solid #EBEBEB; - border-top:15px solid #EBEBEB; - vertical-align:top; - padding:5px; -} - -.frmSelect{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - border:1px #EBEBEB; -} - /* clock */ .citystyle{ @@ -1200,7 +1068,7 @@ top:0px; left:0px; text-align:left; - + } #theClockLayer{ position:relative; @@ -1218,7 +1086,6 @@ font-size:2px; background-color:#000000; } - .facestyle{ margin-top:10px; position:absolute; @@ -1253,6 +1120,7 @@ font-size:10px; color:#000000; } + #wclock{ position:absolute; left:100px; @@ -1270,8 +1138,11 @@ } + + /* Calculator */ .calcBg { + /*background-color: #666;*//*BFC1B7*/ background: url(images/cal_bg.gif); border: 1px solid #009900; } @@ -1320,82 +1191,366 @@ } .calcCancBtn { background: url(images/calc_canc_btn.gif) no-repeat; - + } .calcMemBtn { background: url(images/calc_mem_btn.gif) no-repeat; width:25px; -} + /*background-color: #CCC;*/ +} + +/* RSS STYLES */ + +.subHdr{ + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + color:#FFFFFF; + background-image:url(../../design/images/rssHeader.gif); + background-position:top left; + background-repeat:repeat-x; + height:27px; + padding:0px 10px 0px 10px; + vertical-align:middle; +} + +.delBg{ + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + color:#FFFFFF; + background-image:url(../../design/images/rssdelete.gif); + background-position:top left; + background-repeat:repeat-x; + height:27px; + padding:0px 10px 0px 10px; + vertical-align:middle; +} + +#rssScroll{ + font-family:Arial, Helvetica, sans-serif ; + font-size:12px; + background-color:#FFFFFF; + width:100%; + height:150px; + overflow:auto; + border:0px solid #000000; +} + +.rssTable{ + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + width:100%; + border:0px solid #000000; +} + +.rssTable tr th{ + background-color:#F0F0F0; + text-align:left; + border-bottom:1px solid #E5E5E5; + border-top:1px solid #FFFFFF; + color:#000000; + font-weight:normal; + padding-left:5px; + padding-right:5px; + height:20px; +} + +.rssTable tr td{ + text-align:left; + border:0px solid #000000; + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + white-space:nowrap; + padding:5px; + height:20px; +} + +.frameHdr{ + height:32px; + background-image:url(../../design/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; + font-size:12px; + color:#000000; + background-image:url(../../design/images/rssforward.gif); + background-position:top left; + background-repeat:repeat-x; + height:27px; + padding:0px 10px 0px 10px; + vertical-align:middle; + background-color:#D7D7D7; +} + + +/* 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; + color:#000000; + width:100%; + border:0px solid #000000; +} + +.mnuTab tr td{ + border-bottom:1px solid #EBEBEB; + padding-left:5px; + 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; +} + +a.submenu{ + font-family:Verdana, Arial, Helvetica, sans-serif; + font-size:11px; + width:100px; + height:20px; + padding-top:3px; + 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; + width:100px; + height:20px; + padding-top:3px; + 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:#ECECEC; + border-right:1px solid #CCCCCC; + opacity:.8; +} + /* profile */ +.small { + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; +} + .prvPrfBigText { - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; + font-family: Arial, Helvetica, sans-serif; + font-size: 14px; } .prvPrfTopBg { - background-color:#ebebeb; + background-color:#ebebeb; } .prvPrfBottomBg { - background-color:#ebebeb; + background-color:#ebebeb; } .prvPrfOutline { - border:1px solid #ebebeb; + border:1px solid #ebebeb; } .prvPrfSelectedTab { - background:url(images/prvPrfSelectedTab.gif) repeat-x; - cursor:pointer; + background:url(images/prvPrfSelectedTab.gif) repeat-x; + cursor:pointer; } .prvPrfUnSelectedTab { - background:url(images/prvPrfUnSelectedTab.gif) repeat-x; - cursor:pointer; - + background:url(images/prvPrfUnSelectedTab.gif) repeat-x; + cursor:pointer; } .prvPrfTexture { - background:url(images/prvPrfTexture1.gif); + background:url(../images/prvPrfTexture1.gif); } .prvPrfBgOn{ - background-color:#33ee33; + background-color:#33ee33; } .prvPrfBgOff{ - background-color:#cccccc; + background-color:#cccccc; } .prvPrfHoverOn { - background-color:#ffffef; - + background-color:#ffffef; + } .prvPrfHoverOut { - background-color:#ffffff; + background-color:#ffffff; } .prvPrfBgImgGlobal { - background:url(images/prvPrfBgImgGlobal.jpg) top right no-repeat; + background:url(../images/prvPrfBgImgGlobal.jpg) top right no-repeat; } .prvPrfBgImgTab { - background:url(images/prvPrfBgImgTab.jpg) top right no-repeat; + background:url(../images/prvPrfBgImgTab.jpg) top right no-repeat; } .prvPrfBgImgStandard { - background:url(images/prvPrfBgImgStandard.jpg) top right no-repeat; + background:url(../images/prvPrfBgImgStandard.jpg) top right no-repeat; } .prvPrfBgImgUtils { - background:url(images/prvPrfBgImgUtils.jpg) top right no-repeat; + background:url(../images/prvPrfBgImgUtils.jpg) top right no-repeat; } .prvPrfBgImgField { - background:url(images/prvPrfBgImgField.jpg) top right no-repeat; + 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; + border-top:1px solid #ababab; + border-left:1px solid #ababab; + border-right:1px solid #a1a1a1; } /* Organization */ @@ -1404,10 +1559,10 @@ font-family:Arial, Helvetica, sans-serif; font-size:11px; font-weight:normal; -color:#000000; -border:0px solid #9B9B9B; - border-collapse:collapse; -width:100%; + color:#666666; + border:0px solid #9B9B9B; + border-collapse:collapse; + width:100%; } .orgTab tr th{ @@ -1416,8 +1571,8 @@ font-size:12px; text-decoration:none; font-weight:bold; -height:20px; - padding-left:5px; + height:20px; + padding-left:5px; } .orgTab tr td{ @@ -1426,19 +1581,19 @@ text-decoration:none; font-weight:none; padding-left:5px; -height:20px; - border-bottom:1px solid #CCCCCC; - border-right:1px solid #CCCCCC; + height:20px; + border-bottom:1px solid #CCCCCC; + 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%; + color:#000000; + border:1px solid #999999; + border-collapse:collapse; + width:100%; } .globTab tr th{ @@ -1446,49 +1601,39 @@ 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; - + 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:none; - padding-left:5px; -height:20px; -} - -#orgLay{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; -width:500px; -border:3px solid #CCCCCC; - background-color:#FFFFFF; -padding:5px; + border:1px solid #CCCCCC; + color:#666666; + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-decoration:none; + font-weight:none; + 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; + margin:0px; + font-family:Arial, Helvetica, sans-serif; + font-weight:bold; + font-size:12px; + color:#000000; + text-decoration:underline; + text-align:left; } .groupli{ @@ -1497,225 +1642,91 @@ font-weight:normal; font-size:12px; text-decoration:none; -color:#333333; - list-style-type:none; - text-align:left; -} - -#DeleteLay{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; -width:300px; -border:3px solid #CCCCCC; - background-color:#FFFFFF; -padding:5px; + color:#333333; + list-style-type:none; + text-align:left; +} + +/* tree menu */ + +/*Oraganization Edit Features */ + +#orgLay{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + width:500px; + border:3px solid #CCCCCC; + background-color:#FFFFFF; + padding:5px; + display:none; + position:absolute; + left:100px; + top:100px; +} + +/* Role */ + +#roleLay{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + width:300px; + border:3px solid #CCCCCC; + background-color:#FFFFFF; + padding:5px; + display:none; + position:absolute; } .classBtn{ - font-family:Arial, Helvetica, sans-serif; + font-family:Verdana, Arial, Helvetica, sans-serif; text-decoration:none; font-weight:normal; - font-size:11px; - background-color:#999999; -border:1px solid #666666; - text-align:center; -} + font-size:10px; + 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; + padding-top:3px; + padding-bottom:3px; +} + +.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%; border:1px solid #666666; - font-family:Arial, Helvetica, sans-serif; - font-size:11px; -} - -/*cloud css*/ - -.statechange -{ - position:absolute; - visibility:hidden; - left:10px; - top:20px; - width:300px; - border:3px solid #CCCCCC; - background-color:#FFFFFF; -} - - -.cloudLft{ - background-image:url(images/cloud_left_bdr.gif); - background-position:left top; - background-repeat:repeat-y; -} - -.cloudRht{ - background-image:url(images/cloud_right_bdr.gif); - background-position:right top; - background-repeat:repeat-y; -} - -a.tagit{ - font-family:Verdana, Arial, Helvetica, sans-serif; - color:#000066; - text-decoration:none; -} - -a.tagit:hover{ - font-family:Verdana, Arial, Helvetica, sans-serif; - color:#FFFFFF; - text-decoration:none; - background-color:#000066; - opacity:.7; -} - -/*quickcreate css*/ - -.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:#ededed; - -} -/* PICK LIST */ -ul li{ - padding-bottom:2px; - padding-top:2px; -} + font-family:Arial, Helvetica, sans-serif; + font-size:11px; +} + +/* IMPORT LEADS */ + .leadTable{ border:3px solid #CCCCCC; border-collapse:collapse; } .leadTable tr td{ - border:0px solid #CCCCCC; -} - -/* RSS STYLES */ - -.subHdr{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; -color:#FFFFFF; - background-image:url(images/rssHeader.gif); - background-position:top left; - background-repeat:repeat-x; -height:27px; -padding:0px 10px 0px 10px; - vertical-align:middle; -} -.delBg{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; -color:#FFFFFF; - background-image:url(images/rssdelete.gif); - background-position:top left; - background-repeat:repeat-x; -height:27px; -padding:0px 10px 0px 10px; - vertical-align:middle; -} -#rssScroll{ - font-family:Arial, Helvetica, sans-serif ; - font-size:12px; - background-color:#FFFFFF; -width:100%; -height:150px; -overflow:auto; -border:0px solid #000000; -} - -.rssTable{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; -width:100%; -border:0px solid #000000; -} -.rssTable tr th{ - background-color:#F0F0F0; - text-align:left; - border-bottom:1px solid #E5E5E5; - border-top:1px solid #FFFFFF; -color:#000000; - font-weight:normal; - padding-left:5px; - padding-right:5px; -height:20px; -} - -.rssTable tr td{ - text-align:left; -border:0px solid #000000; - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - white-space:nowrap; -padding:5px; -height:20px; -} -.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; - font-size:12px; - color:#000000; - background-image:url(images/rssforward.gif); - background-position:top left; - background-repeat:repeat-x; - height:27px; - padding:0px 10px 0px 10px; - vertical-align:middle; - background-color:#D7D7D7; -} - - -/* IMPORT MODULE STYLE */ - -.leadTable{ - border:3px solid #CCCCCC; - border-collapse:collapse; -} - -.leadTable tr td{ - border:0px solid #CCCCCC; +/* border:0px solid #CCCCCC;*/ } .genHeaderGray{ @@ -1759,20 +1770,102 @@ .txtGreen{ color:green; +} + +/* PICK LIST */ +ul li{ + padding-bottom:2px; + padding-top:2px; +} +/* MY PREFERENCES */ + +#chPhoto{ + position:relative; + display:none; + top:20px; + width:100%; + border:1px dashed #666666; + background-color:#FFFFEC; +} + +/* CSS FOR REPORTS */ + +.reportHdr{ + background-color:#DDDDDD; + font-size:12px; + font-weight:bold; + vertical-align:middle; + text-align:left; + height:30px; + border-bottom:2px solid #959595; + color:#000000; + padding-left:10px; +} + +#reportLay{ + width:175px; + background-color:#CCCCCC; + border:1px solid #DDDDDD; + padding-top:5px; + position:absolute; + display:none; +} + +a.reportMnu{ + font-size:11px; + color:#0070BA; + text-decoration:none; + display:block; + width:155px; + height:20px; + border-bottom:1px solid #E1E1E1; + padding-left:20px; + padding-top:3px; +} + +a.reportMnu:Hover{ + font-size:11px; + color:#0070BA; + text-decoration:underline; + display:block; + width:155px; + height:20px; + 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; +} -} - -.txtRed{ - color:red; -} - +/* END OF REPORT */ /* WEB MAIL */ a.webMnu{ font-size:11px; color:#0070BA; text-decoration:underline; } -a.webMnu:Hover { +a.webMnu:Hover{ font-size:11px; color:#0070BA; text-decoration:underline; @@ -1808,6 +1901,27 @@ } /* END OF WEB MAIL */ +/* POPUP */ + +a.alpha{ + font-size:11px; + color:gray; + text-decoration:none; + padding-Left:5px; + padding-right:5px; + border:1px dotted #CCCCCC; + background-color:#FFFFCC; +} + +a.alpha:Hover{ + font-size:11px; + color:gray; + text-decoration:underline; + padding-Left:5px; + padding-right:5px; + border:1px dotted #CCCCCC; + background-color:#FFFFCC; +} /* Home Page */ .MatrixLayer{ @@ -1840,12 +1954,18 @@ border-left:2px solid #CCCCCC; border-bottom:2px solid #666666; border-right:2px solid #666666; - left:100px; - top:100px; - display:none; + right:300px; + bottom:100px; background-color:#CCCCCC; position:absolute; -} + z-index:1000001; + display:none; +} + +body > div#allMenu { + position: fixed; +} + .allMnuTable{ width:100%; @@ -1911,4 +2031,106 @@ } /* End Of All Menu */ - +/* Calendar */ +.calHdr{ + background-image:url(../images/cal_hdr.jpg); + background-repeat:repeat-x; + background-position:left top; + height:45px; +} + +.calSel{ + background-image:url(../images/cal_sel.jpg); + background-position:center; + background-repeat:no-repeat; + text-align:center; + color:#FFFFFF; + font-weight:bold; + width:8%; +} + +.calUnSel{ + color:#000000; + font-weight:normal; + text-align:center; + 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; +} + +a.calMnu{ + font-size:11px; + color:#0070BA; + text-decoration:none; + display:block; + height:20px; + padding-left:5px; + padding-top:3px; +} + +a.calMnu:Hover{ + font-size:11px; + color:#0070BA; + text-decoration:underline; + display:block; + height:20px; + padding-left:5px; + padding-top:3px; +} + +#hrView{ + display:block; +} + +#lstView{ + display:none; +} +/* End of Calendar */ + +/* Level 2 Menu Selected*/ + +level2Sel{ + color:#000000; + font-weight:bold; + text-decoration:underline; +} + +#DeleteLay{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + width:300px; + border:3px solid #CCCCCC; + background-color:#FFFFFF; + padding:5px; +} + + + + + + From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 16:19:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 23:19:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5523 - /vtigercrm/trunk/modules/Accounts/ListView.php Message-ID: <20060427231937.3841659B789@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 17:19:32 2006 New Revision: 5523 Log: Added the message to inform the user of the security check of each records in listview-Ahmed Modified: vtigercrm/trunk/modules/Accounts/ListView.php Modified: vtigercrm/trunk/modules/Accounts/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/ListView.php (original) +++ vtigercrm/trunk/modules/Accounts/ListView.php Thu Apr 27 17:19:32 2006 @@ -45,6 +45,15 @@ $smarty = new vtigerCRM_Smarty; $other_text = Array(); +if($_REQUEST['errormsg'] != '') +{ + $errormsg = $_REQUEST['errormsg']; + $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); +}else +{ + $smarty->assign("ERROR",""); +} + //<<<<<<< sort ordering >>>>>>>>>>>>> $sorder = $focus->getSortOrder(); $order_by = $focus->getOrderBy(); @@ -184,7 +193,7 @@ } if(isset($ids)) { - echo ""; + $smarty->assign("ALLIDS", implode($ids,";")); } if(isPermitted("Accounts","Merge") == 'yes') { From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 16:24:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 23:24:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5524 - /vtigercrm/trunk/modules/Activities/ListView.php Message-ID: <20060427232409.C467B59B789@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 17:24:05 2006 New Revision: 5524 Log: Enabled the Security check for each record in list view for all modules-Ahmed Modified: vtigercrm/trunk/modules/Activities/ListView.php Modified: vtigercrm/trunk/modules/Activities/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Activities/ListView.php (original) +++ vtigercrm/trunk/modules/Activities/ListView.php Thu Apr 27 17:24:05 2006 @@ -42,6 +42,14 @@ $smarty = new vtigerCRM_Smarty; $other_text = Array(); +if($_REQUEST['errormsg'] != '') +{ + $errormsg = $_REQUEST['errormsg']; + $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); +}else +{ + $smarty->assign("ERROR",""); +} //<<<<<<< sort ordering >>>>>>>>>>>>> $sorder = $focus->getSortOrder(); $order_by = $focus->getOrderBy(); From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 16:26:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 23:26:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5525 - /vtigercrm/trunk/modules/Campaigns/ListView.php Message-ID: <20060427232634.94BA259B789@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 17:26:30 2006 New Revision: 5525 Log: Enabled the Security check for each record in list view for all modules-Ahmed Modified: vtigercrm/trunk/modules/Campaigns/ListView.php Modified: vtigercrm/trunk/modules/Campaigns/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/ListView.php (original) +++ vtigercrm/trunk/modules/Campaigns/ListView.php Thu Apr 27 17:26:30 2006 @@ -30,6 +30,15 @@ $other_text = Array(); $url_string = ''; // assigning http url string +if($_REQUEST['errormsg'] != '') +{ + $errormsg = $_REQUEST['errormsg']; + $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); +}else +{ + $smarty->assign("ERROR",""); +} + //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>> if($_REQUEST['order_by'] != '') $order_by = $_REQUEST['order_by']; @@ -161,7 +170,7 @@ } if(isset($ids)) { - echo ""; + $smarty->assign("ALLIDS", implode($ids,";")); } $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows; From vtiger-tickets at vtiger.fosslabs.com Thu Apr 27 16:27:58 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 27 Apr 2006 23:27:58 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23469=3A_?= =?utf-8?q?group_details_screen_very_poor?= In-Reply-To: <076.b58f99a77ee3fadb31c013aa933cca61@vtiger.fosslabs.com> References: <076.b58f99a77ee3fadb31c013aa933cca61@vtiger.fosslabs.com> Message-ID: <085.c979ed39543750d8ea457fc59fced813@vtiger.fosslabs.com> #469: group details screen very poor ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 16:28:02 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 23:28:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5526 - /vtigercrm/trunk/modules/Contacts/ListView.php Message-ID: <20060427232802.81C8C59044D@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 17:27:58 2006 New Revision: 5526 Log: Enabled the Security check for each record in list view for all modules-Ahmed Modified: vtigercrm/trunk/modules/Contacts/ListView.php Modified: vtigercrm/trunk/modules/Contacts/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/ListView.php (original) +++ vtigercrm/trunk/modules/Contacts/ListView.php Thu Apr 27 17:27:58 2006 @@ -40,6 +40,14 @@ $smarty = new vtigerCRM_Smarty; $other_text = Array(); +if($_REQUEST['errormsg'] != '') +{ + $errormsg = $_REQUEST['errormsg']; + $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); +}else +{ + $smarty->assign("ERROR",""); +} //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>> $sorder = $focus->getSortOrder(); $order_by = $focus->getOrderBy(); @@ -191,7 +199,7 @@ } if(isset($ids)) { - echo ""; + $smarty->assign("ALLIDS", implode($ids,";")); } if(isPermitted("Contacts","Merge") == 'yes') { From vtiger-tickets at vtiger.fosslabs.com Thu Apr 27 16:28:18 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 27 Apr 2006 23:28:18 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23441=3A_?= =?utf-8?q?irregular_fonts_used?= In-Reply-To: <076.7683af9379201de7952667cc27b64a59@vtiger.fosslabs.com> References: <076.7683af9379201de7952667cc27b64a59@vtiger.fosslabs.com> Message-ID: <085.c3fb2ff866906ee4137b5484422aea1f@vtiger.fosslabs.com> #441: irregular fonts used ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: usability ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 27 16:28:43 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 27 Apr 2006 23:28:43 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23433=3A_?= =?utf-8?q?clicking_on_Back_button_takes_to_blank_page?= In-Reply-To: <076.0409a9546e861609b26d500f8cd9e4ca@vtiger.fosslabs.com> References: <076.0409a9546e861609b26d500f8cd9e4ca@vtiger.fosslabs.com> Message-ID: <085.52e324c0b10c7e89dec23d46ba181428@vtiger.fosslabs.com> #433: clicking on Back button takes to blank page ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: group ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 27 16:29:08 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 27 Apr 2006 23:29:08 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23432=3A_?= =?utf-8?q?haphazard_edit_buttons?= In-Reply-To: <076.b837b04c752eb07135fb9ca907770b50@vtiger.fosslabs.com> References: <076.b837b04c752eb07135fb9ca907770b50@vtiger.fosslabs.com> Message-ID: <085.18bdd298e8911f90b81bc3b26923b7b7@vtiger.fosslabs.com> #432: haphazard edit buttons ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: usability ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 16:30:05 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 23:30:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5527 - /vtigercrm/trunk/modules/Faq/ListView.php Message-ID: <20060427233005.0130959B789@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 17:30:01 2006 New Revision: 5527 Log: Enabled the Security check for each record in list view for all modules-Ahmed Modified: vtigercrm/trunk/modules/Faq/ListView.php Modified: vtigercrm/trunk/modules/Faq/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Faq/ListView.php (original) +++ vtigercrm/trunk/modules/Faq/ListView.php Thu Apr 27 17:30:01 2006 @@ -41,6 +41,15 @@ $focus = new Faq(); $other_text = Array(); + +if($_REQUEST['errormsg'] != '') +{ + $errormsg = $_REQUEST['errormsg']; + $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); +}else +{ + $smarty->assign("ERROR",""); +} $url_string = ''; //<<<>>>>>> $oCustomView = new CustomView("Faq"); From vtiger-tickets at vtiger.fosslabs.com Thu Apr 27 16:31:04 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 27 Apr 2006 23:31:04 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23425=3A_?= =?utf-8?q?field_privileges_and_utilies_can_have_the_same_screen?= In-Reply-To: <076.5763624f4d1838daec66c54496d626ff@vtiger.fosslabs.com> References: <076.5763624f4d1838daec66c54496d626ff@vtiger.fosslabs.com> Message-ID: <085.c2ae0352945fd1f128117ff54cc34ee0@vtiger.fosslabs.com> #425: field privileges and utilies can have the same screen ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: profile ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => invalid * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 16:31:44 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 23:31:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5528 - /vtigercrm/trunk/modules/HelpDesk/ListView.php Message-ID: <20060427233144.ED05B59B789@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 17:31:40 2006 New Revision: 5528 Log: Enabled the Security check for each record in list view for all modules-Ahmed Modified: vtigercrm/trunk/modules/HelpDesk/ListView.php Modified: vtigercrm/trunk/modules/HelpDesk/ListView.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/ListView.php (original) +++ vtigercrm/trunk/modules/HelpDesk/ListView.php Thu Apr 27 17:31:40 2006 @@ -32,6 +32,14 @@ $category = getParentTab(); $other_text = Array(); +if($_REQUEST['errormsg'] != '') +{ + $errormsg = $_REQUEST['errormsg']; + $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); +}else +{ + $smarty->assign("ERROR",""); +} $url_string = ''; // assigning http url string //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>> @@ -163,7 +171,7 @@ } if(isset($ids)) { - echo ""; + $smarty->assign("ALLIDS", implode($ids,";")); } if(isPermitted("HelpDesk","Merge") == 'yes') { From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 16:33:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 23:33:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5529 - /vtigercrm/trunk/modules/Invoice/ListView.php Message-ID: <20060427233330.DDD5659B789@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 17:33:26 2006 New Revision: 5529 Log: Enabled the Security check for each record in list view for all modules-Ahmed Modified: vtigercrm/trunk/modules/Invoice/ListView.php Modified: vtigercrm/trunk/modules/Invoice/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/ListView.php (original) +++ vtigercrm/trunk/modules/Invoice/ListView.php Thu Apr 27 17:33:26 2006 @@ -37,6 +37,14 @@ $smarty = new vtigerCRM_Smarty; $other_text = Array(); +if($_REQUEST['errormsg'] != '') +{ + $errormsg = $_REQUEST['errormsg']; + $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); +}else +{ + $smarty->assign("ERROR",""); +} //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>> if($_REQUEST['order_by'] != '') $order_by = $_REQUEST['order_by']; From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 16:35:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 23:35:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5530 - /vtigercrm/trunk/modules/Leads/ListView.php Message-ID: <20060427233506.C7F8759B789@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 17:35:01 2006 New Revision: 5530 Log: Enabled the Security check for each record in list view for all modules-Ahmed Modified: vtigercrm/trunk/modules/Leads/ListView.php Modified: vtigercrm/trunk/modules/Leads/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Leads/ListView.php (original) +++ vtigercrm/trunk/modules/Leads/ListView.php Thu Apr 27 17:35:01 2006 @@ -49,6 +49,15 @@ $focus = new Lead(); $smarty = new vtigerCRM_Smarty; $other_text=Array(); + +if($_REQUEST['errormsg'] != '') +{ + $errormsg = $_REQUEST['errormsg']; + $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); +}else +{ + $smarty->assign("ERROR",""); +} //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>> $sorder = $focus->getSortOrder(); $order_by = $focus->getOrderBy(); @@ -180,7 +189,7 @@ } if(isset($ids)) { - echo ""; + $smarty->assign("ALLIDS", implode($ids,";")); } if(isPermitted("Leads","Merge") == 'yes') { From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 16:37:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 23:37:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5531 - /vtigercrm/trunk/modules/Notes/ListView.php Message-ID: <20060427233713.3CC6259B789@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 17:37:08 2006 New Revision: 5531 Log: Enabled the Security check for each record in list view for all modules-Ahmed Modified: vtigercrm/trunk/modules/Notes/ListView.php Modified: vtigercrm/trunk/modules/Notes/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Notes/ListView.php (original) +++ vtigercrm/trunk/modules/Notes/ListView.php Thu Apr 27 17:37:08 2006 @@ -59,6 +59,14 @@ $smarty = new vtigerCRM_Smarty; $other_text = Array(); +if($_REQUEST['errormsg'] != '') +{ + $errormsg = $_REQUEST['errormsg']; + $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); +}else +{ + $smarty->assign("ERROR",""); +} //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>> if($_REQUEST['order_by'] != '') $order_by = $_REQUEST['order_by']; From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 16:38:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 23:38:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5532 - /vtigercrm/trunk/modules/Potentials/ListView.php Message-ID: <20060427233833.4E52567FE18@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 17:38:29 2006 New Revision: 5532 Log: Enabled the Security check for each record in list view for all modules-Ahmed Modified: vtigercrm/trunk/modules/Potentials/ListView.php Modified: vtigercrm/trunk/modules/Potentials/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/ListView.php (original) +++ vtigercrm/trunk/modules/Potentials/ListView.php Thu Apr 27 17:38:29 2006 @@ -39,6 +39,14 @@ $smarty = new vtigerCRM_Smarty(); $other_text = Array(); +if($_REQUEST['errormsg'] != '') +{ + $errormsg = $_REQUEST['errormsg']; + $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); +}else +{ + $smarty->assign("ERROR",""); +} //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>> if($_REQUEST['order_by'] != '') $order_by = $_REQUEST['order_by']; From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 16:39:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 23:39:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5533 - /vtigercrm/trunk/modules/PriceBooks/ListView.php Message-ID: <20060427233933.D395859AEFA@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 17:39:29 2006 New Revision: 5533 Log: Enabled the Security check for each record in list view for all modules-Ahmed Modified: vtigercrm/trunk/modules/PriceBooks/ListView.php Modified: vtigercrm/trunk/modules/PriceBooks/ListView.php ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/ListView.php (original) +++ vtigercrm/trunk/modules/PriceBooks/ListView.php Thu Apr 27 17:39:29 2006 @@ -33,6 +33,14 @@ $focus = new PriceBook(); $other_text=Array(); +if($_REQUEST['errormsg'] != '') +{ + $errormsg = $_REQUEST['errormsg']; + $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); +}else +{ + $smarty->assign("ERROR",""); +} if (!isset($where)) $where = ""; //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 16:40:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 23:40:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5534 - /vtigercrm/trunk/modules/Products/ListView.php Message-ID: <20060427234055.03F3567FE16@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 17:40:51 2006 New Revision: 5534 Log: Enabled the Security check for each record in list view for all modules-Ahmed Modified: vtigercrm/trunk/modules/Products/ListView.php Modified: vtigercrm/trunk/modules/Products/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Products/ListView.php (original) +++ vtigercrm/trunk/modules/Products/ListView.php Thu Apr 27 17:40:51 2006 @@ -36,6 +36,14 @@ $smarty->assign("CATEGORY",$category); $other_text = Array(); +if($_REQUEST['errormsg'] != '') +{ + $errormsg = $_REQUEST['errormsg']; + $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); +}else +{ + $smarty->assign("ERROR",""); +} $url_string = '&smodule=PRODUCTS'; // assigning http url string $focus = new Product(); From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 16:42:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 23:42:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5535 - /vtigercrm/trunk/modules/PurchaseOrder/ListView.php Message-ID: <20060427234211.11BAE67FE16@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 17:42:06 2006 New Revision: 5535 Log: Enabled the Security check for each record in list view for all modules-Ahmed Modified: vtigercrm/trunk/modules/PurchaseOrder/ListView.php Modified: vtigercrm/trunk/modules/PurchaseOrder/ListView.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/ListView.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/ListView.php Thu Apr 27 17:42:06 2006 @@ -36,6 +36,14 @@ $smarty = new vtigerCRM_Smarty; $other_text = Array(); +if($_REQUEST['errormsg'] != '') +{ + $errormsg = $_REQUEST['errormsg']; + $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); +}else +{ + $smarty->assign("ERROR",""); +} //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>> if($_REQUEST['order_by'] != '') $order_by = $_REQUEST['order_by']; From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 16:43:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 23:43:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5536 - /vtigercrm/trunk/modules/Quotes/ListView.php Message-ID: <20060427234312.6E3D367FE16@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 17:43:06 2006 New Revision: 5536 Log: Enabled the Security check for each record in list view for all modules-Ahmed Modified: vtigercrm/trunk/modules/Quotes/ListView.php Modified: vtigercrm/trunk/modules/Quotes/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/ListView.php (original) +++ vtigercrm/trunk/modules/Quotes/ListView.php Thu Apr 27 17:43:06 2006 @@ -37,6 +37,14 @@ $smarty = new vtigerCRM_Smarty; $other_text = Array(); +if($_REQUEST['errormsg'] != '') +{ + $errormsg = $_REQUEST['errormsg']; + $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); +}else +{ + $smarty->assign("ERROR",""); +} //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>> if($_REQUEST['order_by'] != '') $order_by = $_REQUEST['order_by']; From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 16:44:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 23:44:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5537 - /vtigercrm/trunk/modules/Vendors/ListView.php Message-ID: <20060427234409.40D9067FE16@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 17:44:04 2006 New Revision: 5537 Log: Enabled the Security check for each record in list view for all modules-Ahmed Modified: vtigercrm/trunk/modules/Vendors/ListView.php Modified: vtigercrm/trunk/modules/Vendors/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Vendors/ListView.php (original) +++ vtigercrm/trunk/modules/Vendors/ListView.php Thu Apr 27 17:44:04 2006 @@ -32,6 +32,14 @@ $focus = new Vendor(); $other_text = Array(); +if($_REQUEST['errormsg'] != '') +{ + $errormsg = $_REQUEST['errormsg']; + $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); +}else +{ + $smarty->assign("ERROR",""); +} if (!isset($where)) $where = ""; //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 16:45:19 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 23:45:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5538 - /vtigercrm/trunk/modules/SalesOrder/ListView.php Message-ID: <20060427234519.857DF67FE16@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 17:45:15 2006 New Revision: 5538 Log: Enabled the Security check for each record in list view for all modules-Ahmed Modified: vtigercrm/trunk/modules/SalesOrder/ListView.php Modified: vtigercrm/trunk/modules/SalesOrder/ListView.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/ListView.php (original) +++ vtigercrm/trunk/modules/SalesOrder/ListView.php Thu Apr 27 17:45:15 2006 @@ -34,6 +34,14 @@ $other_text = Array(); $url_string = ''; // assigning http url string +if($_REQUEST['errormsg'] != '') +{ + $errormsg = $_REQUEST['errormsg']; + $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); +}else +{ + $smarty->assign("ERROR",""); +} //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>> if($_REQUEST['order_by'] != '') $order_by = $_REQUEST['order_by']; From vtiger-tickets at vtiger.fosslabs.com Thu Apr 27 17:13:47 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 00:13:47 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23750=3A_?= =?utf-8?q?Integrate_code_contributions?= In-Reply-To: <076.b16a74c382aa688de221822029b26245@vtiger.fosslabs.com> References: <076.b16a74c382aa688de221822029b26245@vtiger.fosslabs.com> Message-ID: <085.8b00418f2df65b3144cf3ed248043103@vtiger.fosslabs.com> #750: Integrate code contributions ------------------------+--------------------------------------------------- Reporter: allanbush | Owner: richie Type: defect | Status: new Priority: minor | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc3 Resolution: | Keywords: ------------------------+--------------------------------------------------- Comment (by allanbush): (In [5539]) Storing sorting in seesion variable from Fredy's contribution (http://forums.vtiger.com/viewtopic.php?t=4633). Refs #750. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 17:13:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 00:13:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5539 - in /vtigercrm/branches/4.2: include/ListView/ modules/Accounts/ modules/Activities/ modules/Contacts/ modules/Emails/ modules/Faq/ modules/HelpDesk/ modules/Invoice/ modules/Leads/ modules/Notes/ modules/Orders/ modules/Potentials/ modules/Products/ modules/Quotes/ Message-ID: <20060428001349.8D28E6949F0@vtiger.fosslabs.com> Author: allanbush Date: Thu Apr 27 18:13:39 2006 New Revision: 5539 Log: Storing sorting in seesion variable from Fredy's contribution (http://forums.vtiger.com/viewtopic.php?t=4633). Refs #750. Modified: vtigercrm/branches/4.2/include/ListView/ListView.php vtigercrm/branches/4.2/modules/Accounts/ListView.php vtigercrm/branches/4.2/modules/Activities/ListView.php vtigercrm/branches/4.2/modules/Contacts/ListView.php vtigercrm/branches/4.2/modules/Emails/ListView.php vtigercrm/branches/4.2/modules/Faq/ListView.php vtigercrm/branches/4.2/modules/HelpDesk/ListView.php vtigercrm/branches/4.2/modules/Invoice/ListView.php vtigercrm/branches/4.2/modules/Leads/ListView.php vtigercrm/branches/4.2/modules/Notes/ListView.php vtigercrm/branches/4.2/modules/Orders/ListView.php vtigercrm/branches/4.2/modules/Orders/SalesOrderListView.php vtigercrm/branches/4.2/modules/Potentials/ListView.php vtigercrm/branches/4.2/modules/Products/ListView.php vtigercrm/branches/4.2/modules/Products/PriceBookListView.php vtigercrm/branches/4.2/modules/Products/VendorListView.php vtigercrm/branches/4.2/modules/Quotes/ListView.php Modified: vtigercrm/branches/4.2/include/ListView/ListView.php ============================================================================== --- vtigercrm/branches/4.2/include/ListView/ListView.php (original) +++ vtigercrm/branches/4.2/include/ListView/ListView.php Thu Apr 27 18:13:39 2006 @@ -578,5 +578,40 @@ } +// as far as I can tell this isn't used anymore, however it is included in listview.php file of every module so I'm going to take advantage of it to put common functionallity in here + +global $currentModule; + +// ugly, because our module handling sucks +$currentModule_name = $currentModule; +$sub_module = (isset($_REQUEST['smodule'])) ? $_REQUEST['smodule'] : ""; +switch($sub_module) { + case 'SO': + $currentModule_name = 'SalesOrder'; + break; + case 'VENDOR': + $currentModule_name = 'Vendor'; + break; + case 'PRICEBOOK': + $currentModule_name = 'PriceBook'; + break; +} + +session_start(); +if (isset($_REQUEST['order_by'])) { + $order_by = $_REQUEST['order_by']; + $_SESSION["ListViewOrder[$currentModule_name][0]"] = $order_by; +} elseif ($_SESSION["ListViewOrder[$currentModule_name][0]"] != '') { + $order_by = $_SESSION["ListViewOrder[$currentModule_name][0]"]; +} + +$sorder = 'ASC'; +if(isset($_REQUEST['sorder']) && $_REQUEST['sorder'] != '') { + $sorder = $_REQUEST['sorder']; + $_SESSION["ListViewOrder[$currentModule_name][1]"] = $sorder; +} elseif ($_SESSION["ListViewOrder[$currentModule_name][1]"] != '') { + $sorder = $_SESSION["ListViewOrder[$currentModule_name][1]"]; +} + ?> Modified: vtigercrm/branches/4.2/modules/Accounts/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Accounts/ListView.php (original) +++ vtigercrm/branches/4.2/modules/Accounts/ListView.php Thu Apr 27 18:13:39 2006 @@ -47,12 +47,7 @@ if (!isset($where)) $where = ""; -if (isset($_REQUEST['order_by'])) $order_by = $_REQUEST['order_by']; - $url_string = ''; -$sorder = 'ASC'; -if(isset($_REQUEST['sorder']) && $_REQUEST['sorder'] != '') -$sorder = $_REQUEST['sorder']; if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { Modified: vtigercrm/branches/4.2/modules/Activities/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Activities/ListView.php (original) +++ vtigercrm/branches/4.2/modules/Activities/ListView.php Thu Apr 27 18:13:39 2006 @@ -25,6 +25,7 @@ require_once('modules/Activities/Activity.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); +require_once('include/ListView/ListView.php'); require_once('include/uifromdbutil.php'); require_once('modules/CustomView/CustomView.php'); @@ -98,12 +99,7 @@ $focus = new Activity(); -if (isset($_REQUEST['order_by'])) $order_by = $_REQUEST['order_by']; - $url_string = ''; // assigning http url string -$sorder = 'ASC'; // Default sort order -if(isset($_REQUEST['sorder']) && $_REQUEST['sorder'] != '') -$sorder = $_REQUEST['sorder']; if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { Modified: vtigercrm/branches/4.2/modules/Contacts/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Contacts/ListView.php (original) +++ vtigercrm/branches/4.2/modules/Contacts/ListView.php Thu Apr 27 18:13:39 2006 @@ -26,6 +26,7 @@ require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ComboUtil.php'); +require_once('include/ListView/ListView.php'); require_once('include/uifromdbutil.php'); require_once('modules/CustomView/CustomView.php'); @@ -47,12 +48,7 @@ if (!isset($where)) $where = ""; -if (isset($_REQUEST['order_by'])) $order_by = $_REQUEST['order_by']; - $url_string = ''; // assigning http url string -$sorder = 'ASC'; // Default sort order -if(isset($_REQUEST['sorder']) && $_REQUEST['sorder'] != '') -$sorder = $_REQUEST['sorder']; $focus = new Contact(); Modified: vtigercrm/branches/4.2/modules/Emails/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Emails/ListView.php (original) +++ vtigercrm/branches/4.2/modules/Emails/ListView.php Thu Apr 27 18:13:39 2006 @@ -25,6 +25,7 @@ require_once('modules/Emails/Email.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); +require_once('include/ListView/ListView.php'); require_once('include/uifromdbutil.php'); require_once('modules/CustomView/CustomView.php'); Modified: vtigercrm/branches/4.2/modules/Faq/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Faq/ListView.php (original) +++ vtigercrm/branches/4.2/modules/Faq/ListView.php Thu Apr 27 18:13:39 2006 @@ -21,6 +21,7 @@ require_once('modules/Faq/Faq.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/uifromdbutil.php'); +require_once('include/ListView/ListView.php'); global $app_strings; global $mod_strings; @@ -33,12 +34,7 @@ $focus = new Faq(); -if (isset($_REQUEST['order_by'])) $order_by = $_REQUEST['order_by']; - $url_string = ''; // assigning http url string -$sorder = 'ASC'; // Default sort order -if(isset($_REQUEST['sorder']) && $_REQUEST['sorder'] != '') -$sorder = $_REQUEST['sorder']; //Constructing the Search Form if (!isset($_REQUEST['search_form']) || $_REQUEST['search_form'] != 'false') { Modified: vtigercrm/branches/4.2/modules/HelpDesk/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/HelpDesk/ListView.php (original) +++ vtigercrm/branches/4.2/modules/HelpDesk/ListView.php Thu Apr 27 18:13:39 2006 @@ -19,6 +19,7 @@ require_once('XTemplate/xtpl.php'); require_once("data/Tracker.php"); require_once('include/logging.php'); +require_once('include/ListView/ListView.php'); require_once('include/ComboUtil.php'); require_once('include/utils.php'); require_once('modules/HelpDesk/HelpDeskUtil.php'); @@ -44,12 +45,7 @@ $focus = new HelpDesk(); -if (isset($_REQUEST['order_by'])) $order_by = $_REQUEST['order_by']; - $url_string = ''; // assigning http url string -$sorder = 'ASC'; // Default sort order -if(isset($_REQUEST['sorder']) && $_REQUEST['sorder'] != '') -$sorder = $_REQUEST['sorder']; if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { Modified: vtigercrm/branches/4.2/modules/Invoice/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Invoice/ListView.php (original) +++ vtigercrm/branches/4.2/modules/Invoice/ListView.php Thu Apr 27 18:13:39 2006 @@ -47,12 +47,7 @@ if (!isset($where)) $where = ""; -if (isset($_REQUEST['order_by'])) $order_by = $_REQUEST['order_by']; - $url_string = ''; -$sorder = 'ASC'; -if(isset($_REQUEST['sorder']) && $_REQUEST['sorder'] != '') -$sorder = $_REQUEST['sorder']; if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { Modified: vtigercrm/branches/4.2/modules/Leads/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Leads/ListView.php (original) +++ vtigercrm/branches/4.2/modules/Leads/ListView.php Thu Apr 27 18:13:39 2006 @@ -49,12 +49,7 @@ if (!isset($where)) $where = ""; -if (isset($_REQUEST['order_by'])) $order_by = $_REQUEST['order_by']; - $url_string = ''; // assigning http url string -$sorder = 'ASC'; // Default sort order -if(isset($_REQUEST['sorder']) && $_REQUEST['sorder'] != '') -$sorder = $_REQUEST['sorder']; if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { Modified: vtigercrm/branches/4.2/modules/Notes/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Notes/ListView.php (original) +++ vtigercrm/branches/4.2/modules/Notes/ListView.php Thu Apr 27 18:13:39 2006 @@ -93,12 +93,7 @@ if (!isset($where)) $where = ""; -if (isset($_REQUEST['order_by'])) $order_by = $_REQUEST['order_by']; - $url_string = ''; // assigning http url string -$sorder = 'ASC'; // Default sort order -if(isset($_REQUEST['sorder']) && $_REQUEST['sorder'] != '') -$sorder = $_REQUEST['sorder']; if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { Modified: vtigercrm/branches/4.2/modules/Orders/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Orders/ListView.php (original) +++ vtigercrm/branches/4.2/modules/Orders/ListView.php Thu Apr 27 18:13:39 2006 @@ -47,12 +47,7 @@ if (!isset($where)) $where = ""; -if (isset($_REQUEST['order_by'])) $order_by = $_REQUEST['order_by']; - $url_string = '&smodule=PO'; -$sorder = 'ASC'; -if(isset($_REQUEST['sorder']) && $_REQUEST['sorder'] != '') -$sorder = $_REQUEST['sorder']; if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { Modified: vtigercrm/branches/4.2/modules/Orders/SalesOrderListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Orders/SalesOrderListView.php (original) +++ vtigercrm/branches/4.2/modules/Orders/SalesOrderListView.php Thu Apr 27 18:13:39 2006 @@ -13,6 +13,7 @@ require_once('modules/Orders/SalesOrder.php'); require_once('include/utils.php'); require_once('include/uifromdbutil.php'); +require_once('include/ListView/ListView.php'); require_once('modules/CustomView/CustomView.php'); global $app_strings; @@ -44,12 +45,7 @@ */ $focus = new SalesOrder(); -if (isset($_REQUEST['order_by'])) $order_by = $_REQUEST['order_by']; - $url_string = '&smodule=SO'; // assigning http url string -$sorder = 'ASC'; // Default sort order -if(isset($_REQUEST['sorder']) && $_REQUEST['sorder'] != '') -$sorder = $_REQUEST['sorder']; if(isset($_REQUEST['query']) && $_REQUEST['query'] != '' && $_REQUEST['query'] == 'true') { Modified: vtigercrm/branches/4.2/modules/Potentials/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Potentials/ListView.php (original) +++ vtigercrm/branches/4.2/modules/Potentials/ListView.php Thu Apr 27 18:13:39 2006 @@ -47,12 +47,7 @@ $focus = new Potential(); -if (isset($_REQUEST['order_by'])) $order_by = $_REQUEST['order_by']; - $url_string = ''; // assigning http url string -$sorder = 'ASC'; // Default sort order -if(isset($_REQUEST['sorder']) && $_REQUEST['sorder'] != '') -$sorder = $_REQUEST['sorder']; if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { Modified: vtigercrm/branches/4.2/modules/Products/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Products/ListView.php (original) +++ vtigercrm/branches/4.2/modules/Products/ListView.php Thu Apr 27 18:13:39 2006 @@ -14,6 +14,7 @@ require_once('include/utils.php'); require_once('include/ComboUtil.php'); require_once('include/uifromdbutil.php'); +require_once('include/ListView/ListView.php'); require_once('modules/CustomView/CustomView.php'); global $app_strings; @@ -44,12 +45,7 @@ $focus = new Product(); -if (isset($_REQUEST['order_by'])) $order_by = $_REQUEST['order_by']; - $url_string = '&smodule=PRODUCTS'; // assigning http url string -$sorder = 'ASC'; // Default sort order -if(isset($_REQUEST['sorder']) && $_REQUEST['sorder'] != '') -$sorder = $_REQUEST['sorder']; if(isset($_REQUEST['query']) && $_REQUEST['query'] != '' && $_REQUEST['query'] == 'true') { Modified: vtigercrm/branches/4.2/modules/Products/PriceBookListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Products/PriceBookListView.php (original) +++ vtigercrm/branches/4.2/modules/Products/PriceBookListView.php Thu Apr 27 18:13:39 2006 @@ -13,6 +13,7 @@ require_once('modules/Products/PriceBook.php'); require_once('include/utils.php'); require_once('include/uifromdbutil.php'); +require_once('include/ListView/ListView.php'); require_once('modules/CustomView/CustomView.php'); global $app_strings; @@ -46,12 +47,7 @@ if (!isset($where)) $where = ""; -if (isset($_REQUEST['order_by'])) $order_by = $_REQUEST['order_by']; - $url_string = '&smodule=PRICEBOOK'; // assigning http url string -$sorder = 'ASC'; // Default sort order -if(isset($_REQUEST['sorder']) && $_REQUEST['sorder'] != '') -$sorder = $_REQUEST['sorder']; if(isset($_REQUEST['query']) && $_REQUEST['query'] != '' && $_REQUEST['query'] == 'true') { Modified: vtigercrm/branches/4.2/modules/Products/VendorListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Products/VendorListView.php (original) +++ vtigercrm/branches/4.2/modules/Products/VendorListView.php Thu Apr 27 18:13:39 2006 @@ -13,6 +13,7 @@ require_once('modules/Products/Vendor.php'); require_once('include/utils.php'); require_once('include/uifromdbutil.php'); +require_once('include/ListView/ListView.php'); require_once('modules/CustomView/CustomView.php'); global $app_strings; @@ -46,12 +47,7 @@ if (!isset($where)) $where = ""; -if (isset($_REQUEST['order_by'])) $order_by = $_REQUEST['order_by']; - $url_string = '&smodule=VENDOR'; // assigning http url string -$sorder = 'ASC'; // Default sort order -if(isset($_REQUEST['sorder']) && $_REQUEST['sorder'] != '') -$sorder = $_REQUEST['sorder']; if(isset($_REQUEST['query']) && $_REQUEST['query'] != '' && $_REQUEST['query'] == 'true') { Modified: vtigercrm/branches/4.2/modules/Quotes/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Quotes/ListView.php (original) +++ vtigercrm/branches/4.2/modules/Quotes/ListView.php Thu Apr 27 18:13:39 2006 @@ -46,12 +46,7 @@ if (!isset($where)) $where = ""; -if (isset($_REQUEST['order_by'])) $order_by = $_REQUEST['order_by']; - $url_string = ''; -$sorder = 'ASC'; -if(isset($_REQUEST['sorder']) && $_REQUEST['sorder'] != '') -$sorder = $_REQUEST['sorder']; if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { From vtiger-tickets at vtiger.fosslabs.com Thu Apr 27 19:43:29 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 02:43:29 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23711=3A_?= =?utf-8?q?Campaign_Creation_-_Accepts_=27None=27_for_manditory?= In-Reply-To: <076.218e270d39da0f8cbb22282a81567967@vtiger.fosslabs.com> References: <076.218e270d39da0f8cbb22282a81567967@vtiger.fosslabs.com> Message-ID: <085.765d5822b634960934eb78748cb1f7dd@vtiger.fosslabs.com> #711: Campaign Creation - Accepts 'None' for manditory ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mangai Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Campaigns Create ------------------------+--------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 27 19:48:39 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 02:48:39 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23711=3A_?= =?utf-8?q?Campaign_Creation_-_Accepts_=27None=27_for_manditory?= In-Reply-To: <076.218e270d39da0f8cbb22282a81567967@vtiger.fosslabs.com> References: <076.218e270d39da0f8cbb22282a81567967@vtiger.fosslabs.com> Message-ID: <085.b38e039390755a412052ee7dd4e9e18c@vtiger.fosslabs.com> #711: Campaign Creation - Accepts 'None' for manditory ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mangai Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Campaigns Create ------------------------+--------------------------------------------------- Changes (by mangai): * resolution: => fixed * milestone: => 5.0.0 * status: new => closed Comment: This has been fixed and it will be available in our next release. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 20:00:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 03:00:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5540 - /vtigercrm/trunk/include/clock/Clock.php Message-ID: <20060428030052.736236AB213@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 21:00:47 2006 New Revision: 5540 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/include/clock/Clock.php Modified: vtigercrm/trunk/include/clock/Clock.php ============================================================================== --- vtigercrm/trunk/include/clock/Clock.php (original) +++ vtigercrm/trunk/include/clock/Clock.php Thu Apr 27 21:00:47 2006 @@ -10,6 +10,8 @@ ********************************************************************************/ function get_world_clock($image_path) { +global $log; +log->debug("Entering get_world_clock(".$image_path.") method ..."); $the_clock = << @@ -453,7 +455,7 @@ EOQ; - +$log->debug("Exiting get_world_clock method ..."); return $the_clock; } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 20:02:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 03:02:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5541 - /vtigercrm/trunk/include/calculator/Calc.php Message-ID: <20060428030215.6F1366AB213@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 21:02:11 2006 New Revision: 5541 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/include/calculator/Calc.php Modified: vtigercrm/trunk/include/calculator/Calc.php ============================================================================== --- vtigercrm/trunk/include/calculator/Calc.php (original) +++ vtigercrm/trunk/include/calculator/Calc.php Thu Apr 27 21:02:11 2006 @@ -10,6 +10,8 @@ ********************************************************************************/ function get_calc($image_path) { +global $log; +$log->debug("Entering get_calc(".$image_path.") method ..."); $the_calc = << @@ -81,7 +83,7 @@ EOQ; - +$log->debug("Exiting get_calc method ..."); return $the_calc; } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 20:04:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 03:04:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5542 - /vtigercrm/trunk/include/ComboUtil.php Message-ID: <20060428030452.BA0136AB213@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 21:04:48 2006 New Revision: 5542 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/include/ComboUtil.php Modified: vtigercrm/trunk/include/ComboUtil.php ============================================================================== --- vtigercrm/trunk/include/ComboUtil.php (original) +++ vtigercrm/trunk/include/ComboUtil.php Thu Apr 27 21:04:48 2006 @@ -12,6 +12,8 @@ require_once('include/database/PearDatabase.php'); function getComboArray($combofieldNames) { + global $log; + $log->debug("Entering getComboArray(".$combofieldNames.") method ..."); global $adb; $comboFieldArray = Array(); foreach ($combofieldNames as $tableName => $arrayName) @@ -26,6 +28,7 @@ } $comboFieldArray[$fldArrName] = $arrayName; } + $log->debug("Exiting getComboArray method ..."); return $comboFieldArray; } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 20:26:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 03:26:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5543 - /vtigercrm/trunk/include/CustomFieldUtil.php Message-ID: <20060428032640.20D306AB50B@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 21:26:36 2006 New Revision: 5543 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/include/CustomFieldUtil.php Modified: vtigercrm/trunk/include/CustomFieldUtil.php ============================================================================== --- vtigercrm/trunk/include/CustomFieldUtil.php (original) +++ vtigercrm/trunk/include/CustomFieldUtil.php Thu Apr 27 21:26:36 2006 @@ -20,6 +20,8 @@ function getCustomFieldTypeName($uitype) { global $log; + $log->debug("Entering getCustomFieldTypeName(".$uitype.") method ..."); + global $log; $log->info("uitype is ".$uitype); $fldname = ''; @@ -75,6 +77,7 @@ { $fldname = 'Multi-Select Combo Box'; } +$log->debug("Exiting getCustomFieldTypeName method ..."); return $fldname; } @@ -85,6 +88,8 @@ */ function getCustomFieldArray($module) { + global $log; + $log->debug("Entering getCustomFieldArray(".$module.") method ..."); global $adb; $custquery = "select * from field where tablename='".$module."'"; $custresult = $adb->query($custquery); @@ -95,6 +100,7 @@ $colName=$adb->query_result($custresult,$i,"column_name"); $custFldArray[$colName] = $i; } + $log->debug("Exiting getCustomFieldArray method ..."); return $custFldArray; } @@ -107,6 +113,8 @@ */ function getCustomFieldTrans($module, $trans_array) { + global $log; + $log->debug("Entering getCustomFieldTrans(".$module.",". $trans_array.") method ..."); global $adb; $tab_id = getTabid($module); $custquery = "select columnname,fieldlabel from field where generatedtype=2 and tabid=".$tab_id; @@ -119,6 +127,7 @@ $fldLbl = $adb->query_result($custresult,$i,"fieldlabel"); $trans_array[$colName] = $fldLbl; } + $log->debug("Exiting getCustomFieldTrans method ..."); } @@ -131,10 +140,13 @@ */ function getCustomFieldData($tab,$id,$datatype) { + global $log; + $log->debug("Entering getCustomFieldData(".$tab.",".$id.",".$datatype.") method ..."); global $adb; $query = "select * from field where tabid=".$tab." and fieldid=".$id; $result = $adb->query($query); $return_data=$adb->fetch_array($result); + $log->debug("Exiting getCustomFieldData method ..."); return $return_data[$datatype]; } @@ -148,6 +160,8 @@ */ function getFldTypeandLengthValue($label,$typeofdata) { + global $log; + $log->debug("Entering getFldTypeandLengthValue(".$label.",".$typeofdata.") method ..."); if($label == 'Text') { $types = explode("~",$typeofdata); @@ -206,6 +220,7 @@ { $fieldtype = '11'; } + $log->debug("Exiting getFldTypeandLengthValue method ..."); return $fieldtype; } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 20:27:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 03:27:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5544 - /vtigercrm/trunk/include/file.php Message-ID: <20060428032743.D48336AB213@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 21:27:39 2006 New Revision: 5544 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/include/file.php Modified: vtigercrm/trunk/include/file.php ============================================================================== --- vtigercrm/trunk/include/file.php (original) +++ vtigercrm/trunk/include/file.php Thu Apr 27 21:27:39 2006 @@ -32,6 +32,8 @@ class File { function File ($id='',$name='',$module='Notes') { + global $log; + $log->debug("Entering File (".$id.",".$name.",".$module.") method ..."); $this->id = $id; $this->name = $name; $this->module = $module; @@ -42,6 +44,7 @@ * All Rights Reserved. * Contributor(s): SugarCRM Inc. */ $this->folder = '/'.UPLOAD_FOLDER; + $log->debug("Exiting File method ..."); /** END CONTRIBUTION */ } @@ -50,6 +53,8 @@ */ function Upload ($fieldname) { + global $log; + $log->debug("Entering Upload (".$fieldname.") method ..."); global $root_directory; /** BEGIN CONTRIBUTION * Date: 09/08/04 @@ -59,6 +64,7 @@ global $upload_badext; /** END CONTRIBUTION */ if (!isset ($_FILES[$fieldname]) || empty ($_FILES[$fieldname]['tmp_name'])) { + $log->debug("Exiting Upload method ..."); return true; // uploading an empty file can't fail... } $this->name = $_FILES[$fieldname]['name']; @@ -81,7 +87,10 @@ if (!is_dir($this->folder)) { if (mkdir($root_directory.$this->folder, 0755)) + { + $log->debug("Exiting Upload method ..."); return move_uploaded_file($_FILES[$fieldname]['tmp_name'], $dest); + } else { // how to handle such error ? @@ -89,24 +98,32 @@ } } } + $log->debug("Exiting Upload method ..."); return true; } function SetID ($id) { + global $log; + $log->debug("Entering SetID (".$id.") method ..."); global $root_directory; if (empty ($this->name)) + { $log->debug("Exiting SetID method ..."); return; + } if (empty ($id)) die ("id empty"); $this->id = $id; $path = $root_directory.$this->folder; rename ($path.$this->name,$path.$id.$this->name); + $log->debug("Exiting SetID method ..."); } function URL () { + global $log; + $log->debug("Entering URL () method ..."); /** VTIGER CRM CONTRIBUTION BEGINS */ $web_root = $_SERVER['SERVER_NAME']. ":" .$_SERVER['SERVER_PORT']; @@ -116,6 +133,7 @@ */ //global $site_URL; + $log->debug("Exiting URL method ..."); return $web_root.$this->folder.$this->id.rawurlencode($this->name); } @@ -126,7 +144,10 @@ * Contributor(s): SugarCRM Inc. */ function Delete ($old_file) { + global $log; + $log->debug("Entering Delete (".$old_file.") method ..."); global $root_directory, $upload_dir; + $log->debug("Exiting Delete method ..."); return unlink($root_directory . "/" . $upload_dir . $old_file); } /* END CONTRIBUTION */ From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 20:28:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 03:28:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5545 - /vtigercrm/trunk/include/formbase.php Message-ID: <20060428032822.68DFE6AB50B@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 21:28:18 2006 New Revision: 5545 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/include/formbase.php Modified: vtigercrm/trunk/include/formbase.php ============================================================================== --- vtigercrm/trunk/include/formbase.php (original) +++ vtigercrm/trunk/include/formbase.php Thu Apr 27 21:28:18 2006 @@ -22,14 +22,20 @@ function checkRequired($prefix, $required){ + global $log; + $log->debug("Entering checkRequired(".$prefix.",". $required.") method ..."); foreach($required as $key){ if(!isset($_POST[$prefix.$key]) ||empty($_POST[$prefix.$key])){ + $log->debug("Exiting checkRequired method ..."); return false; } } + $log->debug("Exiting checkRequired method ..."); return true; } function populateFromPost($prefix, $focus){ + global $log; + $log->debug("Entering populateFromPost(".$prefix.",". $focus.") method ..."); $focus->retrieve($_POST[$prefix.'record']); foreach($focus->column_fields as $field) { @@ -46,27 +52,33 @@ $focus->$field = $value; } } + $log->debug("Exiting populateFromPost method ..."); return $focus; } function getPostToForm(){ + global $log; + $log->debug("Entering getPostToForm() method ..."); $fields = ''; foreach ($_POST as $key=>$value){ $fields.= ""; } + $log->debug("Exiting getPostToForm method ..."); return $fields; } function handleRedirect($return_id, $return_module){ + global $log; + $log->debug("Entering handleRedirect(".$return_id.",". $return_module.") method ..."); if(isset($_POST['return_module']) && $_POST['return_module'] != "") $return_module = $_POST['return_module']; else $return_module = $return_module; if(isset($_POST['return_action']) && $_POST['return_action'] != "") $return_action = $_POST['return_action']; else $return_action = "DetailView"; if(isset($_POST['return_id']) && $_POST['return_id'] != "") $return_id = $_POST['return_id']; + $log->debug("Exiting handleRedirect method ..."); header("Location: index.php?action=$return_action&module=$return_module&record=$return_id"); } -?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 20:29:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 03:29:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5546 - /vtigercrm/trunk/include/FormValidationUtil.php Message-ID: <20060428032913.3AE7F6AB50B@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 21:29:09 2006 New Revision: 5546 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/include/FormValidationUtil.php Modified: vtigercrm/trunk/include/FormValidationUtil.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 20:36:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 03:36:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5547 - /vtigercrm/trunk/include/db_backup/backup.php Message-ID: <20060428033613.C4F2D6AB577@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 21:36:10 2006 New Revision: 5547 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/include/db_backup/backup.php Modified: vtigercrm/trunk/include/db_backup/backup.php ============================================================================== --- vtigercrm/trunk/include/db_backup/backup.php (original) +++ vtigercrm/trunk/include/db_backup/backup.php Thu Apr 27 21:36:10 2006 @@ -18,6 +18,8 @@ function get_structure() { + global $log; + $log->debug("Entering get_structure() method ..."); mysql_connect(dbserver, dbuser, dbpass); mysql_select_db(dbname); $tables = mysql_list_tables(dbname); @@ -47,16 +49,20 @@ } } } + $log->debug("Exiting get_structure method ..."); return $SQL; } function save_structure($filename, $root_directory) { + global $log; + $log->debug("Entering save_structure(".$filename.",".$root_directory.") method ..."); $sql = get_structure(); $sql = implode("\r", $sql); $handle = fopen($root_directory.'/'.$filename,"wb") ; fwrite($handle,$sql,9999999999); fclose($handle); + $log->debug("Exiting save_structure method ..."); } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 20:36:54 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 03:36:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5548 - /vtigercrm/trunk/include/db_backup/ftp.php Message-ID: <20060428033655.0D4C06AB587@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 21:36:51 2006 New Revision: 5548 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/include/db_backup/ftp.php Modified: vtigercrm/trunk/include/db_backup/ftp.php ============================================================================== --- vtigercrm/trunk/include/db_backup/ftp.php (original) +++ vtigercrm/trunk/include/db_backup/ftp.php Thu Apr 27 21:36:51 2006 @@ -11,11 +11,13 @@ function ftpBackupFile($source_file, $ftpserver, $ftpuser, $ftppassword) { - + global $log; + $log->debug("Entering ftpBackupFile(".$source_file.", ".$ftpserver.", ".$ftpuser.", ".$ftppassword.") method ..."); // set up basic connection $conn_id = @ftp_connect($ftpserver); if(!$conn_id) { + $log->debug("Exiting ftpBackupFile method ..."); return; } @@ -27,6 +29,7 @@ if(!$login_result) { ftp_close($conn_id); + $log->debug("Exiting ftpBackupFile method ..."); return; } @@ -47,6 +50,7 @@ // check upload status if (!$upload) { ftp_close($conn_id); + $log->debug("Exiting ftpBackupFile method ..."); return; } /* @@ -56,5 +60,6 @@ // close the FTP stream ftp_close($conn_id); + $log->debug("Exiting ftpBackupFile method ..."); } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 20:40:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 03:40:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5549 - /vtigercrm/trunk/include/PopulateComboValues.php Message-ID: <20060428034056.5E37F6AB59A@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 21:40:52 2006 New Revision: 5549 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/include/PopulateComboValues.php Modified: vtigercrm/trunk/include/PopulateComboValues.php ============================================================================== --- vtigercrm/trunk/include/PopulateComboValues.php (original) +++ vtigercrm/trunk/include/PopulateComboValues.php Thu Apr 27 21:40:52 2006 @@ -20,6 +20,8 @@ function insertComboValues($values, $tableName) { + global $log; + $log->debug("Entering insertComboValues(".$values.", ".$tableName.") method ..."); global $adb; $i=0; foreach ($values as $val => $cal) @@ -34,10 +36,14 @@ } $i++; } + $log->debug("Exiting insertComboValues method ..."); } function create_tables () { + global $log; + $log->debug("Entering create_tables () method ..."); + global $app_list_strings,$adb; global $combo_strings; $comboTables = Array('leadsource','accounttype','industry','leadstatus','rating','licencekeystatus','opportunity_type','salutationtype','sales_stage','ticketstatus','ticketpriorities','ticketseverities','ticketcategories','duration_minutes','eventstatus','taskstatus','taskpriority','manufacturer','productcategory','activitytype','currency','faqcategories','rsscategory','usageunit','glacct','quotestage','carrier','taxclass','recurringtype','faqstatus','invoicestatus','postatus','sostatus','visibility','campaigntype','campaignstatus','expectedresponse'); @@ -46,6 +52,7 @@ { $this->insertComboValues($combo_strings[$comTab."_dom"],$comTab); } + $log->debug("Exiting create_tables () method ..."); } } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 20:43:02 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 03:43:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5550 - /vtigercrm/trunk/include/PopulateCustomFieldTables.php Message-ID: <20060428034302.C66686AB59A@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 21:42:59 2006 New Revision: 5550 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/include/PopulateCustomFieldTables.php Modified: vtigercrm/trunk/include/PopulateCustomFieldTables.php ============================================================================== --- vtigercrm/trunk/include/PopulateCustomFieldTables.php (original) +++ vtigercrm/trunk/include/PopulateCustomFieldTables.php Thu Apr 27 21:42:59 2006 @@ -10,6 +10,9 @@ require_once('include/database/PearDatabase.php'); function create_custom_field_tables () { + global $log; + $log->debug("Entering create_custom_field_tables () method ..."); global $adb; + $log->debug("Exiting create_custom_field_tables method ..."); } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 21:03:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 04:03:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5551 - /vtigercrm/trunk/include/upload_file.php Message-ID: <20060428040333.279176AB61C@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 22:03:29 2006 New Revision: 5551 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/include/upload_file.php Modified: vtigercrm/trunk/include/upload_file.php ============================================================================== --- vtigercrm/trunk/include/upload_file.php (original) +++ vtigercrm/trunk/include/upload_file.php Thu Apr 27 22:03:29 2006 @@ -28,30 +28,41 @@ function UploadFile ($field_name) { + global $log; + $log->debug("Entering UploadFile (".$field_name.") method ..."); $this->field_name = $field_name; + $log->debug("Exiting UploadFile method ..."); } function get_url($stored_file_name,$bean_id) { + global $log; + $log->debug("Entering get_url(".$stored_file_name.",".$bean_id.") method ..."); global $site_URL; global $upload_dir; //echo $site_URL.'/'.$upload_dir.$bean_id.$stored_file_name; //echo $_ENV['HOSTNAME'] .':' .$_SERVER["SERVER_PORT"].'/'.$upload_dir.$bean_id.$stored_file_name; + $log->debug("Exiting get_url method ..."); return 'http://'.$_ENV['HOSTNAME'] .':' .$_SERVER["SERVER_PORT"].'/'.$upload_dir.$bean_id.$stored_file_name; //return $site_URL.'/'.$upload_dir.$bean_id.$stored_file_name; } function duplicate_file($old_id, $new_id, $file_name) { + global $log; + $log->debug("Entering duplicate_file(".$old_id.", ".$new_id.", ".$file_name.") method ..."); global $root_directory; global $upload_dir; $source = $root_directory.'/'.$upload_dir.$old_id.$file_name; $destination = $root_directory.'/'.$upload_dir.$new_id.$file_name; copy( $source,$destination); + $log->debug("Exiting duplicate_file method ..."); } function confirm_upload() { + global $log; + $log->debug("Eentering confirm_upload() method ..."); global $root_directory; global $upload_dir; global $upload_maxsize; @@ -60,6 +71,7 @@ if (!is_uploaded_file($_FILES[$this->field_name]['tmp_name']) ) { + $log->debug("Exiting confirm_upload method ..."); return false; } else if ($_FILES[$this->field_name]['size'] > $upload_maxsize) @@ -74,17 +86,22 @@ } $this->stored_file_name = $this->create_stored_filename(); - + $log->debug("Exiting confirm_upload method ..."); return true; } function get_stored_file_name() { + global $log; + $log->debug("Entering get_stored_file_name() method ..."); + $log->debug("Exiting get_stored_file_name method ..."); return $this->stored_file_name; } function create_stored_filename() { + global $log; + $log->debug("Entering create_stored_filename() method ..."); global $upload_badext; $stored_file_name = $_FILES[$this->field_name]['name']; @@ -96,12 +113,14 @@ { $stored_file_name .= ".txt"; } - + $log->debug("Exiting create_stored_filename method ..."); return $stored_file_name; } function final_move($bean_id) { + global $log; + $log->debug("Entering final_move(".$bean_id.") method ..."); global $root_directory; global $upload_dir; @@ -113,7 +132,7 @@ { die ("ERROR: can't move_uploaded_file to $destination"); } - + $log->debug("Exiting final_move method ..."); return true; @@ -121,8 +140,11 @@ function unlink_file($bean_id,$file_name) { + global $log; + $log->debug("Entering unlink_file(".$bean_id.",".$file_name.") method ..."); global $root_directory; global $upload_dir; + $log->debug("Exiting unlink_file method ..."); return unlink($root_directory."/".$upload_dir.$bean_id.$file_name); } From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 21:04:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 04:04:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5552 - /vtigercrm/trunk/include/SearchBlock.php Message-ID: <20060428040452.993F86AB61C@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 22:04:48 2006 New Revision: 5552 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/include/SearchBlock.php Modified: vtigercrm/trunk/include/SearchBlock.php ============================================================================== --- vtigercrm/trunk/include/SearchBlock.php (original) +++ vtigercrm/trunk/include/SearchBlock.php Thu Apr 27 22:04:48 2006 @@ -11,6 +11,8 @@ function BuildSearchForm($focus) { + global $log; + $log->debug("Entering BuildSearchForm(".$focus.") method ..."); global $current_module_strings,$app_strings,$adb; $advanced = (isset($_REQUEST['advanced']) && $_REQUEST['advanced'] == 'true'); @@ -20,6 +22,7 @@ print_r($base); print_r($custom); print_r($focus); + $log->debug("Exiting BuildSearchForm method ..."); return ""; } @@ -57,11 +60,14 @@ // Now, reset/reload template so partials are scanned $search_form->blocks = $search_form->maketree($search_form->filecontents,"main"); $search_form->scan_globals(); + $log->debug("Exiting BuildSearchForm method ..."); return $search_form; } function SearchFieldBlock($tableName,$colidName,$tabsrch, $basic=true,$advanced=false,$block=0,$label="",$fields=array(),$doadvanced=true) { + global $log; + $log->debug("Entering SearchFieldBlock(".$tableName.",".$colidName.",".$tabsrch.",". $basic.",".$advanced.",".$block.",".$label.",".$fields.") method ..."); global $sorder, $order_by, $viewid, $currentModule; global $adb,$app_strings,$mod_strings; @@ -251,6 +257,7 @@ echo ""; */ + $log->debug("Exiting SearchFieldBlock method ..."); return $res; } } From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 21:05:47 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 04:05:47 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5553 - /vtigercrm/trunk/include/RelatedListView.php Message-ID: <20060428040547.13E1A6AB61C@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 22:05:43 2006 New Revision: 5553 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/include/RelatedListView.php Modified: vtigercrm/trunk/include/RelatedListView.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 21:12:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 04:12:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5554 - /vtigercrm/trunk/include/utils/UserInfoUtil.php Message-ID: <20060428041220.B33886AB544@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 22:12:16 2006 New Revision: 5554 Log: global variable declared in getRoleSubordinates method 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 Thu Apr 27 22:12:16 2006 @@ -3941,6 +3941,7 @@ */ function getRoleSubordinates($roleId) { + global $log; $log->debug("Entering getRoleSubordinates(".$roleId.") method ..."); global $adb; $roleDetails=getRoleInformation($roleId); From vtiger-tickets at vtiger.fosslabs.com Thu Apr 27 21:20:17 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 04:20:17 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23750=3A_?= =?utf-8?q?Integrate_code_contributions?= In-Reply-To: <076.b16a74c382aa688de221822029b26245@vtiger.fosslabs.com> References: <076.b16a74c382aa688de221822029b26245@vtiger.fosslabs.com> Message-ID: <085.36b2d3e86fa9ca460c81177124d90a23@vtiger.fosslabs.com> #750: Integrate code contributions ------------------------+--------------------------------------------------- Reporter: allanbush | Owner: richie Type: defect | Status: new Priority: minor | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc3 Resolution: | Keywords: ------------------------+--------------------------------------------------- Comment (by allanbush): (In [5555]) Added rdhital's Improved pagination for List Views (http://forums.vtiger.com/viewtopic.php?t=3251). Refs #750. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 21:20:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 04:20:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5555 - in /vtigercrm/branches/4.2: include/ modules/Accounts/ modules/Activities/ modules/Contacts/ modules/Emails/ modules/Faq/ modules/HelpDesk/ modules/Invoice/ modules/Leads/ modules/Notes/ modules/Orders/ modules/Potentials/ modules/Products/ modules/Quotes/ Message-ID: <20060428042018.94D836AB66F@vtiger.fosslabs.com> Author: allanbush Date: Thu Apr 27 22:20:06 2006 New Revision: 5555 Log: Added rdhital's Improved pagination for List Views (http://forums.vtiger.com/viewtopic.php?t=3251). Refs #750. Modified: vtigercrm/branches/4.2/include/uifromdbutil.php vtigercrm/branches/4.2/include/utils.php vtigercrm/branches/4.2/modules/Accounts/ListView.php vtigercrm/branches/4.2/modules/Activities/ListView.php vtigercrm/branches/4.2/modules/Contacts/ListView.php vtigercrm/branches/4.2/modules/Emails/ListView.php vtigercrm/branches/4.2/modules/Faq/ListView.php vtigercrm/branches/4.2/modules/HelpDesk/ListView.php vtigercrm/branches/4.2/modules/Invoice/ListView.php vtigercrm/branches/4.2/modules/Leads/ListView.php vtigercrm/branches/4.2/modules/Notes/ListView.php vtigercrm/branches/4.2/modules/Orders/ListView.php vtigercrm/branches/4.2/modules/Orders/SalesOrderListView.php vtigercrm/branches/4.2/modules/Potentials/ListView.php vtigercrm/branches/4.2/modules/Products/ListView.php vtigercrm/branches/4.2/modules/Products/PriceBookListView.php vtigercrm/branches/4.2/modules/Products/VendorListView.php vtigercrm/branches/4.2/modules/Quotes/ListView.php Modified: vtigercrm/branches/4.2/include/uifromdbutil.php ============================================================================== --- vtigercrm/branches/4.2/include/uifromdbutil.php (original) +++ vtigercrm/branches/4.2/include/uifromdbutil.php Thu Apr 27 22:20:06 2006 @@ -140,29 +140,34 @@ $output = ''; $dir_name=getModuleDirName($module); - if(isset($navigation_array['prev'])) - { + $output .= ''.$navigation_array['allflag'].' '; + if(($navigation_array['prev']) != 0) { $output .= ' '; $output .= ' '; - } - else - { + } else { $output .= ' '; $output .= ' '; } - if(isset($navigation_array['next'])) - { + + for ($i=$navigation_array['first'];$i<=$navigation_array['end'];$i++) { + if ($navigation_array['current']==$i) { + $output .=''.$i.' '; + } else { + $output .= ''.$i.' '; + } + } + + if(($navigation_array['next']) !=0) { $output .= ' '; - $output .= ' '; - } - else - { + $output .= ' '; + } else { $output .= ' '; $output .= ' '; } + $output .= ''; - return $output; + return $output; } ?> Modified: vtigercrm/branches/4.2/include/utils.php ============================================================================== --- vtigercrm/branches/4.2/include/utils.php (original) +++ vtigercrm/branches/4.2/include/utils.php Thu Apr 27 22:20:06 2006 @@ -2486,69 +2486,68 @@ return $user_id; } //outlook security -function getNavigationValues($start, $noofrows, $list_max_entries_per_page) -{ +function getNavigationValues($display, $noofrows, $limit) +{ + global $limitpage_navigation; + if(!isset($limitpage_navigation)) $limitpage_navigation = 5; + $navigation_array = Array(); - require_once('config.php'); - //Setting the start to end counter - $starttoendvaluecounter = $list_max_entries_per_page - 1; - //Setting the ending value - if($noofrows > $list_max_entries_per_page) - { - $end = $start + $starttoendvaluecounter; - if($end > $noofrows) - { - $end = $noofrows; - } - $startvalue = 1; - $remainder = $noofrows % $list_max_entries_per_page; - if($remainder > 0) - { - $endval = $noofrows - $remainder + 1; - } - elseif($remainder == 0) - { - $endval = $noofrows - $starttoendvaluecounter; - } - } - else - { + if(isset($_REQUEST['allflag']) && $_REQUEST['allflag'] == 'All') { + $navigation_array['start'] =1; + $navigation_array['first'] = 1; + $navigation_array['end'] = 1; + $navigation_array['prev'] =0; + $navigation_array['next'] =0; + $navigation_array['end_val'] =$noofrows; + $navigation_array['current'] =1; + $navigation_array['allflag'] ='Normal'; + $navigation_array['verylast'] =1; + return $navigation_array; + } + + $start = ((($display * $limit) - $limit)+1); + $end = $start + ($limit-1); + if($end > $noofrows) { $end = $noofrows; } - - - //Setting the next and previous value - if(isset($start) && $start != '') - { - $tempnextstartvalue = $start + $list_max_entries_per_page; - if($tempnextstartvalue <= $noofrows) - { - - $nextstartvalue = $tempnextstartvalue; - } - $tempprevvalue = $_REQUEST['start'] - $list_max_entries_per_page; - if($tempprevvalue > 0) - { - $prevstartvalue = $tempprevvalue; - } - } - else - { - if($noofrows > $list_max_entries_per_page) - { - $nextstartvalue = $list_max_entries_per_page + 1; - } + $paging = ceil ($noofrows / $limit); + // Display the navigation + if ($display > 1) { + $previous = $display - 1; + } else { + $previous=0; + } + if ($noofrows != $limit) { + $last = $paging; + $first = 1; + if ($paging > $limitpage_navigation) { + $first = $display-floor(($limitpage_navigation/2)); + if ($first<1) $first=1; + $last = ($limitpage_navigation - 1) + $first; + } + if ($last > $paging ) { + $first = $paging - ($limitpage_navigation - 1); + $last = $paging; + } + } + if ($display < $paging) { + $next = $display + 1; + } else { + $next=0; } $navigation_array['start'] = $start; - $navigation_array['end'] = $endval; - $navigation_array['prev'] = $prevstartvalue; - $navigation_array['next'] = $nextstartvalue; + $navigation_array['first'] = $first; + $navigation_array['end'] = $last; + $navigation_array['prev'] = $previous; + $navigation_array['next'] = $next; $navigation_array['end_val'] = $end; - return $navigation_array; - -} + $navigation_array['current'] = $display; + $navigation_array['allflag'] ='All'; + $navigation_array['verylast'] =$paging; + return $navigation_array; +} function getURLstring($focus) { Modified: vtigercrm/branches/4.2/modules/Accounts/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Accounts/ListView.php (original) +++ vtigercrm/branches/4.2/modules/Accounts/ListView.php Thu Apr 27 22:20:06 2006 @@ -430,49 +430,17 @@ $noofrows = $adb->num_rows($list_result); //Retreiving the start value from request -if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') -{ +if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') { $start = $_REQUEST['start']; -} -else -{ - +} else { $start = 1; } //Retreive the Navigation array $navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page); - -// Setting the record count string -if ($navigation_array['start'] == 1) -{ - if($noofrows != 0) - $start_rec = $navigation_array['start']; - else - $start_rec = 0; - if($noofrows > $list_max_entries_per_page) - { - $end_rec = $navigation_array['start'] + $list_max_entries_per_page - 1; - } - else - { - $end_rec = $noofrows; - } - -} -else -{ - if($navigation_array['next'] > $list_max_entries_per_page) - { - $start_rec = $navigation_array['next'] - $list_max_entries_per_page; - $end_rec = $navigation_array['next'] - 1; - } - else - { - $start_rec = $navigation_array['prev'] + $list_max_entries_per_page; - $end_rec = $noofrows; - } -} +$start_rec = $navigation_array['start']; +$end_rec = $navigation_array['end_val']; + $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows; //Retreive the List View Table Header Modified: vtigercrm/branches/4.2/modules/Activities/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Activities/ListView.php (original) +++ vtigercrm/branches/4.2/modules/Activities/ListView.php Thu Apr 27 22:20:06 2006 @@ -317,48 +317,16 @@ $noofrows = $adb->num_rows($list_result); //Retreiving the start value from request -if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') -{ +if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') { $start = $_REQUEST['start']; -} -else -{ - +} else { $start = 1; } //Retreive the Navigation array $navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page); - -// Setting the record count string -if ($navigation_array['start'] == 1) -{ - if($noofrows != 0) - $start_rec = $navigation_array['start']; - else - $start_rec = 0; - if($noofrows > $list_max_entries_per_page) - { - $end_rec = $navigation_array['start'] + $list_max_entries_per_page - 1; - } - else - { - $end_rec = $noofrows; - } - -} -else -{ - if($navigation_array['next'] > $list_max_entries_per_page) - { - $start_rec = $navigation_array['next'] - $list_max_entries_per_page; - $end_rec = $navigation_array['next'] - 1; - } - else - { - $start_rec = $navigation_array['prev'] + $list_max_entries_per_page; - $end_rec = $noofrows; - } -} +$start_rec = $navigation_array['start']; +$end_rec = $navigation_array['end_val']; + $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows; //Retreive the List View Table Header Modified: vtigercrm/branches/4.2/modules/Contacts/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Contacts/ListView.php (original) +++ vtigercrm/branches/4.2/modules/Contacts/ListView.php Thu Apr 27 22:20:06 2006 @@ -394,48 +394,17 @@ $noofrows = $adb->num_rows($list_result); //Retreiving the start value from request -if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') -{ +if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') { $start = $_REQUEST['start']; -} -else -{ +} else { $start = 1; } //Retreive the Navigation array $navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page); - -// Setting the record count string -if ($navigation_array['start'] == 1) -{ - if($noofrows != 0) - $start_rec = $navigation_array['start']; - else - $start_rec = 0; - if($noofrows > $list_max_entries_per_page) - { - $end_rec = $navigation_array['start'] + $list_max_entries_per_page - 1; - } - else - { - $end_rec = $noofrows; - } - -} -else -{ - if($navigation_array['next'] > $list_max_entries_per_page) - { - $start_rec = $navigation_array['next'] - $list_max_entries_per_page; - $end_rec = $navigation_array['next'] - 1; - } - else - { - $start_rec = $navigation_array['prev'] + $list_max_entries_per_page; - $end_rec = $noofrows; - } -} +$start_rec = $navigation_array['start']; +$end_rec = $navigation_array['end_val']; + $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows; //Retreive the List View Table Header Modified: vtigercrm/branches/4.2/modules/Emails/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Emails/ListView.php (original) +++ vtigercrm/branches/4.2/modules/Emails/ListView.php Thu Apr 27 22:20:06 2006 @@ -315,48 +315,16 @@ $noofrows = $adb->num_rows($list_result); //Retreiving the start value from request -if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') -{ +if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') { $start = $_REQUEST['start']; -} -else -{ - +} else { $start = 1; } //Retreive the Navigation array $navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page); - -// Setting the record count string -if ($navigation_array['start'] == 1) -{ - if($noofrows != 0) - $start_rec = $navigation_array['start']; - else - $start_rec = 0; - if($noofrows > $list_max_entries_per_page) - { - $end_rec = $navigation_array['start'] + $list_max_entries_per_page - 1; - } - else - { - $end_rec = $noofrows; - } - -} -else -{ - if($navigation_array['next'] > $list_max_entries_per_page) - { - $start_rec = $navigation_array['next'] - $list_max_entries_per_page; - $end_rec = $navigation_array['next'] - 1; - } - else - { - $start_rec = $navigation_array['prev'] + $list_max_entries_per_page; - $end_rec = $noofrows; - } -} +$start_rec = $navigation_array['start']; +$end_rec = $navigation_array['end_val']; + $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows; //Retreive the List View Table Header Modified: vtigercrm/branches/4.2/modules/Faq/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Faq/ListView.php (original) +++ vtigercrm/branches/4.2/modules/Faq/ListView.php Thu Apr 27 22:20:06 2006 @@ -127,48 +127,16 @@ $noofrows = $adb->num_rows($list_result); //Retreiving the start value from request -if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') -{ +if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') { $start = $_REQUEST['start']; -} -else -{ - +} else { $start = 1; } //Retreive the Navigation array $navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page); +$start_rec = $navigation_array['start']; +$end_rec = $navigation_array['end_val']; -// Setting the record count string -if ($navigation_array['start'] == 1) -{ - if($noofrows != 0) - $start_rec = $navigation_array['start']; - else - $start_rec = 0; - if($noofrows > $list_max_entries_per_page) - { - $end_rec = $navigation_array['start'] + $list_max_entries_per_page - 1; - } - else - { - $end_rec = $noofrows; - } - -} -else -{ - if($navigation_array['next'] > $list_max_entries_per_page) - { - $start_rec = $navigation_array['next'] - $list_max_entries_per_page; - $end_rec = $navigation_array['next'] - 1; - } - else - { - $start_rec = $navigation_array['prev'] + $list_max_entries_per_page; - $end_rec = $noofrows; - } -} $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows; //Retreive the List View Table Header Modified: vtigercrm/branches/4.2/modules/HelpDesk/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/HelpDesk/ListView.php (original) +++ vtigercrm/branches/4.2/modules/HelpDesk/ListView.php Thu Apr 27 22:20:06 2006 @@ -398,48 +398,16 @@ $noofrows = $adb->num_rows($list_result); //Retreiving the start value from request -if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') -{ +if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') { $start = $_REQUEST['start']; -} -else -{ - +} else { $start = 1; } //Retreive the Navigation array $navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page); - -// Setting the record count string -if ($navigation_array['start'] == 1) -{ - if($noofrows != 0) - $start_rec = $navigation_array['start']; - else - $start_rec = 0; - if($noofrows > $list_max_entries_per_page) - { - $end_rec = $navigation_array['start'] + $list_max_entries_per_page - 1; - } - else - { - $end_rec = $noofrows; - } - -} -else -{ - if($navigation_array['next'] > $list_max_entries_per_page) - { - $start_rec = $navigation_array['next'] - $list_max_entries_per_page; - $end_rec = $navigation_array['next'] - 1; - } - else - { - $start_rec = $navigation_array['prev'] + $list_max_entries_per_page; - $end_rec = $noofrows; - } -} +$start_rec = $navigation_array['start']; +$end_rec = $navigation_array['end_val']; + $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows; //Retreive the List View Table Header Modified: vtigercrm/branches/4.2/modules/Invoice/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Invoice/ListView.php (original) +++ vtigercrm/branches/4.2/modules/Invoice/ListView.php Thu Apr 27 22:20:06 2006 @@ -290,49 +290,17 @@ $noofrows = $adb->num_rows($list_result); //Retreiving the start value from request -if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') -{ +if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') { $start = $_REQUEST['start']; -} -else -{ - +} else { $start = 1; } //Retreive the Navigation array $navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page); - -// Setting the record count string -if ($navigation_array['start'] == 1) -{ - if($noofrows != 0) - $start_rec = $navigation_array['start']; - else - $start_rec = 0; - if($noofrows > $list_max_entries_per_page) - { - $end_rec = $navigation_array['start'] + $list_max_entries_per_page - 1; - } - else - { - $end_rec = $noofrows; - } - -} -else -{ - if($navigation_array['next'] > $list_max_entries_per_page) - { - $start_rec = $navigation_array['next'] - $list_max_entries_per_page; - $end_rec = $navigation_array['next'] - 1; - } - else - { - $start_rec = $navigation_array['prev'] + $list_max_entries_per_page; - $end_rec = $noofrows; - } -} +$start_rec = $navigation_array['start']; +$end_rec = $navigation_array['end_val']; + $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows; //Retreive the List View Table Header Modified: vtigercrm/branches/4.2/modules/Leads/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Leads/ListView.php (original) +++ vtigercrm/branches/4.2/modules/Leads/ListView.php Thu Apr 27 22:20:06 2006 @@ -410,48 +410,16 @@ $noofrows = $adb->num_rows($list_result); //Retreiving the start value from request -if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') -{ +if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') { $start = $_REQUEST['start']; -} -else -{ - +} else { $start = 1; } //Retreive the Navigation array $navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page); - -// Setting the record count string -if ($navigation_array['start'] == 1) -{ - if($noofrows != 0) - $start_rec = $navigation_array['start']; - else - $start_rec = 0; - if($noofrows > $list_max_entries_per_page) - { - $end_rec = $navigation_array['start'] + $list_max_entries_per_page - 1; - } - else - { - $end_rec = $noofrows; - } - -} -else -{ - if($navigation_array['next'] > $list_max_entries_per_page) - { - $start_rec = $navigation_array['next'] - $list_max_entries_per_page; - $end_rec = $navigation_array['next'] - 1; - } - else - { - $start_rec = $navigation_array['prev'] + $list_max_entries_per_page; - $end_rec = $noofrows; - } -} +$start_rec = $navigation_array['start']; +$end_rec = $navigation_array['end_val']; + $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows; //Retreive the List View Table Header Modified: vtigercrm/branches/4.2/modules/Notes/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Notes/ListView.php (original) +++ vtigercrm/branches/4.2/modules/Notes/ListView.php Thu Apr 27 22:20:06 2006 @@ -238,48 +238,16 @@ "; //Retreiving the start value from request -if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') -{ +if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') { $start = $_REQUEST['start']; -} -else -{ - +} else { $start = 1; } //Retreive the Navigation array $navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page); - -// Setting the record count string -if ($navigation_array['start'] == 1) -{ - if($noofrows != 0) - $start_rec = $navigation_array['start']; - else - $start_rec = 0; - if($noofrows > $list_max_entries_per_page) - { - $end_rec = $navigation_array['start'] + $list_max_entries_per_page - 1; - } - else - { - $end_rec = $noofrows; - } - -} -else -{ - if($navigation_array['next'] > $list_max_entries_per_page) - { - $start_rec = $navigation_array['next'] - $list_max_entries_per_page; - $end_rec = $navigation_array['next'] - 1; - } - else - { - $start_rec = $navigation_array['prev'] + $list_max_entries_per_page; - $end_rec = $noofrows; - } -} +$start_rec = $navigation_array['start']; +$end_rec = $navigation_array['end_val']; + $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows; Modified: vtigercrm/branches/4.2/modules/Orders/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Orders/ListView.php (original) +++ vtigercrm/branches/4.2/modules/Orders/ListView.php Thu Apr 27 22:20:06 2006 @@ -301,49 +301,17 @@ $noofrows = $adb->num_rows($list_result); //Retreiving the start value from request -if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') -{ +if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') { $start = $_REQUEST['start']; -} -else -{ - +} else { $start = 1; } //Retreive the Navigation array $navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page); - -// Setting the record count string -if ($navigation_array['start'] == 1) -{ - if($noofrows != 0) - $start_rec = $navigation_array['start']; - else - $start_rec = 0; - if($noofrows > $list_max_entries_per_page) - { - $end_rec = $navigation_array['start'] + $list_max_entries_per_page - 1; - } - else - { - $end_rec = $noofrows; - } - -} -else -{ - if($navigation_array['next'] > $list_max_entries_per_page) - { - $start_rec = $navigation_array['next'] - $list_max_entries_per_page; - $end_rec = $navigation_array['next'] - 1; - } - else - { - $start_rec = $navigation_array['prev'] + $list_max_entries_per_page; - $end_rec = $noofrows; - } -} +$start_rec = $navigation_array['start']; +$end_rec = $navigation_array['end_val']; + $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows; //Retreive the List View Table Header Modified: vtigercrm/branches/4.2/modules/Orders/SalesOrderListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Orders/SalesOrderListView.php (original) +++ vtigercrm/branches/4.2/modules/Orders/SalesOrderListView.php Thu Apr 27 22:20:06 2006 @@ -283,48 +283,16 @@ "; //Retreiving the start value from request -if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') -{ +if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') { $start = $_REQUEST['start']; -} -else -{ - +} else { $start = 1; } //Retreive the Navigation array $navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page); - -// Setting the record count string -if ($navigation_array['start'] == 1) -{ - if($noofrows != 0) - $start_rec = $navigation_array['start']; - else - $start_rec = 0; - if($noofrows > $list_max_entries_per_page) - { - $end_rec = $navigation_array['start'] + $list_max_entries_per_page - 1; - } - else - { - $end_rec = $noofrows; - } - -} -else -{ - if($navigation_array['next'] > $list_max_entries_per_page) - { - $start_rec = $navigation_array['next'] - $list_max_entries_per_page; - $end_rec = $navigation_array['next'] - 1; - } - else - { - $start_rec = $navigation_array['prev'] + $list_max_entries_per_page; - $end_rec = $noofrows; - } -} +$start_rec = $navigation_array['start']; +$end_rec = $navigation_array['end_val']; + $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows; //Retreive the List View Table Header Modified: vtigercrm/branches/4.2/modules/Potentials/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Potentials/ListView.php (original) +++ vtigercrm/branches/4.2/modules/Potentials/ListView.php Thu Apr 27 22:20:06 2006 @@ -400,47 +400,16 @@ $noofrows = $adb->num_rows($list_result); //Retreiving the start value from request -if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') -{ +if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') { $start = $_REQUEST['start']; -} -else -{ +} else { $start = 1; } //Retreive the Navigation array $navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page); - -// Setting the record count string -if ($navigation_array['start'] == 1) -{ - if($noofrows != 0) - $start_rec = $navigation_array['start']; - else - $start_rec = 0; - if($noofrows > $list_max_entries_per_page) - { - $end_rec = $navigation_array['start'] + $list_max_entries_per_page - 1; - } - else - { - $end_rec = $noofrows; - } - -} -else -{ - if($navigation_array['next'] > $list_max_entries_per_page) - { - $start_rec = $navigation_array['next'] - $list_max_entries_per_page; - $end_rec = $navigation_array['next'] - 1; - } - else - { - $start_rec = $navigation_array['prev'] + $list_max_entries_per_page; - $end_rec = $noofrows; - } -} +$start_rec = $navigation_array['start']; +$end_rec = $navigation_array['end_val']; + $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows; //Retreive the List View Table Header Modified: vtigercrm/branches/4.2/modules/Products/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Products/ListView.php (original) +++ vtigercrm/branches/4.2/modules/Products/ListView.php Thu Apr 27 22:20:06 2006 @@ -342,48 +342,16 @@ $noofrows = $adb->num_rows($list_result); //Retreiving the start value from request -if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') -{ +if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') { $start = $_REQUEST['start']; -} -else -{ - +} else { $start = 1; } //Retreive the Navigation array $navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page); - -// Setting the record count string -if ($navigation_array['start'] == 1) -{ - if($noofrows != 0) - $start_rec = $navigation_array['start']; - else - $start_rec = 0; - if($noofrows > $list_max_entries_per_page) - { - $end_rec = $navigation_array['start'] + $list_max_entries_per_page - 1; - } - else - { - $end_rec = $noofrows; - } - -} -else -{ - if($navigation_array['next'] > $list_max_entries_per_page) - { - $start_rec = $navigation_array['next'] - $list_max_entries_per_page; - $end_rec = $navigation_array['next'] - 1; - } - else - { - $start_rec = $navigation_array['prev'] + $list_max_entries_per_page; - $end_rec = $noofrows; - } -} +$start_rec = $navigation_array['start']; +$end_rec = $navigation_array['end_val']; + $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows; //Retreive the List View Table Header Modified: vtigercrm/branches/4.2/modules/Products/PriceBookListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Products/PriceBookListView.php (original) +++ vtigercrm/branches/4.2/modules/Products/PriceBookListView.php Thu Apr 27 22:20:06 2006 @@ -242,48 +242,16 @@ $noofrows = $adb->num_rows($list_result); //Retreiving the start value from request -if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') -{ +if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') { $start = $_REQUEST['start']; -} -else -{ - +} else { $start = 1; } //Retreive the Navigation array $navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page); - -// Setting the record count string -if ($navigation_array['start'] == 1) -{ - if($noofrows != 0) - $start_rec = $navigation_array['start']; - else - $start_rec = 0; - if($noofrows > $list_max_entries_per_page) - { - $end_rec = $navigation_array['start'] + $list_max_entries_per_page - 1; - } - else - { - $end_rec = $noofrows; - } - -} -else -{ - if($navigation_array['next'] > $list_max_entries_per_page) - { - $start_rec = $navigation_array['next'] - $list_max_entries_per_page; - $end_rec = $navigation_array['next'] - 1; - } - else - { - $start_rec = $navigation_array['prev'] + $list_max_entries_per_page; - $end_rec = $noofrows; - } -} +$start_rec = $navigation_array['start']; +$end_rec = $navigation_array['end_val']; + $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows; //Retreive the List View Table Header Modified: vtigercrm/branches/4.2/modules/Products/VendorListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Products/VendorListView.php (original) +++ vtigercrm/branches/4.2/modules/Products/VendorListView.php Thu Apr 27 22:20:06 2006 @@ -347,48 +347,16 @@ "; //Retreiving the start value from request -if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') -{ +if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') { $start = $_REQUEST['start']; -} -else -{ - +} else { $start = 1; } //Retreive the Navigation array $navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page); - -// Setting the record count string -if ($navigation_array['start'] == 1) -{ - if($noofrows != 0) - $start_rec = $navigation_array['start']; - else - $start_rec = 0; - if($noofrows > $list_max_entries_per_page) - { - $end_rec = $navigation_array['start'] + $list_max_entries_per_page - 1; - } - else - { - $end_rec = $noofrows; - } - -} -else -{ - if($navigation_array['next'] > $list_max_entries_per_page) - { - $start_rec = $navigation_array['next'] - $list_max_entries_per_page; - $end_rec = $navigation_array['next'] - 1; - } - else - { - $start_rec = $navigation_array['prev'] + $list_max_entries_per_page; - $end_rec = $noofrows; - } -} +$start_rec = $navigation_array['start']; +$end_rec = $navigation_array['end_val']; + $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows; //Retreive the List View Table Header Modified: vtigercrm/branches/4.2/modules/Quotes/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Quotes/ListView.php (original) +++ vtigercrm/branches/4.2/modules/Quotes/ListView.php Thu Apr 27 22:20:06 2006 @@ -312,49 +312,17 @@ $noofrows = $adb->num_rows($list_result); //Retreiving the start value from request -if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') -{ +if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') { $start = $_REQUEST['start']; -} -else -{ - +} else { $start = 1; } //Retreive the Navigation array $navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page); - -// Setting the record count string -if ($navigation_array['start'] == 1) -{ - if($noofrows != 0) - $start_rec = $navigation_array['start']; - else - $start_rec = 0; - if($noofrows > $list_max_entries_per_page) - { - $end_rec = $navigation_array['start'] + $list_max_entries_per_page - 1; - } - else - { - $end_rec = $noofrows; - } - -} -else -{ - if($navigation_array['next'] > $list_max_entries_per_page) - { - $start_rec = $navigation_array['next'] - $list_max_entries_per_page; - $end_rec = $navigation_array['next'] - 1; - } - else - { - $start_rec = $navigation_array['prev'] + $list_max_entries_per_page; - $end_rec = $noofrows; - } -} +$start_rec = $navigation_array['start']; +$end_rec = $navigation_array['end_val']; + $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows; //Retreive the List View Table Header From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 21:35:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 04:35:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5556 - /vtigercrm/trunk/include/ListView/ListView.php Message-ID: <20060428043549.A47956B046E@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 22:35:44 2006 New Revision: 5556 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/include/ListView/ListView.php Modified: vtigercrm/trunk/include/ListView/ListView.php ============================================================================== --- vtigercrm/trunk/include/ListView/ListView.php (original) +++ vtigercrm/trunk/include/ListView/ListView.php Thu Apr 27 22:35:44 2006 @@ -45,7 +45,10 @@ * Contributor(s): ______________________________________. */ function setDisplayHeaderAndFooter($bool){ + global $log; + $log->debug("Entering setDisplayHeaderAndFooter(".$bool.") method ..."); $this->display_header_and_footer = $bool; + $log->debug("Exiting setDisplayHeaderAndFooter method ..."); } /**initializes ListView @@ -54,6 +57,8 @@ * Contributor(s): ______________________________________. */ function ListView(){ + global $log; + $log->debug("Entering ListView() method ..."); if(!$this->initialized){ @@ -70,7 +75,7 @@ $this->local_image_path = 'themes/'.$theme.'/images'; } $this->log = LoggerManager::getLogger('listView_'.$this->local_current_module); - + $log->debug("Exiting ListView method ..."); } } /**sets how many records should be displayed per page in the list view @@ -79,11 +84,17 @@ * Contributor(s): ______________________________________. */ function setRecordsPerPage($count){ + global $log; + $log->debug("Entering setRecordsPerPage(".$count.") method ..."); $this->records_per_page = $count; + $log->debug("Exiting setRecordsPerPage method ..."); } /**sets the header title */ function setHeaderTitle($value){ + global $log; + $log->debug("Entering setHeaderTitle(".$value.") method ..."); $this->header_title = $value; + $log->debug("Exiting setHeaderTitle method ..."); } /**sets the header text this is text thats appended to the header table and is usually used for the creation of buttons * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. @@ -91,7 +102,10 @@ * Contributor(s): ______________________________________. */ function setHeaderText($value){ + global $log; + $log->debug("Entering setHeaderText(".$value.") method ..."); $this->header_text = $value; + $log->debug("Exiting setHeaderText method ..."); } /**sets the path for the XTemplate HTML file to be used this is only needed to be set if you are allowing ListView to create the XTemplate * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. @@ -99,7 +113,10 @@ * Contributor(s): ______________________________________. */ function setXTemplatePath($value){ + global $log; + $log->debug("Entering setXTemplatePath(".$value.") method ..."); $this->xTemplatePath= $value; + $log->debug("Exiting setXTemplatePath method ..."); } /**this is a helper function for allowing ListView to create a new XTemplate it groups parameters that should be set into a single function @@ -108,11 +125,14 @@ * Contributor(s): ______________________________________. */ function initNewXTemplate($XTemplatePath, &$modString, $imagePath = null){ + global $log; + $log->debug("Entering initNewXTemplate(".$XTemplatePath.",".$modString.",". $imagePath = null.") method ..."); $this->setXTemplatePath($XTemplatePath); if(isset($modString)) $this->setModStrings($modString); if(isset($imagePath)) - $this->setImagePath($imagePath); + $this->setImagePath($imagePath); + $log->debug("Exiting initNewXTemplate method ..."); } @@ -122,6 +142,8 @@ * Contributor(s): ______________________________________. */ function setQuery($where, $limit, $orderBy, $varName, $allowOrderByOveride= true){ + global $log; + $log->debug("Entering setQuery(".$where.",". $limit.",". $orderBy.",". $varName.",". $allowOrderByOveride.") method ..."); $this->query_where = $where; if($this->getSessionVariable("query", "where") != $where){ $this->querey_where_has_changed = true; @@ -131,6 +153,7 @@ $this->query_limit = $limit; if(!$allowOrderByOveride){ $this->query_orderby = $orderBy; + $log->debug("Exiting setQuery method ..."); return; } $sortBy = $this->getSessionVariable($varName, "ORDER_BY") ; @@ -172,7 +195,7 @@ }else { $this->query_orderby = ""; } - + $log->debug("Exiting setQuery method ..."); @@ -180,6 +203,9 @@ } function displayArrow(){ + global $log; + $log->debug("Entering displayArrow() method ..."); + $log->debug("Exiting displayArrow method ..."); } @@ -189,8 +215,11 @@ * Contributor(s): ______________________________________. */ function setTheme($theme){ + global $log; + $log->debug("Entering setTheme(".$theme.") method ..."); $this->local_theme = $theme; if(isset($this->xTemplate))$this->xTemplate->assign("THEME", $this->local_theme ); + $log->debug("Exiting setTheme method ..."); } /**sets the AppStrings used only use if it is different from the global @@ -199,9 +228,12 @@ * Contributor(s): ______________________________________. */ function setAppStrings(&$app_strings){ + global $log; + $log->debug("Entering setAppStrings(".$app_strings.") method ..."); unset($this->local_app_strings); $this->local_app_strings = $app_strings; if(isset($this->xTemplate))$this->xTemplate->assign("APP", $this->local_app_strings ); + $log->debug("Exiting setAppStrings method ..."); } /**sets the ModStrings used @@ -210,9 +242,12 @@ * Contributor(s): ______________________________________. */ function setModStrings(&$mod_strings){ + global $log; + $log->debug("Entering setModStrings(".$mod_strings.") method ..."); unset($this->local_module_strings); $this->local_mod_strings = $mod_strings; if(isset($this->xTemplate))$this->xTemplate->assign("MOD", $this->local_mod_strings ); + $log->debug("Exiting setModStrings method ..."); } /**sets the ImagePath used @@ -221,11 +256,14 @@ * Contributor(s): ______________________________________. */ function setImagePath($image_path){ + global $log; + $log->debug("Entering setImagePath(".$image_path.") method ..."); $this->local_image_path = $image_path; if(empty($this->local_image_path)){ $this->local_image_path = 'themes/'.$this->local_theme.'/images'; } if(isset($this->xTemplate))$this->xTemplate->assign("IMAGE_PATH", $this->local_image_path ); + $log->debug("Exiting setImagePath method ..."); } /**sets the currentModule only use if this is different from the global @@ -234,10 +272,14 @@ * Contributor(s): ______________________________________. */ function setCurrentModule($currentModule){ + global $log; + $log->debug("Entering setCurrentModule(".$currentModule.") method ..."); unset($this->local_current_module); $this->local_current_module = $currentModule; $this->log = LoggerManager::getLogger('listView_'.$this->local_current_module); - if(isset($this->xTemplate))$this->xTemplate->assign("MODULE_NAME", $this->local_current_module ); + if(isset($this->xTemplate))$this->xTemplate->assign("MODULE_NAME", $this->local_current_module ); + $log->debug("Exiting setCurrentModule method ..."); + } /**INTERNAL FUNCTION creates an XTemplate DO NOT CALL THIS THIS IS AN INTERNAL FUNCTION @@ -246,6 +288,8 @@ * Contributor(s): ______________________________________. */ function createXTemplate(){ + global $log; + $log->debug("Entering createXTemplate() method ..."); if(!isset($this->xTemplate)){ if(isset($this->xTemplatePath)){ $this->xTemplate = new XTemplate ($this->xTemplatePath); @@ -258,6 +302,7 @@ $log->error("NO XTEMPLATEPATH DEFINED CANNOT CREATE XTEMPLATE"); } } + $log->debug("Exiting createXTemplate method ..."); } /**sets the XTemplate telling ListView to use newXTemplate as its current XTemplate @@ -266,7 +311,10 @@ * Contributor(s): ______________________________________. */ function setXTemplate(&$newXTemplate){ + global $log; + $log->debug("Entering setXTemplate(".$newXTemplate.") method ..."); $this->xTemplate = $newXTemplate; + $log->debug("Exiting setXTemplate method ..."); } /**returns the XTemplate @@ -274,7 +322,10 @@ * All Rights Reserved. * Contributor(s): ______________________________________. */ - function getXTemplate(){ + function getXTemplate(){ + global $log; + $log->debug("Entering getXTemplate() method ..."); + $log->debug("Exiting getXTemplate method ..."); return $this->xTemplate; } @@ -284,11 +335,14 @@ * Contributor(s): ______________________________________. */ function xTemplateAssign($name, $value){ + global $log; + $log->debug("Entering xTemplateAssign(".$name.",". $value.") method ..."); if(!isset($this->xTemplate)){ $this->createXTemplate(); } $this->xTemplate->assign($name, $value); + $log->debug("Exiting xTemplateAssign method ..."); } @@ -298,13 +352,17 @@ * Contributor(s): ______________________________________. */ function getOffset($localVarName){ + global $log; + $log->debug("Entering getOffset(".$localVarName.") method ..."); if($this->querey_where_has_changed){ $this->setSessionVariable($localVarName,"offset", 0); } $offset = $this->getSessionVariable($localVarName,"offset"); if(isset($offset)){ + $log->debug("Exiting getOffset method ..."); return $offset; } + $log->debug("Exiting getOffset method ..."); return 0; } @@ -314,7 +372,10 @@ * Contributor(s): ______________________________________. */ function setOffset($localVarName, $value){ + global $log; + $log->debug("Entering setOffset(".$localVarName.",". $value.") method ..."); $this->setSessionVariable($localVarName, "offset", $value); + $log->debug("Exiting setOffset method ..."); } /**INTERNAL FUNCTION sets a session variable @@ -323,12 +384,18 @@ * Contributor(s): ______________________________________. */ function setSessionVariable($localVarName,$varName, $value){ + global $log; + $log->debug("Entering setSessionVariable(".$localVarName.",".$varName.",". $value.") method ..."); $_SESSION[$this->local_current_module."_".$localVarName."_".$varName] = $value; + $log->debug("Exiting setSessionVariable method ..."); } function setUserVariable($localVarName,$varName, $value){ + global $log; + $log->debug("Entering setUserVariable(".$localVarName.",".$varName.",". $value.") method ..."); global $current_user; $current_user->setPreference($this->local_current_module."_".$localVarName."_".$varName, $value); + $log->debug("Exiting setUserVariable method ..."); } /**INTERNAL FUNCTION returns a session variable first checking the querey for it then checking the session @@ -337,12 +404,16 @@ * Contributor(s): ______________________________________. */ function getSessionVariable($localVarName,$varName){ + global $log; + $log->debug("Entering getSessionVariable(".$localVarName.",".$varName.") method ..."); if(isset($_REQUEST[$this->getSessionVariableName($localVarName, $varName)])){ $this->setSessionVariable($localVarName,$varName,$_REQUEST[$this->getSessionVariableName($localVarName, $varName)]); } if(isset($_SESSION[$this->getSessionVariableName($localVarName, $varName)])){ + $log->debug("Exiting getSessionVariable method ..."); return $_SESSION[$this->getSessionVariableName($localVarName, $varName)]; } + $log->debug("Exiting getSessionVariable method ..."); return ""; } @@ -361,6 +432,9 @@ * Contributor(s): ______________________________________.. */ function getSessionVariableName($localVarName,$varName){ + global $log; + $log->debug("Entering getSessionVariableName(".$localVarName.",".$varName.") method ..."); + $log->debug("Exiting getSessionVariableName method ..."); return $this->local_current_module."_".$localVarName."_".$varName; } @@ -379,6 +453,8 @@ * Contributor(s): ______________________________________.. */ function processSugarBean($xtemplateSection, $html_varName, $seed){ + global $log; + $log->debug("Entering processSugarBean(".$xtemplateSection.",". $html_varName.",". $seed.") method ..."); $current_offset = $this->getOffset($html_varName); $response = $seed->get_list($this->query_orderby, $this->query_where, $current_offset, $this->query_limit); $list = $response['list']; @@ -386,6 +462,7 @@ $next_offset = $response['next_offset']; $previous_offset = $response['previous_offset']; $this->processListNavigation( $xtemplateSection,$html_varName, $current_offset, $next_offset, $previous_offset, $row_count); + $log->debug("Exiting processSugarBean method ..."); return $list; } @@ -401,6 +478,8 @@ * Contributor(s): ______________________________________.. */ function processListNavigation( $xtemplateSection, $html_varName, $current_offset, $next_offset, $previous_offset, $row_count ){ + global $log; + $log->debug("Entering processListNavigation(".$xtemplateSection.",". $html_varName.",". $current_offset.",". $next_offset.",". $previous_offset.",". $row_count.") method ..."); global $current_user; global $allow_exports; $start_record = $current_offset + 1; @@ -483,7 +562,7 @@ $this->xTemplate->assign("EXPORT_LINK", " [ ".$export_link." ]"); } $this->xTemplate->parse($xtemplateSection.".list_nav_row"); - + $log->debug("Exiting processListNavigation method ..."); } } /** @@ -498,6 +577,8 @@ * Contributor(s): ______________________________________.. */ function processListRows(&$data,$xtemplateSection, $html_varName){ + global $log; + $log->debug("Entering processListRows(".$data.",".$xtemplateSection.",". $html_varName.") method ..."); $oddRow = true; foreach($data as $aItem) { @@ -518,6 +599,7 @@ $this->xTemplate->parse($xtemplateSection.".row"); } $this->xTemplate->parse($xtemplateSection); + $log->debug("Exiting processListRows method ..."); } /** @@ -535,6 +617,8 @@ * Contributor(s): ______________________________________.. */ function processListView($seed, $xTemplateSection, $html_varName){ + global $log; + $log->debug("Entering processListView(".$seed.",". $xTemplateSection.",". $html_varName.") method ..."); if(!isset($this->xTemplate)) $this->createXTemplate(); $isSugarBean = is_subclass_of($seed, "SugarBean"); @@ -554,6 +638,7 @@ echo get_form_footer(); if($isSugarBean ) echo "\n\n"; + $log->debug("Exiting processListView method ..."); //if(isset($_SESSION['validation'])){ // print base64_decode('PGEgaHJlZj0naHR0cDovL3d3dy5zdWdhcmNybS5jb20nPlBPV0VSRUQmbmJzcDtCWSZuYnNwO1NVR0FSQ1JNPC9hPg=='); @@ -562,6 +647,8 @@ } function processSortArrows($html_varName){ + global $log; + $log->debug("Entering processSortArrows(".$html_varName.") method ..."); $orderBy = $this->getSessionVariable($html_varName, "ORDER_BY_LAST"); $desc = $this->getSessionVariable($html_varName, $orderBy.'_desc'); $imgArrow = " "; @@ -572,7 +659,8 @@ $this->xTemplateAssign('amount_arrow', $imgArrow); else{ $this->xTemplateAssign($orderBy.'_arrow', $imgArrow); - } + } + $log->debug("Exiting processSortArrows method ..."); } } From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 22:01:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 05:01:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5557 - /vtigercrm/trunk/modules/Accounts/ListViewTop.php Message-ID: <20060428050110.A6A436B046E@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 23:01:06 2006 New Revision: 5557 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/modules/Accounts/ListViewTop.php Modified: vtigercrm/trunk/modules/Accounts/ListViewTop.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/ListViewTop.php (original) +++ vtigercrm/trunk/modules/Accounts/ListViewTop.php Thu Apr 27 23:01:06 2006 @@ -21,6 +21,8 @@ ********************************************************************************/ function getTopAccounts() { + $log = LoggerManager::getLogger('top accounts_list'); + $log->debug("Entering getTopAccounts() method ..."); require_once("data/Tracker.php"); require_once('modules/Potentials/Opportunity.php'); require_once('include/logging.php'); @@ -30,7 +32,6 @@ global $current_language; global $current_user; $current_module_strings = return_module_language($current_language, "Accounts"); - $log = LoggerManager::getLogger('top accounts_list'); $list_query = 'select account.accountid, account.accountname, account.tickersymbol, sum(potential.amount) as amount from potential inner join crmentity on (potential.potentialid=crmentity.crmid) inner join account on (potential.accountid=account.accountid) where crmentity.deleted=0 AND crmentity.smownerid="'.$current_user->id.'" and potential.sales_stage <> "'.$app_strings['LBL_CLOSE_WON'].'" and potential.sales_stage <> "'.$app_strings['LBL_CLOSE_LOST'].'" group by account.accountname order by 3 desc;'; $list_result=$adb->query($list_query); @@ -75,6 +76,7 @@ } $values=Array('Title'=>$title,'Header'=>$header,'Entries'=>$entries); if ( ($display_empty_home_blocks && count($open_accounts_list) == 0 ) || (count($open_accounts_list)>0) ) + $log->debug("Exiting getTopAccounts method ..."); return $values; } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 22:01:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 05:01:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5558 - /vtigercrm/trunk/modules/Accounts/Forms.php Message-ID: <20060428050156.E255E6B046E@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 23:01:52 2006 New Revision: 5558 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/modules/Accounts/Forms.php Modified: vtigercrm/trunk/modules/Accounts/Forms.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 22:02:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 05:02:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5559 - /vtigercrm/trunk/modules/Accounts/Save.php Message-ID: <20060428050255.173446AB67C@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 23:02:49 2006 New Revision: 5559 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/modules/Accounts/Save.php Modified: vtigercrm/trunk/modules/Accounts/Save.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 22:14:05 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 05:14:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5560 - /vtigercrm/trunk/modules/Accounts/Account.php Message-ID: <20060428051405.AC9916AB658@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 23:14:01 2006 New Revision: 5560 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/modules/Accounts/Account.php Modified: vtigercrm/trunk/modules/Accounts/Account.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 22:19:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 05:19:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5561 - /vtigercrm/trunk/modules/Campaigns/Campaign.php Message-ID: <20060428051911.96CA86AB658@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 23:19:07 2006 New Revision: 5561 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/modules/Campaigns/Campaign.php Modified: vtigercrm/trunk/modules/Campaigns/Campaign.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/Campaign.php (original) +++ vtigercrm/trunk/modules/Campaigns/Campaign.php Thu Apr 27 23:19:07 2006 @@ -60,6 +60,8 @@ function get_contacts($id) { + global $log; + $log->debug("Entering get_contacts(".$id.") method ..."); global $mod_strings; $focus = new Contact(); @@ -67,11 +69,13 @@ $returnset = '&return_module=Campaigns&return_action=DetailView&return_id='.$id; $query = 'SELECT contactdetails.*, crmentity.crmid, users.user_name, groups.groupname, crmentity.smownerid from contactdetails inner join crmentity on crmentity.crmid = contactdetails.contactid left join users on crmentity.smownerid = users.id left join contactgrouprelation on contactdetails.contactid=contactgrouprelation.contactid left join groups on groups.groupname=contactgrouprelation.groupname where crmentity.deleted=0 and contactdetails.campaignid = '.$id; - + $log->debug("Exiting get_contacts method ..."); return GetRelatedList('Campaigns','Contacts',$focus,$query,$button,$returnset); } function get_leads($id) { + global $log; + $log->debug("Entering get_leads(".$id.") method ..."); global $mod_strings; $focus = new Lead(); @@ -80,7 +84,7 @@ $returnset = '&return_module=Campaigns&return_action=DetailView&return_id='.$id; $query = 'SELECT leaddetails.*, crmentity.crmid, users.user_name, groups.groupname, crmentity.smownerid from leaddetails inner join crmentity on crmentity.crmid = leaddetails.leadid left join users on crmentity.smownerid = users.id left join leadgrouprelation on leaddetails.leadid=leadgrouprelation.leadid left join groups on groups.groupname=leadgrouprelation.groupname where crmentity.deleted=0 and leaddetails.campaignid = '.$id; - + $log->debug("Exiting get_leads method ..."); return GetRelatedList('Campaigns','Leads',$focus,$query,$button,$returnset); } From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 22:37:25 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 05:37:25 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5562 - /vtigercrm/trunk/modules/Activities/Activity.php Message-ID: <20060428053725.B95FE6B50DE@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 23:37:21 2006 New Revision: 5562 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/modules/Activities/Activity.php Modified: vtigercrm/trunk/modules/Activities/Activity.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 22:39:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 05:39:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5563 - /vtigercrm/trunk/modules/Activities/Event.php Message-ID: <20060428053937.572D56B0473@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 23:39:33 2006 New Revision: 5563 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/modules/Activities/Event.php Modified: vtigercrm/trunk/modules/Activities/Event.php ============================================================================== --- vtigercrm/trunk/modules/Activities/Event.php (original) +++ vtigercrm/trunk/modules/Activities/Event.php Thu Apr 27 23:39:33 2006 @@ -86,14 +86,17 @@ function getCount($user_name) { + global $log; + $log->debug("Entering getCount(".$user_name.") method ..."); $query = "select count(*) from tasks inner join users on users.id=tasks.assigned_user_id where user_name='" .$user_name ."' and tasks.deleted=0"; // echo "\n Query is " .$query ."\n"; $result = $this->db->query($query,true,"Error retrieving contacts count"); $rows_found = $this->db->getRowCount($result); $row = $this->db->fetchByAssoc($result, 0); + - + $log->debug("Exiting getCount method ..."); return $row["count(*)"]; } From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 22:43:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 05:43:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5564 - /vtigercrm/trunk/modules/Activities/OpenListView.php Message-ID: <20060428054359.34B136B0473@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 23:43:55 2006 New Revision: 5564 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/modules/Activities/OpenListView.php Modified: vtigercrm/trunk/modules/Activities/OpenListView.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 22:47:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 05:47:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5565 - /vtigercrm/trunk/modules/Activities/RenderRelatedListUI.php Message-ID: <20060428054724.05AB46D8FCF@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 23:47:21 2006 New Revision: 5565 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/modules/Activities/RenderRelatedListUI.php Modified: vtigercrm/trunk/modules/Activities/RenderRelatedListUI.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 22:49:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 05:49:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5566 - /vtigercrm/trunk/modules/Activities/Save.php Message-ID: <20060428054941.44D056D8FCF@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 23:49:37 2006 New Revision: 5566 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/modules/Activities/Save.php Modified: vtigercrm/trunk/modules/Activities/Save.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 22:54:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 05:54:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5567 - /vtigercrm/trunk/modules/Activities/Forms.php Message-ID: <20060428055412.4B8166D9008@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 23:54:07 2006 New Revision: 5567 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/modules/Activities/Forms.php Modified: vtigercrm/trunk/modules/Activities/Forms.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 23:24:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 06:24:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5568 - /vtigercrm/trunk/modules/Contacts/Contact.php Message-ID: <20060428062433.DF1C26D9038@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 28 00:24:24 2006 New Revision: 5568 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/modules/Contacts/Contact.php Modified: vtigercrm/trunk/modules/Contacts/Contact.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/Contact.php (original) +++ vtigercrm/trunk/modules/Contacts/Contact.php Fri Apr 28 00:24:24 2006 @@ -155,27 +155,33 @@ // Mike Crowe Mod --------------------------------------------------------Default ordering for us function getSortOrder() { + global $log; + $log->debug("Entering getSortOrder() method ..."); if(isset($_REQUEST['sorder'])) $sorder = $_REQUEST['sorder']; else $sorder = (($_SESSION['CONTACTS_SORT_ORDER'] != '')?($_SESSION['CONTACTS_SORT_ORDER']):($this->default_sort_order)); - + $log->debug("Exiting getSortOrder method ..."); return $sorder; } function getOrderBy() { + global $log; + $log->debug("Entering getOrderBy() method ..."); if (isset($_REQUEST['order_by'])) $order_by = $_REQUEST['order_by']; else $order_by = (($_SESSION['CONTACTS_ORDER_BY'] != '')?($_SESSION['CONTACTS_ORDER_BY']):($this->default_order_by)); - + $log->debug("Exiting getOrderBy method ..."); return $order_by; } // Mike Crowe Mod -------------------------------------------------------- function getCount($user_name) { + global $log; + $log->debug("Entering getCount(".$user_name.") method ..."); $query = "select count(*) from contactdetails inner join crmentity on crmentity.crmid=contactdetails.contactid inner join users on users.id=crmentity.smownerid where user_name='" .$user_name ."' and crmentity.deleted=0"; $result = $this->db->query($query,true,"Error retrieving contacts count"); @@ -183,20 +189,27 @@ $row = $this->db->fetchByAssoc($result, 0); - return $row["count(*)"]; + $log->debug("Exiting getCount method ..."); + return $row["count(*)"]; } function get_contacts1($user_name,$email_address) { + global $log; + $log->debug("Entering get_contacts1(".$user_name.",".$email_address.") method ..."); $query = "select users.user_name,groups.groupname, contactdetails.lastname last_name,contactdetails.firstname first_name,contactdetails.contactid as id, contactdetails.salutation as salutation, contactdetails.email as email1,contactdetails.title as title,contactdetails.mobile as phone_mobile,account.accountname as account_name,account.accountid as account_id from contactdetails inner join crmentity on crmentity.crmid=contactdetails.contactid inner join users on users.id=crmentity.smownerid left join account on account.accountid=contactdetails.accountid left join contactaddress on contactaddress.contactaddressid=contactdetails.contactid left join contactgrouprelation on contactdetails.contactid=contactgrouprelation.contactid where user_name='" .$user_name ."' and crmentity.deleted=0 and contactdetails.email like '%" .$email_address ."%' limit 50"; + $log->debug("Exiting get_contacts1 method ..."); return $this->process_list_query1($query); } function get_contacts($user_name,$from_index,$offset) { + global $log; + $log->debug("Entering get_contacts(".$user_name.",".$from_index.",".$offset.") method ..."); $query = "select users.user_name,groups.groupname,contactdetails.department department, contactdetails.phone office_phone, contactdetails.fax fax, contactsubdetails.assistant assistant_name, contactsubdetails.otherphone other_phone, contactsubdetails.homephone home_phone,contactsubdetails.birthday birthdate, contactdetails.lastname last_name,contactdetails.firstname first_name,contactdetails.contactid as id, contactdetails.salutation as salutation, contactdetails.email as email1,contactdetails.title as title,contactdetails.mobile as phone_mobile,account.accountname as account_name,account.accountid as account_id, contactaddress.mailingcity as primary_address_city,contactaddress.mailingstreet as primary_address_street, contactaddress.mailingcountry as primary_address_country,contactaddress.mailingstate as primary_address_state, contactaddress.mailingzip as primary_address_postalcode, contactaddress.othercity as alt_address_city,contactaddress.otherstreet as alt_address_street, contactaddress.othercountry as alt_address_country,contactaddress.otherstate as alt_address_state, contactaddress.otherzip as alt_address_postalcode from contactdetails inner join crmentity on crmentity.crmid=contactdetails.contactid inner join users on users.id=crmentity.smownerid left join account on account.accountid=contactdetails.accountid left join contactaddress on contactaddress.contactaddressid=contactdetails.contactid left join contactsubdetails on contactsubdetails.contactsubscriptionid = contactdetails.contactid left join contactgrouprelation on contactdetails.contactid=contactgrouprelation.contactid left join groups on groups.groupname=contactgrouprelation.groupname left join users on crmentity.smownerid=users.id where user_name='" .$user_name ."' and crmentity.deleted=0 limit " .$from_index ."," .$offset; + $log->debug("Exiting get_contacts method ..."); return $this->process_list_query1($query); } @@ -204,6 +217,8 @@ function process_list_query1($query) { + global $log; + $log->debug("Entering process_list_query1(".$query.") method ..."); $result =& $this->db->query($query,true,"Error retrieving $this->object_name list: "); $list = Array(); @@ -240,6 +255,7 @@ $response['previous_offset'] = $previous_offset; + $log->debug("Exiting process_list_query1 method ..."); return $response; } @@ -252,6 +268,7 @@ function get_opportunities($id) { global $log; + $log->debug("Entering get_opportunities(".$id.") method ..."); global $mod_strings; $focus = new Potential(); @@ -270,6 +287,7 @@ $query = 'select users.user_name,groups.groupname,contactdetails.accountid, contactdetails.contactid , potential.potentialid, potential.potentialname, potential.potentialtype, potential.sales_stage, potential.amount, potential.closingdate, crmentity.crmid, crmentity.smownerid from contactdetails inner join potential on contactdetails.accountid = potential.accountid inner join crmentity on crmentity.crmid = potential.potentialid left join potentialgrouprelation on potential.potentialid=potentialgrouprelation.potentialid left join groups on groups.groupname=potentialgrouprelation.groupname left join users on users.id=crmentity.smownerid where contactdetails.contactid = '.$id.' and crmentity.deleted=0'; if($this->column_fields['account_id'] != 0) + $log->debug("Exiting get_opportunities method ..."); return GetRelatedList('Contacts','Potentials',$focus,$query,$button,$returnset); } @@ -281,7 +299,8 @@ */ function get_activities($id) { - global $log; + global $log; + $log->debug("Entering get_activities(".$id.") method ..."); global $mod_strings; $focus = new Activity(); @@ -298,13 +317,15 @@ $log->info("Activity Related List for Contact Displayed"); $query = "SELECT contactdetails.lastname, contactdetails.firstname, activity.activityid , activity.subject, activity.activitytype, activity.date_start, activity.due_date, cntactivityrel.contactid, crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, recurringevents.recurringtype from contactdetails inner join cntactivityrel on cntactivityrel.contactid = contactdetails.contactid inner join activity on cntactivityrel.activityid=activity.activityid inner join crmentity on crmentity.crmid = cntactivityrel.activityid left outer join recurringevents on recurringevents.activityid=activity.activityid left join activitygrouprelation on activitygrouprelation.activityid=crmentity.crmid left join groups on groups.groupname=activitygrouprelation.groupname where contactdetails.contactid=".$id." and crmentity.deleted = 0 and (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task') AND ( activity.status is NULL || activity.status != 'Completed' ) and ( activity.eventstatus is NULL || activity.eventstatus != 'Held') and ( activity.eventstatus is NULL || activity.eventstatus != 'Not Held' )"; //recurring type is added in Query -Jaguar - + $log->debug("Exiting get_activities method ..."); return GetRelatedList('Contacts','Activities',$focus,$query,$button,$returnset); } function get_history($id) { + global $log; + $log->debug("Entering get_history(".$id.") method ..."); $query = "SELECT activity.activityid, activity.subject, activity.status, activity.eventstatus, activity.activitytype, contactdetails.contactid, contactdetails.firstname, contactdetails.lastname, crmentity.modifiedtime, @@ -321,7 +342,7 @@ and (activity.status = 'Completed' or activity.status = 'Deferred' or (activity.eventstatus != 'Planned' and activity.eventstatus != '')) and cntactivityrel.contactid=".$id; //Don't add order by, because, for security, one more condition will be added with this query in include/RelatedListView.php - + $log->debug("Entering get_history method ..."); return getHistory('Contacts',$query,$id); } @@ -329,7 +350,7 @@ { global $log; global $app_strings; - + $log->debug("Entering get_tickets(".$id.") method ..."); $focus = new HelpDesk(); $button = ' '; @@ -337,12 +358,14 @@ $query = "select crmentity.crmid, troubletickets.title, contactdetails.contactid, troubletickets.parent_id, contactdetails.firstname, contactdetails.lastname, troubletickets.status, troubletickets.priority, crmentity.smownerid from troubletickets inner join crmentity on crmentity.crmid=troubletickets.ticketid left join contactdetails on contactdetails.contactid=troubletickets.parent_id left join users on users.id=crmentity.smownerid left join ticketgrouprelation on troubletickets.ticketid=ticketgrouprelation.ticketid left join groups on groups.groupname=ticketgrouprelation.groupname where crmentity.deleted=0 and contactdetails.contactid=".$id; $log->info("Ticket Related List for Contact Displayed"); + $log->debug("Exiting get_tickets method ..."); return GetRelatedList('Contacts','HelpDesk',$focus,$query,$button,$returnset); } function get_attachments($id) { global $log; + $log->debug("Entering get_attachments(".$id.") method ..."); $query = "select notes.title,'Notes ' ActivityType, notes.filename, attachments.type FileType,crm2.modifiedtime lastmodified, seattachmentsrel.attachmentsid attachmentsid, notes.notesid crmid, @@ -367,11 +390,14 @@ where crmentity.crmid=".$id." order by createdtime desc"; $log->info("Notes&Attachmenmts for Contact Displayed"); + $log->debug("Exiting get_attachments method ..."); return getAttachmentsAndNotes('Contacts',$query,$id); } function get_quotes($id) { + global $log; + $log->debug("Entering get_quotes(".$id.") method ..."); global $app_strings; require_once('modules/Quotes/Quote.php'); $focus = new Quote(); @@ -383,11 +409,14 @@ } $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; $query = "select crmentity.*, quotes.*,potential.potentialname,contactdetails.lastname from quotes inner join crmentity on crmentity.crmid=quotes.quoteid left outer join contactdetails on contactdetails.contactid=quotes.contactid left outer join potential on potential.potentialid=quotes.potentialid left join quotegrouprelation on quotes.quoteid=quotegrouprelation.quoteid left join groups on groups.groupname=quotegrouprelation.groupname where crmentity.deleted=0 and contactdetails.contactid=".$id; + $log->debug("Exiting get_quotes method ..."); return GetRelatedList('Contacts','Quotes',$focus,$query,$button,$returnset); } function get_salesorder($id) { + global $log; + $log->debug("Entering get_salesorder(".$id.") method ..."); require_once('modules/SalesOrder/SalesOrder.php'); global $app_strings; $focus = new SalesOrder(); @@ -401,12 +430,14 @@ $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; $query = "select crmentity.*, salesorder.*, quotes.subject as quotename, account.accountname, contactdetails.lastname from salesorder inner join crmentity on crmentity.crmid=salesorder.salesorderid left outer join quotes on quotes.quoteid=salesorder.quoteid left outer join account on account.accountid=salesorder.accountid left outer join contactdetails on contactdetails.contactid=salesorder.contactid left join sogrouprelation on salesorder.salesorderid=sogrouprelation.salesorderid left join groups on groups.groupname=sogrouprelation.groupname where crmentity.deleted=0 and salesorder.contactid = ".$id; + $log->debug("Exiting get_salesorder method ..."); return GetRelatedList('Contacts','SalesOrder',$focus,$query,$button,$returnset); } function get_products($id) { - + global $log; + $log->debug("Entering get_products(".$id.") method ..."); global $app_strings; require_once('modules/Products/Product.php'); $focus = new Product(); @@ -420,11 +451,14 @@ $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; $query = 'select products.productid, products.productname, products.productcode, products.commissionrate, products.qty_per_unit, products.unit_price, crmentity.crmid, crmentity.smownerid,contactdetails.lastname from products inner join crmentity on crmentity.crmid = products.productid left outer join contactdetails on contactdetails.contactid = products.contactid where contactdetails.contactid = '.$id.' and crmentity.deleted = 0'; + $log->debug("Exiting get_products method ..."); return GetRelatedList('Contacts','Products',$focus,$query,$button,$returnset); } function get_purchase_orders($id) { + global $log; + $log->debug("Entering get_purchase_orders(".$id.") method ..."); global $app_strings; require_once('modules/PurchaseOrder/PurchaseOrder.php'); $focus = new Order(); @@ -439,6 +473,7 @@ $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; $query = "select crmentity.*, purchaseorder.*,vendor.vendorname,contactdetails.lastname from purchaseorder inner join crmentity on crmentity.crmid=purchaseorder.purchaseorderid left outer join vendor on purchaseorder.vendorid=vendor.vendorid left outer join contactdetails on contactdetails.contactid=purchaseorder.contactid left join pogrouprelation on purchaseorder.purchaseorderid=pogrouprelation.purchaseorderid left join groups on groups.groupname=pogrouprelation.groupname where crmentity.deleted=0 and purchaseorder.contactid=".$id; + $log->debug("Exiting get_purchase_orders method ..."); return GetRelatedList('Contacts','PurchaseOrder',$focus,$query,$button,$returnset); } @@ -450,6 +485,7 @@ function get_emails($id) { global $log; + $log->debug("Entering get_emails(".$id.") method ..."); global $mod_strings; $focus = new Email(); @@ -465,6 +501,7 @@ $log->info("Email Related List for Contact Displayed"); $query = 'select activity.activityid, activity.activityid, activity.subject, activity.activitytype, users.user_name, crmentity.modifiedtime, crmentity.crmid, crmentity.smownerid, activity.date_start from activity, seactivityrel, contactdetails, users, crmentity left join activitygrouprelation on activitygrouprelation.activityid=crmentity.crmid left join groups on groups.groupname=activitygrouprelation.groupname where seactivityrel.activityid = activity.activityid and contactdetails.contactid = seactivityrel.crmid and users.id=crmentity.smownerid and crmentity.crmid = activity.activityid and contactdetails.contactid = '.$id.' and activity.activitytype="Emails" and crmentity.deleted = 0'; + $log->debug("Exiting get_emails method ..."); return GetRelatedList('Contacts','Emails',$focus,$query,$button,$returnset); } @@ -475,6 +512,7 @@ function create_export_query(&$order_by, &$where) { global $log; + $log->debug("Entering create_export_query(".$order_by.",".$where.") method ..."); if($this->checkIfCustomTableExists('contactscf')) { $query = $this->constructCustomQueryAddendum('contactscf','Contacts') .", @@ -504,6 +542,7 @@ where crmentity.deleted=0 and users.status='Active' "; } $log->info("Export Query Constructed Successfully"); + $log->debug("Exiting create_export_query method ..."); return $query; } @@ -511,6 +550,8 @@ //Used By vtigerCRM Word Add-In function getColumnNames() { + global $log; + $log->debug("Entering getColumnNames() method ..."); $sql1 = "select fieldlabel from field where tabid=4 and block <> 4"; $result = $this->db->query($sql1); $numRows = $this->db->num_rows($result); @@ -521,6 +562,7 @@ $custom_fields[$i] = strtoupper($custom_fields[$i]); } $mergeflds = $custom_fields; + $log->debug("Exiting getColumnNames method ..."); return $mergeflds; } //End @@ -528,6 +570,8 @@ //Used By vtigerCRM Outlook Add-In function get_searchbyemailid($username,$emailaddress) { + global $log; + $log->debug("Entering get_searchbyemailid(".$username.",".$emailaddress.") method ..."); $query = "select contactdetails.lastname as last_name,contactdetails.firstname as first_name, contactdetails.contactid as id, contactdetails.salutation as salutation, contactdetails.email as email1,contactdetails.title as title, @@ -539,11 +583,14 @@ left join contactaddress on contactaddress.contactaddressid=contactdetails.contactid where user_name='" .$username ."' and crmentity.deleted=0 and contactdetails.email like '%".$emailaddress."%'"; + $log->debug("Exiting get_searchbyemailid method ..."); return $this->process_list_query1($query); } function get_contactsforol($user_name) { + global $log; + $log->debug("Entering get_contactsforol(".$user_name.") method ..."); $query = "select contactdetails.department department, contactdetails.phone, contactdetails.fax, contactsubdetails.assistant assistant_name, contactsubdetails.assistantphone, @@ -566,6 +613,7 @@ left join contactsubdetails on contactsubdetails.contactsubscriptionid = contactdetails.contactid where users.user_name='" .$user_name ."' and crmentity.deleted=0"; + $log->debug("Exiting get_contactsforol method ..."); return $query; } //End From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 23:25:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 06:25:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5569 - /vtigercrm/trunk/modules/Contacts/Save.php Message-ID: <20060428062524.0A7806D9038@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 28 00:25:14 2006 New Revision: 5569 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/modules/Contacts/Save.php Modified: vtigercrm/trunk/modules/Contacts/Save.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 23:28:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 06:28:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5570 - /vtigercrm/trunk/modules/Contacts/Forms.php Message-ID: <20060428062834.2C5FD6D9038@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 28 00:28:25 2006 New Revision: 5570 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/modules/Contacts/Forms.php Modified: vtigercrm/trunk/modules/Contacts/Forms.php ============================================================================== Binary files - no diff available. From vtiger-tickets at vtiger.fosslabs.com Thu Apr 27 23:42:09 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 06:42:09 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23750=3A_?= =?utf-8?q?Integrate_code_contributions?= In-Reply-To: <076.b16a74c382aa688de221822029b26245@vtiger.fosslabs.com> References: <076.b16a74c382aa688de221822029b26245@vtiger.fosslabs.com> Message-ID: <085.e3dfb1fa013f57ff984f5354003bb145@vtiger.fosslabs.com> #750: Integrate code contributions ------------------------+--------------------------------------------------- Reporter: allanbush | Owner: richie Type: defect | Status: new Priority: minor | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc3 Resolution: | Keywords: ------------------------+--------------------------------------------------- Comment (by allanbush): (In [5571]) Added rdhital's pagination in related modules view (http://forums.vtiger.com/viewtopic.php?t=4861). Refs #750. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 23:42:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 06:42:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5571 - in /vtigercrm/branches/4.2/include: RelatedListView.html RelatedListView.php uifromdbutil.php utils.php Message-ID: <20060428064209.046EF6D9544@vtiger.fosslabs.com> Author: allanbush Date: Fri Apr 28 00:42:05 2006 New Revision: 5571 Log: Added rdhital's pagination in related modules view (http://forums.vtiger.com/viewtopic.php?t=4861). Refs #750. Modified: vtigercrm/branches/4.2/include/RelatedListView.html (contents, props changed) vtigercrm/branches/4.2/include/RelatedListView.php vtigercrm/branches/4.2/include/uifromdbutil.php vtigercrm/branches/4.2/include/utils.php Modified: vtigercrm/branches/4.2/include/RelatedListView.html ============================================================================== Binary files - no diff available. Modified: vtigercrm/branches/4.2/include/RelatedListView.php ============================================================================== --- vtigercrm/branches/4.2/include/RelatedListView.php (original) +++ vtigercrm/branches/4.2/include/RelatedListView.php Fri Apr 28 00:42:05 2006 @@ -98,17 +98,14 @@ $noofrows = $adb->num_rows($list_result); //Retreiving the start value from request -if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') -{ - $start = $_REQUEST['start']; -} -else -{ - +$start_idx = $relatedmodule.'start'; +if(isset($_REQUEST[$start_idx]) && $_REQUEST[$start_idx] != '') { + $start = $_REQUEST[$start_idx]; +} else { $start = 1; } //Retreive the Navigation array -$navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page); +$navigation_array = getRelatedNavigationValues($start, $noofrows, $list_max_entries_per_page, $relatedmodule); //Retreive the List View Table Header if($noofrows == 0) @@ -118,7 +115,7 @@ else { $listview_header = getListViewHeader($focus,$relatedmodule,'','','','relatedlist');//"Accounts"); - if ($noofrows > 15) + if ($navigation_array[$relatedmodule.'end_val'] - $navigation_array[$relatedmodule.'start'] > 15) { $xtpl->assign('SCROLLSTART','
        '); $xtpl->assign('SCROLLSTOP','
        '); @@ -144,10 +141,25 @@ //$listview_entries = getListViewEntries1($focus,"Accounts",$list_result,$navigation_array); $xtpl->assign("LISTENTITY", $listview_entries); $xtpl->assign("SELECT_SCRIPT", $view_script); - $navigationOutput = getTableHeaderNavigation($navigation_array, $url_qry,$relatedmodule); + $navigationOutput = getTableHeaderNavigation($navigation_array, $url_qry,$relatedmodule, 'DetailView', ''); //echo $navigationOutput; - //$xtpl->assign("NAVIGATION", $navigationOutput); + $navigationOutput = ' + + + + +
        + + '.$navigationOutput.' +
        +
        '; + + + if($navigation_array[$relatedmodule.'allflag'] != 'All' || $navigation_array[$relatedmodule.'verylast'] > 1) { + // only show if navigation is possible + $xtpl->assign("NAVIGATION", $navigationOutput); + } $xtpl->parse("main"); $xtpl->out("main"); Modified: vtigercrm/branches/4.2/include/uifromdbutil.php ============================================================================== --- vtigercrm/branches/4.2/include/uifromdbutil.php (original) +++ vtigercrm/branches/4.2/include/uifromdbutil.php Fri Apr 28 00:42:05 2006 @@ -137,30 +137,42 @@ global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; + + $record = isset($_REQUEST['record']) ? $_REQUEST['record'] : ''; + $relmodule = $_REQUEST['module'] == $module ? '' : $module; + $start = $relmodule.'start'; + $end_val = $relmodule.'end_val'; + $first = $relmodule.'first'; + $end = $relmodule.'end'; + $allflag = $relmodule.'allflag'; + $current = $relmodule.'current'; + $next = $relmodule.'next'; + $verylast = $relmodule.'verylast'; + $prev = $relmodule.'prev'; + $dir_name = $_REQUEST['module']; + $output = ''; - - $dir_name=getModuleDirName($module); - $output .= ''.$navigation_array['allflag'].' '; - if(($navigation_array['prev']) != 0) { - $output .= ' '; - $output .= ' '; + $output .= ''.$navigation_array[$allflag].' '; + if(($navigation_array[$prev]) != 0) { + $output .= ' '; + $output .= ' '; } else { $output .= ' '; $output .= ' '; } - for ($i=$navigation_array['first'];$i<=$navigation_array['end'];$i++) { - if ($navigation_array['current']==$i) { + for ($i=$navigation_array[$first];$i<=$navigation_array[$end];$i++) { + if ($navigation_array[$current]==$i) { $output .=''.$i.' '; } else { - $output .= ''.$i.' '; + $output .= ''.$i.' '; } } - if(($navigation_array['next']) !=0) { - $output .= ' '; - $output .= ' '; + if(($navigation_array[$next]) !=0) { + $output .= ' '; + $output .= ' '; } else { $output .= ' '; $output .= ' '; Modified: vtigercrm/branches/4.2/include/utils.php ============================================================================== --- vtigercrm/branches/4.2/include/utils.php (original) +++ vtigercrm/branches/4.2/include/utils.php Fri Apr 28 00:42:05 2006 @@ -2485,24 +2485,39 @@ } return $user_id; } -//outlook security + function getNavigationValues($display, $noofrows, $limit) +{ + return getRelatedNavigationValues($display, $noofrows, $limit, ''); +} + +function getRelatedNavigationValues($display, $noofrows, $limit, $relatedmodule) { global $limitpage_navigation; if(!isset($limitpage_navigation)) $limitpage_navigation = 5; $navigation_array = Array(); - if(isset($_REQUEST['allflag']) && $_REQUEST['allflag'] == 'All') { - $navigation_array['start'] =1; - $navigation_array['first'] = 1; - $navigation_array['end'] = 1; - $navigation_array['prev'] =0; - $navigation_array['next'] =0; - $navigation_array['end_val'] =$noofrows; - $navigation_array['current'] =1; - $navigation_array['allflag'] ='Normal'; - $navigation_array['verylast'] =1; + $start_idx = $relatedmodule.'start'; + $first_idx = $relatedmodule.'first'; + $end_idx = $relatedmodule.'end'; + $prev_idx = $relatedmodule.'prev'; + $next_idx = $relatedmodule.'next'; + $end_val_idx = $relatedmodule.'end_val'; + $allflag_idx = $relatedmodule.'allflag'; + $current_idx = $relatedmodule.'current'; + $verylast_idx = $relatedmodule.'verylast'; + + if(isset($_REQUEST[$allflag_idx]) && $_REQUEST[$allflag_idx] == 'All') { + $navigation_array[$start_idx] =1; + $navigation_array[$first_idx] = 1; + $navigation_array[$end_idx] = 1; + $navigation_array[$prev_idx] =0; + $navigation_array[$next_idx] =0; + $navigation_array[$end_val_idx] =$noofrows; + $navigation_array[$current_idx] =1; + $navigation_array[$allflag_idx] ='Normal'; + $navigation_array[$verylast_idx] =1; return $navigation_array; } @@ -2537,15 +2552,15 @@ $next=0; } - $navigation_array['start'] = $start; - $navigation_array['first'] = $first; - $navigation_array['end'] = $last; - $navigation_array['prev'] = $previous; - $navigation_array['next'] = $next; - $navigation_array['end_val'] = $end; - $navigation_array['current'] = $display; - $navigation_array['allflag'] ='All'; - $navigation_array['verylast'] =$paging; + $navigation_array[$start_idx] = $start; + $navigation_array[$first_idx] = $first; + $navigation_array[$end_idx] = $last; + $navigation_array[$prev_idx] = $previous; + $navigation_array[$next_idx] = $next; + $navigation_array[$end_val_idx] = $end; + $navigation_array[$current_idx] = $display; + $navigation_array[$allflag_idx] ='All'; + $navigation_array[$verylast_idx] =$paging; return $navigation_array; } @@ -3034,7 +3049,10 @@ } } - for ($i=$navigation_array['start']; $i<=$navigation_array['end_val']; $i++) + $relmodule = $_REQUEST['module'] == $module || $_REQUEST['module'] == 'Home' ? '' : $module; + $start = $relmodule.'start'; + $end_val = $relmodule.'end_val'; + for ($i=$navigation_array[$start]; $i<=$navigation_array[$end_val]; $i++) { if (($i%2)==0) $list_header .= ''; From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 28 00:06:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 07:06:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5572 - /vtigercrm/trunk/modules/Potentials/Forms.php Message-ID: <20060428070612.DF5776AB5F0@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 28 01:05:45 2006 New Revision: 5572 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/modules/Potentials/Forms.php Modified: vtigercrm/trunk/modules/Potentials/Forms.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 28 00:20:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 07:20:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5573 - /vtigercrm/trunk/modules/Potentials/ListViewTop.php Message-ID: <20060428072020.DC87E6DAC2C@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 28 01:20:03 2006 New Revision: 5573 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/modules/Potentials/ListViewTop.php Modified: vtigercrm/trunk/modules/Potentials/ListViewTop.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 28 00:21:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 07:21:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5574 - /vtigercrm/trunk/modules/Potentials/Opportunity.php Message-ID: <20060428072148.BF4D26DAC2C@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 28 01:21:35 2006 New Revision: 5574 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/modules/Potentials/Opportunity.php Modified: vtigercrm/trunk/modules/Potentials/Opportunity.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 28 00:22:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 07:22:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5575 - /vtigercrm/trunk/modules/Potentials/Charts.php Message-ID: <20060428072237.BB1DF6DAC2C@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 28 01:22:19 2006 New Revision: 5575 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/modules/Potentials/Charts.php Modified: vtigercrm/trunk/modules/Potentials/Charts.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 28 00:49:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 07:49:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5576 - /vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php Message-ID: <20060428074907.BA7496DB0B5@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 28 01:48:54 2006 New Revision: 5576 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php Modified: vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php Fri Apr 28 01:48:54 2006 @@ -116,6 +116,8 @@ */ function get_activities($id) { + global $log; + $log->debug("Entering get_activities(".$id.") method ..."); global $app_strings; require_once('modules/Activities/Activity.php'); $focus = new Activity(); @@ -125,6 +127,7 @@ $returnset = '&return_module=PurchaseOrder&return_action=DetailView&return_id='.$id; $query = "SELECT contactdetails.lastname, contactdetails.firstname, contactdetails.contactid,activity.*,seactivityrel.*,crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, users.user_name from activity inner join seactivityrel on seactivityrel.activityid=activity.activityid inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid = cntactivityrel.contactid left join users on users.id=crmentity.smownerid left join activitygrouprelation on activitygrouprelation.activityid=crmentity.crmid left join groups on groups.groupname=activitygrouprelation.groupname where seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and crmentity.deleted=0 and (activity.status is not NULL && activity.status != 'Completed') and (activity.status is not NULL && activity.status != 'Deferred') or (activity.eventstatus != '' && activity.eventstatus = 'Planned')"; + $log->debug("Exiting get_activities method ..."); return GetRelatedList('PurchaseOrder','Activities',$focus,$query,$button,$returnset); } @@ -134,6 +137,8 @@ */ function get_history($id) { + global $log; + $log->debug("Entering get_history(".$id.") method ..."); $query = "SELECT contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, activity.* ,seactivityrel.*, crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, crmentity.createdtime, crmentity.description, users.user_name @@ -150,6 +155,7 @@ and seactivityrel.crmid=".$id; //Don't add order by, because, for security, one more condition will be added with this query in include/RelatedListView.php + $log->debug("Exiting get_history method ..."); return getHistory('PurchaseOrder',$query,$id); } @@ -159,6 +165,8 @@ */ function get_attachments($id) { + global $log; + $log->debug("Entering get_attachments(".$id.") method ..."); // Armando L?scher 18.10.2005 -> ?visibleDescription // Desc: Inserted crm2.createdtime, notes.notecontent description, users.user_name // Inserted inner join users on crm2.smcreatorid= users.id @@ -190,6 +198,7 @@ inner join users on crm2.smcreatorid= users.id where crmentity.crmid=".$id." order by createdtime desc"; + $log->debug("Exiting get_attachments method ..."); return getAttachmentsAndNotes('PurchaseOrder',$query,$id,$sid='purchaseorderid'); } From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 28 00:50:19 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 07:50:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5577 - /vtigercrm/trunk/modules/SalesOrder/SalesOrder.php Message-ID: <20060428075019.740206D9544@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 28 01:50:06 2006 New Revision: 5577 Log: logs entries inserted in all functions 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 Fri Apr 28 01:50:06 2006 @@ -122,14 +122,17 @@ */ function get_activities($id) { + global $log; + $log->debug("Entering get_activities(".$id.") method ..."); global $app_strings; - require_once('modules/Activities/Activity.php'); + require_once('modules/Activities/Activity.php'); $focus = new Activity(); $button = ''; $returnset = '&return_module=SalesOrder&return_action=DetailView&return_id='.$id; $query = "SELECT contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, activity.*,seactivityrel.*,crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, users.user_name from activity inner join seactivityrel on seactivityrel.activityid=activity.activityid inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid = cntactivityrel.contactid left join users on users.id=crmentity.smownerid left join activitygrouprelation on activitygrouprelation.activityid=crmentity.crmid left join groups on groups.groupname=activitygrouprelation.groupname where seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and crmentity.deleted=0 and (activity.status is not NULL && activity.status != 'Completed') and (activity.status is not NULL && activity.status !='Deferred') or (activity.eventstatus != '' && activity.eventstatus = 'Planned')"; + $log->debug("Exiting get_activities method ..."); return GetRelatedList('SalesOrder','Activities',$focus,$query,$button,$returnset); } @@ -139,6 +142,8 @@ */ function get_history($id) { + global $log; + $log->debug("Entering get_history(".$id.") method ..."); $query = "SELECT contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, activity.*, seactivityrel.*, crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, crmentity.createdtime, crmentity.description, users.user_name @@ -155,6 +160,7 @@ and seactivityrel.crmid=".$id; //Don't add order by, because, for security, one more condition will be added with this query in include/RelatedListView.php + $log->debug("Exiting get_history method ..."); return getHistory('SalesOrder',$query,$id); } @@ -164,6 +170,8 @@ */ function get_attachments($id) { + global $log; + $log->debug("Entering get_attachments(".$id.") method ..."); // Armando L?scher 18.10.2005 -> ?visibleDescription // Desc: Inserted crmentity.createdtime, notes.notecontent description, users.user_name // Inserted inner join users on crmentity.smcreatorid= users.id @@ -195,6 +203,7 @@ inner join users on crmentity.smcreatorid= users.id where crmentity.crmid=".$id." order by createdtime desc"; + $log->debug("Exiting get_attachments method ..."); return getAttachmentsAndNotes('SalesOrder',$query,$id,$sid='salesorderid'); } @@ -204,6 +213,8 @@ */ function get_invoices($id) { + global $log; + $log->debug("Entering get_invoices(".$id.") method ..."); require_once('modules/Invoice/Invoice.php'); $focus = new Invoice(); @@ -213,6 +224,7 @@ $query = "select crmentity.*, invoice.*, account.accountname, salesorder.subject as salessubject from invoice inner join crmentity on crmentity.crmid=invoice.invoiceid left outer join account on account.accountid=invoice.accountid inner join salesorder on salesorder.salesorderid=invoice.salesorderid left join invoicegrouprelation on invoice.invoiceid=invoicegrouprelation.invoiceid left join groups on groups.groupname=invoicegrouprelation.groupname where crmentity.deleted=0 and salesorder.salesorderid=".$id; + $log->debug("Exiting get_invoices method ..."); return GetRelatedList('SalesOrder','Invoice',$focus,$query,$button,$returnset); } From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 28 00:51:31 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 07:51:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5578 - /vtigercrm/trunk/modules/Quotes/Quote.php Message-ID: <20060428075131.6FDC56DB0B5@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 28 01:51:16 2006 New Revision: 5578 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/modules/Quotes/Quote.php Modified: vtigercrm/trunk/modules/Quotes/Quote.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/Quote.php (original) +++ vtigercrm/trunk/modules/Quotes/Quote.php Fri Apr 28 01:51:16 2006 @@ -116,32 +116,40 @@ function get_salesorder($id) { + global $log; + $log->debug("Entering get_salesorder(".$id.") method ..."); require_once('modules/SalesOrder/SalesOrder.php'); - $focus = new SalesOrder(); + $focus = new SalesOrder(); $button = ''; $returnset = '&return_module=Quotes&return_action=DetailView&return_id='.$id; $query = "select crmentity.*, salesorder.*, quotes.subject as quotename, account.accountname from salesorder inner join crmentity on crmentity.crmid=salesorder.salesorderid left outer join quotes on quotes.quoteid=salesorder.quoteid left outer join account on account.accountid=salesorder.accountid left join sogrouprelation on salesorder.salesorderid=sogrouprelation.salesorderid left join groups on groups.groupname=sogrouprelation.groupname where crmentity.deleted=0 and salesorder.quoteid = ".$id; + $log->debug("Exiting get_salesorder method ..."); return GetRelatedList('Quotes','SalesOrder',$focus,$query,$button,$returnset); } function get_activities($id) { + global $log; + $log->debug("Entering get_activities(".$id.") method ..."); global $app_strings; require_once('modules/Activities/Activity.php'); - $focus = new Activity(); + $focus = new Activity(); $button = ''; $returnset = '&return_module=Quotes&return_action=DetailView&return_id='.$id; $query = "SELECT contactdetails.contactid, contactdetails.lastname, contactdetails.firstname, activity.*,seactivityrel.*,crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, users.user_name,recurringevents.recurringtype from activity inner join seactivityrel on seactivityrel.activityid=activity.activityid inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid = cntactivityrel.contactid left join users on users.id=crmentity.smownerid left outer join recurringevents on recurringevents.activityid=activity.activityid left join activitygrouprelation on activitygrouprelation.activityid=crmentity.crmid left join groups on groups.groupname=activitygrouprelation.groupname where seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and (activity.status is not NULL && activity.status != 'Completed') and (activity.status is not NULL && activity.status != 'Deferred') or (activity.eventstatus !='' && activity.eventstatus = 'Planned')"; + $log->debug("Exiting get_activities method ..."); return GetRelatedList('Quotes','Activities',$focus,$query,$button,$returnset); } function get_history($id) { + global $log; + $log->debug("Entering get_history(".$id.") method ..."); $query = "SELECT activity.activityid, activity.subject, activity.status, activity.eventstatus, activity.activitytype, contactdetails.contactid, contactdetails.firstname, contactdetails.lastname, crmentity.modifiedtime, @@ -159,6 +167,7 @@ and seactivityrel.crmid=".$id; //Don't add order by, because, for security, one more condition will be added with this query in include/RelatedListView.php + $log->debug("Exiting get_history method ..."); return getHistory('Quotes',$query,$id); } } From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 01:44:11 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 08:44:11 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23628=3A_?= =?utf-8?q?Issue_in_User_Detail_View?= In-Reply-To: <076.090b02b860493e91e7c111b10940640a@vtiger.fosslabs.com> References: <076.090b02b860493e91e7c111b10940640a@vtiger.fosslabs.com> Message-ID: <085.bec6f111ea8e226ecd635b5293045ca3@vtiger.fosslabs.com> #628: Issue in User Detail View ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: Browser ---------------------------+------------------------------------------------ Changes (by anonymous): * resolution: => duplicate * status: new => closed Comment: 630 -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 01:44:36 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 08:44:36 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23534=3A_?= =?utf-8?q?Issue_in_History?= In-Reply-To: <076.36403516d3a9ceec9637b1a7e733713f@vtiger.fosslabs.com> References: <076.36403516d3a9ceec9637b1a7e733713f@vtiger.fosslabs.com> Message-ID: <085.3a0591994962339219a65a92f8af2017@vtiger.fosslabs.com> #534: Issue in History ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: wontfix | Keywords: Related Lists ---------------------------+------------------------------------------------ Changes (by anonymous): * resolution: => wontfix * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 01:55:12 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 08:55:12 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23122=3A_?= =?utf-8?q?Issue_in_Mass_Delete?= In-Reply-To: <076.89726d02571017484d27333203347a97@vtiger.fosslabs.com> References: <076.89726d02571017484d27333203347a97@vtiger.fosslabs.com> Message-ID: <085.721edf9c40d0eb9398c2e6d1ce4cba9a@vtiger.fosslabs.com> #122: Issue in Mass Delete ------------------------+--------------------------------------------------- Reporter: jeri | Owner: philip Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: massdelete ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => duplicate * status: new => closed Comment: 121 -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 01:58:55 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 08:58:55 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23340=3A_?= =?utf-8?q?massdelete_in_ListView_shows_hacking_attempt?= In-Reply-To: <076.8bb0c18a8c6f0b2898b70887f00fcb22@vtiger.fosslabs.com> References: <076.8bb0c18a8c6f0b2898b70887f00fcb22@vtiger.fosslabs.com> Message-ID: <085.9251f9440dd326de8b9339ea47d56dc6@vtiger.fosslabs.com> #340: massdelete in ListView shows hacking attempt ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: massdelete ---------------------------+------------------------------------------------ Changes (by anonymous): * resolution: => duplicate * status: new => closed Comment: 340 -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 02:04:23 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:04:23 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23659=3A_?= =?utf-8?q?Editor_=28email/notes=29?= In-Reply-To: <076.eacd6674a1378a68e62435b8bb9421fd@vtiger.fosslabs.com> References: <076.eacd6674a1378a68e62435b8bb9421fd@vtiger.fosslabs.com> Message-ID: <085.c7ea17c57faed75b9d0f7246fa258440@vtiger.fosslabs.com> #659: Editor (email/notes) ------------------------+--------------------------------------------------- Reporter: Balduin | Owner: richie Type: defect | Status: new Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => richie Comment: i am unable to reproduce it here. Kindly let me know the steps that you have taken to get the issue. Thanks, Richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 02:06:20 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:06:20 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23489=3A_?= =?utf-8?q?scroll_bar_in_notes_editview?= In-Reply-To: <076.d4c6aa1353950d65538e5120738ca06a@vtiger.fosslabs.com> References: <076.d4c6aa1353950d65538e5120738ca06a@vtiger.fosslabs.com> Message-ID: <085.c6709f8f3f8105a3a817ece74c120c22@vtiger.fosslabs.com> #489: scroll bar in notes editview --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: --------------------------------+------------------------------------------- Changes (by anonymous): * resolution: => invalid * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 02:22:24 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:22:24 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23498=3A_?= =?utf-8?q?Validation_for_create_profile?= In-Reply-To: <076.1673d619387215c8f124824ecac30cb2@vtiger.fosslabs.com> References: <076.1673d619387215c8f124824ecac30cb2@vtiger.fosslabs.com> Message-ID: <085.82c8a08f1443ac1ffeefb9ebe3daaffa@vtiger.fosslabs.com> #498: Validation for create profile ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: validation ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 02:24:38 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:24:38 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23211=3A_?= =?utf-8?q?The_Assigned_to_Field_in_Leads_list_view_is_empty?= In-Reply-To: <076.8a65622385fd35a1361b3352db58a27a@vtiger.fosslabs.com> References: <076.8a65622385fd35a1361b3352db58a27a@vtiger.fosslabs.com> Message-ID: <085.f102825679654e6e49c623a502e20a28@vtiger.fosslabs.com> #211: The Assigned to Field in Leads list view is empty ------------------------+--------------------------------------------------- Reporter: don | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 02:24:45 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:24:45 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23274=3A_?= =?utf-8?q?Usability_Issue_in_Picklist_edit?= In-Reply-To: <076.4ffdd920d7a10450ecd5a4fafd680079@vtiger.fosslabs.com> References: <076.4ffdd920d7a10450ecd5a4fafd680079@vtiger.fosslabs.com> Message-ID: <085.6c73460a05e5dd0c20b5a0bdce0ab489@vtiger.fosslabs.com> #274: Usability Issue in Picklist edit ------------------------+--------------------------------------------------- Reporter: don | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => duplicate * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 02:25:12 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:25:12 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23516=3A_?= =?utf-8?q?Org_Sharing_privileges_UI_Issue?= In-Reply-To: <076.3238204aa46c47b221faa15a66761b82@vtiger.fosslabs.com> References: <076.3238204aa46c47b221faa15a66761b82@vtiger.fosslabs.com> Message-ID: <085.ac48f4363d2af75b4658df9a03bf4bc5@vtiger.fosslabs.com> #516: Org Sharing privileges UI Issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: anonymous Type: defect | Status: closed Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: Security ---------------------------+------------------------------------------------ Changes (by don): * resolution: => invalid * status: assigned => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 02:26:28 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:26:28 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23683=3A_?= =?utf-8?q?Settings_Menu_should_not_be_shown_in_My_Preference_Page?= In-Reply-To: <076.bf8980ab378cbfb991ebb9daeafbe17b@vtiger.fosslabs.com> References: <076.bf8980ab378cbfb991ebb9daeafbe17b@vtiger.fosslabs.com> Message-ID: <085.374776596b02c74d2e131381466d8aef@vtiger.fosslabs.com> #683: Settings Menu should not be shown in My Preference Page ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: ahmed Type: defect | Status: closed Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Users ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 02:28:46 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:28:46 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23582=3A_?= =?utf-8?q?Notes_Security_Issue?= In-Reply-To: <076.774ad43eec994f96640a83f35f43701e@vtiger.fosslabs.com> References: <076.774ad43eec994f96640a83f35f43701e@vtiger.fosslabs.com> Message-ID: <085.48ef14268c14057a26b54a0db308fe5a@vtiger.fosslabs.com> #582: Notes Security Issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Security ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 02:30:58 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:30:58 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23376=3A_?= =?utf-8?q?Issues_in_List_View_of_Tag_-_HelpDesk?= In-Reply-To: <076.a20bd48d395e5686a72ac3d38bf859e1@vtiger.fosslabs.com> References: <076.a20bd48d395e5686a72ac3d38bf859e1@vtiger.fosslabs.com> Message-ID: <085.9a11fc876b0a2cc83766035341884887@vtiger.fosslabs.com> #376: Issues in List View of Tag - HelpDesk ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => invalid * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 02:31:52 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:31:52 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23391=3A_?= =?utf-8?q?Issue_in_Profiles?= In-Reply-To: <076.b90f1eece8a6f489625e9df58a52bad4@vtiger.fosslabs.com> References: <076.b90f1eece8a6f489625e9df58a52bad4@vtiger.fosslabs.com> Message-ID: <085.b6d2a2b3377e2d71ad6c469afdfccba6@vtiger.fosslabs.com> #391: Issue in Profiles ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: profiles ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 02:32:42 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:32:42 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23468=3A_?= =?utf-8?q?Issue_in_List_View?= In-Reply-To: <076.7f645c990ec63ad9af747a3c7223e9ac@vtiger.fosslabs.com> References: <076.7f645c990ec63ad9af747a3c7223e9ac@vtiger.fosslabs.com> Message-ID: <085.733791bcbbbe75f59982cba4bdb59b8e@vtiger.fosslabs.com> #468: Issue in List View ------------------------+--------------------------------------------------- Reporter: don | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 02:32:43 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:32:43 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23499=3A_?= =?utf-8?q?Create_Profile_Issue?= In-Reply-To: <076.8c766e916e9590364dfb9cad98a94c57@vtiger.fosslabs.com> References: <076.8c766e916e9590364dfb9cad98a94c57@vtiger.fosslabs.com> Message-ID: <085.586d31f4bb773765b4a57af9ef9f97bd@vtiger.fosslabs.com> #499: Create Profile Issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 02:39:16 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:39:16 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23588=3A_?= =?utf-8?q?In_Users_List_View_the_role_link_is_not_proper?= In-Reply-To: <076.288cc004f52efd816910739cc64dd80b@vtiger.fosslabs.com> References: <076.288cc004f52efd816910739cc64dd80b@vtiger.fosslabs.com> Message-ID: <085.e7406140643a644d21c9724d1bfe834c@vtiger.fosslabs.com> #588: In Users List View the role link is not proper ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: ela Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: assigned => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 02:43:50 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:43:50 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23195=3A_?= =?utf-8?q?edit_picklist?= In-Reply-To: <076.2ce061c7989257e6a4907a4e0fdd829d@vtiger.fosslabs.com> References: <076.2ce061c7989257e6a4907a4e0fdd829d@vtiger.fosslabs.com> Message-ID: <085.4355370618164b92baf92de1b86b2f0c@vtiger.fosslabs.com> #195: edit picklist ------------------------+--------------------------------------------------- Reporter: richie | Owner: ela Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => ela -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 02:44:00 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:44:00 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23205=3A_?= =?utf-8?q?no_image_mail_server_info?= In-Reply-To: <076.d44d3396d8e036259f267ae772a82b40@vtiger.fosslabs.com> References: <076.d44d3396d8e036259f267ae772a82b40@vtiger.fosslabs.com> Message-ID: <085.5f23d24cd740fb9d291d465cb30f08cb@vtiger.fosslabs.com> #205: no image mail server info ------------------------+--------------------------------------------------- Reporter: richie | Owner: ela Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: mail server info ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => ela -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 02:44:07 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:44:07 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23228=3A_?= =?utf-8?q?migration_screen_to_be_revamped?= In-Reply-To: <076.cef784e4a7cc85c86c5698ecbe3dfa5a@vtiger.fosslabs.com> References: <076.cef784e4a7cc85c86c5698ecbe3dfa5a@vtiger.fosslabs.com> Message-ID: <085.f75d43cfe06fe6e82ea5c1e0a5547fa5@vtiger.fosslabs.com> #228: migration screen to be revamped ------------------------+--------------------------------------------------- Reporter: richie | Owner: ela Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: migration ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => ela -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 02:44:18 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:44:18 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23242=3A_?= =?utf-8?q?Security_Settings_-_LHS_navigation_missing_for_Roles_section?= In-Reply-To: <076.978f8d6d19ec9e1fa5607e8f75858cd8@vtiger.fosslabs.com> References: <076.978f8d6d19ec9e1fa5607e8f75858cd8@vtiger.fosslabs.com> Message-ID: <085.c7ee3aee6be45221adbf652fc82d212e@vtiger.fosslabs.com> #242: Security Settings - LHS navigation missing for Roles section ------------------------+--------------------------------------------------- Reporter: gopal | Owner: ela Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => ela -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 02:44:23 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:44:23 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23392=3A_?= =?utf-8?q?Issue_in_Field_Access_IE_browser?= In-Reply-To: <076.da3a82840e4830a891413c4cbde054cd@vtiger.fosslabs.com> References: <076.da3a82840e4830a891413c4cbde054cd@vtiger.fosslabs.com> Message-ID: <085.b34ed112d09162acff925cde0a10ccaa@vtiger.fosslabs.com> #392: Issue in Field Access IE browser ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: ela Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: UI ---------------------------+------------------------------------------------ Changes (by richie): * owner: developer => ela -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 02:44:43 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:44:43 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23153=3A_?= =?utf-8?q?More_Information=2C_Address_Information_fails_IE?= In-Reply-To: <076.6b87af7d35ac5bf492e6e729ae7b5c58@vtiger.fosslabs.com> References: <076.6b87af7d35ac5bf492e6e729ae7b5c58@vtiger.fosslabs.com> Message-ID: <085.02b0fe405d7448417b7f8b0f08270979@vtiger.fosslabs.com> #153: More Information, Address Information fails IE ------------------------+--------------------------------------------------- Reporter: richie | Owner: richie Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: More Info ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 02:44:55 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:44:55 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23119=3A_?= =?utf-8?q?Edit_and_Delete_button_missing_in_List_View?= In-Reply-To: <076.899bb8c824af029fef6ad40fc6e7f7c4@vtiger.fosslabs.com> References: <076.899bb8c824af029fef6ad40fc6e7f7c4@vtiger.fosslabs.com> Message-ID: <085.f8c90c28fe8b728374180d72510958db@vtiger.fosslabs.com> #119: Edit and Delete button missing in List View ------------------------+--------------------------------------------------- Reporter: don | Owner: ahmed Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 02:45:05 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:45:05 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23125=3A_?= =?utf-8?q?Annoying_shortcut_icon_on_left_side_of_screen?= In-Reply-To: <076.6a9687bb44cf232867d02b741ef9c704@vtiger.fosslabs.com> References: <076.6a9687bb44cf232867d02b741ef9c704@vtiger.fosslabs.com> Message-ID: <085.56bfd16997267debc7a7a6cb87986247@vtiger.fosslabs.com> #125: Annoying shortcut icon on left side of screen ------------------------+--------------------------------------------------- Reporter: richie | Owner: ela Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: arrow ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => ela -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 02:45:12 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:45:12 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23146=3A_?= =?utf-8?q?labels_not_in_single_line?= In-Reply-To: <076.21d4bebde0f315778a165da1f2c19f1f@vtiger.fosslabs.com> References: <076.21d4bebde0f315778a165da1f2c19f1f@vtiger.fosslabs.com> Message-ID: <085.16611e7fe6623209e98257442a3ffe07@vtiger.fosslabs.com> #146: labels not in single line ------------------------+--------------------------------------------------- Reporter: richie | Owner: saint Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: staggered ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => saint -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 02:45:35 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:45:35 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23167=3A_?= =?utf-8?q?standarduser_detail_view_screen_proper?= In-Reply-To: <076.1d766ff6b338fa4771ae7fe7e1bd0c51@vtiger.fosslabs.com> References: <076.1d766ff6b338fa4771ae7fe7e1bd0c51@vtiger.fosslabs.com> Message-ID: <085.20f4825eab07fe8493379878b8bc0bf9@vtiger.fosslabs.com> #167: standarduser detail view screen proper ------------------------+--------------------------------------------------- Reporter: richie | Owner: ela Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => ela -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 02:45:46 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:45:46 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23153=3A_?= =?utf-8?q?More_Information=2C_Address_Information_fails_IE?= In-Reply-To: <076.6b87af7d35ac5bf492e6e729ae7b5c58@vtiger.fosslabs.com> References: <076.6b87af7d35ac5bf492e6e729ae7b5c58@vtiger.fosslabs.com> Message-ID: <085.19b51217c432627e893d811499033bbe@vtiger.fosslabs.com> #153: More Information, Address Information fails IE ------------------------+--------------------------------------------------- Reporter: richie | Owner: saint Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: More Info ------------------------+--------------------------------------------------- Changes (by richie): * owner: richie => saint -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 02:46:09 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:46:09 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23144=3A_?= =?utf-8?q?Statistics_not_in_the_same_plane_as_List_View_Users?= In-Reply-To: <076.6ff95a784ff00fd4b095cf6a1e5450fa@vtiger.fosslabs.com> References: <076.6ff95a784ff00fd4b095cf6a1e5450fa@vtiger.fosslabs.com> Message-ID: <085.fe5ed1ea3d26688e98f2b24ab7bd2395@vtiger.fosslabs.com> #144: Statistics not in the same plane as List View Users ------------------------+--------------------------------------------------- Reporter: richie | Owner: saint Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Statistics ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => saint -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 02:46:17 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:46:17 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23141=3A_?= =?utf-8?q?screen_collapses_IE_User_view?= In-Reply-To: <076.983bdaff841a5d9cb10d3b2b92e4308e@vtiger.fosslabs.com> References: <076.983bdaff841a5d9cb10d3b2b92e4308e@vtiger.fosslabs.com> Message-ID: <085.65f82d09b9b93b24aae29fcb5b1da707@vtiger.fosslabs.com> #141: screen collapses IE User view ------------------------+--------------------------------------------------- Reporter: richie | Owner: saint Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: screen collapse ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => saint -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 02:46:27 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:46:27 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23137=3A_?= =?utf-8?q?Settings-=3EConfiguration_click_shakes_page?= In-Reply-To: <076.c084681044a7a82003c2285e066904e4@vtiger.fosslabs.com> References: <076.c084681044a7a82003c2285e066904e4@vtiger.fosslabs.com> Message-ID: <085.a37afc7d2e2b537938ce4f7c2029918c@vtiger.fosslabs.com> #137: Settings->Configuration click shakes page ------------------------+--------------------------------------------------- Reporter: richie | Owner: ela Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: page shift ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => ela -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 02:46:38 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:46:38 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23135=3A_?= =?utf-8?q?missing_communication_templates?= In-Reply-To: <076.5997046850f52c2dcc019dbeb3ff2438@vtiger.fosslabs.com> References: <076.5997046850f52c2dcc019dbeb3ff2438@vtiger.fosslabs.com> Message-ID: <085.6497a0f5356c3d5143c588463b62cbbc@vtiger.fosslabs.com> #135: missing communication templates ------------------------+--------------------------------------------------- Reporter: richie | Owner: ahmed Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 02:47:03 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:47:03 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23632=3A_?= =?utf-8?q?Issue_in_User_List_View?= In-Reply-To: <076.e81a56a5d59831c54878804f0147eb62@vtiger.fosslabs.com> References: <076.e81a56a5d59831c54878804f0147eb62@vtiger.fosslabs.com> Message-ID: <085.d41d8e9a845bbbac5edd62150053526d@vtiger.fosslabs.com> #632: Issue in User List View ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Browser ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 02:48:41 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:48:41 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23212=3A_?= =?utf-8?q?Inbox_link_under_=27Qualified_Mails=27_is_not_working?= In-Reply-To: <076.883d6a1d409206fc372b8c61a2c9b9f9@vtiger.fosslabs.com> References: <076.883d6a1d409206fc372b8c61a2c9b9f9@vtiger.fosslabs.com> Message-ID: <085.4d7e03138af6542e5ae8a5ac187b928f@vtiger.fosslabs.com> #212: Inbox link under 'Qualified Mails' is not working --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: email inbox --------------------------------+------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 02:48:49 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:48:49 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23213=3A_?= =?utf-8?q?no_image_backup_server_config?= In-Reply-To: <076.3f0dea16607ae71bf674ea181a738a8e@vtiger.fosslabs.com> References: <076.3f0dea16607ae71bf674ea181a738a8e@vtiger.fosslabs.com> Message-ID: <085.6537bdd3bdebfaf3f0eaadda19e5db4b@vtiger.fosslabs.com> #213: no image backup server config ------------------------+--------------------------------------------------- Reporter: richie | Owner: ela Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: backup server config ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => ela -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 02:49:17 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:49:17 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23202=3A_?= =?utf-8?q?=27no_image=27_while_company_info_edit?= In-Reply-To: <076.49b980f60f323d38dd3fb5eb903756ac@vtiger.fosslabs.com> References: <076.49b980f60f323d38dd3fb5eb903756ac@vtiger.fosslabs.com> Message-ID: <085.03085abe629d7dec4dbc2bd04f481258@vtiger.fosslabs.com> #202: 'no image' while company info edit ------------------------+--------------------------------------------------- Reporter: richie | Owner: ela Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: company info ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => ela -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 02:50:52 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:50:52 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23269=3A_?= =?utf-8?q?Calendar_Day_View_-_No_link_at_Time?= In-Reply-To: <076.d9a8f2b119b3df78319e486bdc48f2e9@vtiger.fosslabs.com> References: <076.d9a8f2b119b3df78319e486bdc48f2e9@vtiger.fosslabs.com> Message-ID: <085.c3049455dafd6990cd0db70f12b11f58@vtiger.fosslabs.com> #269: Calendar Day View - No link at Time ------------------------+--------------------------------------------------- Reporter: gopal | Owner: ela Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => ela -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 02:50:58 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:50:58 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23259=3A_?= =?utf-8?q?New_User_-_Reports_To_-_CSS_Not_applied_properly?= In-Reply-To: <076.8733a323192caf9065436361d9d6cd14@vtiger.fosslabs.com> References: <076.8733a323192caf9065436361d9d6cd14@vtiger.fosslabs.com> Message-ID: <085.7d72193a11f086bb3012bcb5b5e60dee@vtiger.fosslabs.com> #259: New User - Reports To - CSS Not applied properly ------------------------+--------------------------------------------------- Reporter: gopal | Owner: ela Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => ela -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 02:51:14 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:51:14 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23282=3A_?= =?utf-8?q?No_Validation_for_Quick_Create_Ticket?= In-Reply-To: <076.f2ce9ea579ed2c3cb483f6fd2702aa69@vtiger.fosslabs.com> References: <076.f2ce9ea579ed2c3cb483f6fd2702aa69@vtiger.fosslabs.com> Message-ID: <085.8f11f2f9ebeacea7194ca944ead4bd8e@vtiger.fosslabs.com> #282: No Validation for Quick Create Ticket ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: ahmed Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 02:51:22 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:51:22 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23285=3A_?= =?utf-8?q?Usability_issue_in_picklist_edit?= In-Reply-To: <076.37f58295d8c930da3b24bcd877110dea@vtiger.fosslabs.com> References: <076.37f58295d8c930da3b24bcd877110dea@vtiger.fosslabs.com> Message-ID: <085.460a49d0796cb7146f2f478ca7b3a3d2@vtiger.fosslabs.com> #285: Usability issue in picklist edit ------------------------+--------------------------------------------------- Reporter: don | Owner: ela Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => ela -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 02:51:35 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:51:35 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23292=3A_?= =?utf-8?q?No_Validation_for_Quick_Edit_of_Mandatory_Fields_-_HelpDesk?= In-Reply-To: <076.60e672e646ab98c96bf4604e5fa4889a@vtiger.fosslabs.com> References: <076.60e672e646ab98c96bf4604e5fa4889a@vtiger.fosslabs.com> Message-ID: <085.99635e6279f3aa2a1399f7577b9edba2@vtiger.fosslabs.com> #292: No Validation for Quick Edit of Mandatory Fields - HelpDesk ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: ahmed Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 02:54:46 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:54:46 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23439=3A_?= =?utf-8?q?Validation_is_not_working_for_quick_create_form?= In-Reply-To: <076.edf94bb3508212d7dd3244389b2a56d2@vtiger.fosslabs.com> References: <076.edf94bb3508212d7dd3244389b2a56d2@vtiger.fosslabs.com> Message-ID: <085.3d4c471b409ec400a3d1b411408bd5f4@vtiger.fosslabs.com> #439: Validation is not working for quick create form ------------------------+--------------------------------------------------- Reporter: don | Owner: ahmed Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 02:55:25 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:55:25 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23409=3A_?= =?utf-8?q?The_copy_address_button_is_missing_in_Create_Contact_Form?= In-Reply-To: <076.c249f9559187934331b763992d94b565@vtiger.fosslabs.com> References: <076.c249f9559187934331b763992d94b565@vtiger.fosslabs.com> Message-ID: <085.98c754f2ae50844c3ca3f26ab61aa668@vtiger.fosslabs.com> #409: The copy address button is missing in Create Contact Form ------------------------+--------------------------------------------------- Reporter: don | Owner: ela Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => ela -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 02:55:26 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:55:26 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2392=3A_E?= =?utf-8?q?mail_template_Subject_Does_not_carry_over=2E?= In-Reply-To: <076.59a21343597c2ac30fcc51aff8a565e1@vtiger.fosslabs.com> References: <076.59a21343597c2ac30fcc51aff8a565e1@vtiger.fosslabs.com> Message-ID: <085.5ed5dcb07edde5e787c45cc313d07be3@vtiger.fosslabs.com> #92: Email template Subject Does not carry over. ------------------------+--------------------------------------------------- Reporter: vito | Owner: ahmed Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 02:55:36 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:55:36 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2399=3A_v?= =?utf-8?q?alidation_is_not_working_for_Notes_module?= In-Reply-To: <076.7a3afc76bba03ac9644950c05984d3a1@vtiger.fosslabs.com> References: <076.7a3afc76bba03ac9644950c05984d3a1@vtiger.fosslabs.com> Message-ID: <085.1ca2d6ed6f1baec6cecdf40d50394423@vtiger.fosslabs.com> #99: validation is not working for Notes module ------------------------+--------------------------------------------------- Reporter: Minnie | Owner: ahmed Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * owner: mangai => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 02:55:45 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:55:45 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23100=3A_?= =?utf-8?q?overlapping_of_layers_in_notes_editview?= In-Reply-To: <076.c00285d475a3ef3ed881eaab34f77db7@vtiger.fosslabs.com> References: <076.c00285d475a3ef3ed881eaab34f77db7@vtiger.fosslabs.com> Message-ID: <085.f2ac4b6c793d24e6f4f8ac131bcb31b0@vtiger.fosslabs.com> #100: overlapping of layers in notes editview ------------------------+--------------------------------------------------- Reporter: Minnie | Owner: ela Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: overlapping ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => ela -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 02:58:09 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:58:09 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23453=3A_?= =?utf-8?q?Issue_in_Globale_Seach?= In-Reply-To: <076.ac20c5429ded63fb3c6424d497bb6088@vtiger.fosslabs.com> References: <076.ac20c5429ded63fb3c6424d497bb6088@vtiger.fosslabs.com> Message-ID: <085.9ab8c90abea830991c7f307b85db4fa6@vtiger.fosslabs.com> #453: Issue in Globale Seach ------------------------+--------------------------------------------------- Reporter: don | Owner: mickie Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => duplicate * status: assigned => closed Comment: 465 -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 02:58:47 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:58:47 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23519=3A_?= =?utf-8?q?validation_for_notes_quickreate?= In-Reply-To: <076.a1e19f784ca3cb33edb5fa2c87c26e5a@vtiger.fosslabs.com> References: <076.a1e19f784ca3cb33edb5fa2c87c26e5a@vtiger.fosslabs.com> Message-ID: <085.a5f44a2a0b3e06c1735de4493d798282@vtiger.fosslabs.com> #519: validation for notes quickreate --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: ahmed Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: --------------------------------+------------------------------------------- Changes (by richie): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 03:03:01 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 10:03:01 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23397=3A_?= =?utf-8?q?Create_role_issue?= In-Reply-To: <076.aefea6f19aa5f2a517b9bdf77c3ee53f@vtiger.fosslabs.com> References: <076.aefea6f19aa5f2a517b9bdf77c3ee53f@vtiger.fosslabs.com> Message-ID: <085.994e6696732f335b6e1c87b74a8cf205@vtiger.fosslabs.com> #397: Create role issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 28 03:08:14 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 10:08:14 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5579 - /vtigercrm/trunk/modules/Users/listroles.php Message-ID: <20060428100814.985A96E5EA9@vtiger.fosslabs.com> Author: don Date: Fri Apr 28 04:08:10 2006 New Revision: 5579 Log: Added parenttab as Settings Modified: vtigercrm/trunk/modules/Users/listroles.php Modified: vtigercrm/trunk/modules/Users/listroles.php ============================================================================== --- vtigercrm/trunk/modules/Users/listroles.php (original) +++ vtigercrm/trunk/modules/Users/listroles.php Fri Apr 28 04:08:10 2006 @@ -130,7 +130,7 @@ echo ''; if(! $roledepth == 0) { - echo ' Add | Edit | Delete | View'; + echo ' Add | Edit | Delete | View'; } else { From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 03:08:41 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 10:08:41 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23404=3A_?= =?utf-8?q?Parent_tab_issue_in_AddRole_Page?= In-Reply-To: <076.044d1f48966c0d70d4c32e54efa789ea@vtiger.fosslabs.com> References: <076.044d1f48966c0d70d4c32e54efa789ea@vtiger.fosslabs.com> Message-ID: <085.ed724b43a0f936dc258d7d2ab54d8a7f@vtiger.fosslabs.com> #404: Parent tab issue in AddRole Page ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Parenttab ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 03:09:22 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 10:09:22 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23405=3A_?= =?utf-8?q?Parent_tab_issue_in_Role_Create=2CSave=2CEdit=2CDelete_Pages?= In-Reply-To: <076.aec1f3244221babda23f926c84f5a963@vtiger.fosslabs.com> References: <076.aec1f3244221babda23f926c84f5a963@vtiger.fosslabs.com> Message-ID: <085.2bc6d98ed1ef01701a51d0bea0ba1dff@vtiger.fosslabs.com> #405: Parent tab issue in Role Create,Save,Edit,Delete Pages ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Parenttab ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 03:09:24 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 10:09:24 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23110=3A_?= =?utf-8?q?Issue_in_the_quick_edit_provided_in_detail_view?= In-Reply-To: <076.786d590796362f282d8e6c86c1e443ce@vtiger.fosslabs.com> References: <076.786d590796362f282d8e6c86c1e443ce@vtiger.fosslabs.com> Message-ID: <085.84c6d73651ae629a820dda0942bc9810@vtiger.fosslabs.com> #110: Issue in the quick edit provided in detail view ------------------------+--------------------------------------------------- Reporter: don | Owner: ahmed Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 03:10:09 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 10:10:09 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23491=3A_?= =?utf-8?q?Edit_Role_Page_Issue?= In-Reply-To: <076.04381931e5dbfbd8cb44eaf74f781e97@vtiger.fosslabs.com> References: <076.04381931e5dbfbd8cb44eaf74f781e97@vtiger.fosslabs.com> Message-ID: <085.93594a1e4e4140d5809eb69960477197@vtiger.fosslabs.com> #491: Edit Role Page Issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 03:15:11 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 10:15:11 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23492=3A_?= =?utf-8?q?Edit_Role_Page_Issue?= In-Reply-To: <076.65ede321df17b6a66866db833adcbc30@vtiger.fosslabs.com> References: <076.65ede321df17b6a66866db833adcbc30@vtiger.fosslabs.com> Message-ID: <085.d0f63361645e6c798025036224d67871@vtiger.fosslabs.com> #492: Edit Role Page Issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 28 03:15:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 10:15:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5580 - /vtigercrm/trunk/Smarty/templates/RoleEditView.tpl Message-ID: <20060428101513.D58126E5FDB@vtiger.fosslabs.com> Author: don Date: Fri Apr 28 04:15:06 2006 New Revision: 5580 Log: modified save to create Modified: vtigercrm/trunk/Smarty/templates/RoleEditView.tpl Modified: vtigercrm/trunk/Smarty/templates/RoleEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/RoleEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/RoleEditView.tpl Fri Apr 28 04:15:06 2006 @@ -113,7 +113,7 @@      -    +    From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 03:15:46 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 10:15:46 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23493=3A_?= =?utf-8?q?Role_DetailView_issue?= In-Reply-To: <076.1d6d9c2d1e47e1eaf37d1812ae640278@vtiger.fosslabs.com> References: <076.1d6d9c2d1e47e1eaf37d1812ae640278@vtiger.fosslabs.com> Message-ID: <085.1251608d28d1a2dc62c1075c618559f8@vtiger.fosslabs.com> #493: Role DetailView issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: ela Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: assigned => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 03:17:16 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 10:17:16 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23496=3A_?= =?utf-8?q?Selected_Info_in_profiles?= In-Reply-To: <076.1b493a92b2d40095c75bb184f4af88eb@vtiger.fosslabs.com> References: <076.1b493a92b2d40095c75bb184f4af88eb@vtiger.fosslabs.com> Message-ID: <085.2e41be8148eb91a01f6c1c6d3546aed0@vtiger.fosslabs.com> #496: Selected Info in profiles ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: ela Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: assigned => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 03:18:14 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 10:18:14 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23497=3A_?= =?utf-8?q?Title_for_profiles?= In-Reply-To: <076.ab007d7fbc97d0b7307ccf3f269a5ad2@vtiger.fosslabs.com> References: <076.ab007d7fbc97d0b7307ccf3f269a5ad2@vtiger.fosslabs.com> Message-ID: <085.88e509f81616870041c1ebbea1297f1a@vtiger.fosslabs.com> #497: Title for profiles ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: anonymous Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: assigned => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 03:19:24 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 10:19:24 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23500=3A_?= =?utf-8?q?Profile_Editview_Issue?= In-Reply-To: <076.b74511bfdcaedb6377789083d2ea3a57@vtiger.fosslabs.com> References: <076.b74511bfdcaedb6377789083d2ea3a57@vtiger.fosslabs.com> Message-ID: <085.b2ac58ad32778e1dbf023aa2e27573d4@vtiger.fosslabs.com> #500: Profile Editview Issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: ela Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: assigned => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 03:22:56 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 10:22:56 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23506=3A_?= =?utf-8?q?Issue_in_Role_Detail_View?= In-Reply-To: <076.667f41f22d766211e84d7731abf53842@vtiger.fosslabs.com> References: <076.667f41f22d766211e84d7731abf53842@vtiger.fosslabs.com> Message-ID: <085.f1e92ce861aceff292e200a39f3c0a24@vtiger.fosslabs.com> #506: Issue in Role Detail View ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 03:25:39 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 10:25:39 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23521=3A_?= =?utf-8?q?Parenttab_Missing_for_Roles?= In-Reply-To: <076.f20ed03a279890af8fd43854390efb9c@vtiger.fosslabs.com> References: <076.f20ed03a279890af8fd43854390efb9c@vtiger.fosslabs.com> Message-ID: <085.e9fdf5f17e929f2a76615629f45c00b2@vtiger.fosslabs.com> #521: Parenttab Missing for Roles ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 03:27:29 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 10:27:29 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23522=3A_?= =?utf-8?q?Parenttab_Missing_for_Profiles=2CGroups?= In-Reply-To: <076.6c1a52af5f2215bd4588470b8cbb73c4@vtiger.fosslabs.com> References: <076.6c1a52af5f2215bd4588470b8cbb73c4@vtiger.fosslabs.com> Message-ID: <085.3fabe57ec1211cbaa785946f8d822a60@vtiger.fosslabs.com> #522: Parenttab Missing for Profiles,Groups ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 03:28:50 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 10:28:50 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23626=3A_?= =?utf-8?q?Issue_in_Profile_listview?= In-Reply-To: <076.49353d33bac9954935073df4c5448b1c@vtiger.fosslabs.com> References: <076.49353d33bac9954935073df4c5448b1c@vtiger.fosslabs.com> Message-ID: <085.3069817c78ca597c414f30b4476f9fcc@vtiger.fosslabs.com> #626: Issue in Profile listview ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: ela Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Browser ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: assigned => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 03:32:19 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 10:32:19 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23666=3A_?= =?utf-8?q?Navigation_not_aligned_proper_in_Users_ListVIew?= In-Reply-To: <076.d4f93c4fb638bae64a73526f41a5c82e@vtiger.fosslabs.com> References: <076.d4f93c4fb638bae64a73526f41a5c82e@vtiger.fosslabs.com> Message-ID: <085.0874832297d3e69f48d0443254443195@vtiger.fosslabs.com> #666: Navigation not aligned proper in Users ListVIew ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: ela Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: assigned => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 04:16:37 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 11:16:37 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2396=3A_P?= =?utf-8?q?DF-generation_=28invoice=29_sometimes_fails?= In-Reply-To: <076.4c46ddeaf8a9bd9a0763c3db83037d45@vtiger.fosslabs.com> References: <076.4c46ddeaf8a9bd9a0763c3db83037d45@vtiger.fosslabs.com> Message-ID: <085.99fa70ecb12da34b4bc828f932f731ae@vtiger.fosslabs.com> #96: PDF-generation (invoice) sometimes fails -----------------------------------+---------------------------------------- Reporter: hpw at softechmatrix.nl | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 4.2.4 Component: vtigercrm | Version: 4.2.3 Resolution: fixed | Keywords: error pdf invoice order -----------------------------------+---------------------------------------- Comment (by hpw at softechmatrix.nl): Allan, thanks for testing again. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 04:18:52 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 11:18:52 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23270=3A_?= =?utf-8?q?Add_Notes_error?= In-Reply-To: <076.4dce61f119947dc3253c993bd923c96c@vtiger.fosslabs.com> References: <076.4dce61f119947dc3253c993bd923c96c@vtiger.fosslabs.com> Message-ID: <085.fe37f7f85b542bceb21718bca3fde0db@vtiger.fosslabs.com> #270: Add Notes error ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: notes ---------------------------+------------------------------------------------ Changes (by richie): * resolution: => fixed * status: new => closed Comment: Fixed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 04:20:09 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 11:20:09 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23273=3A_?= =?utf-8?q?Add_Attachment_issue?= In-Reply-To: <076.f69cbeb2597585fcdeb2060bb5e8ee53@vtiger.fosslabs.com> References: <076.f69cbeb2597585fcdeb2060bb5e8ee53@vtiger.fosslabs.com> Message-ID: <085.feed34c46e7079d236b18aff9e5f5c31@vtiger.fosslabs.com> #273: Add Attachment issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: attachments ---------------------------+------------------------------------------------ Changes (by richie): * resolution: => fixed * status: new => closed Comment: Fixed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 04:21:30 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 11:21:30 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23241=3A_?= =?utf-8?q?Settings_-_Navigation_Links_not_working?= In-Reply-To: <076.f8fb65f8228b4c3942e2d9a6fc7943ff@vtiger.fosslabs.com> References: <076.f8fb65f8228b4c3942e2d9a6fc7943ff@vtiger.fosslabs.com> Message-ID: <085.84d36f9ffd39c60719cbb78d045af31e@vtiger.fosslabs.com> #241: Settings - Navigation Links not working ------------------------+--------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: wontfix | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => wontfix * status: new => closed Comment: Expected Behaviour. Will not be handled. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 04:25:09 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 11:25:09 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23442=3A_?= =?utf-8?q?Improper_message_in_Contact_Detail_View?= In-Reply-To: <076.1dbbaff7c9be01da8e3358818b36ffef@vtiger.fosslabs.com> References: <076.1dbbaff7c9be01da8e3358818b36ffef@vtiger.fosslabs.com> Message-ID: <085.987e858cf26c94dfffd429153d5d2606@vtiger.fosslabs.com> #442: Improper message in Contact Detail View ------------------------+--------------------------------------------------- Reporter: don | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 28 04:51:47 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 11:51:47 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5581 - /vtigercrm/trunk/include/utils/SearchUtils.php Message-ID: <20060428115147.775856E5EA4@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 28 05:51:32 2006 New Revision: 5581 Log: Related to field removed from advance 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 Fri Apr 28 05:51:32 2006 @@ -390,10 +390,13 @@ } $fieldlabel1 = str_replace(" ","_",$fieldlabel); - if ($i==0) - $OPTION_SET .= ""; - else - $OPTION_SET .= ""; + if($fieldlabel != 'Related to') + { + if ($i==0) + $OPTION_SET .= ""; + else + $OPTION_SET .= ""; + } } $log->debug("Exiting getAdvSearchfields method ..."); return $OPTION_SET; From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:01:00 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 12:01:00 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23741=3A_?= =?utf-8?q?Create_Group_-_Default_filter_selection?= In-Reply-To: <076.2a6d5517e6c3b15c30ace383f35ae26b@vtiger.fosslabs.com> References: <076.2a6d5517e6c3b15c30ace383f35ae26b@vtiger.fosslabs.com> Message-ID: <085.d162225ee1cfcc5039d77a24fbd4fb5e@vtiger.fosslabs.com> #741: Create Group - Default filter selection ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: wontfix | Keywords: Create group ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => wontfix * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:04:09 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 12:04:09 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23607=3A_?= =?utf-8?q?Unable_to_create_new_ticket=2E?= In-Reply-To: <076.ec2f296a02d16f9111b0d6b6fd3ed24c@vtiger.fosslabs.com> References: <076.ec2f296a02d16f9111b0d6b6fd3ed24c@vtiger.fosslabs.com> Message-ID: <085.119d5789e50906d88f1bd4f91c289747@vtiger.fosslabs.com> #607: Unable to create new ticket. ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mickie Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: assigned => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:11:40 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 12:11:40 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23605=3A_?= =?utf-8?q?Incomplete_description_for_Pick_List_Editor?= In-Reply-To: <076.39e93a7028e5b13d3dd484adfef8ba8a@vtiger.fosslabs.com> References: <076.39e93a7028e5b13d3dd484adfef8ba8a@vtiger.fosslabs.com> Message-ID: <085.e6d8169f2a3cbcb88332933b08927eb3@vtiger.fosslabs.com> #605: Incomplete description for Pick List Editor ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mangai Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Pick List ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed Comment: (In [5582]) incomplete description removed. Fixes #605 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 28 05:11:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 12:11:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5582 - /vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl Message-ID: <20060428121141.1996D6E782A@vtiger.fosslabs.com> Author: richie Date: Fri Apr 28 06:11:25 2006 New Revision: 5582 Log: incomplete description removed. Fixes #605 Modified: vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl Fri Apr 28 06:11:25 2006 @@ -102,7 +102,6 @@ {$MOD.LBL_PICKLIST_EDITOR}
        - picklist Editor allows you to   From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:12:37 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 12:12:37 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23294=3A_?= =?utf-8?q?UI_Issue_in_Create_Email_Screen?= In-Reply-To: <076.9fb6d611537efe4edae1ae1f973444b1@vtiger.fosslabs.com> References: <076.9fb6d611537efe4edae1ae1f973444b1@vtiger.fosslabs.com> Message-ID: <085.d6639546d01e532a6e483414dd1e0d54@vtiger.fosslabs.com> #294: UI Issue in Create Email Screen ------------------------+--------------------------------------------------- Reporter: don | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => invalid * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:12:49 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 12:12:49 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23208=3A_?= =?utf-8?q?unable_to_edit_outgoing_mailserver_info?= In-Reply-To: <076.b22ddb2182867579185c133f4cf84897@vtiger.fosslabs.com> References: <076.b22ddb2182867579185c133f4cf84897@vtiger.fosslabs.com> Message-ID: <085.7944b73ac7634da9591158f5fef85eca@vtiger.fosslabs.com> #208: unable to edit outgoing mailserver info ------------------------+--------------------------------------------------- Reporter: richie | Owner: mickie Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: wontfix | Keywords: outgoing mailserver info ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => wontfix * status: assigned => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 28 06:06:39 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 13:06:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5583 - /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Message-ID: <20060428130639.DAC1C6E9706@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 28 07:06:34 2006 New Revision: 5583 Log: * Changes made for Campaiign module because this module has been totally changed Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php ============================================================================== --- vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php (original) +++ vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Fri Apr 28 07:06:34 2006 @@ -1662,29 +1662,40 @@ $insert_query8 = "insert into blocks values(76,26,'LBL_CAMPAIGN_INFORMATION',1,0,0,0,0,0)"; Execute($insert_query8); -$insert_query9 = "insert into blocks values(77,26,'LBL_DESCRIPTION_INFORMATION',2,0,0,0,0,0)"; +$insert_query8 = "insert into blocks values (77,26,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)"; +Execute($insert_query8); +$insert_query9 = "insert into blocks values(78,26,'LBL_DESCRIPTION_INFORMATION',3,0,0,0,0,0)"; Execute($insert_query9); $insert_query_array24 = Array( - "insert into field values(26,".$conn->getUniqueID("field").",'campaignname','campaign',1,'2','campaignname','Campaign Name',1,0,0,100,1,76,1,'V~M',0,1,'BAS')", - "insert into field values(26,".$conn->getUniqueID("field").",'campaigntype','campaign',1,15,'campaigntype','Campaign Type',1,0,0,100,2,76,1,'V~O',0,5,'BAS')", - "insert into field values(26,".$conn->getUniqueID("field").",'campaignstatus','campaign',1,15,'campaignstatus','Campaign Status',1,0,0,100,3,76,1,'V~O',0,5,'BAS')", - "insert into field values(26,".$conn->getUniqueID("field").",'closingdate','campaign',1,'23','closingdate','Expected Close Date',1,0,0,100,5,76,1,'D~M',0,3,'BAS')", - "insert into field values(26,".$conn->getUniqueID("field").",'expectedrevenue','campaign',1,'15','expectedrevenue','Expected Revenue',1,0,0,100,6,76,1,'V~O',1,null,'BAS')", - "insert into field values(26,".$conn->getUniqueID("field").",'budgetcost','campaign',1,'1','budgetcost','Budget Cost',1,0,0,100,7,76,1,'V~O',1,null,'BAS')", - "insert into field values(26,".$conn->getUniqueID("field").",'actualcost','campaign',1,'15','actualcost','Actual Cost',1,0,0,100,8,76,1,'V~O',1,null,'BAS')", - "insert into field values(26,".$conn->getUniqueID("field").",'expectedresponse','campaign',1,'16','expectedresponse','Expected Response',1,0,0,100,9,76,1,'V~O',0,4,'BAS')", - "insert into field values(26,".$conn->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,10,76,1,'V~M',1,null,'BAS')", - "insert into field values(26,".$conn->getUniqueID("field").",'numsent','campaign',1,'9','numsent','Num Sent',1,0,0,100,11,76,1,'N~O',1,null,'BAS')", - "insert into field values(26,".$conn->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,13,76,2,'T~O',1,null,'BAS')", - "insert into field values(26,".$conn->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,14,76,2,'T~O',1,null,'BAS')", - "insert into field values(26,".$conn->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,77,1,'V~O',1,null,'BAS')" + "insert into field values (26,".$conn->getUniqueID("field").",'campaignname','campaign',1,'2','campaignname','Campaign Name',1,0,0,100,1,76,1,'V~M',0,1,'BAS')", + "insert into field values (26,".$conn->getUniqueID("field").",'campaigntype','campaign',1,15,'campaigntype','Campaign Type',1,0,0,100,2,76,1,'V~O',0,5,'BAS')", + "insert into field values (26,".$conn->getUniqueID("field").",'product_id','campaign',1,59,'product_id','Product',1,0,0,100,3,76,1,'I~O',0,5,'BAS')", + "insert into field values (26,".$conn->getUniqueID("field").",'campaignstatus','campaign',1,15,'campaignstatus','Campaign Status',1,0,0,100,4,76,1,'V~O',0,5,'BAS')", + "insert into field values (26,".$conn->getUniqueID("field").",'closingdate','campaign',1,'23','closingdate','Expected Close Date',1,0,0,100,5,76,1,'D~M',0,3,'BAS')", + "insert into field values (26,".$conn->getUniqueID("field").",'expectedrevenue','campaign',1,'1','expectedrevenue','Expected Revenue',1,0,0,100,6,76,1,'I~O',1,null,'BAS')", + "insert into field values (26,".$conn->getUniqueID("field").",'budgetcost','campaign',1,'1','budgetcost','Budget Cost',1,0,0,100,7,76,1,'I~O',1,null,'BAS')", + "insert into field values (26,".$conn->getUniqueID("field").",'actualcost','campaign',1,'1','actualcost','Actual Cost',1,0,0,100,8,76,1,'I~O',1,null,'BAS')", + "insert into field values (26,".$conn->getUniqueID("field").",'expectedresponse','campaign',1,'15','expectedresponse','Expected Response',1,0,0,100,9,76,1,'V~O',0,4,'BAS')", + "insert into field values (26,".$conn->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,10,76,1,'V~M',1,null,'BAS')", + "insert into field values (26,".$conn->getUniqueID("field").",'numsent','campaign',1,'9','numsent','Num Sent',1,0,0,100,11,76,1,'N~O',1,null,'BAS')", + "insert into field values (26,".$conn->getUniqueID("field").",'sponsor','campaign',1,'1','sponsor','Sponsor',1,0,0,100,12,76,1,'V~O',1,null,'BAS')", + "insert into field values (26,".$conn->getUniqueID("field").",'targetaudience','campaign',1,'1','targetaudience','Target Audience',1,0,0,100,13,76,1,'V~O',1,null,'BAS')", + "insert into field values (26,".$conn->getUniqueID("field").",'targetsize','campaign',1,'1','targetsize','TargetSize',1,0,0,100,14,76,1,'N~O',1,null,'BAS')", + "insert into field values (26,".$conn->getUniqueID("field").",'expectedresponsecount','campaign',1,'1','expectedresponsecount','Expected Response Count',1,0,0,100,17,76,1,'N~O',1,null,'BAS')", + "insert into field values (26,".$conn->getUniqueID("field").",'expectedsalescount','campaign',1,'1','expectedsalescount','Expected Sales Count',1,0,0,100,15,76,1,'N~O',1,null,'BAS')", + "insert into field values (26,".$conn->getUniqueID("field").",'expectedroi','campaign',1,'1','expectedroi','Expected ROI',1,0,0,100,19,76,1,'N~O',1,null,'BAS')", + "insert into field values (26,".$conn->getUniqueID("field").",'actualresponsecount','campaign',1,'1','actualresponsecount','Actual Response Count',1,0,0,100,18,76,1,'N~O',1,null,'BAS')", + "insert into field values (26,".$conn->getUniqueID("field").",'actualsalescount','campaign',1,'1','actualsalescount','Actual Sales Count',1,0,0,100,16,76,1,'N~O',1,null,'BAS')", + "insert into field values (26,".$conn->getUniqueID("field").",'actualroi','campaign',1,'1','actualroi','Actual ROI',1,0,0,100,20,76,1,'N~O',1,null,'BAS')", + "insert into field values (26,".$conn->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,15,76,2,'T~O',1,null,'BAS')", + "insert into field values (26,".$conn->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,16,76,2,'T~O',1,null,'BAS')", + "insert into field values (26,".$conn->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,78,1,'V~O',1,null,'BAS')" ); foreach($insert_query_array24 as $query) { Execute($query); } - $insert_query_array25 = Array( "insert into relatedlists values (".$conn->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Contacts").",'get_contacts',1,'Contacts',0)", @@ -1705,41 +1716,76 @@ Execute($query); } - -$create_query24 = "CREATE TABLE `campaign` ( - `campaignname` varchar(255) NOT NULL default '', - `campaigntype` varchar(255) default NULL, - `campaignstatus` varchar(255) default NULL, - `expectedrevenue` decimal(11,3) default NULL, - `budgetcost` decimal(11,3) default NULL, - `actualcost` decimal(11,3) default NULL, - `expectedresponse` decimal(10,0) default NULL, - `numsent` decimal(11,0) default NULL, - `campaignid` int(7) default NULL, - `closingdate` date default NULL, - PRIMARY KEY (`campaignname`), - KEY `idx_campaignid` (`campaignid`), - KEY `idx_campaignname` (`campaignname`) -) ENGINE=InnoDB"; +$create_query24 = " +CREATE TABLE `campaign` ( + `campaignname` varchar(255) default NULL, + `campaigntype` varchar(255) default NULL, + `campaignstatus` varchar(255) default NULL, + `expectedrevenue` int(19) default NULL, + `budgetcost` int(19) default NULL, + `actualcost` int(19) default NULL, + `expectedresponse` varchar(255) default NULL, + `numsent` decimal(11,0) default NULL, + `product_id` int(19) default NULL, + `sponsor` varchar(255) default NULL, + `targetaudience` varchar(255) default NULL, + `targetsize` int(19) default NULL, + `expectedresponsecount` int(19) default NULL, + `expectedsalescount` int(19) default NULL, + `expectedroi` int(19) default NULL, + `actualresponsecount` int(19) default NULL, + `actualsalescount` int(19) default NULL, + `actualroi` int(19) default NULL, + `campaignid` int(19) NOT NULL, + `closingdate` date default NULL, + PRIMARY KEY (`campaignid`), + KEY `idx_campaignstatus` (`campaignstatus`), + KEY `idx_campaignname` (`campaignname`), + KEY `idx_campaignid` (`campaignid`) +) ENGINE=InnoDB + "; Execute($create_query24); + + $create_query25 = "CREATE TABLE `campaigncontrel` ( `campaignid` int(19) NOT NULL default '0', `contactid` int(19) NOT NULL default '0', PRIMARY KEY (`campaignid`), KEY `CampaignContRel_IDX1` (`contactid`), - CONSTRAINT `fk_CampaignContRel2` FOREIGN KEY (`contactid`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE + CONSTRAINT `fk_CampaignContRel2` FOREIGN KEY (`contactid`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE, + CONSTRAINT `fk_CampaignContRel1` FOREIGN KEY (`campaignid`) REFERENCES `campaign` (`campaignid`) ON DELETE CASCADE ) ENGINE=InnoDB"; Execute($create_query25); + +$create_table_query = " +CREATE TABLE `campaigngrouprelation` ( + `campaignid` int(19) NOT NULL, + `groupname` varchar(100) default NULL, + PRIMARY KEY (`campaignid`), + KEY `campaigngrouprelation_IDX1` (`groupname`), + CONSTRAINT `fk_campaigngrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `groups` (`groupname`) ON DELETE CASCADE, + CONSTRAINT `fk_campaigngrouprelation1` FOREIGN KEY (`campaignid`) REFERENCES `campaign` (`campaignid`) ON DELETE CASCADE +) ENGINE=InnoDB"; +Execute($create_table_query); + $create_query26 = "CREATE TABLE `campaignleadrel` ( `campaignid` int(19) NOT NULL default '0', `leadid` int(19) NOT NULL default '0', PRIMARY KEY (`campaignid`), - KEY `CampaignLeadRel_IDX1` (`leadid`), - CONSTRAINT `fk_CampaignLeadRel2` FOREIGN KEY (`leadid`) REFERENCES `leaddetails` (`leadid`) ON DELETE CASCADE + KEY `CampaignLeadRel_IDX1` (`leadid`,`campaignid`), + CONSTRAINT `fk_CampaignLeadRel1234` FOREIGN KEY (`campaignid`) REFERENCES `campaign` (`campaignid`) ON DELETE CASCADE, + CONSTRAINT `fk_CampaignLeadRel2423` FOREIGN KEY (`leadid`) REFERENCES `leaddetails` (`leadid`) ON DELETE CASCADE ) ENGINE=InnoDB"; Execute($create_query26); + +$create_table_query1 = "CREATE TABLE `campaignscf` ( + `campaignid` int(19) NOT NULL default '0', + PRIMARY KEY (`campaignid`), + CONSTRAINT `fk_CampaignsCF` FOREIGN KEY (`campaignid`) REFERENCES `campaign` (`campaignid`) ON DELETE CASCADE +) ENGINE=InnoDB"; +Execute($create_table_query1); $alter_query_array18 = Array( "alter table leaddetails add column campaignid int(19) default NULL after leadid", @@ -1884,7 +1930,7 @@ `presence` int(1) NOT NULL default '1', PRIMARY KEY (`campaignstatusid`), KEY `Campaignstatus_UK01` (`campaignstatus`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1", +) ENGINE=InnoDB", "CREATE TABLE `campaigntype` ( `campaigntypeid` int(19) NOT NULL auto_increment, @@ -1893,7 +1939,7 @@ `presence` int(1) NOT NULL default '1', PRIMARY KEY (`campaigntypeid`), UNIQUE KEY `Campaigntype_UK01` (`campaigntype`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1", +) ENGINE=InnoDB", "CREATE TABLE `currency_info_seq` ( `id` int(11) NOT NULL @@ -2055,7 +2101,7 @@ `presence` int(1) NOT NULL default '1', PRIMARY KEY (`expectedresponseid`), UNIQUE KEY `CampaignExpRes_UK01` (`expectedresponse`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1", +) ENGINE=InnoDB", "CREATE TABLE `expectedrevenue` ( `expectedrevenueid` int(19) NOT NULL auto_increment, @@ -2202,13 +2248,6 @@ "ALTER TABLE `blocks` MODIFY COLUMN `tabid` INTEGER(19) NOT NULL UNIQUE", "ALTER TABLE `blocks` MODIFY COLUMN `sequence` INTEGER(10) DEFAULT NULL", "ALTER TABLE `blocks` MODIFY COLUMN `show_title` INTEGER(2) DEFAULT NULL", -"ALTER TABLE `campaign` MODIFY COLUMN `campaignname` VARCHAR(255) COLLATE latin1_swedish_ci DEFAULT NULL UNIQUE", -"ALTER TABLE `campaign` MODIFY COLUMN `campaignstatus` VARCHAR(255) COLLATE latin1_swedish_ci DEFAULT NULL UNIQUE", -"ALTER TABLE `campaign` MODIFY COLUMN `expectedrevenue` VARCHAR(255) DEFAULT NULL", -"ALTER TABLE `campaign` MODIFY COLUMN `budgetcost` VARCHAR(255) DEFAULT NULL", -"ALTER TABLE `campaign` MODIFY COLUMN `actualcost` VARCHAR(255) DEFAULT NULL", -"ALTER TABLE `campaign` MODIFY COLUMN `expectedresponse` VARCHAR(255) DEFAULT NULL", -"ALTER TABLE `campaign` MODIFY COLUMN `campaignid` INTEGER(11) NOT NULL PRIMARY KEY", "ALTER TABLE `chat_msg` MODIFY COLUMN `id` INTEGER(20) NOT NULL AUTO_INCREMENT PRIMARY KEY", "ALTER TABLE `chat_msg` MODIFY COLUMN `chat_from` INTEGER(20) NOT NULL DEFAULT '0' UNIQUE", "ALTER TABLE `chat_msg` MODIFY COLUMN `chat_to` INTEGER(20) NOT NULL DEFAULT '0' UNIQUE", @@ -2419,11 +2458,6 @@ "ALTER TABLE `activity` ADD KEY `status1` (`status`, `eventstatus`)", "ALTER TABLE `attachments` ADD KEY `attachmentsid1` (`attachmentsid`)", "ALTER TABLE `blocks` ADD KEY `block_tabid` (`tabid`)", -"ALTER TABLE `campaign` DROP PRIMARY KEY", -"ALTER TABLE `campaign` ADD PRIMARY KEY (`campaignid`)", -"ALTER TABLE `campaign` ADD KEY `idx_campaignstatus` (`campaignstatus`)", -"ALTER TABLE `campaignleadrel` DROP INDEX CampaignLeadRel_IDX1", -"ALTER TABLE `campaignleadrel` ADD INDEX `CampaignLeadRel_IDX1` (`leadid`, `campaignid`)", "ALTER TABLE `carrier` ADD UNIQUE KEY `carrier_UK01` (`carrier`)", "ALTER TABLE `chat_msg` ADD KEY `chat_msg_IDX0` (`chat_from`)", "ALTER TABLE `chat_msg` ADD KEY `chat_msg_IDX1` (`chat_to`)", @@ -2496,8 +2530,6 @@ "ALTER TABLE `users2group` ADD KEY `fk_users2group2` (`userid`)", "ALTER TABLE `accountgrouprelation` ADD CONSTRAINT `fk_accountgrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `groups` (`groupname`) ON DELETE CASCADE", "ALTER TABLE `accountgrouprelation` ADD CONSTRAINT `fk_accountgrouprelation123` FOREIGN KEY (`accountid`) REFERENCES `account` (`accountid`) ON DELETE CASCADE", -"ALTER TABLE `campaigncontrel` ADD CONSTRAINT `fk_CampaignContRel1` FOREIGN KEY (`campaignid`) REFERENCES `campaign` (`campaignid`) ON DELETE CASCADE", -"ALTER TABLE `campaignleadrel` ADD CONSTRAINT `fk_CampaignLeadRel1234` FOREIGN KEY (`campaignid`) REFERENCES `campaign` (`campaignid`) ON DELETE CASCADE", "ALTER TABLE `contactgrouprelation` ADD CONSTRAINT `fk_contactgrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `groups` (`groupname`) ON DELETE CASCADE", "ALTER TABLE `contactgrouprelation` ADD CONSTRAINT `fk_contactgrouprelation123` FOREIGN KEY (`contactid`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE", "ALTER TABLE `customaction` ADD CONSTRAINT `customaction_FK1` FOREIGN KEY (`cvid`) REFERENCES `customview` (`cvid`) ON DELETE CASCADE", @@ -2596,7 +2628,7 @@ require_once('include/ComboStrings.php'); global $combo_strings; -$comboTables = Array('campaigntype','campaignstatus','expectedrevenue','actualcost','expectedresponse'); +$comboTables = Array('campaigntype','campaignstatus','expectedresponse'); foreach ($comboTables as $tablename) { $values = $combo_strings[$tablename."_dom"]; From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 29 05:57:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 29 Apr 2006 12:57:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5584 - /vtigercrm/trunk/Smarty/templates/HomePage.tpl Message-ID: <20060429125710.5F2086EA6C7@vtiger.fosslabs.com> Author: don Date: Sat Apr 29 06:57:05 2006 New Revision: 5584 Log: Made changes to Homepage.tpl for New Home Page UI 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 Apr 29 06:57:05 2006 @@ -5,11 +5,7 @@ - - - - @@ -51,8 +47,8 @@ Show World Clock... Open Calculator... -   - Open All Menu... +   + Open All Menu... @@ -132,87 +128,69 @@ - + + + + + + + + + + + +
         
        + + + + + + + {foreach item=entries from=$ACTIVITIES.0.Entries} + + + + + {/foreach} + +
        Upcoming Events
        23 Events For Today
        {$entries.IMAGE}{$entries.0}
        1 800 800 8000
        +

        + + + + + + + + + +
        + Pending Events
        + 7 Events in Past 10 days        		 +  
        + + + + + {foreach item=entries from=$ACTIVITIES.1.Entries} + + + + + {/foreach} + + + +
        {$entries.IMAGE}{$entries.0}
        1 800 800 8000
        + + + -{* Quick Access Functionality *} -
        - - - - - - - - - - - -
        Jump To -
        - - Home - Home - Activities - Calander - Email - Sales - - Leads - Accounts - Contacts - Potentials - Quotes - Sales Order - - Invoice - Campaigns - Products - Price Books - Notes - - Support - Help Desk - Faq - Accounts - Contacts - - Products - Notes - Analytics - Dashboard - Reports - Inventory - - Products - Vendors - Price Books - PurchaseOrder - SalesOrder - Quotes - - Invoice - - Tools - Rss - Portal - Notes - - Settings - Settings -
        -
        - {literal} - - -{* Begining of Slide Menu *} +{* Begining of Slide Menu
        @@ -300,7 +300,28 @@ - + *} + +{* Quick Access Functionality *} +
        +
        + + +
        + {assign var="parentno" value=0} + {foreach name=parenttablist key=parenttab item=details from=$QUICKACCESS} + {$parenttab} + {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} + {assign var="parentno" value=$num} + {if $loopvalue eq '0'} + + {/if} + {$modules.1} + {/foreach} + {/foreach} +
        From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 29 06:03:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 29 Apr 2006 13:03:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5586 - /vtigercrm/trunk/include/utils/CommonUtils.php Message-ID: <20060429130356.51AA340E816@vtiger.fosslabs.com> Author: don Date: Sat Apr 29 07:03:52 2006 New Revision: 5586 Log: Added new function getAllParenttabmoduleslist() for new Home Page UI 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 Sat Apr 29 07:03:52 2006 @@ -2098,6 +2098,22 @@ $log->debug("Exiting getEntityName method ..."); } +function getAllParenttabmoduleslist() +{ + global $adb; + $resultant_array = Array(); + $query = 'select name,tablabel,parenttab_label from parenttabrel inner join tab on parenttabrel.tabid = tab.tabid in +ner join parenttab on parenttabrel.parenttabid = parenttab.parenttabid order by parenttab.sequence'; + $result = $adb->query($query); + for($i=0;$i<$adb->num_rows($result);$i++) + { + $parenttabname = $adb->query_result($result,$i,'parenttab_label'); + $modulename = $adb->query_result($result,$i,'name'); + $tablabel = $adb->query_result($result,$i,'tablabel'); + $resultant_array[$parenttabname][] = Array($modulename,$tablabel); + } + return $resultant_array; +} ?> From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 29 06:06:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 29 Apr 2006 13:06:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5587 - /vtigercrm/trunk/include/js/general.js Message-ID: <20060429130630.2C7A149A75E@vtiger.fosslabs.com> Author: don Date: Sat Apr 29 07:06:25 2006 New Revision: 5587 Log: Made changed in general.js for new Homepage UI Modified: vtigercrm/trunk/include/js/general.js Modified: vtigercrm/trunk/include/js/general.js ============================================================================== --- vtigercrm/trunk/include/js/general.js (original) +++ vtigercrm/trunk/include/js/general.js Sat Apr 29 07:06:25 2006 @@ -1356,6 +1356,7 @@ function fnvshNrm(Lay){ var tagName = document.getElementById(Lay); tagName.style.visibility = 'visible'; + tagName.style.display = 'block'; } From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 29 06:15:14 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 29 Apr 2006 13:15:14 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5588 - /vtigercrm/trunk/modules/Home/index.php Message-ID: <20060429131514.7084749A75E@vtiger.fosslabs.com> Author: don Date: Sat Apr 29 07:15:10 2006 New Revision: 5588 Log: Made changes in /Home/index.php for new Homepage UI 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 Sat Apr 29 07:15:10 2006 @@ -63,8 +63,10 @@ case 'OLV': if(isPermitted('Activities','index') == "yes") { - include("modules/Activities/OpenListView.php") ; - $home_values[]= getPendingActivities(); + $activities = Array(); + include("modules/Activities/OpenListView.php") ; + $activities[] = getPendingActivities(0); + $activities[] = getPendingActivities(1); } break; case 'ALVT': @@ -156,6 +158,7 @@ $smarty->assign("IMAGE_PATH",$image_path); $smarty->assign("HOMEDETAILS",$home_values); $smarty->assign("HOMEDEFAULTVIEW",DefHomeView()); +$smarty->assign("ACTIVITIES",$activities); $smarty->display("HomePage.tpl"); function getLoginHistory() From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 29 06:23:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 29 Apr 2006 13:23:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5589 - /vtigercrm/trunk/themes/blue/header.php Message-ID: <20060429132324.B8B8349A75E@vtiger.fosslabs.com> Author: don Date: Sat Apr 29 07:23:20 2006 New Revision: 5589 Log: Made changes in header.php for new Homepage UI Modified: vtigercrm/trunk/themes/blue/header.php Modified: vtigercrm/trunk/themes/blue/header.php ============================================================================== --- vtigercrm/trunk/themes/blue/header.php (original) +++ vtigercrm/trunk/themes/blue/header.php Sat Apr 29 07:23:20 2006 @@ -79,6 +79,8 @@ $smarty->assign("MODULELISTS",$app_list_strings['moduleList']); $smarty->assign("CATEGORY",getParentTab()); $smarty->assign("CALC",get_calc($image_path)); +$smarty->assign("QUICKACCESS",getAllParenttabmoduleslist()); + if (is_admin($current_user)) $smarty->assign("ADMIN_LINK", "".$app_strings['LBL_SETTINGS'].""); From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 29 06:25:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 29 Apr 2006 13:25:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5590 - /vtigercrm/trunk/themes/blue/style.css Message-ID: <20060429132515.CAF756EB721@vtiger.fosslabs.com> Author: don Date: Sat Apr 29 07:25:11 2006 New Revision: 5590 Log: added style for new Homepage UI Modified: vtigercrm/trunk/themes/blue/style.css Modified: vtigercrm/trunk/themes/blue/style.css ============================================================================== --- vtigercrm/trunk/themes/blue/style.css (original) +++ vtigercrm/trunk/themes/blue/style.css Sat Apr 29 07:25:11 2006 @@ -1950,6 +1950,7 @@ /* All Menu */ #allMenu{ width:500px; + z-index:10000002; border-top:2px solid #CCCCCC; border-left:2px solid #CCCCCC; border-bottom:2px solid #666666; From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 29 06:31:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 29 Apr 2006 13:31:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5591 - /vtigercrm/trunk/themes/blue/images/pending_left.gif Message-ID: <20060429133117.ECBB56F0F2D@vtiger.fosslabs.com> Author: richie Date: Sat Apr 29 07:31:13 2006 New Revision: 5591 Log: Added new images/pending_left.gif for Homepage ui Added: vtigercrm/trunk/themes/blue/images/pending_left.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 29 06:32:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 29 Apr 2006 13:32:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5592 - in /vtigercrm/trunk/themes/blue/images: pendingEvents.gif pending_right.gif Message-ID: <20060429133207.8F1DB49A75E@vtiger.fosslabs.com> Author: richie Date: Sat Apr 29 07:32:01 2006 New Revision: 5592 Log: Added two images for new homepage ui Added: vtigercrm/trunk/themes/blue/images/pendingEvents.gif (with props) vtigercrm/trunk/themes/blue/images/pending_right.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 29 06:33:04 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 29 Apr 2006 13:33:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5593 - in /vtigercrm/trunk/themes/blue/images: up.gif upcomingEvents.gif upcoming_left.gif upcoming_right.gif Message-ID: <20060429133304.1116149A75E@vtiger.fosslabs.com> Author: richie Date: Sat Apr 29 07:32:51 2006 New Revision: 5593 Log: Added 4 images for new homepage ui Added: vtigercrm/trunk/themes/blue/images/up.gif (with props) vtigercrm/trunk/themes/blue/images/upcomingEvents.gif (with props) vtigercrm/trunk/themes/blue/images/upcoming_left.gif (with props) vtigercrm/trunk/themes/blue/images/upcoming_right.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 29 10:06:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 29 Apr 2006 17:06:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5594 - /vtigercrm/trunk/modules/Reports/ Message-ID: <20060429170657.D91AD6F0F74@vtiger.fosslabs.com> Author: don Date: Sat Apr 29 11:06:37 2006 New Revision: 5594 Log: New UI has been integrated for Reports Added: vtigercrm/trunk/modules/Reports/ChangeFolder.php vtigercrm/trunk/modules/Reports/ReportsAjax.php Modified: vtigercrm/trunk/modules/Reports/AdvancedFilter.php vtigercrm/trunk/modules/Reports/CreatePDF.php vtigercrm/trunk/modules/Reports/CreateXL.php vtigercrm/trunk/modules/Reports/Delete.php vtigercrm/trunk/modules/Reports/DeleteReportFolder.php vtigercrm/trunk/modules/Reports/ListView.php vtigercrm/trunk/modules/Reports/NewReport0.php vtigercrm/trunk/modules/Reports/NewReport1.php vtigercrm/trunk/modules/Reports/Report.js vtigercrm/trunk/modules/Reports/ReportColumns.php vtigercrm/trunk/modules/Reports/ReportColumnsTotal.php vtigercrm/trunk/modules/Reports/ReportFilters.php vtigercrm/trunk/modules/Reports/ReportGrouping.php vtigercrm/trunk/modules/Reports/ReportRun.php vtigercrm/trunk/modules/Reports/ReportType.php vtigercrm/trunk/modules/Reports/Reports.php vtigercrm/trunk/modules/Reports/Save.php vtigercrm/trunk/modules/Reports/SaveAndRun.php vtigercrm/trunk/modules/Reports/SaveReportFolder.php vtigercrm/trunk/modules/Reports/StandardFilter.php Modified: vtigercrm/trunk/modules/Reports/AdvancedFilter.php ============================================================================== --- vtigercrm/trunk/modules/Reports/AdvancedFilter.php (original) +++ vtigercrm/trunk/modules/Reports/AdvancedFilter.php Sat Apr 29 11:06:37 2006 @@ -8,80 +8,52 @@ * All Rights Reserved. * ********************************************************************************/ -require_once('XTemplate/xtpl.php'); -require_once("data/Tracker.php"); -require_once('themes/'.$theme.'/layout_utils.php'); -require_once('include/logging.php'); -require_once('include/utils/utils.php'); -require_once('modules/Reports/Reports.php'); -require_once('include/database/PearDatabase.php'); - -global $app_strings; -global $app_list_strings; -global $mod_strings; -$current_module_strings = return_module_language($current_language, 'Reports'); - -global $list_max_entries_per_page; -global $urlPrefix; - -$log = LoggerManager::getLogger('adv_report'); - -global $currentModule; -global $image_path; -global $theme; - -global $adv_filter_options; - -$adv_report=new XTemplate ('modules/Reports/AdvancedFilter.html'); -$adv_report->assign("MOD", $mod_strings); -$adv_report->assign("APP", $app_strings); - if(isset($_REQUEST["record"])) { $reportid = $_REQUEST["record"]; -$oReport = new Reports(); +$oReport = new Reports($reportid); $oReport->getAdvancedFilterList($reportid); -$BLOCK1 = getPrimaryColumns_AdvFilterHTML($primarymodule,$oReport->advft_column[0]); -$BLOCK1 .= getSecondaryColumns_AdvFilterHTML($secondarymodule,$oReport->advft_column[0]); -$adv_report->assign("BLOCK1", $BLOCK1); +$BLOCK1 = getPrimaryColumns_AdvFilterHTML($oReport->primodule,$oReport->advft_column[0]); +$BLOCK1 .= getSecondaryColumns_AdvFilterHTML($oReport->secmodule,$oReport->advft_column[0]); +$report_std_filter->assign("BLOCK1", $BLOCK1); -$BLOCK2 = getPrimaryColumns_AdvFilterHTML($primarymodule,$oReport->advft_column[1]); -$BLOCK2 .= getSecondaryColumns_AdvFilterHTML($secondarymodule,$oReport->advft_column[1]); -$adv_report->assign("BLOCK2", $BLOCK2); +$BLOCK2 = getPrimaryColumns_AdvFilterHTML($oReport->primodule,$oReport->advft_column[1]); +$BLOCK2 .= getSecondaryColumns_AdvFilterHTML($oReport->secmodule,$oReport->advft_column[1]); +$report_std_filter->assign("BLOCK2", $BLOCK2); -$BLOCK3 = getPrimaryColumns_AdvFilterHTML($primarymodule,$oReport->advft_column[2]); -$BLOCK3 .= getSecondaryColumns_AdvFilterHTML($secondarymodule,$oReport->advft_column[2]); -$adv_report->assign("BLOCK3", $BLOCK3); +$BLOCK3 = getPrimaryColumns_AdvFilterHTML($oReport->primodule,$oReport->advft_column[2]); +$BLOCK3 .= getSecondaryColumns_AdvFilterHTML($oReport->secmodule,$oReport->advft_column[2]); +$report_std_filter->assign("BLOCK3", $BLOCK3); -$BLOCK4 = getPrimaryColumns_AdvFilterHTML($primarymodule,$oReport->advft_column[3]); -$BLOCK4 .= getSecondaryColumns_AdvFilterHTML($secondarymodule,$oReport->advft_column[3]); -$adv_report->assign("BLOCK4", $BLOCK4); +$BLOCK4 = getPrimaryColumns_AdvFilterHTML($oReport->primodule,$oReport->advft_column[3]); +$BLOCK4 .= getSecondaryColumns_AdvFilterHTML($oReport->secmodule,$oReport->advft_column[3]); +$report_std_filter->assign("BLOCK4", $BLOCK4); -$BLOCK5 = getPrimaryColumns_AdvFilterHTML($primarymodule,$oReport->advft_column[4]); -$BLOCK5 .= getSecondaryColumns_AdvFilterHTML($secondarymodule,$oReport->advft_column[4]); -$adv_report->assign("BLOCK5", $BLOCK5); +$BLOCK5 = getPrimaryColumns_AdvFilterHTML($oReport->primodule,$oReport->advft_column[4]); +$BLOCK5 .= getSecondaryColumns_AdvFilterHTML($oReport->secmodule,$oReport->advft_column[4]); +$report_std_filter->assign("BLOCK5", $BLOCK5); $FILTEROPTION1 = getAdvCriteriaHTML($oReport->advft_option[0]); -$adv_report->assign("FOPTION1",$FILTEROPTION1); +$report_std_filter->assign("FOPTION1",$FILTEROPTION1); $FILTEROPTION2 = getAdvCriteriaHTML($oReport->advft_option[1]); -$adv_report->assign("FOPTION2",$FILTEROPTION2); +$report_std_filter->assign("FOPTION2",$FILTEROPTION2); $FILTEROPTION3 = getAdvCriteriaHTML($oReport->advft_option[2]); -$adv_report->assign("FOPTION3",$FILTEROPTION3); +$report_std_filter->assign("FOPTION3",$FILTEROPTION3); $FILTEROPTION4 = getAdvCriteriaHTML($oReport->advft_option[3]); -$adv_report->assign("FOPTION4",$FILTEROPTION4); +$report_std_filter->assign("FOPTION4",$FILTEROPTION4); $FILTEROPTION5 = getAdvCriteriaHTML($oReport->advft_option[4]); -$adv_report->assign("FOPTION5",$FILTEROPTION5); +$report_std_filter->assign("FOPTION5",$FILTEROPTION5); -$adv_report->assign("VALUE1",$oReport->advft_value[0]); -$adv_report->assign("VALUE2",$oReport->advft_value[1]); -$adv_report->assign("VALUE3",$oReport->advft_value[2]); -$adv_report->assign("VALUE4",$oReport->advft_value[3]); -$adv_report->assign("VALUE5",$oReport->advft_value[4]); +$report_std_filter->assign("VALUE1",$oReport->advft_value[0]); +$report_std_filter->assign("VALUE2",$oReport->advft_value[1]); +$report_std_filter->assign("VALUE3",$oReport->advft_value[2]); +$report_std_filter->assign("VALUE4",$oReport->advft_value[3]); +$report_std_filter->assign("VALUE5",$oReport->advft_value[4]); }else { @@ -89,11 +61,11 @@ $secondarymodule = $_REQUEST["secondarymodule"]; $BLOCK1 = getPrimaryColumns_AdvFilterHTML($primarymodule); $BLOCK1 .= getSecondaryColumns_AdvFilterHTML($secondarymodule); -$adv_report->assign("BLOCK1", $BLOCK1); -$adv_report->assign("BLOCK2", $BLOCK1); -$adv_report->assign("BLOCK3", $BLOCK1); -$adv_report->assign("BLOCK4", $BLOCK1); -$adv_report->assign("BLOCK5", $BLOCK1); +$report_std_filter->assign("BLOCK1", $BLOCK1); +$report_std_filter->assign("BLOCK2", $BLOCK1); +$report_std_filter->assign("BLOCK3", $BLOCK1); +$report_std_filter->assign("BLOCK4", $BLOCK1); +$report_std_filter->assign("BLOCK5", $BLOCK1); } @@ -108,9 +80,7 @@ global $ogReport; global $app_list_strings; global $current_language; - $mod_strings = return_module_language($current_language,$module); - foreach($ogReport->module_list[$module] as $key=>$value) { $shtml .= ""; @@ -223,7 +193,5 @@ return $shtml; } -$adv_report->parse("main"); -$adv_report->out("main"); ?> Modified: vtigercrm/trunk/modules/Reports/CreatePDF.php ============================================================================== --- vtigercrm/trunk/modules/Reports/CreatePDF.php (original) +++ vtigercrm/trunk/modules/Reports/CreatePDF.php Sat Apr 29 11:06:37 2006 @@ -370,7 +370,7 @@ $count = 0; foreach($arr_val[0] as $key=>$value) { - $headerHTML .= ''.$key.''; + $headerHTML .= ''.$key.''; $count = $count + 1; } Modified: vtigercrm/trunk/modules/Reports/CreateXL.php ============================================================================== --- vtigercrm/trunk/modules/Reports/CreateXL.php (original) +++ vtigercrm/trunk/modules/Reports/CreateXL.php Sat Apr 29 11:06:37 2006 @@ -33,8 +33,10 @@ # Write out the data $reportid = $_REQUEST["record"]; $oReport = new Reports($reportid); -$filtercolumn = $stdDateFilterField; -$filter = $stdDateFilter; +$filtercolumn = $_REQUEST['stdDateFilterField']; +$filter = $_REQUEST['stdDateFilter']; +$startdate = $_REQUEST['startdate']; +$enddate = $_REQUEST['enddate']; $oReportRun = new ReportRun($reportid); $filterlist = $oReportRun->RunTimeFilter($filtercolumn,$filter,$startdate,$enddate); Modified: vtigercrm/trunk/modules/Reports/Delete.php ============================================================================== --- vtigercrm/trunk/modules/Reports/Delete.php (original) +++ vtigercrm/trunk/modules/Reports/Delete.php Sat Apr 29 11:06:37 2006 @@ -12,16 +12,29 @@ require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); -global $adb; +if(isset($_REQUEST['idlist']) && $_REQUEST['idlist']!= '') +{ + $id_array = Array(); + $id_array = explode(':',$_REQUEST['idlist']); + for($i = 0;$i < count($id_array)-1;$i++) + { + DeleteReport($id_array[$i]); + } + header("Location: index.php?action=ReportsAjax&file=ListView&mode=ajax&module=Reports"); +}elseif(isset($_REQUEST['record']) && $_REQUEST['record']!= '') +{ + $id = $_REQUEST["record"]; + DeleteReport($id); + header("Location: index.php?action=ReportsAjax&file=ListView&mode=ajaxdelete&module=Reports"); +} -$reportid = $_REQUEST["record"]; -if($reportid != "") +function DeleteReport($reportid) { + global $adb; $idelreportsql = "delete from selectquery where queryid=".$reportid; $idelreportsqlresult = $adb->query($idelreportsql); $ireportsql = "delete from report where reportid=".$reportid; - $ireportsqlresult = $adb->query($ireportsql); + $ireportsqlresult = $adb->query($ireportsql); } -header("Location: index.php?action=index&module=Reports"); ?> Modified: vtigercrm/trunk/modules/Reports/DeleteReportFolder.php ============================================================================== --- vtigercrm/trunk/modules/Reports/DeleteReportFolder.php (original) +++ vtigercrm/trunk/modules/Reports/DeleteReportFolder.php Sat Apr 29 11:06:37 2006 @@ -8,29 +8,20 @@ * All Rights Reserved. * ********************************************************************************/ -require_once('modules/Reports/Reports.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); global $adb; $local_log =& LoggerManager::getLogger('index'); -$focus = new Reports(); - $rfid = $_REQUEST['record']; - -if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] != "") $return_module = $_REQUEST['return_module']; -else $return_module = "Reports"; -if(isset($_REQUEST['return_action']) && $_REQUEST['return_action'] != "") $return_action = $_REQUEST['return_action']; -else $return_action = "index"; - if($rfid != "") { $sql .= "delete from reportfolder where folderid=".$rfid; $result = $adb->query($sql); if($result!=false) { - header("Location: index.php?action=$return_action&module=$return_module"); + header("Location: index.php?action=ReportsAjax&mode=ajax&file=ListView&module=Reports"); }else { include('themes/'.$theme.'/header.php'); Modified: vtigercrm/trunk/modules/Reports/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Reports/ListView.php (original) +++ vtigercrm/trunk/modules/Reports/ListView.php Sat Apr 29 11:06:37 2006 @@ -8,8 +8,8 @@ * All Rights Reserved. * ********************************************************************************/ -require_once('XTemplate/xtpl.php'); require_once("data/Tracker.php"); +require_once('Smarty_setup.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/utils/utils.php'); @@ -31,26 +31,40 @@ global $image_path; global $theme; +global $theme; +$theme_path="themes/".$theme."/"; +$image_path=$theme_path."images/"; // focus_list is the means of passing data to a ListView. global $focus_list; -$list_report_form=new XTemplate ('modules/Reports/ListView.html'); +$list_report_form = new vtigerCRM_Smarty; $list_report_form->assign("MOD", $mod_strings); $list_report_form->assign("APP", $app_strings); - +$list_report_form->assign("APPLIST", $app_list_strings); $list_report_form->assign("IMAGE_PATH", $image_path); -//report creation button -$newrpt_button = ''; -//report folder creation button -$newrpt_fldr_button = ''; - +$list_report_form->assign("CATEGORY",getParentTab()); +$list_report_form->assign("MODULE",$currentModule); $list_report_form->assign("NEWRPT_BUTTON",$newrpt_button); $list_report_form->assign("NEWRPT_FLDR_BUTTON",$newrpt_fldr_button); $repObj = new Reports (); -$list_report_form->assign("REPT_FLDR_BLK",$repObj->sgetRptFldr()); -$list_report_form->assign("JAVASCRIPT",""); -$list_report_form->parse("main"); -$list_report_form->out("main"); +$list_report_form->assign("REPT_FLDR",$repObj->sgetRptFldr('SAVED')); +$cusFldrDtls = Array(); +$cusFldrDtls = $repObj->sgetRptFldr('CUSTOMIZED'); +$list_report_form->assign("REPT_CUSFLDR",$cusFldrDtls); +foreach($cusFldrDtls as $entries) +{ + $fldrids_lists [] =$entries['id']; +} +if(count($fldrids_lists) > 0) + $list_report_form->assign("FOLDE_IDS",implode(',',$fldrids_lists)); +$list_report_form->assign("REPT_MODULES",getReportsModuleList()); +$list_report_form->assign("REPT_FOLDERS",$repObj->sgetRptFldr()); +if($_REQUEST['mode'] == 'ajax') + $list_report_form->display("ReportsCustomize.tpl"); +elseif($_REQUEST['mode'] == 'ajaxdelete') + $list_report_form->display("ReportContents.tpl"); +else + $list_report_form->display("Reports.tpl"); ?> Modified: vtigercrm/trunk/modules/Reports/NewReport0.php ============================================================================== --- vtigercrm/trunk/modules/Reports/NewReport0.php (original) +++ vtigercrm/trunk/modules/Reports/NewReport0.php Sat Apr 29 11:06:37 2006 @@ -8,7 +8,7 @@ * All Rights Reserved. * ********************************************************************************/ -require_once('XTemplate/xtpl.php'); +require_once('Smarty_setup.php'); require_once("data/Tracker.php"); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); @@ -27,90 +27,21 @@ global $theme; global $focus_list; -echo get_module_title($mod_strings['LBL_MODULE_NAME'],$mod_strings['LBL_CREATE_REPORT'], true); -echo "\n
        \n"; - -/** Function to get the primary module list in reports - * This function generates the list of primary modules in reports - * and returns the module in a combo HTML values - */ - -function getPrimaryModuleList() -{ - global $adb; - global $app_list_strings; - global $report_modules; - global $mod_strings; - - $count_flag = 0; - foreach($app_list_strings['moduleList'] as $key=>$value) - { - for($i=0;$i$value"; - } - } - } - - } - if($count_flag == 0) - { - $shtml .= ""; - } - return $shtml; -} - -/** Function to get the Related module list in reports - * This function generates the list of secondary modules in reports - * and returns the related module in a combo HTML values - */ - -function getRelatedModuleList() -{ - global $app_list_strings; - global $related_modules; - global $mod_strings; - - foreach($related_modules as $key_module=>$rel_modules) - { - if(isPermitted($key_module,'index') == "yes") - { - $shtml .= ""; - } - } - - return $shtml; -} - -$primary_module_html = getPrimaryModuleList(); -$related_module_html = getRelatedModuleList(); -$list_report_form=new XTemplate ('modules/Reports/NewReport0.html'); +$theme_path="themes/".$theme."/"; +$image_path=$theme_path."images/"; +require_once($theme_path.'layout_utils.php'); +$list_report_form = new vtigerCRM_Smarty; $list_report_form->assign("MOD", $mod_strings); $list_report_form->assign("APP", $app_strings); -$list_report_form->assign("PRIMARYMODULE",$primary_module_html); -$list_report_form->assign("RELATEDMODULES",$related_module_html); +if($_REQUEST['reportmodule'] != '') +{ + $list_report_form->assign("RELATEDMODULES",getReportRelatedModules($_REQUEST['reportmodule'])); + $list_report_form->assign("REP_MODULE",$_REQUEST['reportmodule']); +} +$repObj = new Reports (); +$list_report_form->assign("REP_FOLDERS",$repObj->sgetRptFldr()); $list_report_form->assign("IMAGE_PATH", $image_path); $list_report_form->assign("ERROR_MSG", $mod_strings['LBL_NO_PERMISSION']); -$list_report_form->parse("main"); -$list_report_form->out("main"); +$list_report_form->display("ReportsStep0.tpl"); ?> Modified: vtigercrm/trunk/modules/Reports/NewReport1.php ============================================================================== --- vtigercrm/trunk/modules/Reports/NewReport1.php (original) +++ vtigercrm/trunk/modules/Reports/NewReport1.php Sat Apr 29 11:06:37 2006 @@ -8,12 +8,12 @@ * All Rights Reserved. * ********************************************************************************/ -require_once('XTemplate/xtpl.php'); require_once("data/Tracker.php"); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/utils/utils.php'); require_once('modules/Reports/Reports.php'); +require_once('Smarty_setup.php'); global $app_strings; global $app_list_strings; @@ -29,19 +29,16 @@ // focus_list is the means of passing data to a ListView. global $focus_list; -if(isset($_REQUEST["record"])) -{ - echo get_module_title($mod_strings['LBL_MODULE_NAME'], $mod_strings['LBL_CUSTOMIZE_REPORT'], true); - echo "\n
        \n"; -}else -{ - echo get_module_title($mod_strings['LBL_MODULE_NAME'],$mod_strings['LBL_CREATE_REPORT'], true); - echo "\n
        \n"; - -} +$theme_path="themes/".$theme."/"; +$image_path=$theme_path."images/"; +require_once($theme_path.'layout_utils.php'); +$list_report_form = new vtigerCRM_Smarty; +$list_report_form->assign("MOD", $mod_strings); +$list_report_form->assign("APP", $app_strings); if(isset($_REQUEST["record"])) { $reportid = $_REQUEST["record"]; + $list_report_form->assign('REPORT_ID',$reportid); $oReport = new Reports($reportid); $primarymodule = $oReport->primodule; $secondarymodule = $oReport->secmodule; @@ -54,201 +51,20 @@ $ogReport->getSecModuleColumnsList($oReport->secmodule); }else { - $primarymodule=$_REQUEST["primarymodule"]; - $secondarymodule=$_REQUEST["secondarymodule"]; + $primarymodule = $_REQUEST["primarymodule"]; + $secondarymodule = $_REQUEST["secondarymodule"]; + $reportname = $_REQUEST["reportname"]; + $reportdescription = $_REQUEST["reportdes"]; + $folderid = $_REQUEST["reportfolder"]; $ogReport = new Reports(); $ogReport->getPriModuleColumnsList($primarymodule); $ogReport->getSecModuleColumnsList($secondarymodule); } +$list_report_form->assign('PRI_MODULE',$primarymodule); +$list_report_form->assign('SEC_MODULE',$secondarymodule); +$list_report_form->assign('REPORT_NAME',$reportname); +$list_report_form->assign('REPORT_DESC',$reportdescription); +$list_report_form->assign('FOLDERID',$folderid); +$list_report_form->assign("IMAGE_PATH", $image_path); +$list_report_form->display("ReportsStep1.tpl"); ?> - - - - -
        - - - - - - - - - - - - - - - -
        - - - -
        - -
        - - - - -
        - - - - - - - - -
        - - - - - - - - -
        - - - - - - - - -
        - - - - - - - - -

        - - -
        - - Modified: vtigercrm/trunk/modules/Reports/Report.js ============================================================================== --- vtigercrm/trunk/modules/Reports/Report.js (original) +++ vtigercrm/trunk/modules/Reports/Report.js Sat Apr 29 11:06:37 2006 @@ -141,25 +141,8 @@ goToURL( "?module=Reports&action=NewReport0&return_module=Reports&return_action=index" ); return; } - if( actionName == "newReportFolder" ) - { - goToURL( "?module=Reports&action=NewReportFolder&return_module=Reports&return_action=index" ); - return; - } goToURL( "/crm/ScheduleReport.do?step=showAllSchedules" ); } -function showRelatedModules(currmodule) - { - for (i=0;iassign("MOD", $mod_strings); $report_column->assign("APP", $app_strings); $report_column->assign("IMAGE_PATH",$image_path); @@ -126,7 +126,6 @@ return $shtml; } -$report_column->parse("main"); -$report_column->out("main"); +$report_column->display("ReportColumns.tpl"); ?> Modified: vtigercrm/trunk/modules/Reports/ReportColumnsTotal.php ============================================================================== --- vtigercrm/trunk/modules/Reports/ReportColumnsTotal.php (original) +++ vtigercrm/trunk/modules/Reports/ReportColumnsTotal.php Sat Apr 29 11:06:37 2006 @@ -8,8 +8,8 @@ * All Rights Reserved. * ********************************************************************************/ -require_once('XTemplate/xtpl.php'); require_once("data/Tracker.php"); +require_once('Smarty_setup.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/utils/utils.php'); @@ -29,7 +29,7 @@ global $currentModule; global $image_path; global $theme; -$report_column_tot=new XTemplate('modules/Reports/ReportColumnsTotal.html'); +$report_column_tot=new vtigerCRM_Smarty; $report_column_tot->assign("MOD", $mod_strings); $report_column_tot->assign("APP", $app_strings); $report_column_tot->assign("IMAGE_PATH",$image_path); @@ -39,16 +39,14 @@ $recordid = $_REQUEST["record"]; $oReport = new Reports($recordid); $BLOCK1 = $oReport->sgetColumntoTotalSelected($oReport->primodule,$oReport->secmodule,$recordid); - $report_column_tot->assign("BLOCK1",$BLOCK1); + $report_column_tot->assign("BLOCK1",$BLOCK1); }else { $primarymodule = $_REQUEST["primarymodule"]; $secondarymodule = $_REQUEST["secondarymodule"]; $oReport = new Reports(); $BLOCK1 = $oReport->sgetColumntoTotal($primarymodule,$secondarymodule); - $report_column_tot->assign("BLOCK1",$BLOCK1); + $report_column_tot->assign("BLOCK1",$BLOCK1); } - -$report_column_tot->parse("main"); -$report_column_tot->out("main"); +$report_column_tot->display('ReportColumnsTotal.tpl'); ?> Modified: vtigercrm/trunk/modules/Reports/ReportFilters.php ============================================================================== --- vtigercrm/trunk/modules/Reports/ReportFilters.php (original) +++ vtigercrm/trunk/modules/Reports/ReportFilters.php Sat Apr 29 11:06:37 2006 @@ -7,39 +7,37 @@ * Portions created by vtiger are Copyright (C) vtiger. * All Rights Reserved. * - ********************************************************************************/ + *****************************************************>***************************/ + +require_once('Smarty_setup.php'); +require_once("data/Tracker.php"); +require_once('themes/'.$theme.'/layout_utils.php'); +require_once('include/logging.php'); +require_once('include/utils/utils.php'); +require_once('modules/Reports/Reports.php'); +require_once('include/database/PearDatabase.php'); + + +global $app_strings; +global $app_list_strings; global $mod_strings; +$current_module_strings = return_module_language($current_language, 'Reports'); +global $list_max_entries_per_page; +global $urlPrefix; + +$log = LoggerManager::getLogger('report_type'); +global $currentModule; +global $image_path; +global $theme; + +$report_std_filter = new vtigerCRM_Smarty; +$report_std_filter->assign("MOD", $mod_strings); +$report_std_filter->assign("APP", $app_strings); +$report_std_filter->assign("IMAGE_PATH",$image_path); + +include("modules/Reports/StandardFilter.php"); +include("modules/Reports/AdvancedFilter.php"); + + +$report_std_filter->display('ReportFilters.tpl'); ?> - - - - - - - - - - -
        -
        - - - - - -
        :
        - -
        -
        - - - - - -
        :
        - -
        -
        -
        - - Modified: vtigercrm/trunk/modules/Reports/ReportGrouping.php ============================================================================== --- vtigercrm/trunk/modules/Reports/ReportGrouping.php (original) +++ vtigercrm/trunk/modules/Reports/ReportGrouping.php Sat Apr 29 11:06:37 2006 @@ -8,7 +8,7 @@ * All Rights Reserved. * ********************************************************************************/ -require_once('XTemplate/xtpl.php'); +require_once('Smarty_setup.php'); require_once("data/Tracker.php"); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); @@ -29,41 +29,40 @@ global $currentModule; global $image_path; global $theme; -$report_group=new XTemplate('modules/Reports/ReportGrouping.html'); +$report_group=new vtigerCRM_Smarty; $report_group->assign("MOD", $mod_strings); $report_group->assign("APP", $app_strings); $report_group->assign("IMAGE_PATH",$image_path); if(isset($_REQUEST["record"])) { + $reportid = $_REQUEST["record"]; + $oReport = new Reports($reportid); + $list_array = $oReport->getSelctedSortingColumns($reportid); -$reportid = $_REQUEST["record"]; -$oReport = new Reports($reportid); -$list_array = $oReport->getSelctedSortingColumns($reportid); + $BLOCK1 = getPrimaryColumns_GroupingHTML($oReport->primodule,$list_array[0]); + $BLOCK1 .= getSecondaryColumns_GroupingHTML($oReport->secmodule,$list_array[0]); + $report_group->assign("BLOCK1",$BLOCK1); -$BLOCK1 = getPrimaryColumns_GroupingHTML($primarymodule,$list_array[0]); -$BLOCK1 .= getSecondaryColumns_GroupingHTML($secondarymodule,$list_array[0]); -$report_group->assign("BLOCK1",$BLOCK1); + $BLOCK2 = getPrimaryColumns_GroupingHTML($oReport->primodule,$list_array[1]); + $BLOCK2 .= getSecondaryColumns_GroupingHTML($oReport->secmodule,$list_array[1]); + $report_group->assign("BLOCK2",$BLOCK2); -$BLOCK2 = getPrimaryColumns_GroupingHTML($primarymodule,$list_array[1]); -$BLOCK2 .= getSecondaryColumns_GroupingHTML($secondarymodule,$list_array[1]); -$report_group->assign("BLOCK2",$BLOCK2); + $BLOCK3 = getPrimaryColumns_GroupingHTML($oReport->primodule,$list_array[2]); + $BLOCK3 .= getSecondaryColumns_GroupingHTML($oReport->secmodule,$list_array[2]); + $report_group->assign("BLOCK3",$BLOCK3); -$BLOCK3 = getPrimaryColumns_GroupingHTML($primarymodule,$list_array[2]); -$BLOCK3 .= getSecondaryColumns_GroupingHTML($secondarymodule,$list_array[2]); -$report_group->assign("BLOCK3",$BLOCK3); - -$sortorder = $oReport->ascdescorder; + $sortorder = $oReport->ascdescorder; }else { -$primarymodule = $_REQUEST["primarymodule"]; -$secondarymodule = $_REQUEST["secondarymodule"]; -$BLOCK1 = getPrimaryColumns_GroupingHTML($primarymodule); -$BLOCK1 .= getSecondaryColumns_GroupingHTML($secondarymodule); -$report_group->assign("BLOCK1",$BLOCK1); -$report_group->assign("BLOCK2",$BLOCK1); -$report_group->assign("BLOCK3",$BLOCK1); + $primarymodule = $_REQUEST["primarymodule"]; + $secondarymodule = $_REQUEST["secondarymodule"]; + $BLOCK1 = getPrimaryColumns_GroupingHTML($primarymodule); + $BLOCK1 .= getSecondaryColumns_GroupingHTML($secondarymodule); + $report_group->assign("BLOCK1",$BLOCK1); + $report_group->assign("BLOCK2",$BLOCK1); + $report_group->assign("BLOCK3",$BLOCK1); } @@ -190,7 +189,6 @@ "; } $report_group->assign("ASCDESC3",$shtml); +$report_group->display("ReportGrouping.tpl"); -$report_group->parse("main"); -$report_group->out("main"); ?> Modified: vtigercrm/trunk/modules/Reports/ReportRun.php ============================================================================== --- vtigercrm/trunk/modules/Reports/ReportRun.php (original) +++ vtigercrm/trunk/modules/Reports/ReportRun.php Sat Apr 29 11:06:37 2006 @@ -71,7 +71,6 @@ $columnslist[$fieldcolname] = $querycolumns; } } - //print_r($columnslist); $log->info("ReportRun :: Successfully returned getQueryColumnsList".$reportid); return $columnslist; } @@ -79,14 +78,6 @@ function getEscapedColumns($selectedfields) { $fieldname = $selectedfields[3]; - /*if($fieldname == "assigned_user_id") - { - $querycolumn = "usersRel.user_name"." ".$selectedfields[2]; - }*/ - /*if($fieldname == "account_id") - { - $querycolumn = "accountRel.accountname"." ".$selectedfields[2]; - }*/ if($fieldname == "parent_id") { if($this->primarymodule == "HelpDesk") @@ -102,22 +93,6 @@ $querycolumn = "case crmentityRelActivities.setype when 'Accounts' then accountRelActivities.accountname when 'Leads' then leaddetailsRelActivities.lastname when 'Potentials' then potentialRelActivities.potentialname when 'Quotes' then quotesRelActivities.subject when 'PurchaseOrder' then purchaseorderRelActivities.subject when 'Invoice' then invoiceRelActivities.subject End"." '".$selectedfields[2]."', crmentityRelActivities.setype 'Entity_type'"; } } - /*if($fieldname == "contact_id") - { - $querycolumn = "contactdetailsRel.lastname"." ".$selectedfields[2]; - }*/ - /*if($fieldname == "vendor_id") - { - $querycolumn = "vendorRel.name"." ".$selectedfields[2]; - } - if($fieldname == "potential_id") - { - $querycolumn = "potentialRel.potentialname"." ".$selectedfields[2]; - } - if($fieldname == "assigned_user_id1") - { - $querycolumn = "usersRel1.user_name"." ".$selectedfields[2]; - }*/ return $querycolumn; } @@ -584,7 +559,6 @@ $datevalue[1] = ""; } - //$log->info("ReportRun :: Successfully returned getQueryColumnsList".$reportid); return $datevalue; } @@ -632,7 +606,6 @@ global $adb; global $modules; global $log; - //$modules = array("Leads_", "Accounts_", "Potentials_", "Contacts_","_"); $sreportsortsql = "select reportsortcol.* from report"; $sreportsortsql .= " inner join reportsortcol on report.reportid = reportsortcol.reportid"; @@ -961,7 +934,6 @@ function getReportsQuery($module) { global $log; - //echo $this->secondarymodule."
        "; if($module == "Leads") { $query = "from leaddetails @@ -991,6 +963,7 @@ $query = "from contactdetails inner join crmentity as crmentityContacts on crmentityContacts.crmid = contactdetails.contactid inner join contactaddress on contactdetails.contactid = contactaddress.contactaddressid + inner join customerdetails on customerdetails.customerid = contactdetails.contactid inner join contactsubdetails on contactdetails.contactid = contactsubdetails.contactsubscriptionid inner join contactscf on contactdetails.contactid = contactscf.contactid left join contactdetails as contactdetailsContacts on contactdetailsContacts.contactid = contactdetails.reportsto @@ -1220,7 +1193,7 @@ for ($x=0; $x<$y; $x++) { $fld = $adb->field_name($result, $x); - $header .= "".str_replace($modules," ",$fld->name).""; + $header .= "".str_replace($modules," ",$fld->name).""; } $noofrows = $adb->num_rows($result); @@ -1308,37 +1281,23 @@ $arr_val[] = $arraylists; }while($custom_field_values = $adb->fetch_array($result)); - - $totalhtml = ' - - '.$mod_strings['LBL_GRAND_TOTAL'].': '.$noofrows.' Records - '; - - $sHTML = ' - - - - - - + $sHTML ='
        '.$this->reportname.'
        '. $header .''. $valtemplate - .'' - .$totalhtml. - '
        - - '; + .' + '; //<<<<<<<>>>>>>>>>>> - return $sHTML; + $return_data[] = $sHTML; + $return_data[] = $noofrows; + return $return_data; } }elseif($outputformat == "PDF") { $sSQL = $this->sGetSQLforReport($this->reportid,$filterlist); - //$modules = array("Leads_", "Accounts_", "Potentials_", "Contacts_","_"); $result = $adb->query($sSQL); $y=$adb->num_fields($result); @@ -1346,8 +1305,6 @@ { $noofrows = $adb->num_rows($result); $custom_field_values = $adb->fetch_array($result); - - //$modules = array("Leads_", "Accounts_", "Potentials_", "Contacts_","_"); do { @@ -1373,14 +1330,13 @@ $sSQL = $this->sGetSQLforReport($this->reportid,$filterlist,"COLUMNSTOTOTAL"); if(isset($this->totallist)) { - //print_r($this->totallist); if($sSQL != "") { $result = $adb->query($sSQL); $y=$adb->num_fields($result); $custom_field_values = $adb->fetch_array($result); - $coltotalhtml .= ""; + $coltotalhtml .= "
        TotalsSUMAVGMINMAX
        "; foreach($this->totallist as $key=>$value) { @@ -1436,7 +1392,6 @@ $coltotalhtml .= ''; } -// print_r($keyhdr); $coltotalhtml .= "
        TotalsSUMAVGMINMAX
        "; } } Modified: vtigercrm/trunk/modules/Reports/ReportType.php ============================================================================== --- vtigercrm/trunk/modules/Reports/ReportType.php (original) +++ vtigercrm/trunk/modules/Reports/ReportType.php Sat Apr 29 11:06:37 2006 @@ -8,13 +8,12 @@ * All Rights Reserved. * ********************************************************************************/ -require_once('XTemplate/xtpl.php'); require_once("data/Tracker.php"); -require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/utils/utils.php'); require_once('modules/Reports/Reports.php'); require_once('include/database/PearDatabase.php'); +require_once('Smarty_setup.php'); global $app_strings; global $app_list_strings; @@ -29,10 +28,13 @@ global $currentModule; global $image_path; global $theme; -$report_type=new XTemplate('modules/Reports/ReportType.html'); -$report_type->assign("MOD", $mod_strings); -$report_type->assign("APP", $app_strings); -$report_type->assign("IMAGE_PATH",$image_path); +$theme_path="themes/".$theme."/"; +$image_path=$theme_path."images/"; +require_once($theme_path.'layout_utils.php'); +$list_report_form = new vtigerCRM_Smarty; +$list_report_form->assign("MOD", $mod_strings); +$list_report_form->assign("APP", $app_strings); +$list_report_form->assign("IMAGE_PATH",$image_path); if(isset($_REQUEST["record"])) { $recordid = $_REQUEST["record"]; @@ -42,27 +44,6 @@ { $selectedreporttype = "tabular"; } -if($selectedreporttype == "tabular") -{ - $shtml = ''; -}else -{ - $shtml = ''; -} - -$report_type->assign("REPORT_TAB_TYPE",$shtml); - -if($selectedreporttype == "summary") -{ - $sumhtml = ''; -}else -{ - $sumhtml = ''; -} - -$report_type->assign("REPORT_SUM_TYPE",$sumhtml); - -$report_type->parse("main"); - -$report_type->out("main"); +$list_report_form->assign("REPORT_TYPE",$selectedreporttype); +$list_report_form->display("ReportsType.tpl"); ?> Modified: vtigercrm/trunk/modules/Reports/Reports.php ============================================================================== --- vtigercrm/trunk/modules/Reports/Reports.php (original) +++ vtigercrm/trunk/modules/Reports/Reports.php Sat Apr 29 11:06:37 2006 @@ -23,7 +23,7 @@ global $related_modules; global $profileList; -$profileList = getCurrentUserProfileList(); +//$profileList = getCurrentUserProfileList(); $adv_filter_options = array("e"=>"equals", "n"=>"not equal to", "s"=>"starts with", @@ -39,7 +39,7 @@ 'HelpDesk','Quotes','PurchaseOrder','Invoice','Activities' ); -$related_modules = Array('Leads'=>Array(''), +$related_modules = Array('Leads'=>Array(), 'Accounts'=>Array('Potentials','Contacts','Products','Quotes','Invoice'), 'Contacts'=>Array('Accounts','Potentials','Quotes','PurchaseOrder'), 'Potentials'=>Array('Accounts','Contacts','Quotes'), @@ -153,51 +153,45 @@ * contains HTML */ - function sgetRptFldr() + function sgetRptFldr($mode='') { global $adb; global $log; - + $returndata = Array(); $sql = "select * from reportfolder order by folderid"; $result = $adb->query($sql); $reportfldrow = $adb->fetch_array($result); - $x = 0; - do - { - $reporttempid = $reportfldrow["folderid"]."RptFldr"; - $reporttempidjs[$x] = "'".$reportfldrow["folderid"]."RptFldr'"; - - $shtml .= "
        - - - - -
        -
        - -
        -         		- ".$reportfldrow["foldername"].""; - if($reportfldrow["state"]=="SAVED") - { - $shtml .=""; - }else - { - $shtml .="  [ Edit Folder - | - Del Folder ]"; - } - $shtml .=" -
        "; - $shtml .= $this->sgetRptsforFldr($reportfldrow["folderid"]); - $x = $x + 1; - - }while($reportfldrow = $adb->fetch_array($result)); - $this->srptfldridjs = implode(",",$reporttempidjs); + if($mode != '') + { + do + { + if($reportfldrow["state"] == $mode) + { + $details = Array(); + $details['state'] = $reportfldrow["state"]; + $details['id'] = $reportfldrow["folderid"]; + $details['name'] = $reportfldrow["foldername"]; + $details['description'] = $reportfldrow["description"]; + $details['details'] = $this->sgetRptsforFldr($reportfldrow["folderid"]); + $returndata[] = $details; + } + }while($reportfldrow = $adb->fetch_array($result)); + }else + { + do + { + $details = Array(); + $details['state'] = $reportfldrow["state"]; + $details['id'] = $reportfldrow["folderid"]; + $details['name'] = $reportfldrow["foldername"]; + $details['description'] = $reportfldrow["description"]; + $returndata[] = $details; + }while($reportfldrow = $adb->fetch_array($result)); + } $log->info("Reports :: ListView->Successfully returned report folder HTML"); - return $shtml; + return $returndata; } /** Function to get the Reports inside each modules @@ -212,6 +206,7 @@ global $adb; global $log; global $mod_strings; + $returndata = Array(); require_once('include/utils/UserInfoUtil.php'); @@ -221,72 +216,23 @@ $report = $adb->fetch_array($result); if(count($report)>0) { - $srptdetails .= '
        - - - - - -
          - - - - - - '; - $rowcnt = 1; - $count_flag = 0; do { - /* if(isPermitted($report['primarymodule'],'index') == "yes" && (isPermitted($report['secondarymodules'],'index')== "yes" || $report['secondarymodules'] == '')) - {*/ - $count_flag = 1; - if ($rowcnt%2 == 0) - $srptdetails .= ''; - else - $srptdetails .= ''; - - $srptdetails .= ' - - - '; - $rowcnt++; - // } + $report_details = Array(); + $report_details ['customizable'] = $report["customizable"]; + $report_details ['reportid'] = $report["reportid"]; + $report_details ['primarymodule'] = $report["primarymodule"]; + $report_details ['secondarymodules'] = $report["secondarymodules"]; + $report_details ['state'] = $report["state"]; + $report_details ['description'] = $report["description"]; + $report_details ['reportname'] = $report["reportname"]; + + $returndata []=$report_details; }while($report = $adb->fetch_array($result)); - /* if($count_flag == 0) - { - $srptdetails .= ""; - } -*/ - $srptdetails .= '
        Report NameDescription
        -
        '; - if($report["customizable"]==1) - { - $srptdetails .= 'Customize'; - } - - if($report["state"] !="SAVED") - { - $srptdetails .= " | Del"; - } - $srptdetails .='
        -         		'.$report["reportname"].''.$report["description"].'
        ".$mod_strings['LBL_NO_PERMISSION']."
        -
        -
        '; - }else - { - $srptdetails .= '
        - - - - - -
        No reports in this folder
        -
        '; } $log->info("Reports :: ListView->Successfully returned report details HTML"); - return $srptdetails; + return $returndata; } /** Function to get the array of ids @@ -504,7 +450,6 @@ $tabid = getTabid($module); global $profile_id; - foreach($this->module_list[$module] as $key=>$blockid) { $blockids[] = $blockid; @@ -846,9 +791,7 @@ global $adb; global $modules; global $log; - - $ssql = "select relcriteria.* from report inner join selectquery on relcriteria.queryid = report.queryid"; - $ssql.= " left join relcriteria on relcriteria.queryid = selectquery.queryid"; + $ssql = 'select relcriteria.* from report inner join relcriteria on relcriteria.queryid = report.queryid left join selectquery on relcriteria.queryid = selectquery.queryid'; $ssql.= " where report.reportid =".$reportid." order by relcriteria.columnindex"; $result = $adb->query($ssql); @@ -897,17 +840,17 @@ function sgetColumntoTotal($primarymodule,$secondarymodule) { - $shtml = $this->sgetColumnstoTotalHTML($primarymodule,0); + $options = Array(); + $options []= $this->sgetColumnstoTotalHTML($primarymodule,0); if($secondarymodule != "") { $secondarymodule = explode(":",$secondarymodule); for($i=0;$i < count($secondarymodule) ;$i++) { - $shtml .= $this->sgetColumnstoTotalHTML($secondarymodule[$i],($i+1)); - } - } - - return $shtml; + $options []= $this->sgetColumnstoTotalHTML($secondarymodule[$i],($i+1)); + } + } + return $options; } /** Function to get the selected columns of total fields in Reports @@ -921,7 +864,7 @@ { global $adb; global $log; - + $options = Array(); if($reportid != "") { $ssql = "select reportsummary.* from reportsummary inner join report on report.reportid = reportsummary.reportsummaryid where report.reportid=".$reportid; @@ -937,18 +880,18 @@ }while($reportsummaryrow = $adb->fetch_array($result)); } } - $shtml = $this->sgetColumnstoTotalHTML($primarymodule,0); + $options []= $this->sgetColumnstoTotalHTML($primarymodule,0); if($secondarymodule != "") { $secondarymodule = explode(":",$secondarymodule); for($i=0;$i < count($secondarymodule) ;$i++) { - $shtml .= $this->sgetColumnstoTotalHTML($secondarymodule[$i],($i+1)); + $options []= $this->sgetColumnstoTotalHTML($secondarymodule[$i],($i+1)); } } $log->info("Reports :: Successfully returned sgetColumntoTotalSelected"); - return $shtml; + return $options; } @@ -979,22 +922,14 @@ } $result = $adb->query($ssql); $columntototalrow = $adb->fetch_array($result); - $n = 0; + $options_list = Array(); do { $typeofdata = explode("~",$columntototalrow["typeofdata"]); - - if($typeofdata[0] == "N" || $typeofdata[0] == "I") - { - - if(($n % 2) == 0) - { - $shtml .= ''; - }else - { - $shtml .= ''; - } - + + if($typeofdata[0] == "N" || $typeofdata[0] == "I") + { + $options = Array(); if(isset($this->columnssummary)) { $selectedcolumn = ""; @@ -1017,72 +952,101 @@ } $columntototalrow['fieldlabel'] = str_replace(" ","_",$columntototalrow['fieldlabel']); - $shtml .= ''.$columntototalrow['tablabel'].' - '.$columntototalrow['fieldlabel'].' -
        '; - + $options []= $columntototalrow['tablabel'].' - '.$columntototalrow['fieldlabel']; if($selectedcolumn1[2] == "cb:".$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel']."_SUM:2") { - $shtml .= ''; }else + $options []= ''; + }else { - $shtml .= ''; + $options []= ''; } - $shtml .= '
        -
        '; if($selectedcolumn1[3] == "cb:".$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel']."_AVG:3") { - $shtml .= ''; + $options []= ''; }else { - $shtml .= ''; + $options []= ''; } - $shtml .= '
        -
        '; if($selectedcolumn1[4] == "cb:".$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel']."_MIN:4") { - $shtml .= ''; + $options []= ''; }else { - $shtml .= ''; + $options []= ''; } - $shtml .= '
        -
        '; if($selectedcolumn1[5] == "cb:".$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel']."_MAX:5") { - $shtml .= ''; + $options []= ''; }else { - $shtml .= ''; + $options []= ''; } - - $shtml .= '
        - '; - $n = $n + 1; - }else { - $shtml .= ''.$columntototalrow['tablabel'].' - '.$columntototalrow['fieldlabel'].' -
        - -
        -
        - -
        -
        - -
        -
        - -
        - '; - $n = $n + 1; + $options []= $columntototalrow['tablabel'].' - '.$columntototalrow['fieldlabel']; + $options []= ''; + $options []= ''; + $options []= ''; + $options [] =''; } + $options_list [] = $options; } }while($columntototalrow = $adb->fetch_array($result)); $log->info("Reports :: Successfully returned sgetColumnstoTotalHTML"); - return $shtml; - } + return $options_list; + } +} + +/** Function to get the primary module list in reports + * This function generates the list of primary modules in reports + * and returns an array of permitted modules + */ + +function getReportsModuleList() +{ + global $adb; + global $app_list_strings; + global $report_modules; + global $mod_strings; + $modules = Array(); + foreach($app_list_strings['moduleList'] as $key=>$value) + { + for($i=0;$i Modified: vtigercrm/trunk/modules/Reports/Save.php ============================================================================== --- vtigercrm/trunk/modules/Reports/Save.php (original) +++ vtigercrm/trunk/modules/Reports/Save.php Sat Apr 29 11:06:37 2006 @@ -190,13 +190,13 @@

      " ; echo $errormessage; } - header("Location: index.php?action=SaveAndRun&module=Reports&record=$genQueryId"); + echo ''; } }else { if($reportid != "") { - if($selectedcolumnstring != "") + if($selectedcolumnstring != "") { $idelcolumnsql = "delete from selectcolumn where queryid=".$reportid; $idelcolumnsqlresult = $adb->query($idelcolumnsql); @@ -212,7 +212,7 @@ } } } - + $ireportsql = "update report set"; $ireportsql .= " REPORTNAME='".$reportname."',"; $ireportsql .= " DESCRIPTION='".$reportdescription."',"; @@ -268,29 +268,29 @@ $ireportsummarysql = "insert into reportsummary (REPORTSUMMARYID,SUMMARYTYPE,COLUMNNAME) values (".$reportid.",".$i.",'".$columnstototal[$i]."')"; $ireportsummaryresult = $adb->query($ireportsummarysql); } - $log->info("Reports :: Save->Successfully saved reportsummary"); + $log->info("Reports :: Save->Successfully saved reportsummary"); //<<<>>>>>> //<<<>>>>>> - $idelrelcriteriasql = "delete from relcriteria where queryid=".$reportid; - $idelrelcriteriasqlresult = $adb->query($idelrelcriteriasql); - - for ($i=0;$iquery($irelcriteriasql); - } - $log->info("Reports :: Save->Successfully saved relcriteria"); + $idelrelcriteriasql = "delete from relcriteria where queryid=".$reportid; + $idelrelcriteriasqlresult = $adb->query($idelrelcriteriasql); + + for ($i=0;$iquery($irelcriteriasql); + } + $log->info("Reports :: Save->Successfully saved relcriteria"); //<<<>>>>>> }else { include('themes/'.$theme.'/header.php'); $errormessage = "Error Message
        -
      • Error while inserting the record -

      " ; +
    • Error while inserting the record +

    " ; echo $errormessage; } }else @@ -301,6 +301,6 @@
    " ; echo $errormessage; } - header("Location: index.php?action=SaveAndRun&module=Reports&record=$reportid"); + echo ''; } ?> Modified: vtigercrm/trunk/modules/Reports/SaveAndRun.php ============================================================================== --- vtigercrm/trunk/modules/Reports/SaveAndRun.php (original) +++ vtigercrm/trunk/modules/Reports/SaveAndRun.php Sat Apr 29 11:06:37 2006 @@ -18,13 +18,13 @@ require_once('include/database/PearDatabase.php'); require_once("modules/Reports/ReportRun.php"); require_once('include/utils/utils.php'); -include('themes/'.$theme.'/header.php'); +require_once('Smarty_setup.php'); global $adb; global $mod_strings; $reportid = $_REQUEST["record"]; - +$folderid = $_REQUEST["folderid"]; $filtercolumn = $_REQUEST["stdDateFilterField"]; $filter = $_REQUEST["stdDateFilter"]; $startdate = $_REQUEST["startdate"]; @@ -45,74 +45,145 @@ $totalhtml = $oReportRun->GenerateReport("TOTALHTML",$filterlist); if(isPermitted($primarymodule,'index') == "yes" && (isPermitted($secondarymodule,'index')== "yes")) { -?> - - -reportname, false); -?> -
    -
    - - - - - - - -
    :
    - -
    - - - - - - - - -
    - - -
    - - + $list_report_form = new vtigerCRM_Smarty; + $ogReport->getSelectedStandardCriteria($reportid); - - - + $BLOCK1 = getPrimaryStdFilterHTML($ogReport->primodule,$ogReport->stdselectedcolumn); + $BLOCK1 .= getSecondaryStdFilterHTML($ogReport->secmodule,$ogReport->stdselectedcolumn); + $list_report_form->assign("BLOCK1",$BLOCK1); + $BLOCKJS = $ogReport->getCriteriaJS(); + $list_report_form->assign("BLOCKJS",$BLOCKJS); - + $BLOCKCRITERIA = $ogReport->getSelectedStdFilterCriteria($ogReport->stdselectedfilter); + $list_report_form->assign("BLOCKCRITERIA",$BLOCKCRITERIA); -
    -
    - - - - -
    -
    - -
    - - - - -
    -
    -startdate; + $list_report_form->assign("STARTDATE",$startdate); + + $enddate = $ogReport->enddate; + $list_report_form->assign("ENDDATE",$enddate); + + $list_report_form->assign("MOD", $mod_strings); + $list_report_form->assign("APP", $app_strings); + $list_report_form->assign("IMAGE_PATH", $image_path); + $list_report_form->assign("REPORTID", $reportid); + $list_report_form->assign("REPORTNAME", $ogReport->reportname); + $list_report_form->assign("REPORTHTML", $sshtml); + $list_report_form->assign("REPORTTOTHTML", $totalhtml); + $list_report_form->assign("FOLDERID", $folderid); + if($_REQUEST['mode'] != 'ajax') + { + $list_report_form->assign("REPINFOLDER", getReportsinFolder($folderid)); + include('themes/'.$theme.'/header.php'); + $list_report_form->display('ReportRun.tpl'); + } + else + { + $list_report_form->display('ReportRunContents.tpl'); + } } else { echo $mod_strings['LBL_NO_PERMISSION']." ".$primarymodule." ".$secondarymodule; } +function getPrimaryStdFilterHTML($module,$selected="") +{ + global $app_list_strings; + global $ogReport; + global $current_language; + + $mod_strings = return_module_language($current_language,$module); + + $result = $ogReport->getStdCriteriaByModule($module); + + if(isset($result)) + { + foreach($result as $key=>$value) + { + if(isset($mod_strings[$value])) + { + if($key == $selected) + { + $shtml .= ""; + }else + { + $shtml .= ""; + } + }else + { + if($key == $selected) + { + $shtml .= ""; + }else + { + $shtml .= ""; + } + } + } + } + + return $shtml; +} + +function getSecondaryStdFilterHTML($module,$selected="") +{ + global $app_list_strings; + global $ogReport; + global $current_language; + + if($module != "") + { + $secmodule = explode(":",$module); + for($i=0;$i < count($secmodule) ;$i++) + { + $result = $ogReport->getStdCriteriaByModule($secmodule[$i]); + $mod_strings = return_module_language($current_language,$secmodule[$i]); + if(isset($result)) + { + foreach($result as $key=>$value) + { + if(isset($mod_strings[$value])) + { + if($key == $selected) + { + $shtml .= ""; + }else + { + $shtml .= ""; + } + }else + { + if($key == $selected) + { + $shtml .= ""; + }else + { + $shtml .= ""; + } + } + } + } + + } + } + return $shtml; +} +function getReportsinFolder($folderid) +{ + global $adb; + $query = 'select reportid,reportname from report where folderid='.$folderid; + $result = $adb->query($query); + $reports_array = Array(); + for($i=0;$i < $adb->num_rows($result);$i++) + { + $reportid = $adb->query_result($result,$i,'reportid'); + $reportname = $adb->query_result($result,$i,'reportname'); + $reports_array[$reportid] = $reportname; + } + if(count($reports_array) > 0) + return $reports_array; + else + return false; +} +?> Modified: vtigercrm/trunk/modules/Reports/SaveReportFolder.php ============================================================================== --- vtigercrm/trunk/modules/Reports/SaveReportFolder.php (original) +++ vtigercrm/trunk/modules/Reports/SaveReportFolder.php Sat Apr 29 11:06:37 2006 @@ -18,16 +18,11 @@ $focus = new Reports(); $rfid = $_REQUEST['record']; -$mode = $_REQUEST['mode']; -$foldername = addslashes($_REQUEST["folderName"]); -$folderdesc = addslashes($_REQUEST["folderDesc"]); -//echo $id.$mode."1".$foldername."2".$folderdesc; - -if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] != "") $return_module = $_REQUEST['return_module']; -else $return_module = "Reports"; -if(isset($_REQUEST['return_action']) && $_REQUEST['return_action'] != "") $return_action = $_REQUEST['return_action']; -else $return_action = "index"; - +$mode = $_REQUEST['savemode']; +$foldername = addslashes($_REQUEST["foldername"]); +$folderdesc = addslashes($_REQUEST["folderdesc"]); +$foldername = str_replace('*amp*','&',$foldername); +$folderdesc = str_replace('*amp*','&',$folderdesc); if($mode=="Save") { if($rfid=="") @@ -38,7 +33,7 @@ $result = $adb->query($sql); if($result!=false) { - header("Location: index.php?action=$return_action&module=$return_module"); + header("Location: index.php?action=ReportsAjax&file=ListView&mode=ajax&module=Reports"); }else { include('themes/'.$theme.'/header.php'); @@ -59,7 +54,7 @@ $result = $adb->query($sql); if($result!=false) { - header("Location: index.php?action=$return_action&module=$return_module"); + header("Location: index.php?action=ReportsAjax&file=ListView&mode=ajax&module=Reports"); }else { include('themes/'.$theme.'/header.php'); Modified: vtigercrm/trunk/modules/Reports/StandardFilter.php ============================================================================== --- vtigercrm/trunk/modules/Reports/StandardFilter.php (original) +++ vtigercrm/trunk/modules/Reports/StandardFilter.php Sat Apr 29 11:06:37 2006 @@ -8,31 +8,6 @@ * All Rights Reserved. * ********************************************************************************/ -require_once('XTemplate/xtpl.php'); -require_once("data/Tracker.php"); -require_once('themes/'.$theme.'/layout_utils.php'); -require_once('include/logging.php'); -require_once('include/utils/utils.php'); -require_once('modules/Reports/Reports.php'); -require_once('include/database/PearDatabase.php'); - -global $app_strings; -global $app_list_strings; -global $mod_strings; -$current_module_strings = return_module_language($current_language, 'Reports'); - -global $list_max_entries_per_page; -global $urlPrefix; - -$log = LoggerManager::getLogger('report_type'); - -global $currentModule; -global $image_path; -global $theme; -$report_std_filter=new XTemplate('modules/Reports/StandardFilter.html'); -$report_std_filter->assign("MOD", $mod_strings); -$report_std_filter->assign("APP", $app_strings); -$report_std_filter->assign("IMAGE_PATH",$image_path); if(isset($_REQUEST["record"]) == false) { @@ -43,11 +18,11 @@ $BLOCK1 = getPrimaryStdFilterHTML($primarymodule); $BLOCK1 .= getSecondaryStdFilterHTML($secondarymodule); - $report_std_filter->assign("BLOCK1",$BLOCK1); + $report_std_filter->assign("BLOCK1_STD",$BLOCK1); $BLOCKJS = $oReport->getCriteriaJS(); - $report_std_filter->assign("BLOCKJS",$BLOCKJS); + $report_std_filter->assign("BLOCKJS_STD",$BLOCKJS); $BLOCKCRITERIA = $oReport->getSelectedStdFilterCriteria(); - $report_std_filter->assign("BLOCKCRITERIA",$BLOCKCRITERIA); + $report_std_filter->assign("BLOCKCRITERIA_STD",$BLOCKCRITERIA); }elseif(isset($_REQUEST["record"]) == true) { @@ -55,21 +30,21 @@ $oReport = new Reports($reportid); $oReport->getSelectedStandardCriteria($reportid); - $BLOCK1 = getPrimaryStdFilterHTML($primarymodule,$oReport->stdselectedcolumn); - $BLOCK1 .= getSecondaryStdFilterHTML($secondarymodule,$oReport->stdselectedcolumn); - $report_std_filter->assign("BLOCK1",$BLOCK1); + $BLOCK1 = getPrimaryStdFilterHTML($oReport->primodule,$oReport->stdselectedcolumn); + $BLOCK1 .= getSecondaryStdFilterHTML($oReport->secmodule,$oReport->stdselectedcolumn); + $report_std_filter->assign("BLOCK1_STD",$BLOCK1); $BLOCKJS = $oReport->getCriteriaJS(); - $report_std_filter->assign("BLOCKJS",$BLOCKJS); + $report_std_filter->assign("BLOCKJS_STD",$BLOCKJS); $BLOCKCRITERIA = $oReport->getSelectedStdFilterCriteria($oReport->stdselectedfilter); - $report_std_filter->assign("BLOCKCRITERIA",$BLOCKCRITERIA); + $report_std_filter->assign("BLOCKCRITERIA_STD",$BLOCKCRITERIA); $startdate = $oReport->startdate; - $report_std_filter->assign("STARTDATE",$startdate); + $report_std_filter->assign("STARTDATE_STD",$startdate); $enddate = $oReport->enddate; - $report_std_filter->assign("ENDDATE",$enddate); + $report_std_filter->assign("ENDDATE_STD",$enddate); } @@ -117,7 +92,6 @@ global $app_list_strings; global $ogReport; global $current_language; - if($module != "") { $secmodule = explode(":",$module); @@ -155,7 +129,5 @@ } return $shtml; } -$report_std_filter->parse("main"); -$report_std_filter->out("main"); ?> From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 29 10:10:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 29 Apr 2006 17:10:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5595 - /vtigercrm/trunk/Smarty/templates/ Message-ID: <20060429171037.CC9696F0F6D@vtiger.fosslabs.com> Author: don Date: Sat Apr 29 11:10:25 2006 New Revision: 5595 Log: Reports Smartified and New UI has been integrated Added: vtigercrm/trunk/Smarty/templates/ReportColumns.tpl vtigercrm/trunk/Smarty/templates/ReportColumnsTotal.tpl vtigercrm/trunk/Smarty/templates/ReportContents.tpl vtigercrm/trunk/Smarty/templates/ReportFilters.tpl vtigercrm/trunk/Smarty/templates/ReportGrouping.tpl vtigercrm/trunk/Smarty/templates/ReportRun.tpl vtigercrm/trunk/Smarty/templates/ReportRunContents.tpl vtigercrm/trunk/Smarty/templates/Reports.tpl vtigercrm/trunk/Smarty/templates/ReportsCustomize.tpl vtigercrm/trunk/Smarty/templates/ReportsStep0.tpl vtigercrm/trunk/Smarty/templates/ReportsStep1.tpl vtigercrm/trunk/Smarty/templates/ReportsType.tpl From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 29 10:16:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 29 Apr 2006 17:16:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5596 - /vtigercrm/trunk/themes/blue/style.css Message-ID: <20060429171630.A32F56F0F50@vtiger.fosslabs.com> Author: don Date: Sat Apr 29 11:16:26 2006 New Revision: 5596 Log: New Css added for Report HTML Generation Modified: vtigercrm/trunk/themes/blue/style.css Modified: vtigercrm/trunk/themes/blue/style.css ============================================================================== --- vtigercrm/trunk/themes/blue/style.css (original) +++ vtigercrm/trunk/themes/blue/style.css Sat Apr 29 11:16:26 2006 @@ -2130,8 +2130,81 @@ padding:5px; } - - - - - + +/* For Report HTML Generation*/ +.rptCellLabel { + background-color:#f6f6f6; + padding-right:10px; + border-right: 1px solid #DDDDDD; + border-bottom:1px solid #eaeaea; + color:#737373; + white-space:nowrap; +} +.rptTable { + border-left: 1px solid #DDDDDD; + border-bottom: 1px solid #DDDDDD; + border-top: 1px solid #DDDDDD; +} +.rptTitle, .rptHead, .rptData, .rptGrpHead, .rptGrp1Total, .rptGrp2Total, .rptTotal { + font-family: Verdana, Arial, Helvetica, Sans-serif; + font-size: 11px; + font-weight: bold; +height: 20px; +padding: 4px; + border-right: 1px solid #DDDDDD; + border-bottom: 1px solid #DDDDDD; +background: #DDDDDD; +} +.rptTitle { + border-right: 1px solid #333; + border-bottom: 1px solid #333; +background: #2C527C; +color: #FFF; +} +.rptGrpHead { +background: #FFF; + border-bottom: 1px solid #FFF; + border-top: 1px solid #DDDDDD; + font-weight: normal; +} + +.rptData { + background: #FFF; + font-weight: normal; +} +.rptGrp1Total { + background: #E3F4F4; +} +.rptGrp2Total { + background: #F1FBEC; +} +.rptTotal { + background: #FFF7DD; +} +.rptEmptyGrp { + background: #FFF; + border-right: 1px solid #DDDDDD; +} +.statechange +{ + position:absolute; + visibility:hidden; + left:10px; + top:20px; + width:300px; + border:3px solid #CCCCCC; + background-color:#FFFFFF; +} +#PopupLay{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + width:500px; + border:3px solid #CCCCCC; + background-color:#FFFFFF; + padding:5px; + display:none; + position:absolute; + left:100px; + top:100px; +} From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 29 10:22:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 29 Apr 2006 17:22:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5597 - in /vtigercrm/trunk/themes/blue/images: Reports_arrow.gif report_bg.gif report_bottom.gif report_btn.gif report_newHdr.gif Message-ID: <20060429172243.A31656F0F76@vtiger.fosslabs.com> Author: don Date: Sat Apr 29 11:22:33 2006 New Revision: 5597 Log: images added for the new UI for Reports Added: vtigercrm/trunk/themes/blue/images/Reports_arrow.gif (with props) vtigercrm/trunk/themes/blue/images/report_bg.gif (with props) vtigercrm/trunk/themes/blue/images/report_bottom.gif (with props) vtigercrm/trunk/themes/blue/images/report_btn.gif (with props) vtigercrm/trunk/themes/blue/images/report_newHdr.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 29 23:37:29 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sun, 30 Apr 2006 06:37:29 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5598 - in /vtigercrm/trunk: modules/Reports/ReportRun.php themes/blue/style.css Message-ID: <20060430063729.8E3926F0FB2@vtiger.fosslabs.com> Author: don Date: Sun Apr 30 00:37:23 2006 New Revision: 5598 Log: css issues has been fixed for reports Modified: vtigercrm/trunk/modules/Reports/ReportRun.php vtigercrm/trunk/themes/blue/style.css Modified: vtigercrm/trunk/modules/Reports/ReportRun.php ============================================================================== --- vtigercrm/trunk/modules/Reports/ReportRun.php (original) +++ vtigercrm/trunk/modules/Reports/ReportRun.php Sun Apr 30 00:37:23 2006 @@ -1356,37 +1356,37 @@ $arraykey = trim($value).'_SUM'; if(isset($keyhdr[$arraykey])) { - $coltotalhtml .= ''.$keyhdr[$arraykey].''; + $coltotalhtml .= ''.$keyhdr[$arraykey].''; }else { - $coltotalhtml .= ' '; + $coltotalhtml .= ' '; } $arraykey = trim($value).'_AVG'; if(isset($keyhdr[$arraykey])) { - $coltotalhtml .= ''.$keyhdr[$arraykey].''; + $coltotalhtml .= ''.$keyhdr[$arraykey].''; }else { - $coltotalhtml .= ' '; + $coltotalhtml .= ' '; } $arraykey = trim($value).'_MIN'; if(isset($keyhdr[$arraykey])) { - $coltotalhtml .= ''.$keyhdr[$arraykey].''; + $coltotalhtml .= ''.$keyhdr[$arraykey].''; }else { - $coltotalhtml .= ' '; + $coltotalhtml .= ' '; } $arraykey = trim($value).'_MAX'; if(isset($keyhdr[$arraykey])) { - $coltotalhtml .= ''.$keyhdr[$arraykey].''; + $coltotalhtml .= ''.$keyhdr[$arraykey].''; }else { - $coltotalhtml .= ' '; + $coltotalhtml .= ' '; } $coltotalhtml .= ''; Modified: vtigercrm/trunk/themes/blue/style.css ============================================================================== --- vtigercrm/trunk/themes/blue/style.css (original) +++ vtigercrm/trunk/themes/blue/style.css Sun Apr 30 00:37:23 2006 @@ -2138,6 +2138,7 @@ border-right: 1px solid #DDDDDD; border-bottom:1px solid #eaeaea; color:#737373; + font-weight: bold; white-space:nowrap; } .rptTable { @@ -2145,45 +2146,48 @@ border-bottom: 1px solid #DDDDDD; border-top: 1px solid #DDDDDD; } -.rptTitle, .rptHead, .rptData, .rptGrpHead, .rptGrp1Total, .rptGrp2Total, .rptTotal { +.rptTitle, .rptHead, .rptData, .rptGrpHead{ font-family: Verdana, Arial, Helvetica, Sans-serif; font-size: 11px; - font-weight: bold; -height: 20px; -padding: 4px; - border-right: 1px solid #DDDDDD; - border-bottom: 1px solid #DDDDDD; -background: #DDDDDD; + text-align:left; + font-weight: normal; + height: 20px; + padding: 4px; + border-right: 1px solid #DDDDDD; + border-bottom: 1px solid #DDDDDD; + background: #DDDDDD; +} +.rptGrp1Total, .rptGrp2Total, .rptTotal { + font-family: Verdana, Arial, Helvetica, Sans-serif; + font-size: 11px; + text-align:center; + font-weight: normal; + background: #FFF; + height: 20px; + 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; + background: #2C527C; + color: #FFF; } .rptGrpHead { -background: #FFF; - border-bottom: 1px solid #FFF; - border-top: 1px solid #DDDDDD; - font-weight: normal; + background: #FFF; + border-bottom: 1px solid #FFF; + border-top: 1px solid #DDDDDD; + font-weight: normal; } .rptData { background: #FFF; - font-weight: normal; -} -.rptGrp1Total { - background: #E3F4F4; -} -.rptGrp2Total { - background: #F1FBEC; -} -.rptTotal { - background: #FFF7DD; + font-weight: normal; } .rptEmptyGrp { background: #FFF; - border-right: 1px solid #DDDDDD; + border-right: 1px solid #DDDDDD; } .statechange { From vtigercrm-commits at vtiger.fosslabs.com Sun Apr 30 00:08:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sun, 30 Apr 2006 07:08:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5599 - /vtigercrm/trunk/Smarty/templates/ReportRun.tpl Message-ID: <20060430070855.3AF856F0FC6@vtiger.fosslabs.com> Author: don Date: Sun Apr 30 01:08:51 2006 New Revision: 5599 Log: Report Info message changed Modified: vtigercrm/trunk/Smarty/templates/ReportRun.tpl Modified: vtigercrm/trunk/Smarty/templates/ReportRun.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ReportRun.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ReportRun.tpl Sun Apr 30 01:08:51 2006 @@ -156,10 +156,10 @@ if(startdatevalue != '' && enddatevalue=='') { - var reportinfr = 'Reporting "'+stdDateFilterFieldvalue+'" of "'+stdDateFiltervalue+'" (from '+startdatevalue+' )'; + var reportinfr = 'Reporting "'+stdDateFilterFieldvalue+'" (from '+startdatevalue+' )'; }else if(startdatevalue == '' && enddatevalue !='') { - var reportinfr = 'Reporting "'+stdDateFilterFieldvalue+'" of "'+stdDateFiltervalue+'" ( till '+enddatevalue+')'; + var reportinfr = 'Reporting "'+stdDateFilterFieldvalue+'" ( till '+enddatevalue+')'; }else if(startdatevalue == '' && enddatevalue =='') { var reportinfr = 'No filter Selected'; From vtigercrm-commits at vtiger.fosslabs.com Sun Apr 30 01:34:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sun, 30 Apr 2006 08:34:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5600 - /vtigercrm/trunk/themes/blue/style.css Message-ID: <20060430083433.6E2FC6F0FD8@vtiger.fosslabs.com> Author: don Date: Sun Apr 30 02:34:29 2006 New Revision: 5600 Log: css added for reports Modified: vtigercrm/trunk/themes/blue/style.css Modified: vtigercrm/trunk/themes/blue/style.css ============================================================================== --- vtigercrm/trunk/themes/blue/style.css (original) +++ vtigercrm/trunk/themes/blue/style.css Sun Apr 30 02:34:29 2006 @@ -2212,3 +2212,13 @@ left:100px; top:100px; } + +#folderLay{ + width:175px; + background-color:#CCCCCC; + border:1px solid #DDDDDD; + padding-top:5px; + position:absolute; + display:none; +} + From accounts at eBay.com Sun Apr 30 02:10:57 2006 From: accounts at eBay.com (eBay) Date: Sun, 30 Apr 2006 02:10:57 -0700 (PDT) Subject: [Vtigercrm-commits] Question about your item -- respond now Message-ID: <1146388257.138339.qmail@eBay.com> An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20060430/970b1ac9/attachment-0001.html From vtigercrm-commits at vtiger.fosslabs.com Sun Apr 30 03:05:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sun, 30 Apr 2006 10:05:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5601 - in /vtigercrm/trunk/modules/Dashboard: Entity_charts.php ReportsCharts.php Message-ID: <20060430100540.83A0D6ECFC9@vtiger.fosslabs.com> Author: richie Date: Sun Apr 30 04:05:34 2006 New Revision: 5601 Log: Charts in Reports has been integrated Added: vtigercrm/trunk/modules/Dashboard/ReportsCharts.php Modified: vtigercrm/trunk/modules/Dashboard/Entity_charts.php Modified: vtigercrm/trunk/modules/Dashboard/Entity_charts.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/Entity_charts.php (original) +++ vtigercrm/trunk/modules/Dashboard/Entity_charts.php Sun Apr 30 04:05:34 2006 @@ -57,12 +57,13 @@ global $adb; global $days,$date_array,$period_type; - $where= " and crmentity.smownerid=".$user_id." and crmentity.createdtime between '".$date_start."' and '".$end_date."'" ; + //$where= " and crmentity.smownerid=".$user_id." and crmentity.createdtime between '".$date_start."' and '".$end_date."'" ; $query.=$where; if($added_qry!="") $query.=$added_qry; $result=$adb->query($query); + $no_of_rows=$adb->num_rows($result); $mod_count_array=array(); $mod_name_array=array(); @@ -261,7 +262,7 @@ else { $data=0; - echo "

    The data is not available with the specified time period

    "; + return "

    The data is not available with the specified time period

    "; } return $data; } From vtigercrm-commits at vtiger.fosslabs.com Sun Apr 30 03:10:16 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sun, 30 Apr 2006 10:10:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5602 - in /vtigercrm/trunk/modules/Reports: ReportRun.php SaveAndRun.php Message-ID: <20060430101016.E721A6EB3DC@vtiger.fosslabs.com> Author: richie Date: Sun Apr 30 04:10:12 2006 New Revision: 5602 Log: Charts in Reports has been integrated Modified: vtigercrm/trunk/modules/Reports/ReportRun.php vtigercrm/trunk/modules/Reports/SaveAndRun.php Modified: vtigercrm/trunk/modules/Reports/ReportRun.php ============================================================================== --- vtigercrm/trunk/modules/Reports/ReportRun.php (original) +++ vtigercrm/trunk/modules/Reports/ReportRun.php Sun Apr 30 04:10:12 2006 @@ -1292,6 +1292,7 @@ //<<<<<<<>>>>>>>>>>> $return_data[] = $sHTML; $return_data[] = $noofrows; + $return_data[] = $sSQL; return $return_data; } }elseif($outputformat == "PDF") Modified: vtigercrm/trunk/modules/Reports/SaveAndRun.php ============================================================================== --- vtigercrm/trunk/modules/Reports/SaveAndRun.php (original) +++ vtigercrm/trunk/modules/Reports/SaveAndRun.php Sun Apr 30 04:10:12 2006 @@ -48,6 +48,9 @@ $list_report_form = new vtigerCRM_Smarty; $ogReport->getSelectedStandardCriteria($reportid); + require_once('modules/DashBoard/ReportsCharts.php'); + $image = get_graph_by_type('Report','Report',$primarymodule,'',$sshtml[2]); + $list_report_form->assign("GRAPH", $image); $BLOCK1 = getPrimaryStdFilterHTML($ogReport->primodule,$ogReport->stdselectedcolumn); $BLOCK1 .= getSecondaryStdFilterHTML($ogReport->secmodule,$ogReport->stdselectedcolumn); From vtigercrm-commits at vtiger.fosslabs.com Sun Apr 30 05:39:46 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sun, 30 Apr 2006 12:39:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5603 - /vtigercrm/trunk/include/utils/CommonUtils.php Message-ID: <20060430123946.7CEE440F7D1@vtiger.fosslabs.com> Author: don Date: Sun Apr 30 06:39:40 2006 New Revision: 5603 Log: Added Security to HomPage UI 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 Sun Apr 30 06:39:40 2006 @@ -715,6 +715,7 @@ function getDisplayCurrency() { global $log; + global $adb; $log->debug("Entering getDisplayCurrency() method ..."); $curr_array = Array(); $sql1 = "select * from currency_info where currency_status='Active'"; @@ -2098,21 +2099,36 @@ $log->debug("Exiting getEntityName method ..."); } + function getAllParenttabmoduleslist() { global $adb; + global $current_user; $resultant_array = Array(); - $query = 'select name,tablabel,parenttab_label from parenttabrel inner join tab on parenttabrel.tabid = tab.tabid in -ner join parenttab on parenttabrel.parenttabid = parenttab.parenttabid order by parenttab.sequence'; + $query = 'select name,tablabel,parenttab_label,tab.tabid from parenttabrel inner join tab on parenttabrel.tabid = tab.tabid inner join parenttab on parenttabrel.parenttabid = parenttab.parenttabid order by parenttab.sequence'; $result = $adb->query($query); + require('user_privileges/user_privileges_'.$current_user->id.'.php'); for($i=0;$i<$adb->num_rows($result);$i++) { $parenttabname = $adb->query_result($result,$i,'parenttab_label'); $modulename = $adb->query_result($result,$i,'name'); $tablabel = $adb->query_result($result,$i,'tablabel'); - $resultant_array[$parenttabname][] = Array($modulename,$tablabel); + $tabid = $adb->query_result($result,$i,'tabid'); + if($is_admin) + { + $resultant_array[$parenttabname][] = Array($modulename,$tablabel); + } + elseif($profileGlobalPermission[2]==0 || $profileGlobalPermission[1]==0 || $profileTabsPermission[$tabid]==0) { + $resultant_array[$parenttabname][] = Array($modulename,$tablabel); + } } - return $resultant_array; + + if($is_admin) + { + $resultant_array['Settings'][] = Array('Settings','Settings'); + } + + return $resultant_array; } From vtigercrm-commits at vtiger.fosslabs.com Sun Apr 30 05:46:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sun, 30 Apr 2006 12:46:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5604 - /vtigercrm/trunk/themes/blue/style.css Message-ID: <20060430124603.B593B5CE163@vtiger.fosslabs.com> Author: don Date: Sun Apr 30 06:45:59 2006 New Revision: 5604 Log: Added style to Homepage Modified: vtigercrm/trunk/themes/blue/style.css Modified: vtigercrm/trunk/themes/blue/style.css ============================================================================== --- vtigercrm/trunk/themes/blue/style.css (original) +++ vtigercrm/trunk/themes/blue/style.css Sun Apr 30 06:45:59 2006 @@ -1955,16 +1955,12 @@ border-left:2px solid #CCCCCC; border-bottom:2px solid #666666; border-right:2px solid #666666; - right:300px; - bottom:100px; + left:300px; + top:100px; background-color:#CCCCCC; position:absolute; z-index:1000001; display:none; -} - -body > div#allMenu { - position: fixed; } From vtigercrm-commits at vtiger.fosslabs.com Sun Apr 30 05:48:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sun, 30 Apr 2006 12:48:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5605 - /vtigercrm/trunk/Smarty/templates/HomePage.tpl Message-ID: <20060430124830.079E15CE198@vtiger.fosslabs.com> Author: don Date: Sun Apr 30 06:48:26 2006 New Revision: 5605 Log: Adjusted graph posn in Homepage 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 Sun Apr 30 06:48:26 2006 @@ -106,7 +106,7 @@ - + Total : 340 @@ -121,7 +121,7 @@ - + Total : 340 From vtigercrm-commits at vtiger.fosslabs.com Sun Apr 30 05:49:29 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sun, 30 Apr 2006 12:49:29 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5606 - /vtigercrm/trunk/Smarty/templates/ReportRunContents.tpl Message-ID: <20060430124929.99E6B5CE198@vtiger.fosslabs.com> Author: richie Date: Sun Apr 30 06:49:25 2006 New Revision: 5606 Log: Added graph Modified: vtigercrm/trunk/Smarty/templates/ReportRunContents.tpl Modified: vtigercrm/trunk/Smarty/templates/ReportRunContents.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ReportRunContents.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ReportRunContents.tpl Sun Apr 30 06:49:25 2006 @@ -1,3 +1,10 @@ + + + + +
    + {$GRAPH} +
    From vtiger-tickets at vtiger.fosslabs.com Sun Apr 2 05:01:51 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sun, 02 Apr 2006 09:01:51 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2376=3A_A?= =?utf-8?q?ccounts_-_Input_field_tab_order?= Message-ID: <076.8d85c2213e2306a8bab8f1b045c0ea05@vtiger.fosslabs.com> #76: Accounts - Input field tab order -----------------------------------+---------------------------------------- Reporter: eberle.d at 4net.ch | Owner: developer Type: defect | Status: new Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: Input field tab order | -----------------------------------+---------------------------------------- When entering account details for address information the cursor jumps from billing adress to shipping address, billing p.o. box to shipping p.o. box and so on. This isn't practical. It should be that it jumps from field to field one adress aerea. That means from field to field within billing address and than from field to field within shipping address. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Apr 2 05:05:00 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sun, 02 Apr 2006 09:05:00 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2376=3A_A?= =?utf-8?q?ccounts_-_Input_field_tab_order?= In-Reply-To: <076.8d85c2213e2306a8bab8f1b045c0ea05@vtiger.fosslabs.com> References: <076.8d85c2213e2306a8bab8f1b045c0ea05@vtiger.fosslabs.com> Message-ID: <085.28967a9ac45dc0d832f912f04e508aba@vtiger.fosslabs.com> #76: Accounts - Input field tab order -------------------------------+-------------------------------------------- Reporter: eberle.d at 4net.ch | Owner: developer Type: defect | Status: new Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Input field tab order -------------------------------+-------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Apr 2 05:11:03 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sun, 02 Apr 2006 09:11:03 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2377=3A_A?= =?utf-8?q?dd_accounts_doesn=27t_work_in_detail_view?= Message-ID: <076.d541c69836d3e93fc412dae2f6fd0dd8@vtiger.fosslabs.com> #77: Add accounts doesn't work in detail view ------------------------------+--------------------------------------------- Reporter: eberle.d at 4net.ch | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | ------------------------------+--------------------------------------------- In detail view of an account the button 'Add contacts' doesn't work. To add an account you have to go back to list view :-( -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Apr 2 05:12:09 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sun, 02 Apr 2006 09:12:09 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2377=3A_A?= =?utf-8?q?dd_accounts_doesn=27t_work_in_detail_view?= In-Reply-To: <076.d541c69836d3e93fc412dae2f6fd0dd8@vtiger.fosslabs.com> References: <076.d541c69836d3e93fc412dae2f6fd0dd8@vtiger.fosslabs.com> Message-ID: <085.d88a420fa32749c3a7eec7f3a154b23a@vtiger.fosslabs.com> #77: Add accounts doesn't work in detail view -------------------------------+-------------------------------------------- Reporter: eberle.d at 4net.ch | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: -------------------------------+-------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Apr 2 05:22:07 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sun, 02 Apr 2006 09:22:07 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2378=3A_I?= =?utf-8?q?nput_tab_field_order_for_contacts?= Message-ID: <076.29f680660699a95123ad31091918c40c@vtiger.fosslabs.com> #78: Input tab field order for contacts -----------------------+---------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- Unlogical order. Cursor jumps from firstname to officephone, to lastname, to mobile etc. Should jump from name fields to phone fields an so on. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Apr 2 05:24:03 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sun, 02 Apr 2006 09:24:03 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2378=3A_I?= =?utf-8?q?nput_tab_field_order_for_contacts?= In-Reply-To: <076.29f680660699a95123ad31091918c40c@vtiger.fosslabs.com> References: <076.29f680660699a95123ad31091918c40c@vtiger.fosslabs.com> Message-ID: <085.c4f84d6068924713989ff1d761220b69@vtiger.fosslabs.com> #78: Input tab field order for contacts ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Apr 2 05:24:19 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sun, 02 Apr 2006 09:24:19 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2378=3A_I?= =?utf-8?q?nput_tab_field_order_for_contacts?= In-Reply-To: <076.29f680660699a95123ad31091918c40c@vtiger.fosslabs.com> References: <076.29f680660699a95123ad31091918c40c@vtiger.fosslabs.com> Message-ID: <085.eaf28d49ea454103468c4604ad192da0@vtiger.fosslabs.com> #78: Input tab field order for contacts ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Apr 2 05:27:59 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sun, 02 Apr 2006 09:27:59 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2379=3A_A?= =?utf-8?q?ddress_inheritance?= Message-ID: <076.cc7367ebe2ccb8423599b01e9c951b5c@vtiger.fosslabs.com> #79: Address inheritance ------------------------------+--------------------------------------------- Reporter: eberle.d at 4net.ch | Owner: developer Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | ------------------------------+--------------------------------------------- Address inheritance doesn't work! I created an account and some contacts for this account. Than I changed the adress (billing street) in the account. But in contacts nothing has changed. Changes in accounts must change contact information also. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Apr 2 05:30:35 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sun, 02 Apr 2006 09:30:35 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2380=3A_B?= =?utf-8?q?lock_=27Custom_information=27_for_accounts?= Message-ID: <076.a9588a24eea5812b218bd55fd917354f@vtiger.fosslabs.com> #80: Block 'Custom information' for accounts ------------------------------+--------------------------------------------- Reporter: eberle.d at 4net.ch | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | ------------------------------+--------------------------------------------- The block 'Custom Information' isn't shown when I create a new account. Only after it was created I can edit the entry again an then the block 'Custom information' will be shown. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Apr 2 05:45:10 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sun, 02 Apr 2006 09:45:10 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2381=3A_?= =?utf-8?q?=22Available_Merge_Fields=22_does_not_work_in_the_email_templat?= =?utf-8?q?es_=28adding_a_merge_field_to_a_template_does_not_result_in_tha?= =?utf-8?q?t_field_being_merged=29?= Message-ID: <076.247dfccd0d5a7f69c4c5016ef5f5c24b@vtiger.fosslabs.com> #81: "Available Merge Fields" does not work in the email templates (adding a merge field to a template does not result in that field being merged) ----------------------------------------------------------+----------------- Reporter: scott at crazycolour.com | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: merge fields not available in email template | ----------------------------------------------------------+----------------- Alpha 4 release (not an option in the 'version' field below??) When I created a template (called Roundtree) in the demo_5alpha sample on the vtiger web site. I used the following: Hi $contacts_firstname or $leads_firstname This is a list of fields: $contacts_lastname $contacts_salutationtype $contacts_email That was a test! When I selected an email template these fields were not filled in despite most of these being available. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Apr 2 06:10:07 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sun, 02 Apr 2006 10:10:07 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2382=3A_T?= =?utf-8?q?icket-Activity-Relation?= Message-ID: <076.6df10c0ea64c5d95a412b52a9cface15@vtiger.fosslabs.com> #82: Ticket-Activity-Relation ------------------------------+--------------------------------------------- Reporter: eberle.d at 4net.ch | Owner: developer Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | ------------------------------+--------------------------------------------- The relation of a task to a ticket isn't shown. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Apr 2 06:13:31 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sun, 02 Apr 2006 10:13:31 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2382=3A_T?= =?utf-8?q?icket-Activity-Relation?= In-Reply-To: <076.6df10c0ea64c5d95a412b52a9cface15@vtiger.fosslabs.com> References: <076.6df10c0ea64c5d95a412b52a9cface15@vtiger.fosslabs.com> Message-ID: <085.79befd7a1aec929fb7ad80ef51001db2@vtiger.fosslabs.com> #82: Ticket-Activity-Relation -------------------------------+-------------------------------------------- Reporter: eberle.d at 4net.ch | Owner: developer Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: -------------------------------+-------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Apr 2 06:28:38 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sun, 02 Apr 2006 10:28:38 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2383=3A_L?= =?utf-8?q?ist_views?= Message-ID: <076.064dd25ff4712e59a1e226505f0b11ec@vtiger.fosslabs.com> #83: List views -----------------------+---------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: new Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- In list views there is a line 'Showing 1-12 from 12' but in fact the list vies only shows 10 entries an I can't use the arrows to select the next list view page. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Apr 2 06:34:48 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sun, 02 Apr 2006 10:34:48 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2384=3A_T?= =?utf-8?q?itle_of_notes_in_listview_/_Edit_not_possible?= Message-ID: <076.c9721036e7f48c5c7365768ca6672367@vtiger.fosslabs.com> #84: Title of notes in listview / Edit not possible ------------------------------+--------------------------------------------- Reporter: eberle.d at 4net.ch | Owner: developer Type: defect | Status: new Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | ------------------------------+--------------------------------------------- The subject of a note isn't visible in the related list views. Instead the note itself is displayed under subject. Description remains empty. It is not possible to click on the note to go to the detailview nor is it possible to edit the note. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Apr 2 06:39:33 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sun, 02 Apr 2006 10:39:33 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2385=3A_U?= =?utf-8?q?nneccesary_information_in_related_list_view_under_accounts?= Message-ID: <076.b10358da8d6986cc94695bfc2a2ffb24@vtiger.fosslabs.com> #85: Unneccesary information in related list view under accounts ------------------------------+--------------------------------------------- Reporter: eberle.d at 4net.ch | Owner: developer Type: defect | Status: new Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | ------------------------------+--------------------------------------------- Under accounts the realted list view for contacts shows the column 'Accounts' -> unneccesary. Please show function or department instead. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 07:52:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 03 Apr 2006 11:52:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4828 - in /vtigercrm/trunk/modules: Settings/ Settings/language/ Users/ Message-ID: <20060403115234.E781A5BA31B@vtiger.fosslabs.com> Author: don Date: Mon Apr 3 05:52:19 2006 New Revision: 4828 Log: new UI integrated for settings Modified: vtigercrm/trunk/modules/Settings/BackupServerConfig.php vtigercrm/trunk/modules/Settings/EditCompanyDetails.php vtigercrm/trunk/modules/Settings/EmailConfig.php vtigercrm/trunk/modules/Settings/OrganizationConfig.php vtigercrm/trunk/modules/Settings/Save.php vtigercrm/trunk/modules/Settings/add2db.php vtigercrm/trunk/modules/Settings/language/en_us.lang.php vtigercrm/trunk/modules/Users/Announcements.php vtigercrm/trunk/modules/Users/OrganizationTermsandConditions.php vtigercrm/trunk/modules/Users/UsersAjax.php Modified: vtigercrm/trunk/modules/Settings/BackupServerConfig.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/Settings/EditCompanyDetails.php ============================================================================== --- vtigercrm/trunk/modules/Settings/EditCompanyDetails.php (original) +++ vtigercrm/trunk/modules/Settings/EditCompanyDetails.php Mon Apr 3 05:52:19 2006 @@ -9,37 +9,40 @@ * ********************************************************************************/ -require_once('XTemplate/xtpl.php'); +require_once('Smarty_setup.php'); global $mod_strings; global $app_strings; global $app_list_strings; -$filetype=$_REQUEST['file_type']; -$filesize=$_REQUEST['file_size']; -$logo_value=$_REQUEST['logo_value']; - -echo get_module_title($mod_strings['LBL_MODULE_NAME'], $mod_strings['LBL_SETTINGS'].' : '. $mod_strings['LBL_COMPANY_INFO'], true); -echo '

    '; +$smarty = new vtigerCRM_Smarty; //error handling -$flag = $_REQUEST['flag']; -if($flag ==1)echo " Logo has to be an Image of type jpeg/png"; - -if($flag == 3)echo "Sorry, the uploaded file exceeds the maximum filesize limit. Please try a file smaller than 800000 bytes
    "; - -if($flag == 4 )echo "Problems in file upload. Please try again!
    "; - -if($flag == 2)echo "Error Message
    • Invalid file OR
    • File has no data
    "; - +if(isset($_REQUEST['flag']) && $_REQUEST['flag'] != '') +{ + $flag = $_REQUEST['flag']; + switch($flag) + { + case 1: + $smarty->assign("ERRORFLAG"," Logo has to be an Image of type jpeg/png"); + break; + case 2: + $smarty->assign("ERRORFLAG","Error Message
    • Invalid file OR
    • File has no data
    "); + break; + case 3: + $smarty->assign("ERRORFLAG","Sorry, the uploaded file exceeds the maximum filesize limit. Please try a file smaller than 800000 bytes"); + break; + case 4: + $smarty->assign("ERRORFLAG","Problems in file upload. Please try again!
    "); + break; + default: + $smarty->assign("ERRORFLAG",""); + + } +} global $adb; global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); - -$xtpl=new XTemplate ('modules/Settings/EditCompanyDetails.html'); -//$xtpl=new XTemplate ('modules/Settings/add2db'); -$xtpl->assign("MOD", $mod_strings); -$xtpl->assign("APP", $app_strings); $sql="select * from organizationdetails"; $result = $adb->query($sql); @@ -55,40 +58,33 @@ $organization_logoname = $adb->query_result($result,0,'logoname'); -$xtpl->assign("RETURN_MODULE","Settings"); -$xtpl->assign("RETURN_ACTION","index"); - -$xtpl->assign("FILE_NAME",$filename); -$xtpl->assign("FILE_TYPE",$filetype); -$xtpl->assign("FILE_SIZE",$filesize); -$xtpl->assign("LOGO_VALUE",$logo_value); - if (isset($organization_name)) - $xtpl->assign("ORGANIZATIONNAME",$organization_name); + $smarty->assign("ORGANIZATIONNAME",$organization_name); if (isset($organization_address)) - $xtpl->assign("ORGANIZATIONADDRESS",$organization_address); + $smarty->assign("ORGANIZATIONADDRESS",$organization_address); if (isset($organization_city)) - $xtpl->assign("ORGANIZATIONCITY",$organization_city); + $smarty->assign("ORGANIZATIONCITY",$organization_city); if (isset($organization_state)) - $xtpl->assign("ORGANIZATIONSTATE",$organization_state); + $smarty->assign("ORGANIZATIONSTATE",$organization_state); if (isset($organization_code)) - $xtpl->assign("ORGANIZATIONCODE",$organization_code); + $smarty->assign("ORGANIZATIONCODE",$organization_code); if (isset($organization_country)) - $xtpl->assign("ORGANIZATIONCOUNTRY",$organization_country); + $smarty->assign("ORGANIZATIONCOUNTRY",$organization_country); if (isset($organization_phone)) - $xtpl->assign("ORGANIZATIONPHONE",$organization_phone); + $smarty->assign("ORGANIZATIONPHONE",$organization_phone); if (isset($organization_fax)) - $xtpl->assign("ORGANIZATIONFAX",$organization_fax); + $smarty->assign("ORGANIZATIONFAX",$organization_fax); if (isset($organization_website)) - $xtpl->assign("ORGANIZATIONWEBSITE",$organization_website); + $smarty->assign("ORGANIZATIONWEBSITE",$organization_website); if ($organization_logoname == '') $organization_logoname = $_REQUEST['prev_name']; if (isset($organization_logoname)) - $xtpl->assign("ORGANIZATIONLOGONAME",$organization_logoname); + $smarty->assign("ORGANIZATIONLOGONAME",$organization_logoname); -$xtpl->parse("main"); -$xtpl->out("main"); - - +$smarty->assign("MOD", return_module_language($current_language,'Settings')); +$smarty->assign("IMAGE_PATH",$image_path); +$smarty->assign("APP", $app_strings); +$smarty->assign("CMOD", $mod_strings); +$smarty->display('Settings/EditCompanyInfo.tpl'); ?> Modified: vtigercrm/trunk/modules/Settings/EmailConfig.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/Settings/OrganizationConfig.php ============================================================================== --- vtigercrm/trunk/modules/Settings/OrganizationConfig.php (original) +++ vtigercrm/trunk/modules/Settings/OrganizationConfig.php Mon Apr 3 05:52:19 2006 @@ -10,28 +10,30 @@ ********************************************************************************/ -require_once('XTemplate/xtpl.php'); +require_once('Smarty_setup.php'); + global $mod_strings; global $app_strings; global $app_list_strings; - - -echo get_module_title($mod_strings['LBL_MODULE_NAME'], $mod_strings['LBL_SETTINGS'].' : '. $mod_strings['LBL_COMPANY_INFO'], true); -echo '

    '; global $adb; global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); -$xtpl=new XTemplate('modules/Settings/OrganizationConfig.html'); -$xtpl->assign("MOD", $mod_strings); -$xtpl->assign("APP", $app_strings); +global $mod_strings; +global $app_strings; +global $app_list_strings; - $xtpl->assign("EDITCOMPANYDETAILS","    "); +global $adb; +global $theme; +$theme_path="themes/".$theme."/"; +$image_path=$theme_path."images/"; +require_once($theme_path.'layout_utils.php'); + + +$smarty = new vtigerCRM_Smarty; $sql="select * from organizationdetails"; $result = $adb->query($sql); @@ -47,30 +49,26 @@ $organization_logo = $adb->query_result($result,0,'logo'); $organization_logoname = $adb->query_result($result,0,'logoname'); -$xtpl->assign("RETURN_MODULE","Settings"); -$xtpl->assign("RETURN_ACTION","index"); - - if (isset($organization_name)) - $xtpl->assign("ORGANIZATIONNAME",$organization_name); + $smarty->assign("ORGANIZATIONNAME",$organization_name); if (isset($organization_address)) - $xtpl->assign("ORGANIZATIONADDRESS",$organization_address); + $smarty->assign("ORGANIZATIONADDRESS",$organization_address); if (isset($organization_city)) - $xtpl->assign("ORGANIZATIONCITY",$organization_city); + $smarty->assign("ORGANIZATIONCITY",$organization_city); if (isset($organization_state)) - $xtpl->assign("ORGANIZATIONSTATE",$organization_state); + $smarty->assign("ORGANIZATIONSTATE",$organization_state); if (isset($organization_code)) - $xtpl->assign("ORGANIZATIONCODE",$organization_code); + $smarty->assign("ORGANIZATIONCODE",$organization_code); if (isset($organization_country)) - $xtpl->assign("ORGANIZATIONCOUNTRY",$organization_country); + $smarty->assign("ORGANIZATIONCOUNTRY",$organization_country); if (isset($organization_phone)) - $xtpl->assign("ORGANIZATIONPHONE",$organization_phone); + $smarty->assign("ORGANIZATIONPHONE",$organization_phone); if (isset($organization_fax)) - $xtpl->assign("ORGANIZATIONFAX",$organization_fax); + $smarty->assign("ORGANIZATIONFAX",$organization_fax); if (isset($organization_website)) - $xtpl->assign("ORGANIZATIONWEBSITE",$organization_website); + $smarty->assign("ORGANIZATIONWEBSITE",$organization_website); if (isset($organization_logo)) - $xtpl->assign("ORGANIZATIONLOGO",$organization_logo); + $smarty->assign("ORGANIZATIONLOGO",$organization_logo); $path = "test/logo"; $dir_handle = @opendir($path) or die("Unable to open directory $path"); @@ -95,12 +93,14 @@ if (isset($organization_logopath)) - $xtpl->assign("ORGANIZATIONLOGOPATH",$path); + $smarty->assign("ORGANIZATIONLOGOPATH",$path); if (isset($organization_logoname)) - $xtpl->assign("ORGANIZATIONLOGONAME",$logo_name); + $smarty->assign("ORGANIZATIONLOGONAME",$logo_name); closedir($dir_handle); -$xtpl->parse("main"); -$xtpl->out("main"); - +$smarty->assign("MOD", return_module_language($current_language,'Settings')); +$smarty->assign("IMAGE_PATH",$image_path); +$smarty->assign("APP", $app_strings); +$smarty->assign("CMOD", $mod_strings); +$smarty->display('Settings/CompanyInfo.tpl'); ?> Modified: vtigercrm/trunk/modules/Settings/Save.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/Settings/add2db.php ============================================================================== --- vtigercrm/trunk/modules/Settings/add2db.php (original) +++ vtigercrm/trunk/modules/Settings/add2db.php Mon Apr 3 05:52:19 2006 @@ -36,7 +36,6 @@ { $savelogo="false"; $error_flag ="1"; - //$errormessage = " Logo has to be an Image of type jpeg/png"; } else if($result!=false) { @@ -47,7 +46,6 @@ { $savelogo="false"; $error_flag ="1"; - //$errormessage = " Logo has to be an Image of type jpeg/png"; } } @@ -56,10 +54,6 @@ $savelogo="false"; if($filename != "") $error_flag ="2"; - //$errormessage = "Error Message
      - //
    • Invalid file OR - //
    • File has no data - //

    " ; } $errorCode = $_FILES['binFile']['error']; @@ -73,14 +67,12 @@ else if($errorCode == 2) { $error_flag ="3"; - //$errormessage = "Sorry, the uploaded file exceeds the maximum filesize limit. Please try a file smaller than 800000 bytes
    "; $savelogo="false"; $nologo_specified="false"; } else if($errorCode == 3 ) { $error_flag ="4"; - //$errormessage = "Problems in file upload. Please try again!
    "; $savelogo="false"; $nologo_specified="false"; } 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 Mon Apr 3 05:52:19 2006 @@ -539,7 +539,8 @@ //Added fields after 5.0 Alpha 'LBL_REQUIRE_SMTP_AUTHENTICATION'=>'Require SMTP Authentication?', 'LBL_ANNOUNCEMENT'=>'Announcements', -'LBL_SETTING_ANNOUNCEMENT'=>'Announcements', +'LBL_SETTING_ANNOUNCEMENT'=>'Announcement', +'LBL_ANNOUNCEMENT_INFO'=>'Type the announcement text below, and click the save button.', ); Modified: vtigercrm/trunk/modules/Users/Announcements.php ============================================================================== --- vtigercrm/trunk/modules/Users/Announcements.php (original) +++ vtigercrm/trunk/modules/Users/Announcements.php Mon Apr 3 05:52:19 2006 @@ -9,6 +9,7 @@ * ********************************************************************************/ +require_once('XTemplate/xtpl.php'); global $adb; global $current_user; global $theme; @@ -19,46 +20,13 @@ $announcement=$adb->query_result($result,0,'announcement'); $title_prev=$adb->query_result($result,0,'title'); $id=$adb->query_result($result,0,'creatorid'); -if($id != $current_user->id) - $announcement=''; - $html=' -

    "); - - $xtpl->assign("CANCELCOMPANYDETAILS","
    - - - - - - - - - - - - -
    Announcements
    Title
    - Create Announcement -
     
    -
    - - -
    -
    '; - echo $html; +$smarty->assign("ANNOUNCE",$announcement); +$smarty->assign("MOD", return_module_language($current_language,'Settings')); +$smarty->assign("IMAGE_PATH",$image_path); +$smarty->assign("APP", $app_strings); +$smarty->assign("CMOD", $mod_strings); + +$smarty->display("Settings/Announcements.tpl"); + ?> Modified: vtigercrm/trunk/modules/Users/OrganizationTermsandConditions.php ============================================================================== --- vtigercrm/trunk/modules/Users/OrganizationTermsandConditions.php (original) +++ vtigercrm/trunk/modules/Users/OrganizationTermsandConditions.php Mon Apr 3 05:52:19 2006 @@ -10,54 +10,36 @@ ********************************************************************************/ -require_once('XTemplate/xtpl.php'); -//require_once('data/Tracker.php'); -//require_once('include/utils/UserInfoUtil.php'); require_once('include/database/PearDatabase.php'); +require_once('Smarty_setup.php'); global $mod_strings; global $app_strings; global $app_list_strings; -echo get_module_title($mod_strings['LBL_MODULE_NAME'],$mod_strings['INV_TERMSANDCONDITIONS'],true); -echo '

    '; global $adb; global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); -$xtpl=new XTemplate('modules/Users/OrganizationTermsandConditions.html'); -$xtpl->assign("MOD", $mod_strings); -$xtpl->assign("APP", $app_strings); - - +$smarty = new vtigerCRM_Smarty; $sql="select * from inventory_tandc"; $result = $adb->query($sql); -//$inventoryResult = $adb->fetch_array($result); $inventory_id = $adb->query_result($result,0,'id'); $inventory_type = $adb->query_result($result,0,'type'); $inventory_tandc = $adb->query_result($result,0,'tandc'); -if(isset($inventory_id)) - $xtpl->assign("INVENTORYID",$inventory_id); -if (isset($inventory_type)) - $xtpl->assign("INVENTORYTYPE",$inventory_type); if (isset($inventory_tandc)) - $xtpl->assign("INV_TERMSANDCONDITIONS",$inventory_tandc); - - -/* - $xtpl->assign("INVENTORYID",$inventoryResult["id"]); -//if (isset($inventory_type)) - $xtpl->assign("INVENTORYTYPE",$inventoryResult["type"]); -//if (isset($inventory_tandc)) - $xtpl->assign("INV_TERMSANDCONDITIONS",$inventoryResult["tandc"]);*/ - - -$xtpl->parse("main"); -$xtpl->out("main"); - + $smarty->assign("INV_TERMSANDCONDITIONS",$inventory_tandc); +if(isset($_REQUEST['inv_terms_mode']) && $_REQUEST['inv_terms_mode'] != '') + $smarty->assign("INV_TERMS_MODE",$_REQUEST['inv_terms_mode']); +else + $smarty->assign("INV_TERMS_MODE",'view'); + +$smarty->assign("MOD", return_module_language($current_language,'Settings')); +$smarty->assign("IMAGE_PATH",$image_path); +$smarty->assign("APP", $app_strings); +$smarty->assign("CMOD", $mod_strings); +$smarty->display("Settings/InventoryTerms.tpl"); ?> - - Modified: vtigercrm/trunk/modules/Users/UsersAjax.php ============================================================================== --- vtigercrm/trunk/modules/Users/UsersAjax.php (original) +++ vtigercrm/trunk/modules/Users/UsersAjax.php Mon Apr 3 05:52:19 2006 @@ -41,9 +41,9 @@ $sql="select * from announcement where creatorid=".$current_user->id; $is_announce=$adb->query($sql); if($adb->num_rows($is_announce) > 0) - $query="update announcement set announcement=".$adb->formatString("announcement","announcement",$announcement).",time=".$adb->formatString("announcement","time",$date_var).",title=".$adb->formatString("announcement","title",$title)." where creatorid=".$current_user->id; + $query="update announcement set announcement=".$adb->formatString("announcement","announcement",$announcement).",time=".$adb->formatString("announcement","time",$date_var).",title='announcement' where creatorid=".$current_user->id; else - $query="insert into announcement values (".$current_user->id.",".$adb->formatString("announcement","announcement",$announcement).",".$adb->formatString("announcement","time",$date_var).",'".$date_var."')"; + $query="insert into announcement values (".$current_user->id.",".$adb->formatString("announcement","announcement",$announcement).",'announcement','".$date_var."')"; $result=$adb->query($query); echo $announcement; } From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 07:55:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 03 Apr 2006 11:55:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4829 - /vtigercrm/trunk/themes/blue/style.css Message-ID: <20060403115520.7951E5BA327@vtiger.fosslabs.com> Author: don Date: Mon Apr 3 05:55:15 2006 New Revision: 4829 Log: style for button has been added Modified: vtigercrm/trunk/themes/blue/style.css Modified: vtigercrm/trunk/themes/blue/style.css ============================================================================== --- vtigercrm/trunk/themes/blue/style.css (original) +++ vtigercrm/trunk/themes/blue/style.css Mon Apr 3 05:55:15 2006 @@ -1509,6 +1509,13 @@ border:1px solid #666666; text-align:center; } +.txtBox{ + width:85%; + border:1px solid #666666; + font-family:Arial, Helvetica, sans-serif; + font-size:11px; +} + /*cloud css*/ .statechange From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 08:02:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 03 Apr 2006 12:02:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4830 - /vtigercrm/trunk/modules/Users/savetermsandconditions.php Message-ID: <20060403120222.3E3A85BA336@vtiger.fosslabs.com> Author: don Date: Mon Apr 3 06:02:17 2006 New Revision: 4830 Log: changes made to integrate new UI Modified: vtigercrm/trunk/modules/Users/savetermsandconditions.php Modified: vtigercrm/trunk/modules/Users/savetermsandconditions.php ============================================================================== --- vtigercrm/trunk/modules/Users/savetermsandconditions.php (original) +++ vtigercrm/trunk/modules/Users/savetermsandconditions.php Mon Apr 3 06:02:17 2006 @@ -11,7 +11,7 @@ require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); -$inv_type=$_REQUEST['inventory_type']; +$inv_type='Inventory'; $inv_tandc=$_REQUEST['inventory_tandc']; $sql="select * from inventory_tandc where type='".$inv_type."'"; From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 08:04:39 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 03 Apr 2006 12:04:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4831 - in /vtigercrm/trunk: Smarty/templates/Settings/ include/images/ Message-ID: <20060403120439.E78715BA336@vtiger.fosslabs.com> Author: don Date: Mon Apr 3 06:04:26 2006 New Revision: 4831 Log: new files added to integrate new UI Added: vtigercrm/trunk/Smarty/templates/Settings/ vtigercrm/trunk/Smarty/templates/Settings/Announcements.tpl (with props) vtigercrm/trunk/Smarty/templates/Settings/BackupServer.tpl (with props) vtigercrm/trunk/Smarty/templates/Settings/CompanyInfo.tpl (with props) vtigercrm/trunk/Smarty/templates/Settings/EditCompanyInfo.tpl (with props) vtigercrm/trunk/Smarty/templates/Settings/EmailConfig.tpl (with props) vtigercrm/trunk/Smarty/templates/Settings/InventoryTerms.tpl (with props) vtigercrm/trunk/include/images/announ.gif (with props) vtigercrm/trunk/include/images/noimage.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 08:07:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 03 Apr 2006 12:07:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4832 - in /vtigercrm/trunk/modules: Settings/ Users/ Message-ID: <20060403120750.788F55BA344@vtiger.fosslabs.com> Author: don Date: Mon Apr 3 06:07:41 2006 New Revision: 4832 Log: files removed as the settings smartified for the new UI Removed: vtigercrm/trunk/modules/Settings/BackupServerConfig.html vtigercrm/trunk/modules/Settings/EditCompanyDetails.html vtigercrm/trunk/modules/Settings/EmailConfig.html vtigercrm/trunk/modules/Settings/OrganizationConfig.html vtigercrm/trunk/modules/Users/EditTermsandConditions.html vtigercrm/trunk/modules/Users/EditTermsandConditions.php vtigercrm/trunk/modules/Users/OrganizationTermsandConditions.html From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 08:40:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 03 Apr 2006 12:40:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4833 - /vtigercrm/trunk/schema/DatabaseSchema.xml Message-ID: <20060403124034.6F7DB59E1F6@vtiger.fosslabs.com> Author: don Date: Mon Apr 3 06:40:28 2006 New Revision: 4833 Log: Fixed indexing issues in reporddatefilter,reportmodules,reportsortcol,reportsummary Modified: vtigercrm/trunk/schema/DatabaseSchema.xml Modified: vtigercrm/trunk/schema/DatabaseSchema.xml ============================================================================== --- vtigercrm/trunk/schema/DatabaseSchema.xml (original) +++ vtigercrm/trunk/schema/DatabaseSchema.xml Mon Apr 3 06:40:28 2006 @@ -5657,14 +5657,11 @@ - - reportmodulesid - Type=InnoDB - ADD CONSTRAINT reportmodules_FK1 FOREIGN KEY (REPORTMODULESID) REFERENCES report (REPORTID) ON DELETE CASCADE + ADD CONSTRAINT reportmodules_FK1 FOREIGN KEY (reportmodulesid) REFERENCES report(reportid) ON DELETE CASCADEType=InnoDB
    @@ -5672,13 +5669,9 @@ - - - - @@ -5686,14 +5679,11 @@ - - reportid - Type=InnoDB
    - ADD CONSTRAINT reportsortcol_FK1 FOREIGN KEY (REPORTID) REFERENCES report (REPORTID) ON DELETE CASCADE + ADD CONSTRAINT FK1_reportsortcol FOREIGN KEY (reportid) REFERENCES report(reportid) ON DELETE CASCADEType=InnoDB
    @@ -5701,8 +5691,6 @@ - - @@ -5716,14 +5704,11 @@ - - datefilterid - Type=InnoDB
    - ADD CONSTRAINT reportdatefilter_FK1 FOREIGN KEY (DATEFILTERID) REFERENCES report (REPORTID) ON DELETE CASCADE + ADD CONSTRAINT FK1_reportdatefilter FOREIGN KEY (datefilterid) REFERENCES report(reportid) ON DELETE CASCADEType=InnoDB
    @@ -5731,26 +5716,19 @@ - - - - - - reportsummaryid - Type=InnoDB
    - ADD CONSTRAINT reportsummary_FK1 FOREIGN KEY (REPORTSUMMARYID) REFERENCES report (REPORTID) ON DELETE CASCADE + ADD CONSTRAINT reportsummary_FK1 FOREIGN KEY (reportsummaryid) REFERENCES report(reportid) ON DELETE CASCADEType=InnoDB
    From vtiger-tickets at vtiger.fosslabs.com Mon Apr 3 12:28:28 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 03 Apr 2006 16:28:28 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2317=3A_A?= =?utf-8?q?dd_postgresql_support_to_4=2E2_branch?= In-Reply-To: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> References: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> Message-ID: <085.c3a432300001f662f66fc6b3a4b92bea@vtiger.fosslabs.com> #17: Add postgresql support to 4.2 branch ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Resolution: | Keywords: database postgresql ------------------------+--------------------------------------------------- Comment (by allanbush): (In [4834]) Fetching id for ticketcomments before inserting into database. Refs #17. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 12:28:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 03 Apr 2006 16:28:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4834 - in /vtigercrm/branches/4.2_postgresql_integration: data/CRMEntity.php install/5createTables.inc.php Message-ID: <20060403162829.102A959E806@vtiger.fosslabs.com> Author: allanbush Date: Mon Apr 3 10:28:25 2006 New Revision: 4834 Log: Fetching id for ticketcomments before inserting into database. Refs #17. Modified: vtigercrm/branches/4.2_postgresql_integration/data/CRMEntity.php vtigercrm/branches/4.2_postgresql_integration/install/5createTables.inc.php Modified: vtigercrm/branches/4.2_postgresql_integration/data/CRMEntity.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/data/CRMEntity.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/data/CRMEntity.php Mon Apr 3 10:28:25 2006 @@ -740,8 +740,9 @@ else $ownertype = 'customer'; - $comment = addslashes($_REQUEST['comments']); - $sql = "insert into ticketcomments values('',".$this->id.",'".$comment."','".$current_user->id."','".$ownertype."','".$current_time."')"; + $comment = $adb->quote($_REQUEST['comments']); + $id = $adb->getUniqueID("ticketcomments_commentid"); + $sql = "insert into ticketcomments values(".$id.",".$this->id.",".$comment.",'".$current_user->id."','".$ownertype."','".$current_time."')"; $adb->query($sql); } function insertIntoFAQCommentTable($table_name, $module) Modified: vtigercrm/branches/4.2_postgresql_integration/install/5createTables.inc.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/install/5createTables.inc.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/install/5createTables.inc.php Mon Apr 3 10:28:25 2006 @@ -248,6 +248,7 @@ $db->getUniqueID("rss"); $db->getUniqueID("selectquery"); $db->getUniqueID("systems"); +$db->getUniqueID("ticketcomments_commentid"); $db->getUniqueID("wordtemplates"); From vtiger-tickets at vtiger.fosslabs.com Mon Apr 3 12:52:35 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 03 Apr 2006 16:52:35 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2317=3A_A?= =?utf-8?q?dd_postgresql_support_to_4=2E2_branch?= In-Reply-To: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> References: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> Message-ID: <085.642b2e5ad04b47873cd36c21dd349c7e@vtiger.fosslabs.com> #17: Add postgresql support to 4.2 branch ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Resolution: | Keywords: database postgresql ------------------------+--------------------------------------------------- Comment (by allanbush): (In [4835]) Fixed date formatting on attachment creation. Refs #17. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 12:52:36 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 03 Apr 2006 16:52:36 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4835 - /vtigercrm/branches/4.2_postgresql_integration/modules/uploads/add2db.php Message-ID: <20060403165236.7C04459F66F@vtiger.fosslabs.com> Author: allanbush Date: Mon Apr 3 10:52:33 2006 New Revision: 4835 Log: Fixed date formatting on attachment creation. Refs #17. Modified: vtigercrm/branches/4.2_postgresql_integration/modules/uploads/add2db.php Modified: vtigercrm/branches/4.2_postgresql_integration/modules/uploads/add2db.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/modules/uploads/add2db.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/modules/uploads/add2db.php Mon Apr 3 10:52:33 2006 @@ -40,7 +40,7 @@ $current_id = $adb->getUniqueID("crmentity"); $desc = $_REQUEST['txtDescription']; $description = addslashes($desc); - $date_var = date('YmdHis'); + $date_var = $adb->database->DBTimeStamp(date('YmdHis')); //$data = addslashes(fread(fopen($uploaddir.$binFile, "r"), $filesize)); $filenameBase64 = $filename.".base64"; @@ -50,8 +50,8 @@ fwrite($wfh,base64_encode(fread($rfh, $filesize))); deleteFile($uploaddir,$filename); - $query = "insert into 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 = "insert into crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values('"; + $query .= $current_id."','".$current_user->id."','".$current_user->id."','".$_REQUEST['return_module'].' Attachment'."','".$description."',".$date_var.",".$date_var.")"; $result = $adb->query($query); $sql = "insert into attachments values("; From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 12:55:18 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 03 Apr 2006 16:55:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4836 - /vtigercrm/branches/4.2_postgresql_integration/include/database/PearDatabase.php Message-ID: <20060403165518.9208559F67B@vtiger.fosslabs.com> Author: allanbush Date: Mon Apr 3 10:55:13 2006 New Revision: 4836 Log: Added support for postgres blob insertion (adodb is limited in it's postgres blob support and only one of UpdateBlobFile or UpdateBlob work Modified: vtigercrm/branches/4.2_postgresql_integration/include/database/PearDatabase.php Modified: vtigercrm/branches/4.2_postgresql_integration/include/database/PearDatabase.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/include/database/PearDatabase.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/include/database/PearDatabase.php Mon Apr 3 10:55:13 2006 @@ -264,7 +264,14 @@ { $this->println("updateBlobFile t=".$tablename." c=".$colname." id=".$id." f=".$filename); $this->checkConnection(); - $result = $this->database->UpdateBlobFile($tablename, $colname, $filename, $id); + if($this->isPostgres()) { + $fp = fopen($filename, "r"); + $filecontent = fread($fp, filesize($filename)); + $result = $this->database->UpdateBlob($tablename, $colname, $filecontent, $id); + fclose($fp); + } else { + $result = $this->database->UpdateBlobFile($tablename, $colname, $filename, $id); + } $this->println("updateBlobFile t=".$tablename." c=".$colname." id=".$id." f=".$filename." status=".$result); return $result; } From vtiger-tickets at vtiger.fosslabs.com Mon Apr 3 13:02:15 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 03 Apr 2006 17:02:15 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2317=3A_A?= =?utf-8?q?dd_postgresql_support_to_4=2E2_branch?= In-Reply-To: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> References: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> Message-ID: <085.a978653b484aed441324a2048226a8b8@vtiger.fosslabs.com> #17: Add postgresql support to 4.2 branch ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Resolution: | Keywords: database postgresql ------------------------+--------------------------------------------------- Comment (by allanbush): (In [4837]) Fixed FAQ comment creation by fetching next id value before inserting a new row. Refs #17. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 13:02:16 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 03 Apr 2006 17:02:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4837 - in /vtigercrm/branches/4.2_postgresql_integration: data/CRMEntity.php install/5createTables.inc.php Message-ID: <20060403170216.3E75859F6CE@vtiger.fosslabs.com> Author: allanbush Date: Mon Apr 3 11:02:13 2006 New Revision: 4837 Log: Fixed FAQ comment creation by fetching next id value before inserting a new row. Refs #17. Modified: vtigercrm/branches/4.2_postgresql_integration/data/CRMEntity.php vtigercrm/branches/4.2_postgresql_integration/install/5createTables.inc.php Modified: vtigercrm/branches/4.2_postgresql_integration/data/CRMEntity.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/data/CRMEntity.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/data/CRMEntity.php Mon Apr 3 11:02:13 2006 @@ -753,8 +753,9 @@ $current_time = date('Y-m-d H:i:s'); - $comment = addslashes($_REQUEST['comments']); - $sql = "insert into faqcomments values('',".$this->id.",'".$comment."','".$current_time."')"; + $comment = $adb->quote($_REQUEST['comments']); + $id = $adb->getUniqueID("faqcomments_commentid"); + $sql = "insert into faqcomments values(".$id.",".$this->id.",".$comment.",'".$current_time."')"; $adb->query($sql); } function insertIntoReminderTable($table_name,$module,$recurid) Modified: vtigercrm/branches/4.2_postgresql_integration/install/5createTables.inc.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/install/5createTables.inc.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/install/5createTables.inc.php Mon Apr 3 11:02:13 2006 @@ -235,6 +235,7 @@ $db->getUniqueID("customview"); $db->getUniqueID("def_org_share"); $db->getUniqueID("emailtemplates"); +$db->getUniqueID("faqcomments_commentid"); $db->getUniqueID("field"); $db->getUniqueID("import_maps"); $db->getUniqueID("inventorynotification"); From vtiger-tickets at vtiger.fosslabs.com Mon Apr 3 13:06:11 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 03 Apr 2006 17:06:11 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2317=3A_A?= =?utf-8?q?dd_postgresql_support_to_4=2E2_branch?= In-Reply-To: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> References: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> Message-ID: <085.1f5de052b4ec87bcd8917f4df1e99233@vtiger.fosslabs.com> #17: Add postgresql support to 4.2 branch ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Resolution: | Keywords: database postgresql ------------------------+--------------------------------------------------- Comment (by allanbush): (In [4838]) Fixed error in sales order related list (detail view) by using OR in the query instead of ||. Refs #17. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 13:06:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 03 Apr 2006 17:06:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4838 - /vtigercrm/branches/4.2_postgresql_integration/modules/Orders/SalesOrder.php Message-ID: <20060403170612.0A42859F6E6@vtiger.fosslabs.com> Author: allanbush Date: Mon Apr 3 11:06:09 2006 New Revision: 4838 Log: Fixed error in sales order related list (detail view) by using OR in the query instead of ||. Refs #17. Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Orders/SalesOrder.php Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Orders/SalesOrder.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/modules/Orders/SalesOrder.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/modules/Orders/SalesOrder.php Mon Apr 3 11:06:09 2006 @@ -172,7 +172,7 @@ } function get_activities($id) { - $query = "SELECT contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, activity.*,seactivityrel.*,crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, users.user_name from activity inner join seactivityrel on seactivityrel.activityid=activity.activityid inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid = cntactivityrel.contactid left join users on users.id=crmentity.smownerid where seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and crmentity.deleted=0 and ( activity.status is NULL || activity.status != 'Completed' ) and ( activity.eventstatus is NULL || activity.eventstatus != 'Held')"; + $query = "SELECT contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, activity.*,seactivityrel.*,crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, users.user_name from activity inner join seactivityrel on seactivityrel.activityid=activity.activityid inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid = cntactivityrel.contactid left join users on users.id=crmentity.smownerid where seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and crmentity.deleted=0 and ( activity.status is NULL OR activity.status != 'Completed' ) and ( activity.eventstatus is NULL OR activity.eventstatus != 'Held')"; renderSalesRelatedActivities($query,$id); } function get_history($id) From vtiger-tickets at vtiger.fosslabs.com Mon Apr 3 13:07:29 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 03 Apr 2006 17:07:29 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2317=3A_A?= =?utf-8?q?dd_postgresql_support_to_4=2E2_branch?= In-Reply-To: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> References: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> Message-ID: <085.79639190f0a8c85294f50498b4e2fa9e@vtiger.fosslabs.com> #17: Add postgresql support to 4.2 branch ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Resolution: | Keywords: database postgresql ------------------------+--------------------------------------------------- Comment (by allanbush): (In [4839]) Fixed related list query, replacing || with OR. Refs #17. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 13:07:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 03 Apr 2006 17:07:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4839 - /vtigercrm/branches/4.2_postgresql_integration/modules/Invoice/Invoice.php Message-ID: <20060403170730.9BC2859F6EA@vtiger.fosslabs.com> Author: allanbush Date: Mon Apr 3 11:07:27 2006 New Revision: 4839 Log: Fixed related list query, replacing || with OR. Refs #17. Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Invoice/Invoice.php Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Invoice/Invoice.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/modules/Invoice/Invoice.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/modules/Invoice/Invoice.php Mon Apr 3 11:07:27 2006 @@ -166,7 +166,7 @@ } function get_activities($id) { - $query = "SELECT contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, activity.*,seactivityrel.*,crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, users.user_name from activity inner join seactivityrel on seactivityrel.activityid=activity.activityid inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid = cntactivityrel.contactid left join users on users.id=crmentity.smownerid where seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and crmentity.deleted=0 and ( activity.status is NULL || activity.status != 'Completed' ) and ( activity.eventstatus is NULL || activity.eventstatus != 'Held')"; + $query = "SELECT contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, activity.*,seactivityrel.*,crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, users.user_name from activity inner join seactivityrel on seactivityrel.activityid=activity.activityid inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid = cntactivityrel.contactid left join users on users.id=crmentity.smownerid where seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and crmentity.deleted=0 and ( activity.status is NULL OR activity.status != 'Completed' ) and ( activity.eventstatus is NULL OR activity.eventstatus != 'Held')"; renderRelatedActivities($query,$id); } function get_history($id) From vtiger-tickets at vtiger.fosslabs.com Mon Apr 3 13:16:19 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 03 Apr 2006 17:16:19 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2317=3A_A?= =?utf-8?q?dd_postgresql_support_to_4=2E2_branch?= In-Reply-To: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> References: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> Message-ID: <085.6c0a21a688742d1fb7b0aba5bb4127ad@vtiger.fosslabs.com> #17: Add postgresql support to 4.2 branch ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Resolution: | Keywords: database postgresql ------------------------+--------------------------------------------------- Comment (by allanbush): (In [4840]) Fixed detail view by replacing || with OR in related list query. Refs #17. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 13:16:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 03 Apr 2006 17:16:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4840 - /vtigercrm/branches/4.2_postgresql_integration/modules/Orders/Order.php Message-ID: <20060403171620.4240F59F6E7@vtiger.fosslabs.com> Author: allanbush Date: Mon Apr 3 11:16:17 2006 New Revision: 4840 Log: Fixed detail view by replacing || with OR in related list query. Refs #17. Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Orders/Order.php Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Orders/Order.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/modules/Orders/Order.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/modules/Orders/Order.php Mon Apr 3 11:16:17 2006 @@ -166,7 +166,7 @@ } function get_activities($id) { - $query = "SELECT contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, activity.*,seactivityrel.*,crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, users.user_name from activity inner join seactivityrel on seactivityrel.activityid=activity.activityid inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid = cntactivityrel.contactid left join users on users.id=crmentity.smownerid where seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and crmentity.deleted=0 and ( activity.status is NULL || activity.status != 'Completed' ) and ( activity.eventstatus is NULL || activity.eventstatus != 'Held')"; + $query = "SELECT contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, activity.*,seactivityrel.*,crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, users.user_name from activity inner join seactivityrel on seactivityrel.activityid=activity.activityid inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid = cntactivityrel.contactid left join users on users.id=crmentity.smownerid where seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and crmentity.deleted=0 and ( activity.status is NULL OR activity.status != 'Completed' ) and ( activity.eventstatus is NULL OR activity.eventstatus != 'Held')"; renderRelatedActivities($query,$id); } function get_history($id) From vtiger-tickets at vtiger.fosslabs.com Mon Apr 3 13:41:08 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 03 Apr 2006 17:41:08 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2317=3A_A?= =?utf-8?q?dd_postgresql_support_to_4=2E2_branch?= In-Reply-To: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> References: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> Message-ID: <085.2fa7556ca5d60f1140d205c3596da1ef@vtiger.fosslabs.com> #17: Add postgresql support to 4.2 branch ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Resolution: | Keywords: database postgresql ------------------------+--------------------------------------------------- Comment (by allanbush): (In [4841]) Various changes to get reports working with postgres. Refs #17. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 13:41:08 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 03 Apr 2006 17:41:08 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4841 - in /vtigercrm/branches/4.2_postgresql_integration/modules/Reports: ReportRun.php Save.php SaveReportFolder.php Message-ID: <20060403174108.0BD7259F679@vtiger.fosslabs.com> Author: allanbush Date: Mon Apr 3 11:41:02 2006 New Revision: 4841 Log: Various changes to get reports working with postgres. Refs #17. Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Reports/ReportRun.php vtigercrm/branches/4.2_postgresql_integration/modules/Reports/Save.php vtigercrm/branches/4.2_postgresql_integration/modules/Reports/SaveReportFolder.php Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Reports/ReportRun.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/modules/Reports/ReportRun.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/modules/Reports/ReportRun.php Mon Apr 3 11:41:02 2006 @@ -93,15 +93,15 @@ { if($this->primarymodule == "HelpDesk") { - $querycolumn = "case crmentityRelHelpDesk.setype when 'Accounts' then accountRelHelpDesk.accountname when 'Contacts' then contactdetailsRelHelpDesk.lastname End"." '".$selectedfields[2]."', crmentityRelHelpDesk.setype 'Entity_type'"; + $querycolumn = "case crmentityRelHelpDesk.setype when 'Accounts' then accountRelHelpDesk.accountname when 'Contacts' then contactdetailsRelHelpDesk.lastname End"." AS \"".$selectedfields[2]."\", crmentityRelHelpDesk.setype AS Entity_type"; } if($this->primarymodule == "Products" || $this->secondarymodule == "Products") { - $querycolumn = "case crmentityRelProducts.setype when 'Accounts' then accountRelProducts.accountname when 'Leads' then leaddetailsRelProducts.lastname when 'Potentials' then potentialRelProducts.potentialname End"." '".$selectedfields[2]."', crmentityRelProducts.setype 'Entity_type'"; + $querycolumn = "case crmentityRelProducts.setype when 'Accounts' then accountRelProducts.accountname when 'Leads' then leaddetailsRelProducts.lastname when 'Potentials' then potentialRelProducts.potentialname End"." AS \"".$selectedfields[2]."\", crmentityRelProducts.setype AS Entity_type"; } if($this->primarymodule == "Activities" || $this->secondarymodule == "Activities") { - $querycolumn = "case crmentityRelActivities.setype when 'Accounts' then accountRelActivities.accountname when 'Leads' then leaddetailsRelActivities.lastname when 'Potentials' then potentialRelActivities.potentialname when 'Quotes' then quotesRelActivities.subject when 'Orders' then purchaseorderRelActivities.subject when 'Invoice' then invoiceRelActivities.subject End"." '".$selectedfields[2]."', crmentityRelActivities.setype 'Entity_type'"; + $querycolumn = "case crmentityRelActivities.setype when 'Accounts' then accountRelActivities.accountname when 'Leads' then leaddetailsRelActivities.lastname when 'Potentials' then potentialRelActivities.potentialname when 'Quotes' then quotesRelActivities.subject when 'Orders' then purchaseorderRelActivities.subject when 'Invoice' then invoiceRelActivities.subject End"." AS \"".$selectedfields[2]."\", crmentityRelActivities.setype AS Entity_type"; } } /*if($fieldname == "contact_id") @@ -1471,19 +1471,19 @@ $fieldlist = explode(":",$fieldcolname); if($fieldlist[4] == 2) { - $stdfilterlist[$fieldcolname] = "sum(".$fieldlist[1].".".$fieldlist[2].") ".$fieldlist[3]; + $stdfilterlist[$fieldcolname] = "sum(".$fieldlist[1].".".$fieldlist[2].") AS ".$fieldlist[3]; } if($fieldlist[4] == 3) { - $stdfilterlist[$fieldcolname] = "avg(".$fieldlist[1].".".$fieldlist[2].") ".$fieldlist[3]; + $stdfilterlist[$fieldcolname] = "avg(".$fieldlist[1].".".$fieldlist[2].") AS ".$fieldlist[3]; } if($fieldlist[4] == 4) { - $stdfilterlist[$fieldcolname] = "min(".$fieldlist[1].".".$fieldlist[2].") ".$fieldlist[3]; + $stdfilterlist[$fieldcolname] = "min(".$fieldlist[1].".".$fieldlist[2].") AS ".$fieldlist[3]; } if($fieldlist[4] == 5) { - $stdfilterlist[$fieldcolname] = "max(".$fieldlist[1].".".$fieldlist[2].") ".$fieldlist[3]; + $stdfilterlist[$fieldcolname] = "max(".$fieldlist[1].".".$fieldlist[2].") AS ".$fieldlist[3]; } } } Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Reports/Save.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/modules/Reports/Save.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/modules/Reports/Save.php Mon Apr 3 11:41:02 2006 @@ -36,10 +36,10 @@ //<<<<<<>>>>>>>> //<<<<<<>>>>>>>> -$reportname = $adb->database->qstr($_REQUEST["reportName"]); -$reportdescription = $adb->database->qstr($_REQUEST["reportDesc"]); -$reporttype = $adb->database->qstr($_REQUEST["reportType"]); -$folderid = $adb->database->qstr($_REQUEST["folder"]); +$reportname = $adb->quote($_REQUEST["reportName"]); +$reportdescription = $adb->quote($_REQUEST["reportDesc"]); +$reporttype = $adb->quote($_REQUEST["reportType"]); +$folderid = $adb->quote($_REQUEST["folder"]); //<<<<<<>>>>>>>> //<<<<<<>>>>>>>> @@ -214,9 +214,9 @@ } $ireportsql = "update report set"; - $ireportsql .= " REPORTNAME='".$reportname."',"; - $ireportsql .= " DESCRIPTION='".$reportdescription."',"; - $ireportsql .= " REPORTTYPE='".$reporttype."'"; + $ireportsql .= " REPORTNAME=".$reportname.","; + $ireportsql .= " DESCRIPTION=".$reportdescription.","; + $ireportsql .= " REPORTTYPE=".$reporttype.""; $ireportsql .= " where REPORTID=".$reportid; $ireportresult = $adb->query($ireportsql); $vtlog->logthis("Reports :: Save->Successfully saved report","info"); Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Reports/SaveReportFolder.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/modules/Reports/SaveReportFolder.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/modules/Reports/SaveReportFolder.php Mon Apr 3 11:41:02 2006 @@ -19,8 +19,8 @@ $rfid = $_REQUEST['record']; $mode = $_REQUEST['mode']; -$foldername = addslashes($_REQUEST["folderName"]); -$folderdesc = addslashes($_REQUEST["folderDesc"]); +$foldername = $adb->quote($_REQUEST["folderName"]); +$folderdesc = $adb->quote($_REQUEST["folderDesc"]); //echo $id.$mode."1".$foldername."2".$folderdesc; if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] != "") $return_module = $_REQUEST['return_module']; @@ -32,9 +32,8 @@ { if($rfid=="") { - $sql = "INSERT INTO reportfolder "; - $sql .= "(FOLDERID,FOLDERNAME,DESCRIPTION,STATE) "; - $sql .= "VALUES ('','".$foldername."','".$folderdesc."','CUSTOMIZED')"; + $sql = "INSERT INTO reportfolder (foldername,description,state) + VALUES (".$foldername.",".$folderdesc.",'CUSTOMIZED')"; $result = $adb->query($sql); if($result!=false) { @@ -53,8 +52,8 @@ if($rfid != "") { $sql = "update reportfolder set "; - $sql .= "FOLDERNAME='".$foldername."', "; - $sql .= "DESCRIPTION='".$folderdesc."' "; + $sql .= "FOLDERNAME=".$foldername.", "; + $sql .= "DESCRIPTION=".$folderdesc." "; $sql .= "where folderid=".$rfid; $result = $adb->query($sql); if($result!=false) From vtiger-tickets at vtiger.fosslabs.com Mon Apr 3 13:44:59 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 03 Apr 2006 17:44:59 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2317=3A_A?= =?utf-8?q?dd_postgresql_support_to_4=2E2_branch?= In-Reply-To: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> References: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> Message-ID: <085.cc05aae31c5b4cc6da93f7b575c50712@vtiger.fosslabs.com> #17: Add postgresql support to 4.2 branch ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Resolution: | Keywords: database postgresql ------------------------+--------------------------------------------------- Comment (by allanbush): (In [4842]) Added select column aliases to fix login history page. Refs #17. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 13:44:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 03 Apr 2006 17:44:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4842 - /vtigercrm/branches/4.2_postgresql_integration/modules/Users/LoginHistory.php Message-ID: <20060403174459.C7F0359F6C1@vtiger.fosslabs.com> Author: allanbush Date: Mon Apr 3 11:44:57 2006 New Revision: 4842 Log: Added select column aliases to fix login history page. Refs #17. Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Users/LoginHistory.php Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Users/LoginHistory.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/modules/Users/LoginHistory.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/modules/Users/LoginHistory.php Mon Apr 3 11:44:57 2006 @@ -126,7 +126,7 @@ // Determine if the account name is present in the where clause. // $query = "SELECT * from loginhistory order by login_time"; global $current_user; - $query = "SELECT user_name,user_ip,".$this->db->getDBDateString("login_time")." login_time,".$this->db->getDBDateString("logout_time")." logout_time,status FROM $this->table_name "; + $query = "SELECT user_name,user_ip,".$this->db->getDBDateString("login_time")." AS login_time,".$this->db->getDBDateString("logout_time")." AS logout_time,status FROM $this->table_name "; if($where != "") { if(!is_admin($current_user)) From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 14:27:44 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 03 Apr 2006 18:27:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4843 - /vtigercrm/trunk/include/utils/CommonUtils.php Message-ID: <20060403182744.5199259F810@vtiger.fosslabs.com> Author: don Date: Mon Apr 3 12:27:39 2006 New Revision: 4843 Log: written tab sequence array in tabdata 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 Mon Apr 3 12:27:39 2006 @@ -1279,11 +1279,14 @@ $result = $adb->query($sql); $num_rows=$adb->num_rows($result); $result_array=Array(); + $seq_array=Array(); for($i=0;$i<$num_rows;$i++) { $tabid=$adb->query_result($result,$i,'tabid'); $tabname=$adb->query_result($result,$i,'name'); + $presence=$adb->query_result($result,$i,'presence'); $result_array[$tabname]=$tabid; + $seq_array[$tabid]=$presence; } @@ -1306,6 +1309,8 @@ $newbuf .= "//This file contains the commonly used variables \n"; $newbuf .= "\n"; $newbuf .= "\$tab_info_array=".constructArray($result_array).";\n"; + $newbuf .= "\n"; + $newbuf .= "\$tab_seq_array=".constructArray($seq_array).";\n"; $newbuf .= "?>"; fputs($handle, $newbuf); fclose($handle); From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 14:28:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 03 Apr 2006 18:28:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4844 - /vtigercrm/trunk/include/utils/UserInfoUtil.php Message-ID: <20060403182848.7CDCC59F810@vtiger.fosslabs.com> Author: don Date: Mon Apr 3 12:28:44 2006 New Revision: 4844 Log: Added function getPermittedModuleNames 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 Mon Apr 3 12:28:44 2006 @@ -4034,4 +4034,42 @@ return $fldModArr; } +/** Function to get the permitted module name Array with presence as 0 + * @returns permitted module name Array :: Type Array + * + */ +function getPermittedModuleNames() +{ + global $current_user; + $permittedModules=Array(); + require('user_privileges/user_privileges_'.$current_user->id.'.php'); + include('tabdata.php'); + + if($is_admin == false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1) + { + foreach($tab_seq_array as $tabid=>$seq_value) + { + if($seq_value ==0 && $profileTabsPermission[$tabid] == 0) + { + $permittedModules[]=getTabModuleName($tabid); + } + + } + + + } + else + { + foreach($tab_seq_array as $tabid=>$seq_value) + { + if($seq_value ==0) + { + $permittedModules[]=getTabModuleName($tabid); + } + + } + } + return $permittedModules; +} + ?> From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 14:31:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 03 Apr 2006 18:31:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4845 - in /vtigercrm/trunk/modules/Users: CreateUserPrivilegeFile.php User.php Message-ID: <20060403183112.84E0F59F82E@vtiger.fosslabs.com> Author: don Date: Mon Apr 3 12:31:07 2006 New Revision: 4845 Log: Now in index.php querying user table every time is avoided Modified: vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php vtigercrm/trunk/modules/Users/User.php Modified: vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php ============================================================================== --- vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php (original) +++ vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php Mon Apr 3 12:31:07 2006 @@ -21,9 +21,17 @@ $newbuf .= "//This is the access privilege file\n"; $user_focus= new User(); $user_focus->retrieve($userid); + $userInfo=Array(); + foreach($user_focus->column_fields as $field) + { + $userInfo[$field]= $user_focus->$field; + } + if($user_focus->is_admin == 'on') { $newbuf .= "\$is_admin=true;\n"; + $newbuf .="\n"; + $newbuf .= "\$user_info=".constructSingleStringKeyValueArray($userInfo).";\n"; $newbuf .= "\n"; $newbuf .= "?>"; fputs($handle, $newbuf); @@ -48,6 +56,8 @@ $subRoleAndUsers=getSubordinateRoleAndUsers($user_role); $def_org_share=getDefaultSharingAction(); $parentRoles=getParentRole($user_role); + + $newbuf .= "\$current_user_roles='".$user_role."';\n"; @@ -69,6 +79,8 @@ $newbuf .= "\$parent_roles=".constructSingleCharArray($parentRoles).";\n"; $newbuf .="\n"; $newbuf .= "\$subordinate_roles_users=".constructTwoDimensionalCharIntSingleArray($subRoleAndUsers).";\n"; + $newbuf .="\n"; + $newbuf .= "\$user_info=".constructSingleStringKeyValueArray($userInfo).";\n"; $newbuf .= "?>"; fputs($handle, $newbuf); @@ -1106,6 +1118,32 @@ } } +function constructSingleStringKeyValueArray($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; + } +} + + function constructSingleArray($var) { Modified: vtigercrm/trunk/modules/Users/User.php ============================================================================== --- vtigercrm/trunk/modules/Users/User.php (original) +++ vtigercrm/trunk/modules/Users/User.php Mon Apr 3 12:31:07 2006 @@ -552,6 +552,25 @@ $this->reports_to_name = ''; } } + + function retrieveCurrentUserInfoFromFile($userid) + { + require('user_privileges/user_privileges_'.$userid.'.php'); + foreach($this->column_fields as $field) + { + if(isset($user_info[$field])) + { + $this->$field = $user_info[$field]; + } + } + return $this; + + } + + } + + + ?> From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 14:32:53 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 03 Apr 2006 18:32:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4846 - /vtigercrm/trunk/index.php Message-ID: <20060403183253.D7EB559F82E@vtiger.fosslabs.com> Author: don Date: Mon Apr 3 12:32:49 2006 New Revision: 4846 Log: Modified: vtigercrm/trunk/index.php Modified: vtigercrm/trunk/index.php ============================================================================== --- vtigercrm/trunk/index.php (original) +++ vtigercrm/trunk/index.php Mon Apr 3 12:32:49 2006 @@ -320,37 +320,6 @@ $log->info("current page is $currentModuleFile"); $log->info("current module is $currentModule "); -//define default home pages for each module -require_once("modules/Users/TabMenu.php"); -$tabData = new TabMenu(); - -global $permittedModulesList; - -$permittedModulesList = fetchPermissionDataForTabList(); -//print_r($permittedModulesList); -$tempList=""; -if(!$permittedModulesList == "") -{ - - foreach ($permittedModulesList as $list) - { - if($tempList=="") - { - $tempList = "'".$list."'" ; - } - else - { - $tempList .= ",'" . $list."'" ; - } - $list=""; - } -} - -$moduleList = $tabData->getTabNames($tempList); - -foreach ($moduleList as $mod) { - $moduleDefaultFile[$mod] = "modules/".$currentModule."/index.php"; -} // for printing $module = (isset($_REQUEST['module'])) ? $_REQUEST['module'] : ""; @@ -363,12 +332,21 @@ if($use_current_login) { - $result = $current_user->retrieve($_SESSION['authenticated_user_id']); + //$result = $current_user->retrieve($_SESSION['authenticated_user_id']); + //getting the current user info from flat file + $result = $current_user->retrieveCurrentUserInfoFromFile($_SESSION['authenticated_user_id']); if($result == null) { session_destroy(); header("Location: index.php?action=Login&module=Users"); } + + $moduleList = getPermittedModuleNames(); + + foreach ($moduleList as $mod) { + $moduleDefaultFile[$mod] = "modules/".$currentModule."/index.php"; + } + $log->debug('Current user is: '.$current_user->user_name); } From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 14:41:35 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 03 Apr 2006 18:41:35 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4847 - /vtigercrm/trunk/install/5createTables.inc.php Message-ID: <20060403184135.A901259F7C3@vtiger.fosslabs.com> Author: don Date: Mon Apr 3 12:41:31 2006 New Revision: 4847 Log: Removed reference to TabMenu.php 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 Mon Apr 3 12:41:31 2006 @@ -33,7 +33,6 @@ require_once('modules/Users/User.php'); require_once('modules/Import/ImportMap.php'); require_once('modules/Import/UsersLastImport.php'); -require_once('modules/Users/TabMenu.php'); require_once('modules/Users/LoginHistory.php'); require_once('modules/Settings/FileStorage.php'); require_once('data/Tracker.php'); From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 14:44:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 03 Apr 2006 18:44:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4848 - /vtigercrm/trunk/modules/Users/TabMenu.php Message-ID: <20060403184450.03AFC59F7C3@vtiger.fosslabs.com> Author: don Date: Mon Apr 3 12:44:47 2006 New Revision: 4848 Log: junk file Removed: vtigercrm/trunk/modules/Users/TabMenu.php From vtiger-tickets at vtiger.fosslabs.com Mon Apr 3 15:59:19 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 03 Apr 2006 19:59:19 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2317=3A_A?= =?utf-8?q?dd_postgresql_support_to_4=2E2_branch?= In-Reply-To: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> References: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> Message-ID: <085.14a48d1c42d601034dfec25b7dbd38ec@vtiger.fosslabs.com> #17: Add postgresql support to 4.2 branch ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Resolution: | Keywords: database postgresql ------------------------+--------------------------------------------------- Comment (by allanbush): (In [4849]) Added some input checking to pervent query errors from missing data. Refs #17. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 15:59:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 03 Apr 2006 19:59:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4849 - in /vtigercrm/branches/4.2_postgresql_integration/modules: Notes/Delete.php Products/Delete.php Products/Popup.php Message-ID: <20060403195920.593AB59F890@vtiger.fosslabs.com> Author: allanbush Date: Mon Apr 3 13:59:15 2006 New Revision: 4849 Log: Added some input checking to pervent query errors from missing data. Refs #17. Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Notes/Delete.php vtigercrm/branches/4.2_postgresql_integration/modules/Products/Delete.php vtigercrm/branches/4.2_postgresql_integration/modules/Products/Popup.php Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Notes/Delete.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/modules/Notes/Delete.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/modules/Notes/Delete.php Mon Apr 3 13:59:15 2006 @@ -32,8 +32,10 @@ $sql = 'update notes set contact_id = 0 where notesid = '.$_REQUEST['record']; $adb->query($sql); } -$sql = 'delete from senotesrel where notesid = '.$_REQUEST['record']. ' and crmid = '.$_REQUEST['return_id']; -$adb->query($sql); +if($_REQUEST['return_id']) { + $sql = 'delete from senotesrel where notesid = '.$_REQUEST['record']. ' and crmid = '.$_REQUEST['return_id']; + $adb->query($sql); +} $sql_recentviewed ='delete from tracker where user_id = '.$current_user->id.' and item_id = '.$_REQUEST['record']; $adb->query($sql_recentviewed); Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Products/Delete.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/modules/Products/Delete.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/modules/Products/Delete.php Mon Apr 3 13:59:15 2006 @@ -37,7 +37,7 @@ if($_REQUEST['return_module'] == 'Potentials' || $_REQUEST['return_module'] == 'Accounts' || $_REQUEST['return_module'] == 'Leads') $sql = 'delete from seproductsrel where crmid = '.$_REQUEST['return_id'].' and productid = '.$_REQUEST['record']; - $adb->query($sql); + if($sql) $adb->query($sql); } if($_REQUEST['return_module'] == "Contacts") { Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Products/Popup.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/modules/Products/Popup.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/modules/Products/Popup.php Mon Apr 3 13:59:15 2006 @@ -37,7 +37,7 @@ $xtpl->assign("SMODULE",$_REQUEST['smodule']); $smodule = $_REQUEST['smodule']; $url_string = '&smodule=VENDOR'; - $search_query .= " and vendor_id=''"; + $search_query .= " and vendor_id is null"; } From vtiger-tickets at vtiger.fosslabs.com Mon Apr 3 16:00:33 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 03 Apr 2006 20:00:33 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2317=3A_A?= =?utf-8?q?dd_postgresql_support_to_4=2E2_branch?= In-Reply-To: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> References: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> Message-ID: <085.42641334b347b999ca99335dee6e4f55@vtiger.fosslabs.com> #17: Add postgresql support to 4.2 branch ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Resolution: | Keywords: database postgresql ------------------------+--------------------------------------------------- Comment (by allanbush): (In [4850]) Fixed typo in query line. Refs #17. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 16:00:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 03 Apr 2006 20:00:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4850 - /vtigercrm/branches/4.2_postgresql_integration/modules/Users/saveemailtemplate.php Message-ID: <20060403200034.6552659F8A5@vtiger.fosslabs.com> Author: allanbush Date: Mon Apr 3 14:00:31 2006 New Revision: 4850 Log: Fixed typo in query line. Refs #17. Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Users/saveemailtemplate.php Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Users/saveemailtemplate.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/modules/Users/saveemailtemplate.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/modules/Users/saveemailtemplate.php Mon Apr 3 14:00:31 2006 @@ -42,7 +42,7 @@ } else { - $sql = "insert into emailtemplates values ('". $folderName. "','".$templateName."','".$subject."',".$description.".$body.",0,".$db->getUniqueID('emailtemplates').")"; + $sql = "insert into emailtemplates values ('". $folderName. "','".$templateName."','".$subject."',".$description.",".$body.",0,".$db->getUniqueID('emailtemplates').")"; $adb->query($sql); $vtlog->logthis("added to the db the emailtemplate",'info'); From vtiger-tickets at vtiger.fosslabs.com Mon Apr 3 16:01:18 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 03 Apr 2006 20:01:18 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2317=3A_A?= =?utf-8?q?dd_postgresql_support_to_4=2E2_branch?= In-Reply-To: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> References: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> Message-ID: <085.6c5bcf0a7d926c4f57f659900708c805@vtiger.fosslabs.com> #17: Add postgresql support to 4.2 branch ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Resolution: | Keywords: database postgresql ------------------------+--------------------------------------------------- Comment (by allanbush): (In [4851]) Added input sanitization before using it in a query. Refs #17. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 16:01:18 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 03 Apr 2006 20:01:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4851 - in /vtigercrm/branches/4.2_postgresql_integration/modules: Settings/SaveConvertLead.php Users/SaveOrgSharing.php Message-ID: <20060403200118.C421C59F88F@vtiger.fosslabs.com> Author: allanbush Date: Mon Apr 3 14:01:15 2006 New Revision: 4851 Log: Added input sanitization before using it in a query. Refs #17. Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Settings/SaveConvertLead.php vtigercrm/branches/4.2_postgresql_integration/modules/Users/SaveOrgSharing.php Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Settings/SaveConvertLead.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/modules/Settings/SaveConvertLead.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/modules/Settings/SaveConvertLead.php Mon Apr 3 14:01:15 2006 @@ -27,23 +27,23 @@ $contact_id_name=$lead_id."_contact"; $potential_id_name=$lead_id."_potential"; - $account_id_val=$_REQUEST[$account_id_name]; - $contact_id_val=$_REQUEST[$contact_id_name]; - $potential_id_val=$_REQUEST[$potential_id_name]; + $account_id_val = (int) $_REQUEST[$account_id_name]; + $contact_id_val = (int) $_REQUEST[$contact_id_name]; + $potential_id_val = (int) $_REQUEST[$potential_id_name]; if($account_id_val=="None") { - $account_id_val=""; + $account_id_val="null"; } if($contact_id_val=="None") { - $contact_id_val=""; + $contact_id_val="null"; } if($potential_id_val =="None") { - $potential_id_val=""; + $potential_id_val="null"; } - $update_sql="update convertleadmapping set accountfid='".$account_id_val."',contactfid='".$contact_id_val."',potentialfid='".$potential_id_val."' where leadfid=".$lead_id; + $update_sql="update convertleadmapping set accountfid=".$account_id_val.",contactfid=".$contact_id_val.",potentialfid=".$potential_id_val." where leadfid=".$lead_id; $adb->query($update_sql); } Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Users/SaveOrgSharing.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/modules/Users/SaveOrgSharing.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/modules/Users/SaveOrgSharing.php Mon Apr 3 14:01:15 2006 @@ -23,7 +23,7 @@ if($tabid != 8 && $tab_id != 14 && $tab_id != 15 && $tab_id != 18 && $tab_id != 19 && $tab_id != 16 & $tab_id != 22) { $reqval = $tabid.'_per'; - $permission=$_REQUEST[$reqval]; + $permission = (int) $_REQUEST[$reqval]; $sql7="update def_org_share set permission=".$permission." where tabid=".$tabid." and ruleid=".$ruleid; //echo $sql7; //echo '
    '; From vtiger-tickets at vtiger.fosslabs.com Mon Apr 3 17:24:56 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 03 Apr 2006 21:24:56 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2386=3A_H?= =?utf-8?q?elpDesk_Assigned_To_field_pulls_only_user_data_in_Custom_Views?= Message-ID: <076.f9eb297f705149b7cfa25e948aa290f1@vtiger.fosslabs.com> #86: HelpDesk Assigned To field pulls only user data in Custom Views ------------------------------------+--------------------------------------- Reporter: james at jenxnetwork.com | Owner: Any Developer Type: defect | Status: new Priority: critical | Milestone: 4.2.4 Component: vtigercrm | Version: 4.2.3 Keywords: helpdesk, custom views | ------------------------------------+--------------------------------------- I've tested this extensively; email me with any questions. What's happening is when creating a custom view, the Assigned To field can only be filtered for user names. What should happen is that the advanced filter should compare with user names and group names, since groups can be passed to the Assigned To field. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 3 17:25:28 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 03 Apr 2006 21:25:28 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2386=3A_H?= =?utf-8?q?elpDesk_Assigned_To_field_pulls_only_user_data_in_Custom_Views?= In-Reply-To: <076.f9eb297f705149b7cfa25e948aa290f1@vtiger.fosslabs.com> References: <076.f9eb297f705149b7cfa25e948aa290f1@vtiger.fosslabs.com> Message-ID: <085.c53859edbfd645e3795ffd73d04e5825@vtiger.fosslabs.com> #86: HelpDesk Assigned To field pulls only user data in Custom Views ------------------------------------+--------------------------------------- Reporter: james at jenxnetwork.com | Owner: Any Developer Type: defect | Status: new Priority: critical | Milestone: 4.2.4 Component: vtigercrm | Version: 4.2.3 Resolution: | Keywords: helpdesk, custom views ------------------------------------+--------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 23:21:04 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 03:21:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4852 - /vtigercrm/trunk/modules/Settings/CurrencyListView.php Message-ID: <20060404032104.6EF6359F9BB@vtiger.fosslabs.com> Author: saraj Date: Mon Apr 3 21:20:59 2006 New Revision: 4852 Log: changes made for new UI Modified: vtigercrm/trunk/modules/Settings/CurrencyListView.php Modified: vtigercrm/trunk/modules/Settings/CurrencyListView.php ============================================================================== --- vtigercrm/trunk/modules/Settings/CurrencyListView.php (original) +++ vtigercrm/trunk/modules/Settings/CurrencyListView.php Mon Apr 3 21:20:59 2006 @@ -9,62 +9,39 @@ * All Rights Reserved. * ********************************************************************************/ +require_once('Smarty_setup.php'); +require_once('include/database/PearDatabase.php'); +require_once('include/utils/UserInfoUtil.php'); +global $mod_strings,$adb,$theme; +$theme_path="themes/".$theme."/"; +$image_path=$theme_path."images/"; +$smarty=new vtigerCRM_Smarty; -require_once('include/database/PearDatabase.php'); -?> - - - -Roles List - - - - -
    - - - -
    - -
    -
    - - - - - - - - - - query($sql); $temprow = $adb->fetch_array($result); - $del="Del "; $cnt=1; - -require_once('include/utils/UserInfoUtil.php'); + $currency = Array(); do { - if ($cnt%2==0) - printf("",$temprow["currency_name"]); - else - printf("%s",$temprow["currency_name"]); - printf("",$temprow["currency_code"]); - printf("",$temprow["currency_symbol"]); - printf("",$temprow["conversion_rate"]); - printf("",$temprow["currency_status"]); - if($temprow["defaultid"] != '-11') - printf("",$del); - $cnt++; + $currency_element = Array(); + $currency_element['name'] = $temprow["currency_name"]; + $currency_element['code'] = $temprow["currency_code"]; + $currency_element['symbol'] = $temprow["currency_symbol"]; + $currency_element['crate'] = $temprow["conversion_rate"]; + $currency_element['status'] = $temprow["currency_status"]; + if($temprow["defaultid"] != '-11') + { + $currency_element['name'] = ''.$temprow["currency_name"].''; + $currency_element['tool']= 'Edit | Delete'; + } + else + $currency_element['tool']= ''; + $currency[] = $currency_element; + $cnt++; }while($temprow = $adb->fetch_array($result)); +$smarty->assign("MOD",$mod_strings); +$smarty->assign("CURRENCY_LIST",$currency); +$smarty->display('CurrencyListView.tpl'); ?> -
     
    "); - else - printf("
    "); - if($temprow["defaultid"] == '-11') - printf("%s%s%s%s%s%s
    - - From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 23:23:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 03:23:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4853 - /vtigercrm/trunk/Smarty/templates/CurrencyListView.tpl Message-ID: <20060404032311.5A74759F9BC@vtiger.fosslabs.com> Author: saraj Date: Mon Apr 3 21:23:06 2006 New Revision: 4853 Log: new UI has been integrated for currency listview Added: vtigercrm/trunk/Smarty/templates/CurrencyListView.tpl From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 23:29:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 03:29:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4854 - /vtigercrm/trunk/modules/Settings/language/en_us.lang.php Message-ID: <20060404032937.B405659F9BB@vtiger.fosslabs.com> Author: saraj Date: Mon Apr 3 21:29:33 2006 New Revision: 4854 Log: labels added for currency listview 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 Mon Apr 3 21:29:33 2006 @@ -70,11 +70,13 @@ 'LBL_CURRENCY_CODE'=>'Currency Code', -'LBL_CURRENCY_SYMBOL'=>'Currency Symbol', +'LBL_CURRENCY_SYMBOL'=>'Symbol', 'LBL_CURRENCY_CRATE'=>'Conversion Rate', 'LBL_CURRENCY_STATUS'=>'Status', + +'LBL_CURRENCY_TOOL'=>'Tools', @@ -298,9 +300,6 @@ 'LBL_CURRENCY_CONFIG'=>'Currency Configuration', 'LBL_CURRENCY_INFO'=>'Currency Information', -'LBL_CURRENCY_NAME'=>'Currency Name', -'LBL_CURRENCY_CODE'=>'Currency Code', -'LBL_CURRENCY_SYMBOL'=>'Currency Symbol', From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 3 23:58:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 03:58:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4855 - /vtigercrm/trunk/include/utils/ListViewUtils.php Message-ID: <20060404035842.D74DD59F9C3@vtiger.fosslabs.com> Author: saraj Date: Mon Apr 3 21:58:38 2006 New Revision: 4855 Log: changes made to reduce the no. of queries logging for non admin user 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 Mon Apr 3 21:58:38 2006 @@ -63,7 +63,6 @@ $list_header = Array(); //Get the tabid of the module - //require_once('include/utils/UserInfoUtil.php') $tabid = getTabid($smodule); global $current_user; //added for customview 27/5 @@ -75,10 +74,44 @@ } } + //Added to reduce the no. of queries logging for non-admin user -- by minnie-start + $field_list ='('; + $j=0; + require('user_privileges/user_privileges_'.$current_user->id.'.php'); + foreach($focus->list_fields as $name=>$tableinfo) + { + $fieldname = $focus->list_fields_name[$name]; + if($oCv) + { + if(isset($oCv->list_fields_name)) + { + $fieldname = $oCv->list_fields_name[$name]; + } + } + if($j != 0) + { + $field_list .= ', '; + } + $field_list .= "'".$fieldname."'"; + $j++; + } + $field_list .=')'; + if($is_admin==false) + { + $profileList = getCurrentUserProfileList(); + $query = "select profile2field.*,field.fieldname from field inner join profile2field on profile2field.fieldid=field.fieldid inner join def_org_field on def_org_field.fieldid=field.fieldid where field.tabid=".$tabid." and profile2field.visible=0 and def_org_field.visible=0 and profile2field.profileid in ".$profileList." and field.fieldname in ".$field_list." group by field.fieldid"; + $result = $adb->query($query); + $field=Array(); + for($k=0;$k < $adb->num_rows($result);$k++) + { + $field[]=$adb->query_result($result,$k,"fieldname"); + } + } + //end + //modified for customview 27/5 - $app_strings change to $mod_strings foreach($focus->list_fields as $name=>$tableinfo) { - //$fieldname = $focus->list_fields_name[$name]; //commented for customview 27/5 //added for customview 27/5 if($oCv) { @@ -94,19 +127,7 @@ $fieldname = $focus->list_fields_name[$name]; } - //Getting the Entries from Profile2 field table - global $current_user; - require('user_privileges/user_privileges_'.$current_user->id.'.php'); - if($is_admin == false) - { - - $profileList = getCurrentUserProfileList(); - $query = "select profile2field.* from field inner join profile2field on profile2field.fieldid=field.fieldid inner join def_org_field on def_org_field.fieldid=field.fieldid where field.tabid=".$tabid." and profile2field.visible=0 and def_org_field.visible=0 and profile2field.profileid in ".$profileList." and field.fieldname='".$fieldname."' group by field.fieldid"; - $result = $adb->query($query); - } - - - if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] ==0 || $adb->num_rows($result) == 1) + if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] ==0 || in_array($fieldname,$field)) { if(isset($focus->sortby_fields) && $focus->sortby_fields !='') { @@ -184,7 +205,6 @@ //Added condition to hide the close column in Related Lists if($name == 'Close' && $relatedlist != '') { - //$list_header .= ''; // $list_header[] = ''; } else @@ -208,11 +228,8 @@ $arrow=''; $list_header = Array(); - //$theme = $focus->current_theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; - //$list_header = ''; - //$list_header .= ''; foreach($focus->search_fields as $name=>$tableinfo) { $fieldname = $focus->search_fields_name[$name]; @@ -258,11 +275,8 @@ } } $list_header[]=$name; - //$list_header .= ''.$name.''; - //$list_header .=''; } } - //$list_header .= ''; return $list_header; } @@ -343,7 +357,7 @@ //parameter added for customview $oCv 27/5 function getListViewEntries($focus, $module,$list_result,$navigation_array,$relatedlist='',$returnset='',$edit_action='EditView',$del_action='Delete',$oCv='') { - global $adb; + global $adb,$current_user; global $app_strings; $noofrows = $adb->num_rows($list_result); $list_block = Array(); @@ -362,7 +376,40 @@ $focus->list_fields = $oCv->list_fields; } } - + //Added to reduce the no. of queries logging for non-admin user -- by minnie-start + $field_list ='('; + $j=0; + require('user_privileges/user_privileges_'.$current_user->id.'.php'); + foreach($focus->list_fields as $name=>$tableinfo) + { + $fieldname = $focus->list_fields_name[$name]; + if($oCv) + { + if(isset($oCv->list_fields_name)) + { + $fieldname = $oCv->list_fields_name[$name]; + } + } + if($j != 0) + { + $field_list .= ', '; + } + $field_list .= "'".$fieldname."'"; + $j++; + } + $field_list .=')'; + if($is_admin==false) + { + $profileList = getCurrentUserProfileList(); + $query = "select profile2field.*,field.fieldname from field inner join profile2field on profile2field.fieldid=field.fieldid inner join def_org_field on def_org_field.fieldid=field.fieldid where field.tabid=".$tabid." and profile2field.visible=0 and def_org_field.visible=0 and profile2field.profileid in ".$profileList." and field.fieldname in ".$field_list." group by field.fieldid"; + $result = $adb->query($query); + $field=Array(); + for($k=0;$k < $adb->num_rows($result);$k++) + { + $field[]=$adb->query_result($result,$k,"fieldname"); + } + } + //end for ($i=$navigation_array['start']; $i<=$navigation_array['end_val']; $i++) { $list_header =Array(); @@ -404,17 +451,7 @@ } } - global $current_user; - require('user_privileges/user_privileges_'.$current_user->id.'.php'); - if($is_admin==false) - { - $profileList = getCurrentUserProfileList(); - $query = "select profile2field.* from field inner join profile2field on profile2field.fieldid=field.fieldid inner join def_org_field on def_org_field.fieldid=field.fieldid where field.tabid=".$tabid." and profile2field.visible=0 and def_org_field.visible=0 and profile2field.profileid in ".$profileList." and field.fieldname='".$fieldname."' group by field.fieldid"; - - $result = $adb->query($query); - } - - if($is_admin==true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] ==0 || $adb->num_rows($result) == 1) + if($is_admin==true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] ==0 || in_array($fieldname,$field)) { @@ -547,11 +584,9 @@ } else { - - $query = "select * from field where tabid=".$tabid." and fieldname='".$fieldname."'"; + $query="select uitype,columnname from field where tabid=".$tabid." and fieldname='".$fieldname."'"; $field_result = $adb->query($query); $list_result_count = $i-1; - $value = getValue($field_result,$list_result,$fieldname,$focus,$module,$entity_id,$list_result_count,"list","",$returnset,$oCv->setdefaultviewid); } } @@ -600,7 +635,6 @@ $noofrows = $adb->num_rows($list_result); $list_header = ''; global $theme; - //$theme = $focus->current_theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; $list_block = Array(); @@ -612,16 +646,11 @@ for ($i=$navigation_array['start']; $i<=$navigation_array['end_val']; $i++) { - /*if (($i%2)==0) - $list_header .= ''; - else - $list_header .= '';*/ //Getting the entityid $entity_id = $adb->query_result($list_result,$i-1,"crmid"); $list_header=Array(); - //$list_header .= ''; foreach($focus->search_fields as $name=>$tableinfo) { $fieldname = $focus->search_fields_name[$name]; @@ -694,15 +723,11 @@ } } - //$list_header .= ''.$value.''; - //$list_header .=''; $list_header[]=$value; } } - //$list_header .= ''; $list_block[$entity_id]=$list_header; } - //$list_header .= ''; return $list_block; } @@ -856,9 +881,7 @@ if($parentid != '') { $sql="select * from ".$tablename." where ".$idname." = ".$parentid; - //echo '
    query : .. '.$sql; $fieldvalue=$adb->query_result($adb->query($sql),0,$fieldname); - //echo '

    val : '.$fieldvalue; $value=''.$fieldvalue.''; } @@ -887,9 +910,7 @@ if($parentid != '') { $sql="select * from ".$tablename." where ".$idname." = ".$parentid; - //echo '
    query : .. '.$sql; $fieldvalue=$adb->query_result($adb->query($sql),0,$fieldname); - //echo '

    val : '.$fieldvalue; $value=''.$fieldvalue.''; } @@ -1047,7 +1068,6 @@ $row_id = $_REQUEST['curr_row']; $unitprice=$adb->query_result($list_result,$list_result_count,'unit_price'); - //$qty_stock=$adb->query_result($list_result,$list_result_count,'qtyinstock'); $value = ''.$temp_val.''; } elseif($popuptype == "inventory_pb") @@ -1185,7 +1205,6 @@ $value = $temp_val; } } -// $value .= $returnset; // Mike Crowe Mod --------------------------------------------------------Make right justified and currency value if ( in_array($uitype,array(71,72,7,9,90)) ) From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 00:06:54 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 04:06:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4856 - /vtigercrm/trunk/include/utils/SearchUtils.php Message-ID: <20060404040654.DE75559F9C8@vtiger.fosslabs.com> Author: saraj Date: Mon Apr 3 22:06:50 2006 New Revision: 4856 Log: changes made to reduce the no. of queries logging for non admin user 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 Mon Apr 3 22:06:50 2006 @@ -26,7 +26,7 @@ global $adb; global $theme; global $app_strings; - global $mod_strings; + global $mod_strings,$current_user; //Seggregating between module and smodule if(isset($_REQUEST['smodule']) && $_REQUEST['smodule'] == 'VENDOR') { @@ -64,6 +64,41 @@ $focus->list_fields = $oCv->list_fields; } } + //Added to reduce the no. of queries logging for non-admin users -- by Minnie-start + $field_list ='('; + $j=0; + require('user_privileges/user_privileges_'.$current_user->id.'.php'); + foreach($focus->list_fields as $name=>$tableinfo) + { + $fieldname = $focus->list_fields_name[$name]; + if($oCv) + { + if(isset($oCv->list_fields_name)) + { + $fieldname = $oCv->list_fields_name[$name]; + } + } + if($j != 0) + { + $field_list .= ', '; + } + $field_list .= "'".$fieldname."'"; + $j++; + } + $field_list .=')'; + //Getting the Entries from Profile2 field table + if($is_admin == false) + { + $profileList = getCurrentUserProfileList(); + //changed to get field.fieldname + $query = "select profile2field.*,field.fieldname from field inner join profile2field on profile2field.fieldid=field.fieldid inner join def_org_field on def_org_field.fieldid=field.fieldid where field.tabid=".$tabid." and profile2field.visible=0 and def_org_field.visible=0 and profile2field.profileid in ".$profileList." and field.fieldname in ".$field_list." group by field.fieldid"; + $result = $adb->query($query); + $field=Array(); + for($k=0;$k < $adb->num_rows($result);$k++) + { + $field[]=$adb->query_result($result,$k,"fieldname"); + } + } //modified for customview 27/5 - $app_strings change to $mod_strings foreach($focus->list_fields as $name=>$tableinfo) @@ -92,19 +127,7 @@ $fieldname = $focus->list_fields_name[$name]; } - //Getting the Entries from Profile2 field table - global $current_user; - require('user_privileges/user_privileges_'.$current_user->id.'.php'); - if($is_admin == false) - { - - $profileList = getCurrentUserProfileList(); - $query = "select profile2field.* from field inner join profile2field on profile2field.fieldid=field.fieldid inner join def_org_field on def_org_field.fieldid=field.fieldid where field.tabid=".$tabid." and profile2field.visible=0 and def_org_field.visible=0 and profile2field.profileid in ".$profileList." and field.fieldname='".$fieldname."' group by field.fieldid"; - $result = $adb->query($query); - } - - - if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] ==0 || $adb->num_rows($result) == 1) + if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] ==0 || in_array($fieldname,$field)) { if(isset($focus->sortby_fields) && $focus->sortby_fields !='') { From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 00:14:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 04:14:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4857 - /vtigercrm/trunk/log4php.properties Message-ID: <20060404041420.AD5D859F9C8@vtiger.fosslabs.com> Author: saraj Date: Mon Apr 3 22:14:16 2006 New Revision: 4857 Log: changes made to fix the issue that logs are not generated in windows machine Modified: vtigercrm/trunk/log4php.properties Modified: vtigercrm/trunk/log4php.properties ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 00:55:54 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 04:55:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4858 - in /vtigercrm/trunk: Smarty/templates/Settings/ModuleOwnersContents.tpl modules/Settings/ListModuleOwners.php modules/Settings/SettingsAjax.php Message-ID: <20060404045554.5382D59F9D6@vtiger.fosslabs.com> Author: don Date: Mon Apr 3 22:55:41 2006 New Revision: 4858 Log: * files added to integrate new UI for module OwnersSmarty/templates/Settings/ModuleOwners.tpl Added: vtigercrm/trunk/Smarty/templates/Settings/ModuleOwnersContents.tpl (with props) vtigercrm/trunk/modules/Settings/SettingsAjax.php Modified: vtigercrm/trunk/modules/Settings/ListModuleOwners.php Modified: vtigercrm/trunk/modules/Settings/ListModuleOwners.php ============================================================================== --- vtigercrm/trunk/modules/Settings/ListModuleOwners.php (original) +++ vtigercrm/trunk/modules/Settings/ListModuleOwners.php Mon Apr 3 22:55:41 2006 @@ -9,63 +9,75 @@ * ********************************************************************************/ -require_once('XTemplate/xtpl.php'); -echo get_module_title($mod_strings['LBL_MODULE_NAME'], $mod_strings['LBL_MODULE_NAME'].' : Assign Module Owners', true); - +require_once('Smarty_setup.php'); +require_once('include/utils/utils.php'); global $mod_strings, $app_strings; global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; +$module_array = getModuleNameList(); +if($_REQUEST['list_module_mode'] != '' && $_REQUEST['list_module_mode'] == 'save') +{ + foreach($module_array as $val) + { + $req_name = 'user_'.strtolower($val); + $userid = $_REQUEST[$req_name]; + $tabid = getTabid($val); + if($tabid != '' && $userid != '') + { + $sql = 'update moduleowners set user_id = '.$userid.' where tabid = '.$tabid; + $adb->query($sql); + } + } + +} +elseif($_REQUEST['list_module_mode'] != '' && $_REQUEST['list_module_mode'] == 'edit') +{ + $user_array = get_user_array(false); + foreach($module_array as $val) + { + $user_combo = getUserCombo($user_array,$val); -$module_array = getModuleNameList(); -$user_array = get_user_array(); + $user_list []= $val; + $user_list []= $user_combo; -$row = 1; -foreach($module_array as $val) -{ - if ($row%2==0) - { - $trowclass = 'evenListRow'; } - else - { - $trowclass = 'oddListRow'; - } - $row ++; - $user_list .= ''.$val.' : '; - - //get the user array as a combo list - $user_id = getModuleOwner(getTabid($val)); - $user_name = getUserName($user_id); - - $user_list .= ''.$user_name.''; - - //To add the modules as single string to pass as hidden value - $modules .= $val.'&&&'; + $user_list = array_chunk($user_list,2); } +$smarty = new vtigerCRM_Smarty; +if($_REQUEST['list_module_mode'] != 'edit') +{ + foreach($module_array as $val) + { + $user_list []= $val; -require_once($theme_path.'layout_utils.php'); + //get the user array as a combo list + $user_id = getModuleOwner(getTabid($val)); + $user_name = getUserName($user_id); + $user_list []= $user_id; + $user_list []= $user_name; + } + + $user_list = array_chunk($user_list,3); +} $log->info("Settings Module Owners view"); -$xtpl=new XTemplate ('modules/Settings/ListModuleOwners.html'); -$xtpl->assign("MOD", $mod_strings); -$xtpl->assign("APP", $app_strings); -$xtpl->assign("THEME", $theme); -$xtpl->assign("IMAGE_PATH", $image_path); -$xtpl->assign("MODULE", "Settings"); +$smarty->assign("MODULE_MODE",$_REQUEST['list_module_mode']); +$smarty->assign("USER_LIST", $user_list); +$smarty->assign("MOD", return_module_language($current_language,'Settings')); +$smarty->assign("IMAGE_PATH",$image_path); +$smarty->assign("APP", $app_strings); +$smarty->assign("CMOD", $mod_strings); -$xtpl->assign("MODULES_LIST", $modules); - -$xtpl->assign("USER_LIST", $user_list); - -$xtpl->parse("main"); - -$xtpl->out("main"); - +if($_REQUEST['file_mode'] != 'ajax') + $smarty->display("Settings/ModuleOwners.tpl"); +else + $smarty->display("Settings/ModuleOwnersContents.tpl"); + function getModuleOwner($tabid) { global $adb; @@ -87,9 +99,31 @@ { array_push($mod_array,$row['name']); } - //echo '
    ';print_r($mod_array);echo '
    '; - return $mod_array; } +function getUserCombo($user_array,$name) +{ + global $adb; + $tabid = getTabid($name); + $sql = "select * from moduleowners where tabid=".$tabid; + $res = $adb->query($sql); + $db_userid = $adb->query_result($res,0,'user_id'); + + //Form the user combo list for each module + $combo_name = "user_".strtolower($name); + $user_combo = ''; + + return $user_combo; +} ?> From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 00:56:26 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 04:56:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4859 - /vtigercrm/trunk/Smarty/templates/Settings/ModuleOwners.tpl Message-ID: <20060404045626.1FEE059F9E2@vtiger.fosslabs.com> Author: don Date: Mon Apr 3 22:56:16 2006 New Revision: 4859 Log: * files added to integrate new UI for module Owners Added: vtigercrm/trunk/Smarty/templates/Settings/ModuleOwners.tpl (with props) From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 00:58:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 04:58:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4860 - in /vtigercrm/trunk/modules/Settings: EditModuleOwners.html EditModuleOwners.php ListModuleOwners.html SaveModuleOwners.php Message-ID: <20060404045824.6710459F9E2@vtiger.fosslabs.com> Author: don Date: Mon Apr 3 22:58:16 2006 New Revision: 4860 Log: files removed as the module owners smartified Removed: vtigercrm/trunk/modules/Settings/EditModuleOwners.html vtigercrm/trunk/modules/Settings/EditModuleOwners.php vtigercrm/trunk/modules/Settings/ListModuleOwners.html vtigercrm/trunk/modules/Settings/SaveModuleOwners.php From vtiger-tickets at vtiger.fosslabs.com Tue Apr 4 01:39:57 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 04 Apr 2006 05:39:57 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2369=3A_R?= =?utf-8?q?emove_custom_adodb_debugging_information?= In-Reply-To: <076.26ddec60f221c4ecc7f1e2da51a456e3@vtiger.fosslabs.com> References: <076.26ddec60f221c4ecc7f1e2da51a456e3@vtiger.fosslabs.com> Message-ID: <085.44ab17bf38f8456ea9af0e72128fe49f@vtiger.fosslabs.com> #69: Remove custom adodb debugging information ------------------------+--------------------------------------------------- Reporter: allanbush | Owner: allanbush Type: task | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: postgres ------------------------+--------------------------------------------------- Comment (by allanbush): (In [4861]) Removed missing transaction support warning from the mysql driver debugging information. Refs #69. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 01:39:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 05:39:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4861 - /vtigercrm/branches/4.2_postgresql_integration/adodb/drivers/adodb-mysql.inc.php Message-ID: <20060404053958.A8C3B59F9EF@vtiger.fosslabs.com> Author: allanbush Date: Mon Apr 3 23:39:55 2006 New Revision: 4861 Log: Removed missing transaction support warning from the mysql driver debugging information. Refs #69. Modified: vtigercrm/branches/4.2_postgresql_integration/adodb/drivers/adodb-mysql.inc.php Modified: vtigercrm/branches/4.2_postgresql_integration/adodb/drivers/adodb-mysql.inc.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/adodb/drivers/adodb-mysql.inc.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/adodb/drivers/adodb-mysql.inc.php Mon Apr 3 23:39:55 2006 @@ -171,7 +171,7 @@ function BeginTrans() { - if ($this->debug) ADOConnection::outp("Transactions not supported in 'mysql' driver. Use 'mysqlt' or 'mysqli' driver"); + //if ($this->debug) ADOConnection::outp("Transactions not supported in 'mysql' driver. Use 'mysqlt' or 'mysqli' driver"); } function _affectedrows() @@ -772,4 +772,4 @@ } -?> +?> From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 02:50:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 06:50:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4862 - /vtigercrm/trunk/include/utils/CommonUtils.php Message-ID: <20060404065058.D0DA559F9F0@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 4 00:50:53 2006 New Revision: 4862 Log: changes made to parenttab from flat 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 Tue Apr 4 00:50:53 2006 @@ -944,19 +944,45 @@ function getParentTabName($parenttabid) { - global $adb; - $sql = "select parenttab_label from parenttab where parenttabid=".$parenttabid; - $result = $adb->query($sql); - $parent_tabname= $adb->query_result($result,0,"parenttab_label"); - return $parent_tabname; -} + global $adb; + if (file_exists('parent_tabdata.php') && (filesize('parent_tabdata.php') != 0)) + { + include('parent_tabdata.php'); + $parent_tabname= $parent_tab_info_array[$parenttabid]; + } + else + { + $sql = "select parenttab_label from parenttab where parenttabid=".$parenttabid; + $result = $adb->query($sql); + $parent_tabname= $adb->query_result($result,0,"parenttab_label"); + } + return $parent_tabname; +} + function getParentTabFromModule($module) { global $adb; - $sql = "select parenttab.* from parenttab inner join parenttabrel on parenttabrel.parenttabid=parenttab.parenttabid inner join tab on tab.tabid=parenttabrel.tabid where tab.name='".$module."'"; - $result = $adb->query($sql); - $tab = $adb->query_result($result,0,"parenttab_label"); - return $tab; + if (file_exists('tabdata.php') && (filesize('tabdata.php') != 0) && file_exists('parent_tabdata.php') && (filesize('parent_tabdata.php') != 0)) + { + include('tabdata.php'); + include('parent_tabdata.php'); + $tabid=$tab_info_array[$module]; + foreach($parent_child_tab_rel_array as $parid=>$childArr) + { + if(in_array($tabid,$childArr)) + { + $parent_tabname= $parent_tab_info_array[$parid]; + } + } + return $parent_tabname; + } + else + { + $sql = "select parenttab.* from parenttab inner join parenttabrel on parenttabrel.parenttabid=parenttab.parenttabid inner join tab on tab.tabid=parenttabrel.tabid where tab.name='".$module."'"; + $result = $adb->query($sql); + $tab = $adb->query_result($result,0,"parenttab_label"); + return $tab; + } } /** From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 03:27:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 07:27:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4863 - /vtigercrm/trunk/modules/Users/listwordtemplates.php Message-ID: <20060404072740.D4E3459FA14@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 4 01:27:36 2006 New Revision: 4863 Log: Modified the listwordtemplate file to integrate the new ui for mail merge templates and smartise it Ahmed Modified: vtigercrm/trunk/modules/Users/listwordtemplates.php Modified: vtigercrm/trunk/modules/Users/listwordtemplates.php ============================================================================== --- vtigercrm/trunk/modules/Users/listwordtemplates.php (original) +++ vtigercrm/trunk/modules/Users/listwordtemplates.php Tue Apr 4 01:27:36 2006 @@ -9,53 +9,49 @@ * All Rights Reserved. * ********************************************************************************/ +require_once('Smarty_setup.php'); +require_once('include/database/PearDatabase.php'); -require_once('include/database/PearDatabase.php'); -?> - - - -Word Templates List - - - - - - -
    - -
    -
    -query($sql); + $edit="Edit "; $del="Del "; $bar=" | "; $cnt=1; -*/ -/* -do -{ - $name=$temprow["name"]; - if ($cnt%2==0) - printf(" "); - else - printf(" "); - - printf(" %s",$temprow["filename"]); -*/ -/* - printf("%s",$temprow["description"]); - $cnt++; - } - while($temprow = mysql_fetch_array($result)); -*/ + +$return_data = Array(); +$num_rows = $adb->num_rows($result); + + +for($i=0;$i < $num_rows; $i++) +{ + $wordtemplatearray=array(); + $wordtemplatearray['templateid'] = $adb->query_result($result,$i,'templateid'); + $wordtemplatearray['description'] = $adb->query_result($result,$i,'description'); + $wordtemplatearray['module'] = $adb->query_result($result,$i,'module'); + $wordtemplatearray['filename'] = $adb->query_result($result,$i,'filename'); + $wordtemplatearray['filetype'] = $adb->query_result($result,$i,'filetype'); + $wordtemplatearray['filesize'] = $adb->query_result($result,$i,'filesize'); + $return_data []= $wordtemplatearray; +} +require_once('include/utils/UserInfoUtil.php'); +global $app_strings; +global $mod_strings; +global $theme; +$theme_path="themes/".$theme."/"; +$image_path=$theme_path."images/"; + +$smarty = new vtigerCRM_Smarty; +global $current_language; +$smod_strings = return_module_language($current_language,'Settings'); +$smarty->assign("MOD", $smod_strings); +$smarty->assign("UMOD", $mod_strings); +$smarty->assign("IMAGE_PATH",$image_path); + + +$smarty->assign("WORDTEMPLATES",$return_data); +$smarty->display("ListWordTemplates.tpl"); ?> - - From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 03:29:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 07:29:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4864 - /vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl Message-ID: <20060404072903.7929659FA14@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 4 01:28:58 2006 New Revision: 4864 Log: Created new wordtemplate tpl for smartification of the new ui of mail merger template - Ahmed Added: vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 03:33:35 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 07:33:35 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4865 - /vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl Message-ID: <20060404073335.D98E259FA14@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 4 01:33:31 2006 New Revision: 4865 Log: Added the settings link in the Header of Email Template Modified: vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl Modified: vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl Tue Apr 4 01:33:31 2006 @@ -62,7 +62,7 @@ From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 03:34:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 07:34:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4866 - /vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl Message-ID: <20060404073411.B893759FA14@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 4 01:34:07 2006 New Revision: 4866 Log: Added the settings link in the Header of Email Template Modified: vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl Modified: vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl Tue Apr 4 01:34:07 2006 @@ -9,7 +9,7 @@

    - {$UMOD.LBL_EMAIL_TEMPLATES_LIST} + {$MOD.LBL_SETTINGS} > {$UMOD.LBL_EMAIL_TEMPLATES_LIST}
    From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 03:34:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 07:34:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4867 - /vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl Message-ID: <20060404073440.4ADAB59FA14@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 4 01:34:36 2006 New Revision: 4867 Log: Added the settings link in the Header of Email Template Modified: vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl Modified: vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl Tue Apr 4 01:34:36 2006 @@ -109,9 +109,9 @@ From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 03:45:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 07:45:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4868 - /vtigercrm/trunk/include/utils/DetailViewUtils.php Message-ID: <20060404074517.9A6BB59FA21@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 4 01:45:13 2006 New Revision: 4868 Log: Function not in use removed 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 Apr 4 01:45:13 2006 @@ -844,7 +844,6 @@ global $current_user; require('user_privileges/user_privileges_'.$current_user->id.'.php'); - $mod_dir_name=getModuleDirName($module); $cur_tab_id = getTabid($module); $sql1 = "select * from relatedlists where tabid=".$cur_tab_id; From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 03:45:29 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 07:45:29 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4869 - /vtigercrm/trunk/include/RelatedListView.php Message-ID: <20060404074530.0ACD359FA21@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 4 01:45:25 2006 New Revision: 4869 Log: Function not in use removed Modified: vtigercrm/trunk/include/RelatedListView.php Modified: vtigercrm/trunk/include/RelatedListView.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 03:51:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 07:51:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4870 - /vtigercrm/trunk/modules/Users/language/en_us.lang.php Message-ID: <20060404075124.252F959FA29@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 4 01:51:19 2006 New Revision: 4870 Log: Added some labels for Mail Merge Template Smartification Ahmed Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 04:29:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 08:29:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4871 - /vtigercrm/trunk/config.template.php Message-ID: <20060404082928.7B28359FA39@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 4 02:29:24 2006 New Revision: 4871 Log: * Added the FCKEDITOR_DISPLAY variable to show or hide the FCKEditor Modified: vtigercrm/trunk/config.template.php Modified: vtigercrm/trunk/config.template.php ============================================================================== --- vtigercrm/trunk/config.template.php (original) +++ vtigercrm/trunk/config.template.php Tue Apr 4 02:29:24 2006 @@ -19,11 +19,13 @@ // memory limit default value = 16M ini_set('memory_limit','16M'); -// show or hide world clock and calculator +// show or hide world clock, calculator and FCKEditor // world_clock_display default value = true -// calculator_clock_display default value = true +// calculator_display default value = true +// fckeditor_display default value = true $WORLD_CLOCK_DISPLAY = 'true'; $CALCULATOR_DISPLAY = 'true'; +$FCKEDITOR_DISPLAY = 'true'; // url for customer portal (Example: http://vtiger.com/portal) $PORTAL_URL = 'http://your-domain.com/customerportal'; From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 05:59:53 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 09:59:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4872 - /vtigercrm/trunk/pkg/apache/conf/win_httpd.conf Message-ID: <20060404095953.C055F59FA5C@vtiger.fosslabs.com> Author: richie Date: Tue Apr 4 03:59:49 2006 New Revision: 4872 Log: removed MaxSpareServers etc entry as they have no bearing on Windows functionality. Commented out unwanted modules in Apache Modified: vtigercrm/trunk/pkg/apache/conf/win_httpd.conf Modified: vtigercrm/trunk/pkg/apache/conf/win_httpd.conf ============================================================================== --- vtigercrm/trunk/pkg/apache/conf/win_httpd.conf (original) +++ vtigercrm/trunk/pkg/apache/conf/win_httpd.conf Tue Apr 4 03:59:49 2006 @@ -56,10 +56,6 @@ # ServerRoot "VTIGER_HOME/apache" #reference http://www.faqs.org/docs/securing/chap29sec245.html -MinSpareServers 16 -MaxSpareServers 64 -StartServers 16 -MaxClients 512 MaxRequestsPerChild 100000 # @@ -139,25 +135,25 @@ LoadModule access_module modules/mod_access.so LoadModule actions_module modules/mod_actions.so LoadModule alias_module modules/mod_alias.so -LoadModule asis_module modules/mod_asis.so -LoadModule auth_module modules/mod_auth.so +#LoadModule asis_module modules/mod_asis.so +#LoadModule auth_module modules/mod_auth.so #LoadModule auth_anon_module modules/mod_auth_anon.so #LoadModule auth_dbm_module modules/mod_auth_dbm.so #LoadModule auth_digest_module modules/mod_auth_digest.so LoadModule autoindex_module modules/mod_autoindex.so #LoadModule cern_meta_module modules/mod_cern_meta.so -LoadModule cgi_module modules/mod_cgi.so +#LoadModule cgi_module modules/mod_cgi.so #LoadModule dav_module modules/mod_dav.so #LoadModule dav_fs_module modules/mod_dav_fs.so LoadModule dir_module modules/mod_dir.so -LoadModule env_module modules/mod_env.so +#LoadModule env_module modules/mod_env.so #LoadModule expires_module modules/mod_expires.so #LoadModule file_cache_module modules/mod_file_cache.so #LoadModule headers_module modules/mod_headers.so -LoadModule imap_module modules/mod_imap.so -LoadModule include_module modules/mod_include.so +#LoadModule imap_module modules/mod_imap.so +#LoadModule include_module modules/mod_include.so #LoadModule info_module modules/mod_info.so -LoadModule isapi_module modules/mod_isapi.so +#LoadModule isapi_module modules/mod_isapi.so LoadModule log_config_module modules/mod_log_config.so LoadModule mime_module modules/mod_mime.so #LoadModule mime_magic_module modules/mod_mime_magic.so From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 06:54:05 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 10:54:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4873 - /vtigercrm/trunk/include/utils/CommonUtils.php Message-ID: <20060404105405.4776C59FA5C@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 4 04:54:00 2006 New Revision: 4873 Log: Docs added for functions 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 Apr 4 04:54:00 2006 @@ -519,7 +519,13 @@ } - +/** + * Get the username by giving the user id. This method expects the user id + * param $label_list - the array of strings to that contains the option list + * param $key_list - the array of strings to that contains the values list + * param $selected - the string which contains the default value + */ + function getUserName($userid) { global $log; @@ -535,7 +541,11 @@ return $user_name; } - +/** + * Creates and returns database query. To be used for search and other text links. This method expects the module object. + * param $focus - the module object contains the column fields + */ + function getURLstring($focus) { $qry = ""; @@ -566,7 +576,10 @@ } - +/** This function returns the date in user specified format. + * param $cur_date_val - the default date format + */ + function getDisplayDate($cur_date_val) { global $current_user; @@ -576,26 +589,20 @@ $dat_fmt = 'dd-mm-yyyy'; } - //echo $dat_fmt; - //echo '
    '.$cur_date_val.'
    '; $date_value = explode(' ',$cur_date_val); list($y,$m,$d) = split('-',$date_value[0]); - //echo $y.'----'.$m.'------'.$d; if($dat_fmt == 'dd-mm-yyyy') { - //echo '
    inside 1'; $display_date = $d.'-'.$m.'-'.$y; } elseif($dat_fmt == 'mm-dd-yyyy') { - //echo '
    inside 2'; $display_date = $m.'-'.$d.'-'.$y; } elseif($dat_fmt == 'yyyy-mm-dd') { - //echo '
    inside 3'; $display_date = $y.'-'.$m.'-'.$d; } @@ -607,6 +614,10 @@ } +/** This function returns the date in user specified format. + * Takes no param, receives the date format from current user object + */ + function getNewDisplayDate() { global $log; @@ -638,6 +649,10 @@ return $display_date; } +/** This function returns the default currency information. + * Takes no param, return type array. + */ + function getDisplayCurrency() { global $adb; @@ -655,15 +670,29 @@ return $curr_array; } +/** This function returns the amount converted to dollar. + * param $amount - amount to be converted. + * param $crate - conversion rate. + */ + function convertToDollar($amount,$crate){ return $amount / $crate; } +/** This function returns the amount converted from dollar. + * param $amount - amount to be converted. + * param $crate - conversion rate. + */ function convertFromDollar($amount,$crate){ return $amount * $crate; } +/** This function returns the conversion rate for a given currency. + * param $id - currency id. + * param $symbol - currency symbol. + */ + function getConversionRate($id,$symbol) { global $adb; @@ -673,6 +702,11 @@ return $rate; } +/** This function returns the conversion rate for a given currency. + * param $id - currency id. + * param $symbol - currency symbol. + */ + function getCurrencySymbol($id) { global $adb; @@ -682,6 +716,10 @@ return $curr_symbol; } +/** This function returns the terms and condition from the database. + * Takes no param and the return type is text. + */ + function getTermsandConditions() { global $adb; @@ -691,19 +729,15 @@ return $tandc; } -function getModuleDirName($module) -{ - if($module == 'Vendor' || $module == 'PriceBook') - { - $dir_name = 'Products'; - } - else - { - $dir_name = $module; - } - return $dir_name; -} - +/** + * Create select options in a dropdown list. To be used inside + * a reminder select statement in a activity form. + * param $start - start value + * param $end - end value + * param $fldname - field name + * param $selvalue - selected value + */ + function getReminderSelectOption($start,$end,$fldname,$selvalue='') { global $mod_strings; @@ -722,7 +756,11 @@ return $OPTION_FLD; } - +/** This function returns the List price of a given product in a given price book. + * param $productid - product id. + * param $pbid - pricebook id. + */ + function getListPrice($productid,$pbid) { global $log; @@ -735,12 +773,20 @@ return $lp; } +/** This function returns a string with removed new line character, single quote, and back slash double quoute. + * param $str - string to be converted. + */ + function br2nl($str) { $str = preg_replace("/(\r\n)/", " ", $str); $str = preg_replace("/'/", " ", $str); $str = preg_replace("/\"/", " ", $str); return $str; } + +/** This function returns a text, which escapes the html encode for link tag/ a href tag +*param $text - string/text +*/ function make_clickable($text) { From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 08:01:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 12:01:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4874 - /vtigercrm/trunk/include/utils/ListViewUtils.php Message-ID: <20060404120158.C8A5659FA51@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 4 06:01:54 2006 New Revision: 4874 Log: changes made to reduce the no. of queries logging for listview 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 Apr 4 06:01:54 2006 @@ -74,7 +74,7 @@ } } - //Added to reduce the no. of queries logging for non-admin user -- by minnie-start + //Added to reduce the no. of queries logging for non-admin user -- by Minnie-start $field_list ='('; $j=0; require('user_privileges/user_privileges_'.$current_user->id.'.php'); @@ -224,10 +224,37 @@ global $adb; global $theme; global $app_strings; - global $mod_strings; + global $mod_strings,$current_user; $arrow=''; $list_header = Array(); - + $tabid = getTabid($module); + //Added to reduce the no. of queries logging for non-admin user -- by Minnie-start + $field_list ='('; + $j=0; + require('user_privileges/user_privileges_'.$current_user->id.'.php'); + foreach($focus->search_fields as $name=>$tableinfo) + { + $fieldname = $focus->search_fields_name[$name]; + if($j != 0) + { + $field_list .= ', '; + } + $field_list .= "'".$fieldname."'"; + $j++; + } + $field_list .=')'; + if($is_admin==false) + { + $profileList = getCurrentUserProfileList(); + $query = "select profile2field.*,field.fieldname from field inner join profile2field on profile2field.fieldid=field.fieldid inner join def_org_field on def_org_field.fieldid=field.fieldid where field.tabid=".$tabid." and profile2field.visible=0 and def_org_field.visible=0 and profile2field.profileid in ".$profileList." and field.fieldname in ".$field_list." group by field.fieldid"; + $result = $adb->query($query); + $field=Array(); + for($k=0;$k < $adb->num_rows($result);$k++) + { + $field[]=$adb->query_result($result,$k,"fieldname"); + } + } + //end $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; foreach($focus->search_fields as $name=>$tableinfo) @@ -408,6 +435,21 @@ { $field[]=$adb->query_result($result,$k,"fieldname"); } + } + //constructing the uitype and columnname array + $ui_col_array=Array(); + + $query = "select uitype,columnname,fieldname from field where tabid=".$tabid." and fieldname in".$field_list; + $result = $adb->query($query); + $num_rows=$adb->num_rows($result); + for($i=0;$i<$num_rows;$i++) + { + $tempArr=array(); + $uitype=$adb->query_result($result,$i,'uitype'); + $columnname=$adb->query_result($result,$i,'columnname'); + $field_name=$adb->query_result($result,$i,'fieldname'); + $tempArr[$uitype]=$columnname; + $ui_col_array[$field_name]=$tempArr; } //end for ($i=$navigation_array['start']; $i<=$navigation_array['end_val']; $i++) @@ -584,10 +626,8 @@ } else { - $query="select uitype,columnname from field where tabid=".$tabid." and fieldname='".$fieldname."'"; - $field_result = $adb->query($query); $list_result_count = $i-1; - $value = getValue($field_result,$list_result,$fieldname,$focus,$module,$entity_id,$list_result_count,"list","",$returnset,$oCv->setdefaultviewid); + $value = getValue($ui_col_array,$list_result,$fieldname,$focus,$module,$entity_id,$list_result_count,"list","",$returnset,$oCv->setdefaultviewid); } } //Added condition to hide the close symbol in Related Lists @@ -631,19 +671,58 @@ function getSearchListViewEntries($focus, $module,$list_result,$navigation_array) { - global $adb; + global $adb,$theme,$current_user; $noofrows = $adb->num_rows($list_result); $list_header = ''; - global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; $list_block = Array(); //getting the fieldtable entries from database $tabid = getTabid($module); - global $current_user; require('user_privileges/user_privileges_'.$current_user->id.'.php'); - + + //Added to reduce the no. of queries logging for non-admin user -- by Minnie-start + $field_list ='('; + $j=0; + foreach($focus->search_fields as $name=>$tableinfo) + { + $fieldname = $focus->search_fields_name[$name]; + if($j != 0) + { + $field_list .= ', '; + } + $field_list .= "'".$fieldname."'"; + $j++; + } + $field_list .=')'; + if($is_admin==false) + { + $profileList = getCurrentUserProfileList(); + $query = "select profile2field.*,field.fieldname from field inner join profile2field on profile2field.fieldid=field.fieldid inner join def_org_field on def_org_field.fieldid=field.fieldid where field.tabid=".$tabid." and profile2field.visible=0 and def_org_field.visible=0 and profile2field.profileid in ".$profileList." and field.fieldname in ".$field_list." group by field.fieldid"; + $result = $adb->query($query); + $field=Array(); + for($k=0;$k < $adb->num_rows($result);$k++) + { + $field[]=$adb->query_result($result,$k,"fieldname"); + } + } + //constructing the uitype and columnname array + $ui_col_array=Array(); + + $query = "select uitype,columnname,fieldname from field where tabid=".$tabid." and fieldname in".$field_list; + $result = $adb->query($query); + $num_rows=$adb->num_rows($result); + for($i=0;$i<$num_rows;$i++) + { + $tempArr=array(); + $uitype=$adb->query_result($result,$i,'uitype'); + $columnname=$adb->query_result($result,$i,'columnname'); + $field_name=$adb->query_result($result,$i,'fieldname'); + $tempArr[$uitype]=$columnname; + $ui_col_array[$field_name]=$tempArr; + } + //end for ($i=$navigation_array['start']; $i<=$navigation_array['end_val']; $i++) { @@ -715,11 +794,8 @@ } else { - $query = "select * from field where tabid=".$tabid." and fieldname='".$fieldname."'"; - $field_result = $adb->query($query); $list_result_count = $i-1; - - $value = getValue($field_result,$list_result,$fieldname,$focus,$module,$entity_id,$list_result_count,"search",$focus->popup_type); + $value = getValue($ui_col_array,$list_result,$fieldname,$focus,$module,$entity_id,$list_result_count,"search",$focus->popup_type); } } @@ -738,10 +814,14 @@ function getValue($field_result, $list_result,$fieldname,$focus,$module,$entity_id,$list_result_count,$mode,$popuptype,$returnset='',$viewid='') { global $adb; - $tabname = getParentTab(); - $uitype = $adb->query_result($field_result,0,"uitype"); + $tabname = getParentTab(); + $uicolarr=$field_result[$fieldname]; + foreach($uicolarr as $key=>$value) + { + $uitype = $key; - $colname = $adb->query_result($field_result,0,"columnname"); + $colname = $value; + } //added for getting event status in Custom view - Jaguar if($module == 'Activities' && $colname == "status") From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 08:38:36 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 12:38:36 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4875 - /vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl Message-ID: <20060404123836.8233F49EFA8@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 4 06:38:32 2006 New Revision: 4875 Log: Added new tpl for smartification of new ui of Mail Merge Template - ahmed Added: vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 08:46:04 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 12:46:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4876 - /vtigercrm/trunk/themes/blue/images/fp1.gif Message-ID: <20060404124604.8708759FA8F@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 4 06:45:59 2006 New Revision: 4876 Log: Added 3 images for new ui of Mail Merge Template Added: vtigercrm/trunk/themes/blue/images/fp1.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 08:46:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 12:46:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4877 - /vtigercrm/trunk/themes/blue/images/fp2.gif Message-ID: <20060404124615.8E21959FA8F@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 4 06:46:10 2006 New Revision: 4877 Log: Added 3 images for new ui of Mail Merge Template Added: vtigercrm/trunk/themes/blue/images/fp2.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 08:46:25 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 12:46:25 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4878 - /vtigercrm/trunk/themes/blue/images/fp3.gif Message-ID: <20060404124625.98DEF59FA83@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 4 06:46:20 2006 New Revision: 4878 Log: Added 3 images for new ui of Mail Merge Template Added: vtigercrm/trunk/themes/blue/images/fp3.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 4 11:04:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 04 Apr 2006 15:04:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4879 - /vtigercrm/trunk/include/database/PearDatabase.php Message-ID: <20060404150406.D272C59FAAA@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 4 09:04:02 2006 New Revision: 4879 Log: log level has been changed for statement at line no 200 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 Tue Apr 4 09:04:02 2006 @@ -200,7 +200,7 @@ else { // $this->println("checkconnect using old connection"); - $log->info('checkconnect using old connection'); + $log->debug('checkconnect using old connection'); } } From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 01:01:14 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 05:01:14 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4880 - /vtigercrm/trunk/modules/Users/upload.php Message-ID: <20060405050114.5ADAC5C7073@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 4 23:01:09 2006 New Revision: 4880 Log: Made the necessary changes for smartification of new ui for mail merge template - Ahmed Modified: vtigercrm/trunk/modules/Users/upload.php Modified: vtigercrm/trunk/modules/Users/upload.php ============================================================================== --- vtigercrm/trunk/modules/Users/upload.php (original) +++ vtigercrm/trunk/modules/Users/upload.php Tue Apr 4 23:01:09 2006 @@ -1,4 +1,6 @@ - + +require_once('Smarty_setup.php'); +require_once('include/database/PearDatabase.php'); +require_once('include/utils/utils.php'); +require_once('modules/Users/add2db.php'); + +global $app_strings; +global $mod_strings; +global $app_list_strings; +global $adb; +global $theme; +$theme_path="themes/".$theme."/"; +$image_path=$theme_path."images/"; +require_once($theme_path.'layout_utils.php'); + +$smarty = new vtigerCRM_Smarty; + + +$smarty->assign("MOD", return_module_language($current_language,'Settings')); +$smarty->assign("IMAGE_PATH",$image_path); +$smarty->assign("APP", $app_strings); +$smarty->assign("UMOD", $mod_strings); + +$smarty->display('CreateWordTemplate.tpl'); + +?> - - - - - -
    - - - -

    - {$UMOD.LBL_EMAIL_TEMPLATE_INFORMATION} "{$TEMPLATENAME}" + {$MOD.LBL_SETTINGS} > {$UMOD.LBL_EMAIL_TEMPLATE_INFORMATION} "{$TEMPLATENAME}"
    		 

    {if $EMODE eq 'edit'} - Communication Templates > Editing Email Templates > {$TEMPLATENAME} + {$MOD.LBL_SETTINGS} > Communication Templates > Editing Email Templates > {$TEMPLATENAME} {else} - Communication Templates > Creating Email Templates > New + {$MOD.LBL_SETTINGS} > Communication Templates > Creating Email Templates > New {/if}
    - - - - - -
    - - - - - - - - - - - - - -
    : -
    :
    :
    -
    - - - - -
    - -
    - - - + + From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 02:00:51 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 06:00:51 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4881 - /vtigercrm/trunk/modules/CustomView/PopulateCustomView.php Message-ID: <20060405060051.099B45C3718@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 00:00:47 2006 New Revision: 4881 Log: fieldname has been modified for default listview Modified: vtigercrm/trunk/modules/CustomView/PopulateCustomView.php Modified: vtigercrm/trunk/modules/CustomView/PopulateCustomView.php ============================================================================== --- vtigercrm/trunk/modules/CustomView/PopulateCustomView.php (original) +++ vtigercrm/trunk/modules/CustomView/PopulateCustomView.php Wed Apr 5 00:00:47 2006 @@ -134,7 +134,7 @@ 'leaddetails:company:company:Leads_Company:V', 'leadaddress:phone:phone:Leads_Phone:V', 'leadsubdetails:website:website:Leads_Website:V', - 'leaddetails:email:email:Leads_Email:V', + 'leaddetails:email:email:Leads_Email:E', 'crmentity:smownerid:assigned_user_id:Leads_Assigned_To:V'), Array('leaddetails:firstname:firstname:Leads_First_Name:V', @@ -142,14 +142,14 @@ 'leaddetails:company:company:Leads_Company:V', 'leaddetails:leadsource:leadsource:Leads_Lead_Source:V', 'leadsubdetails:website:website:Leads_Website:V', - 'leaddetails:email:email:Leads_Email:V'), + 'leaddetails:email:email:Leads_Email:E'), Array('leaddetails:firstname:firstname:Leads_First_Name:V', 'leaddetails:lastname:lastname:Leads_Last_Name:V', 'leaddetails:company:company:Leads_Company:V', 'leaddetails:leadsource:leadsource:Leads_Lead_Source:V', 'leadsubdetails:website:website:Leads_Website:V', - 'leaddetails:email:email:Leads_Email:V'), + 'leaddetails:email:email:Leads_Email:E'), Array('account:accountname:accountname:Accounts_Account_Name:V', 'accountbillads:city:bill_city:Accounts_City:V', @@ -173,8 +173,8 @@ 'contactdetails:lastname:lastname:Contacts_Last_Name:V', 'contactdetails:title:title:Contacts_Title:V', 'contactdetails:accountid:account_id:Contacts_Account_Name:I', - 'contactdetails:email:email:Contacts_Email:V', - 'contactdetails:phone:phone:Contacts_Phone:V', + 'contactdetails:email:email:Contacts_Email:E', + 'contactdetails:phone:phone:Contacts_Office_Phone:V', 'crmentity:smownerid:assigned_user_id:Contacts_Assigned_To:V'), Array('contactdetails:firstname:firstname:Contacts_First_Name:V', @@ -189,13 +189,13 @@ 'contactdetails:lastname:lastname:Contacts_Last_Name:V', 'contactdetails:title:title:Contacts_Title:V', 'contactdetails:accountid:account_id:Contacts_Account_Name:I', - 'contactdetails:email:email:Contacts_Email:V', + 'contactdetails:email:email:Contacts_Email:E', 'contactsubdetails:otherphone:otherphone:Contacts_Phone:V', 'crmentity:smownerid:assigned_user_id:Contacts_Assigned_To:V'), Array('potential:potentialname:potentialname:Potentials_Potential_Name:V', 'potential:accountid:account_id:Potentials_Account_Name:V', - 'potential:sales_stage:sales_stage:Potentials_Sales_Stage:N', + 'potential:sales_stage:sales_stage:Potentials_Sales_Stage:V', 'potential:leadsource:leadsource:Potentials_Lead_Source:V', 'potential:closingdate:closingdate:Potentials_Expected_Close_Date:D', 'crmentity:smownerid:assigned_user_id:Potentials_Assigned_To:V'), @@ -253,30 +253,30 @@ 'quotes:validtill:validtill:Quotes_Valid_Till:D', 'crmentity:smownerid:assigned_user_id:Quotes_Assigned_To:V'), - Array('activity:status:status:Activities_Status:V', - 'activity:activitytype:activitytype:Activities_Type:V', + Array('activity:status:taskstatus:Activities_Status:V', + 'activity:activitytype::Activities_Type:V', 'activity:subject:subject:Activities_Subject:V', - 'contactdetails:lastname:lastname:Activities_Contact_Name:V', - 'seactivityrel:activityid:activityid:Activities_Related_To:V', + 'cntactivityrel:contactid:contact_id:Activities_Contact_Name:I', + 'seactivityrel:crmid:parent_id:Activities_Related_To:V', 'activity:date_start:date_start:Activities_Start_Date:D', 'activity:due_date:due_date:Activities_End_Date:D', 'crmentity:smownerid:assigned_user_id:Activities_Assigned_To:V'), Array('activity:subject:subject:Emails_Subject:V', - 'seactivityrel:activityid:activityid:Emails_Related_To:I', + 'seactivityrel:crmid:parent_id:Emails_Related_To:I', 'activity:date_start:date_start:Emails_Date_Sent:D', 'crmentity:smownerid:assigned_user_id:Emails_Assigned_To:V'), Array('crmentity:crmid::Invoice_Invoice_Id:I', 'invoice:subject:subject:Invoice_Subject:V', - 'invoice:salesorderid:salesorder_id:Invoice_Sales_Order:V', + 'invoice:salesorderid:salesorder_id:Invoice_Sales_Order:I', 'invoice:invoicestatus:invoicestatus:Invoice_Status:V', 'invoice:total:hdnGrandTotal:Invoice_Total:I', 'crmentity:smownerid:assigned_user_id:Invoice_Assigned_To:V'), Array('notes:title:title:Notes_Title:V', 'notes:contact_id:contact_id:Notes_Contact_Name:I', - 'senotesrel:crmid:crmid:Notes_Related_To:I', + 'senotesrel:crmid:parent_id:Notes_Related_To:I', 'notes:filename:filename:Notes_File:V', 'crmentity:modifiedtime:modifiedtime:Notes_Modified_Time:V'), @@ -304,7 +304,7 @@ Array('vendor:vendorname:vendorname:Vendors_Vendor_Name:V', 'vendor:phone:phone:Vendors_Phone:V', - 'vendor:email:email:Vendors_Email:V', + 'vendor:email:email:Vendors_Email:E', 'vendor:category:category:Vendors_Category:V'), @@ -317,9 +317,12 @@ 'crmentity:createdtime:createdtime:Faq_Created_Time:D', 'crmentity:modifiedtime:modifiedtime:Faq_Modified_Time:D'), //this sequence has to be maintained - Array('campaign:campaignname:campaignname:Campaigns_Campaign_Name:V', - 'campaign:campaignid:campaignid:Campaigns_Campaign_ID:V', - 'campaign:campaigntype:campaigntype:Campaigns_Campaign_Type:V'), + Array('campaign:campaignname:campaignname:Campaigns_Campaign_Name:V', + 'campaign:campaigntype:campaigntype:Campaigns_Campaign_Type:N', + 'campaign:campaignstatus:campaignstatus:Campaigns_Campaign_Status:N', + 'campaign:expectedrevenue:expectedrevenue:Campaigns_Expected_Revenue:V', + 'campaign:closingdate:closingdate:Campaigns_Expected_Close_Date:D', + 'crmentity:smownerid:assigned_user_id:Campaigns_Assigned_To:V'), ); From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 02:02:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 06:02:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4882 - /vtigercrm/trunk/modules/Accounts/ListView.php Message-ID: <20060405060244.144DC5C707C@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 00:02:35 2006 New Revision: 4882 Log: dom array has been removed Modified: vtigercrm/trunk/modules/Accounts/ListView.php Modified: vtigercrm/trunk/modules/Accounts/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/ListView.php (original) +++ vtigercrm/trunk/modules/Accounts/ListView.php Wed Apr 5 00:02:35 2006 @@ -32,10 +32,6 @@ global $currentModule; global $theme; -// Get _dom arrays from Database -$comboFieldNames = Array('accounttype'=>'account_type_dom' - ,'industry'=>'industry_dom'); -$comboFieldArray = getComboArray($comboFieldNames); $category = getParentTab(); // focus_list is the means of passing data to a ListView. From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 02:05:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 06:05:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4883 - /vtigercrm/trunk/modules/Campaigns/ListView.php Message-ID: <20060405060515.397C75C707C@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 00:05:10 2006 New Revision: 4883 Log: dom array has been removed Modified: vtigercrm/trunk/modules/Campaigns/ListView.php Modified: vtigercrm/trunk/modules/Campaigns/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/ListView.php (original) +++ vtigercrm/trunk/modules/Campaigns/ListView.php Wed Apr 5 00:05:10 2006 @@ -21,13 +21,7 @@ global $app_strings,$mod_strings,$current_language; $current_module_strings = return_module_language($current_language, 'Campaigns'); -$comboFieldNames = Array('campaigntype'=>'campaigntype_dom' - ,'campaignstatus'=>'campaignstatus_dom'); -$comboFieldArray = getComboArray($comboFieldNames); -global $currentModule; - - -global $theme; +global $currentModule,$theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 02:07:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 06:07:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4884 - /vtigercrm/trunk/modules/Contacts/ListView.php Message-ID: <20060405060722.8A5555C707C@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 00:07:17 2006 New Revision: 4884 Log: dom array has been removed Modified: vtigercrm/trunk/modules/Contacts/ListView.php Modified: vtigercrm/trunk/modules/Contacts/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/ListView.php (original) +++ vtigercrm/trunk/modules/Contacts/ListView.php Wed Apr 5 00:07:17 2006 @@ -34,12 +34,7 @@ $log = LoggerManager::getLogger('contact_list'); -global $currentModule; -global $theme; - -// Get _dom arrays from Database -$comboFieldNames = Array('leadsource'=>'leadsource_dom'); -$comboFieldArray = getComboArray($comboFieldNames); +global $currentModule,$theme; $focus = new Contact(); $smarty = new vtigerCRM_Smarty; From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 02:12:35 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 06:12:35 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4885 - /vtigercrm/trunk/modules/HelpDesk/ListView.php Message-ID: <20060405061235.DF8285C707D@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 00:12:31 2006 New Revision: 4885 Log: dom array has been removed Modified: vtigercrm/trunk/modules/HelpDesk/ListView.php Modified: vtigercrm/trunk/modules/HelpDesk/ListView.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/ListView.php (original) +++ vtigercrm/trunk/modules/HelpDesk/ListView.php Wed Apr 5 00:12:31 2006 @@ -25,12 +25,6 @@ global $app_strings; global $mod_strings; - -$comboFieldNames = Array('ticketpriorities'=>'ticketpriorities_dom' - ,'ticketstatus'=>'ticketstatus_dom' - ,'ticketcategories'=>'ticketcategories_dom'); -$comboFieldArray = getComboArray($comboFieldNames); - global $currentModule; $focus = new HelpDesk(); From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 02:14:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 06:14:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4886 - /vtigercrm/trunk/modules/Invoice/ListView.php Message-ID: <20060405061403.BB7D25C7085@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 00:13:59 2006 New Revision: 4886 Log: dom array has been removed Modified: vtigercrm/trunk/modules/Invoice/ListView.php Modified: vtigercrm/trunk/modules/Invoice/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/ListView.php (original) +++ vtigercrm/trunk/modules/Invoice/ListView.php Wed Apr 5 00:13:59 2006 @@ -28,11 +28,6 @@ global $app_strings,$list_max_entries_per_page,$currentModule,$theme; $log = LoggerManager::getLogger('order_list'); - -// Get _dom arrays from Database -$comboFieldNames = Array('accounttype'=>'account_type_dom' - ,'industry'=>'industry_dom'); -$comboFieldArray = getComboArray($comboFieldNames); if (!isset($where)) $where = ""; From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 02:18:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 06:18:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4887 - /vtigercrm/trunk/modules/Leads/ListView.php Message-ID: <20060405061807.13BF85A84A5@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 00:18:01 2006 New Revision: 4887 Log: dom array has been modified Modified: vtigercrm/trunk/modules/Leads/ListView.php Modified: vtigercrm/trunk/modules/Leads/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Leads/ListView.php (original) +++ vtigercrm/trunk/modules/Leads/ListView.php Wed Apr 5 00:18:01 2006 @@ -37,10 +37,7 @@ global $theme; // Get _dom arrays from Database -$comboFieldNames = Array('leadsource'=>'leadsource_dom' - ,'leadstatus'=>'leadstatus_dom' - ,'rating'=>'rating_dom' - ,'industry'=>'industry_dom'); +$comboFieldNames = Array('leadstatus'=>'leadstatus_dom'); $comboFieldArray = getComboArray($comboFieldNames); $category = getParentTab(); From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 02:19:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 06:19:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4888 - /vtigercrm/trunk/modules/Potentials/ListView.php Message-ID: <20060405061956.B30F059FA03@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 00:19:45 2006 New Revision: 4888 Log: dom array has been removed Modified: vtigercrm/trunk/modules/Potentials/ListView.php Modified: vtigercrm/trunk/modules/Potentials/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/ListView.php (original) +++ vtigercrm/trunk/modules/Potentials/ListView.php Wed Apr 5 00:19:45 2006 @@ -29,12 +29,6 @@ global $currentModule,$theme; -// Get _dom arrays from Database -$comboFieldNames = Array('leadsource'=>'leadsource_dom' - ,'opportunity_type'=>'opportunity_type_dom' - ,'sales_stage'=>'sales_stage_dom'); -$comboFieldArray = getComboArray($comboFieldNames); - $category = getParentTab(); if (!isset($where)) $where = ""; From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 02:21:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 06:21:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4889 - /vtigercrm/trunk/modules/Products/ListView.php Message-ID: <20060405062155.C86315A84A5@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 00:21:48 2006 New Revision: 4889 Log: dom array has been removed Modified: vtigercrm/trunk/modules/Products/ListView.php Modified: vtigercrm/trunk/modules/Products/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Products/ListView.php (original) +++ vtigercrm/trunk/modules/Products/ListView.php Wed Apr 5 00:21:48 2006 @@ -35,11 +35,6 @@ $category = getParentTab(); $smarty->assign("CATEGORY",$category); $other_text = Array(); - - -$comboFieldNames = Array('manufacturer'=>'manufacturer_dom' - ,'productcategory'=>'productcategory_dom'); -$comboFieldArray = getComboArray($comboFieldNames); $url_string = '&smodule=PRODUCTS'; // assigning http url string From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 02:23:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 06:23:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4890 - /vtigercrm/trunk/modules/PurchaseOrder/ListView.php Message-ID: <20060405062348.A29E55A84A5@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 00:23:44 2006 New Revision: 4890 Log: dom array has been removed Modified: vtigercrm/trunk/modules/PurchaseOrder/ListView.php Modified: vtigercrm/trunk/modules/PurchaseOrder/ListView.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/ListView.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/ListView.php Wed Apr 5 00:23:44 2006 @@ -27,12 +27,6 @@ global $app_strings,$list_max_entries_per_page,$currentModule,$theme; $log = LoggerManager::getLogger('order_list'); - - -// Get _dom arrays from Database -$comboFieldNames = Array('accounttype'=>'account_type_dom' - ,'industry'=>'industry_dom'); -$comboFieldArray = getComboArray($comboFieldNames); if (!isset($where)) $where = ""; From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 02:25:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 06:25:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4891 - /vtigercrm/trunk/modules/Quotes/ListView.php Message-ID: <20060405062506.9D6985A84A5@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 00:25:01 2006 New Revision: 4891 Log: dom array has been removed Modified: vtigercrm/trunk/modules/Quotes/ListView.php Modified: vtigercrm/trunk/modules/Quotes/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/ListView.php (original) +++ vtigercrm/trunk/modules/Quotes/ListView.php Wed Apr 5 00:25:01 2006 @@ -28,10 +28,6 @@ global $app_strings,$list_max_entries_per_page,$currentModule,$theme; $log = LoggerManager::getLogger('quote_list'); - -// Get _dom arrays from Database -$comboFieldNames = Array('quotestage'=>'quotestage_dom'); -$comboFieldArray = getComboArray($comboFieldNames); if (!isset($where)) $where = ""; From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 02:30:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 06:30:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4892 - /vtigercrm/trunk/modules/Settings/CurrencyDetailView.php Message-ID: <20060405063058.5DEBD5C707D@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 00:30:54 2006 New Revision: 4892 Log: changes made for smartification Modified: vtigercrm/trunk/modules/Settings/CurrencyDetailView.php Modified: vtigercrm/trunk/modules/Settings/CurrencyDetailView.php ============================================================================== --- vtigercrm/trunk/modules/Settings/CurrencyDetailView.php (original) +++ vtigercrm/trunk/modules/Settings/CurrencyDetailView.php Wed Apr 5 00:30:54 2006 @@ -8,37 +8,34 @@ * All Rights Reserved. * ********************************************************************************/ -require_once('XTemplate/xtpl.php'); +require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('include/utils/UserInfoUtil.php'); require_once('include/database/PearDatabase.php'); -global $mod_strings; -global $app_strings; -global $app_list_strings; -global $theme; +global $mod_strings,$app_strings,$theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); -$xtpl=new XTemplate ('modules/Settings/CurrencyInfo.html'); -$xtpl->assign("MOD", $mod_strings); -$xtpl->assign("APP", $app_strings); +$smarty=new vtigerCRM_Smarty; +$smarty->assign("MOD", $mod_strings); +$smarty->assign("APP", $app_strings); +$smarty->assign("IMAGE_PATH",$image_path); if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { $tempid = $_REQUEST['record']; $sql = "select * from currency_info where id=".$tempid; $result = $adb->query($sql); $currencyResult = $adb->fetch_array($result); -$xtpl->assign("CURRENCY_NAME",$currencyResult['currency_name']); -$xtpl->assign("CURRENCY_CODE",$currencyResult['currency_code']); -$xtpl->assign("CURRENCY_SYMBOL",$currencyResult['currency_symbol']); -$xtpl->assign("CONVERSION_RATE",$currencyResult['conversion_rate']); -$xtpl->assign("CURRENCY_STATUS",$currencyResult['currency_status']); -$xtpl->assign("ID",$tempid); +$smarty->assign("CURRENCY_NAME",$currencyResult['currency_name']); +$smarty->assign("CURRENCY_CODE",$currencyResult['currency_code']); +$smarty->assign("CURRENCY_SYMBOL",$currencyResult['currency_symbol']); +$smarty->assign("CONVERSION_RATE",$currencyResult['conversion_rate']); +$smarty->assign("CURRENCY_STATUS",$currencyResult['currency_status']); +$smarty->assign("ID",$tempid); } -$xtpl->parse("main"); -$xtpl->out("main"); +$smarty->display("CurrencyEditView.tpl"); From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 02:32:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 06:32:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4893 - /vtigercrm/trunk/modules/Settings/CurrencyEditView.php Message-ID: <20060405063237.7EC8C5C707D@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 00:32:30 2006 New Revision: 4893 Log: file added for currency editview Added: vtigercrm/trunk/modules/Settings/CurrencyEditView.php From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 02:46:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 06:46:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4894 - /vtigercrm/trunk/Smarty/templates/CurrencyEditView.tpl Message-ID: <20060405064640.E771F5C709D@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 00:46:29 2006 New Revision: 4894 Log: CurrencyEditView.tpl has been added Added: vtigercrm/trunk/Smarty/templates/CurrencyEditView.tpl From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 02:48:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 06:48:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4895 - /vtigercrm/trunk/Smarty/templates/CurrencyListView.tpl Message-ID: <20060405064810.5DE7F5C709D@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 00:48:03 2006 New Revision: 4895 Log: action has been modified Modified: vtigercrm/trunk/Smarty/templates/CurrencyListView.tpl Modified: vtigercrm/trunk/Smarty/templates/CurrencyListView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CurrencyListView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CurrencyListView.tpl Wed Apr 5 00:48:03 2006 @@ -13,7 +13,8 @@ -->*}
    - + + Modified: vtigercrm/trunk/modules/Dashboard/horizontal_bargraph.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/horizontal_bargraph.php (original) +++ vtigercrm/trunk/modules/Dashboard/horizontal_bargraph.php Wed Apr 5 02:24:29 2006 @@ -10,9 +10,10 @@ * ********************************************************************************/ -include ("jpgraph/src/jpgraph.php"); -include ("jpgraph/src/jpgraph_bar.php"); require_once('config.php'); +require_once('include/utils/GraphUtils.php'); +include_once ('Image/Graph.php'); +include_once ('Image/Canvas.php'); $tmp_dir=$root_directory."cache/images/"; @@ -24,7 +25,7 @@ function horizontal_graph($referdata,$refer_code,$width,$height,$left,$right,$top,$bottom,$title,$target_val,$cache_file_name,$html_image_name) { - global $log,$root_directory; + global $log,$root_directory,$lang_crm,$theme; //We'll be getting the values in the form of a string separated by commas $datay=explode(",",$referdata); // The datay values $datax=explode(",",$refer_code); // The datax values @@ -71,110 +72,152 @@ //datax is the status // Set the basic parameters of the graph - $graph = new Graph($width,$height,'auto'); - $graph->SetScale("textlin"); - - // To get a horizontal Graph - $graph->Set90AndMargin($left,$right,$top,$bottom); - - $graph->xaxis->SetPos('min'); - - // Nice shadow - $graph->SetShadow(); - + $canvas =& Image_Canvas::factory('png', array('width' => $width, 'height' => $height, 'usemap' => true)); + $imagemap = $canvas->getImageMap(); + $graph =& Image_Graph::factory('graph', $canvas); + $font =& $graph->addNew('font', calculate_font_name($lang_crm)); + // set the font size to 12 + $font->setSize(8); + + if($theme == "blue") + { + $font_color = "#212473"; + } + else + { + $font_color = "#000000"; + } + $font->setColor($font_color); + + $graph->setFont($font); + $titlestr =& Image_Graph::factory('title', array($title,10)); + $plotarea =& Image_Graph::factory('plotarea',array( + 'axis', + 'axis', + 'horizontal' + )); + $graph->add( + Image_Graph::vertical($titlestr, + $plotarea, + 5 + ) + ); + + + // Now create a bar plot + $max=0; + $xlabels = array(); + $dataset = & Image_Graph::factory('dataset'); + $fill =& Image_Graph::factory('gradient', array(IMAGE_GRAPH_GRAD_VERTICAL_MIRRORED, 'blue', 'white')); + for($i=0;$i=$max) $max=$datay[$i]; + $dataset->addPoint( + $x, + $datay[$i], + array( + 'url' => $target[$i], + 'alt' => $alts[$i] + ) + ); + // build the xaxis label array to allow intermediate ticks + $xlabels[$x] = $datax[$i]; + $xlabels[$x+1] = ''; + } + + + $bplot = & $plotarea->addNew('bar', $dataset); + $bplot->setFillStyle($fill); + + //You can change the width of the bars if you like + $bplot->setBarWidth(50/count($datax),"%"); + $bplot->setPadding(array('top'=>20)); + + // We want to display the value of each bar at the top + //$bplot->value->Show(); + //$bplot->value->SetFont(FF_FONT2,FS_BOLD,12); + //$bplot->value->SetAlign('left','center'); + //$bplot->value->SetColor("black","gray4"); + //$bplot->value->SetFormat('%d'); + + //$graph->SetBackgroundGradient('#E5E5E5','white',GRAD_VER,BGRAD_PLOT); + $bplot->setBackground(Image_Graph::factory('gradient', array(IMAGE_GRAPH_GRAD_HORIZONTAL, 'white', '#E5E5E5'))); + //$bplot->SetFillGradient("navy","lightsteelblue",GRAD_MIDVER); + + //$graph->SetFrame(false); + //$graph->SetMarginColor('cadetblue2'); + //$graph->ygrid->SetFill(true,'azure1','azure2'); + //$graph->xgrid->Show(); + + // Add the bar to the graph + //$graph->Add($bplot); + // Setup title - $graph->title->Set($title); - $graph->title->SetFont(FF_FONT2,FS_BOLD,14); + //$titlestr->setText($title); // Setup X-axis - $graph->xaxis->SetTickLabels($datax); - $graph->xaxis->SetFont(FF_FONT2,FS_NORMAL,12); - - // Some extra margin looks nicer - $graph->xaxis->SetLabelMargin(5); - - // Label align for X-axis - $graph->xaxis->SetLabelAlign('right','center'); - - if($max>=5) - { - $graph->xaxis->SetLabelFormat('%d'); - } + $xaxis =& $plotarea->getAxis(IMAGE_GRAPH_AXIS_X); + $yaxis =& $plotarea->getAxis(IMAGE_GRAPH_AXIS_Y); + $yaxis->setFontSize(10); + + // Invert X-axis and put Y-axis at bottom + $xaxis->setInverted(true); + $yaxis->setAxisIntersection('max'); + + // set grid + $gridY =& $plotarea->addNew('line_grid', IMAGE_GRAPH_AXIS_Y); + $gridY->setLineColor('#E5E5E5 at 0.5'); + $gridY2 =& $plotarea->addNew('bar_grid', null, IMAGE_GRAPH_AXIS_Y); + $gridY2->setFillColor('#66CDAA at 0.2'); + // Add some grace to y-axis so the bars doesn't go // all the way to the end of the plot area - $graph->yaxis->scale->SetGrace(20); - - // Setup the Y-axis to be displayed in the bottom of the - // graph. We also finetune the exact layout of the title, - // ticks and labels to make them look nice. - $graph->yaxis->SetPos('max'); + $yaxis->forceMaximum(round(($max * 1.1) + 0.5)); // First make the labels look right - $graph->yaxis->SetLabelAlign('center','top'); - $graph->yaxis->SetLabelFormat('%d'); - $graph->yaxis->SetLabelSide(SIDE_RIGHT); + $yaxis->setLabelInterval(1); + $yaxis->setTickOptions(-5,0); + $yaxis->setLabelInterval(0.5,2); + $yaxis->setTickOptions(-2,0,2); + + // Create the xaxis labels + $array_data =& Image_Graph::factory('Image_Graph_DataPreprocessor_Array', + array($xlabels) + ); // The fix the tick marks - //$graph->yaxis->SetTickSide(SIDE_LEFT); - - // Finally setup the title - $graph->yaxis->SetTitleSide(SIDE_RIGHT); - $graph->yaxis->SetTitleMargin(35); - - $graph->yaxis->title->SetFont(FF_FONT2,FS_BOLD,12); - $graph->yaxis->title->SetAngle(0); - - $graph->yaxis->SetFont(FF_FONT2,FS_NORMAL); - - // Now create a bar pot - $max=0; - for($i=0;$i=$max) - $max=$x; - else - $max=$max; - } - - - $bplot = new BarPlot($datay); - $bplot->SetFillColor("aquamarine3"); - - //You can change the width of the bars if you like - $bplot->SetWidth(0.2); - - // We want to display the value of each bar at the top - $bplot->value->Show(); - $bplot->value->SetFont(FF_FONT2,FS_BOLD,12); - $bplot->value->SetAlign('left','center'); - $bplot->value->SetColor("black","gray4"); - $bplot->value->SetFormat('%d'); - - //Adding this top get usemap - $bplot->SetCSIMTargets($target,$alts); - - $graph->SetBackgroundGradient('#E5E5E5','white',GRAD_VER,BGRAD_PLOT); - $bplot->SetFillGradient("navy","lightsteelblue",GRAD_MIDVER); - - $graph->SetFrame(false); - $graph->SetMarginColor('cadetblue2'); - $graph->ygrid->SetFill(true,'azure1','azure2'); - $graph->xgrid->Show(); - - // Add the bar to the graph - $graph->Add($bplot); + $xaxis->setDataPreprocessor($array_data); + $xaxis->forceMinimum(0); + $xaxis->forceMaximum(2*count($datay)); + $xaxis->setLabelInterval(1); + $xaxis->setTickOptions(0,0); + $xaxis->setLabelInterval(2,2); + $xaxis->setTickOptions(5,0,2); + + // set markers + $marker =& $graph->addNew('value_marker', IMAGE_GRAPH_VALUE_Y); + $marker->setFillColor('000000 at 0.0'); + $marker->setBorderColor('000000 at 0.0'); + $marker->setFontSize(10); + // shift markers 10 pix right + $marker_pointing =& $graph->addNew('Image_Graph_Marker_Pointing', array(10,0,& $marker)); + $marker_pointing->setLineColor('000000 at 0.0'); + $bplot->setMarker($marker_pointing); //Getting the graph in the form of html page - $graph-> Stroke( $cache_file_name ); - $imgMap = $graph ->GetHTMLImageMap ($html_image_name); - save_image_map($cache_file_name.'.map', $imgMap); - $base_name_cache_file=basename($cache_file_name); - $ccc="cache/images/".$base_name_cache_file; - $img = "" ; - $img.=$imgMap; + $img = $graph->done( + array( + 'tohtml' => true, + 'border' => 0, + 'filename' => $cache_file_name, + 'filepath' => '', + 'urlpath' => '' + )); + save_image_map($cache_file_name.'.map', $img); + return $img; } Modified: vtigercrm/trunk/modules/Dashboard/pie_graph.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/pie_graph.php (original) +++ vtigercrm/trunk/modules/Dashboard/pie_graph.php Wed Apr 5 02:24:29 2006 @@ -11,8 +11,9 @@ ********************************************************************************/ -include ("jpgraph/src/jpgraph_pie.php"); -include ("jpgraph/src/jpgraph_pie3d.php"); +require_once('include/utils/GraphUtils.php'); +include_once ('Image/Graph.php'); +include_once ('Image/Canvas.php'); /** Function to render the Horizontal Graph @@ -24,7 +25,7 @@ { - global $log,$root_directory; + global $log,$root_directory,$lang_crm,$theme; //We'll be getting the values in the form of a string separated by commas $datay=explode(",",$referdata); // The datay values $datax=explode(",",$refer_code); // The datax values @@ -40,37 +41,99 @@ $alts[]=$name."=%d"; } - $graph = new PieGraph($width,$height,"auto"); + if($theme == "blue") + { + $font_color = "#212473"; + } + else + { + $font_color = "#000000"; + } + + $canvas =& Image_Canvas::factory('png', array('width' => $width, 'height' => $height, 'usemap' => true)); + $imagemap = $canvas->getImageMap(); + $graph =& Image_Graph::factory('graph', $canvas); + $font =& $graph->addNew('font', calculate_font_name('en_en')); + // set the font size to 11 pixels + $font->setSize(8); + $font->setColor($font_color); + + $graph->setFont($font); + // create the plotarea layout + $title =& Image_Graph::factory('title', array($title,10)); + $plotarea =& Image_Graph::factory('plotarea',array( + 'category', + 'axis' + )); + $footer =& Image_Graph::factory('title', array('Footer',8)); + $legend_box =& Image_Graph::factory('legend'); + $graph->add( + Image_Graph::vertical($title, + $plotarea, + 5 + ) + ); + // Generate colours + $colors = color_generator(count($datay),'#33CCFF','#3322FF'); + $dataset = & Image_Graph::factory('dataset'); + $fills =& Image_Graph::factory('Image_Graph_Fill_Array'); + $sum = 0; + for($i=0;$iaddPoint( + $datax[$i], + $datay[$i], + array( + 'url' => $target[$i], + 'alt' => $alts[$i] + ) + ); + $sum += $datay[$i]; + $fills->addColor($colors[$i]); + } - $graph->SetShadow(); + // create an array with % values + $pcvalues = array(); + for($i=0;$ititle->Set($title); - $graph->title->SetFont(FF_FONT1,FS_BOLD); + // create the pie chart and associate the filling colours + $gbplot = & $plotarea->addNew('pie', $dataset); + $plotarea->hideAxis(); + $gbplot->setFillStyle($fills); - $p1 = new PiePlot3D($datay); - $p1->SetTheme("sand"); - $p1->ExplodeSlice(1); - $p1->SetCenter(0.45); - $p1->SetLegends($datax); + // format the data values + $marker_array =& Image_Graph::factory('Image_Graph_DataPreprocessor_Array', array($pcvalues)); + + // set markers + $marker =& $graph->addNew('value_marker', IMAGE_GRAPH_VALUE_Y); + $marker->setDataPreprocessor($marker_array); + $marker->setFillColor('#FFFFFF'); + $marker->setBorderColor($font_color); + $marker->setFontColor($font_color); + $marker->setFontSize(8); + $pointingMarker =& $graph->addNew('Image_Graph_Marker_Pointing_Angular', array(20, &$marker)); + $gbplot->setMarker($pointingMarker); + + // set legend + $legend_box =& $plotarea->addNew('legend'); + $legend_box->setPadding(array('top'=>20,'bottom'=>0,'left'=>0,'right'=>0)); + $legend_box->setFillColor('#F5F5F5'); + $legend_box->showShadow(); - // Setup the labels - $p1->SetLabelType(PIE_VALUE_PER); - $p1->value->Show(); - $p1->value->SetFormat('%2.1f%%'); - $p1->SetCSIMTargets($target,$alts); - // Don't display the border - $graph->SetFrame(false); + $img = $graph->done( + array( + 'tohtml' => true, + 'border' => 0, + 'filename' => $cache_file_name, + 'filepath' => '', + 'urlpath' => '' + )); + save_image_map($cache_file_name.'.map', $img); - $graph->Add($p1); - - $graph-> Stroke( $cache_file_name ); - $imgMap = $graph ->GetHTMLImageMap ($html_image_name); - save_image_map($cache_file_name.'.map', $imgMap); - $base_name_cache_file=basename($cache_file_name); - $ccc="cache/images/".$base_name_cache_file; - $img = "" ; - $img.=$imgMap; return $img; } Modified: vtigercrm/trunk/modules/Dashboard/vertical_bargraph.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/vertical_bargraph.php (original) +++ vtigercrm/trunk/modules/Dashboard/vertical_bargraph.php Wed Apr 5 02:24:29 2006 @@ -10,124 +10,193 @@ * ********************************************************************************/ - -include ("jpgraph/src/jpgraph_flags.php"); -include ("jpgraph/src/jpgraph_iconplot.php"); - -/** Function to render the Vertical Bar Graph - * Portions created by vtiger are Copyright (C) vtiger. - * All Rights Reserved. - * Contributor(s): ______________________________________.. +require_once('config.php'); +require_once('include/utils/GraphUtils.php'); +include_once ('Image/Graph.php'); +include_once ('Image/Canvas.php'); + +$tmp_dir=$root_directory."cache/images/"; + +/** Function to render the Horizontal Graph + * Portions created by vtiger are Copyright (C) vtiger. + * All Rights Reserved. + * Contributor(s): ______________________________________.. */ - function vertical_graph($referdata,$refer_code,$width,$height,$left,$right,$top,$bottom,$title,$target_val,$cache_file_name,$html_image_name) { - //We'll be getting the values in the form of a string separated by commas - $datay=explode(",",$referdata); //The datay values - $datax=explode(",",$refer_code); // The datax values - $target_val=urldecode($target_val);// The links values for bar are given as string in the encoded form, here we are decoding it + global $log,$root_directory,$lang_crm,$theme; +//We'll be getting the values in the form of a string separated by commas + $datay=explode(",",$referdata); // The datay values + $datax=explode(",",$refer_code); // The datax values + +// The links values are given as string in the encoded form, here we are decoding it + $target_val=urldecode($target_val); $target=explode(",",$target_val); - $alts=array(); //Array which contains the data which is displayed on the mouse over + $alts=array(); $temp=array(); for($i=0;$i=14) - $name=substr($name, 0, 14); - $temp[]=$name; +//If the daatx value of a string is greater, adding '\n' to it so that it'll cme inh 2nd line + if(strlen($name)>=14) + $name=substr($name, 0, 14); + if($pos>=2) + { + $val=explode(" ",$name); + $n=count($val)-1; + + $x=""; + for($j=0;$j $width, 'height' => $height, 'usemap' => true)); + $imagemap = $canvas->getImageMap(); + $graph =& Image_Graph::factory('graph', $canvas); + $font =& $graph->addNew('font', calculate_font_name($lang_crm)); + // set the font size to 12 + $font->setSize(8); + + if($theme == "blue") + { + $font_color = "#212473"; + } + else + { + $font_color = "#000000"; + } + $font->setColor($font_color); + + $graph->setFont($font); + $titlestr =& Image_Graph::factory('title', array($title,10)); + $plotarea =& Image_Graph::factory('plotarea',array( + 'axis', + 'axis', + 'vertical' + )); + $graph->add( + Image_Graph::vertical($titlestr, + $plotarea, + 5 + ) + ); + + + // Now create a bar plot $max=0; + $xlabels = array(); + $dataset = & Image_Graph::factory('dataset'); + $fill =& Image_Graph::factory('gradient', array(IMAGE_GRAPH_GRAD_HORIZONTAL_MIRRORED, 'blue', 'white')); for($i=0;$i=$max) - $max=$x; - else - $max=$max; - } - - // Create the graph. These two calls are always required - $graph = new Graph($width,$height,"auto"); - $graph->SetScale("textlin"); - $graph->yaxis->scale->SetGrace(20); - - // Add a drop shadow - $graph->SetShadow(); - - // Adjust the margin a bit to make more room for titles - $graph->img->SetMargin($left,$right,$top,$bottom); - - - - // Create a bar pot - $bplot = new BarPlot($datay); - - // Adjust fill color - $bplot->SetFillColor('orange'); - $bplot->value->Show(); - $graph->Add($bplot); - - // Setup the titles - $graph->title->Set($title); - - // Make the bar a little bit wider - $bplot->SetWidth(0.2); + $x=1+2*$i; + if($datay[$i]>=$max) $max=$datay[$i]; + $dataset->addPoint( + $x, + $datay[$i], + array( + 'url' => $target[$i], + 'alt' => $alts[$i] + ) + ); + // build the xaxis label array to allow intermediate ticks + $xlabels[$x] = $datax[$i]; + $xlabels[$x+1] = ''; + } + + + //$bplot = new BarPlot($datay); + $bplot = & $plotarea->addNew('bar', $dataset); + $bplot->setFillStyle($fill); + + //You can change the width of the bars if you like + $bplot->setBarWidth(50/count($datax),"%"); + $bplot->setPadding(array('top'=>20)); + + $bplot->setBackground(Image_Graph::factory('gradient', array(IMAGE_GRAPH_GRAD_VERTICAL, 'white', '#E5E5E5'))); // Setup X-axis - $graph->xaxis->SetTickLabels($datax); - $graph->xaxis->SetFont(FF_FONT2,FS_Bold,12); - - - $graph->xaxis->SetLabelAlign('center','top'); - $graph->xaxis->SetLabelAngle(90); - - $graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); - if($max>=5) - { - $graph->yaxis->SetLabelFormat('%d'); - } - - // Setup color for gradient fill style - $bplot->SetFillGradient("navy","lightsteelblue",GRAD_MIDVER); - $graph->SetFrame(false); - $graph->SetMarginColor('white'); - $graph->xgrid->Show(); - - // To get the Targets - $bplot->SetCSIMTargets($target,$alts); - - // Set color for the frame of each bar - $bplot->SetColor("navy"); - - - $graph->SetBackgroundGradient('#F2FBDB','white',GRAD_VER,BGRAD_PLOT); - - $graph->title->SetFont(FF_FONT1,FS_BOLD); - - $img_path="test/logo/vtiger-crm-logo.jpg"; - - $icon = new IconPlot($img_path,0.7,0.3,1,30); - $icon->SetAnchor('center','center'); - $graph->Add($icon); - - - $bplot->value->SetFormat('%d'); - - //Getting the graph in the form of html page - $graph-> Stroke( $cache_file_name ); - $imgMap = $graph ->GetHTMLImageMap ($html_image_name); - save_image_map($cache_file_name.'.map', $imgMap); - $base_name_cache_file=basename($cache_file_name); - $ccc="cache/images/".$base_name_cache_file; - $img= "" ; - $img.=$imgMap; + $xaxis =& $plotarea->getAxis(IMAGE_GRAPH_AXIS_X); + $yaxis =& $plotarea->getAxis(IMAGE_GRAPH_AXIS_Y); + $yaxis->setFontSize(10); + + // set grid + $gridY =& $plotarea->addNew('line_grid', IMAGE_GRAPH_AXIS_Y); + $gridY->setLineColor('#E5E5E5 at 0.5'); + $gridY2 =& $plotarea->addNew('bar_grid', null, IMAGE_GRAPH_AXIS_Y); + $gridY2->setFillColor('#66CDAA at 0.2'); + + + // Add some grace to y-axis so the bars doesn't go + // all the way to the end of the plot area + $yaxis->forceMaximum(round(($max * 1.1) + 0.5)); + + // First make the labels look right + $yaxis->setLabelInterval(1); + $yaxis->setTickOptions(5,0); + $yaxis->setLabelInterval(0.5,2); + $yaxis->setTickOptions(2,0,2); + + // Create the xaxis labels + $array_data =& Image_Graph::factory('Image_Graph_DataPreprocessor_Array', + array($xlabels) + ); + + // Then fix the tick marks + $xaxis->setDataPreprocessor($array_data); + $xaxis->forceMinimum(0); + $xaxis->forceMaximum(2*count($datay)); + $xaxis->setFontAngle('vertical'); + $xaxis->setLabelInterval(1); + $xaxis->setTickOptions(0,0); + $xaxis->setLabelInterval(2,2); + $xaxis->setTickOptions(5,0,2); + + // set markers + $marker =& $graph->addNew('value_marker', IMAGE_GRAPH_VALUE_Y); + $marker->setFillColor('000000 at 0.0'); + $marker->setBorderColor('000000 at 0.0'); + $marker->setFontSize(10); + // shift markers 10 pix right + $marker_pointing =& $graph->addNew('Image_Graph_Marker_Pointing', array(0,-10,& $marker)); + $marker_pointing->setLineColor('000000 at 0.0'); + $bplot->setMarker($marker_pointing); + + + //Getting the graph in the form of html page + $img = $graph->done( + array( + 'tohtml' => true, + 'border' => 0, + 'filename' => $cache_file_name, + 'filepath' => '', + 'urlpath' => '' + )); + save_image_map($cache_file_name.'.map', $img); + return $img; - } + ?> Modified: vtigercrm/trunk/modules/Potentials/Charts.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 05:37:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 09:37:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4897 - /vtigercrm/trunk/include/utils/ListViewUtils.php Message-ID: <20060405093722.D18CB5C371B@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 03:37:14 2006 New Revision: 4897 Log: changes made to reduce the query logging 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 Wed Apr 5 03:37:14 2006 @@ -621,8 +621,7 @@ } elseif($owner_id == 0 && $name == 'Assigned To') { - $group_info = getGroupName($entity_id, $module); - $value = $group_info[0]; + $value=$adb->query_result($list_result,$i-1,"groupname"); } else { @@ -661,7 +660,6 @@ else $varreturnset .= '&activity_mode=Events'; } - $mod_dir=getModuleDirName($module); $list_block[$entity_id] = $list_header; } @@ -838,8 +836,7 @@ if($uitype == 52 || $uitype == 53 || $uitype == 77) { - $user_name = getUserName($temp_val); - $value = $user_name; + $value = $adb->query_result($list_result,$list_result_count,'user_name'); } elseif($uitype == 5 || $uitype == 6 || $uitype == 23 || $uitype == 70) { @@ -1797,12 +1794,11 @@ $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; $output = '

    From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 04:25:26 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 08:25:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4896 - in /vtigercrm/trunk: ./ Image/ Image/Canvas/ Image/Canvas/Fonts/ Image/Canvas/GD/ Image/Graph/ Image/Graph/Axis/ Image/Graph/Axis/Marker/ Image/Graph/DataPreprocessor/ Image/Graph/DataSelector/ Image/Graph/Dataset/ Image/Graph/Figure/ Image/Graph/Fill/ Image/Graph/Grid/ Image/Graph/Images/ Image/Graph/Images/Icons/ Image/Graph/Images/Maps/ Image/Graph/Layout/ Image/Graph/Line/ Image/Graph/Marker/ Image/Graph/Marker/Pointing/ Image/Graph/Plot/ Image/Graph/Plot/Fit/ Image/Graph/Plot/Smoothed/ Image/Graph/Plotarea/ include/utils/ jpgraph/ modules/Dashboard/ modules/Potentials/ Message-ID: <20060405082526.1575059FAC1@vtiger.fosslabs.com> Author: jacquemesm Date: Wed Apr 5 02:24:29 2006 New Revision: 4896 Log: Image Graph implementation : suppress JPGraph and replace by Image Graph, replace several chart modules Added: vtigercrm/trunk/Image/ vtigercrm/trunk/Image/Canvas/ vtigercrm/trunk/Image/Canvas.php vtigercrm/trunk/Image/Canvas/Color.php vtigercrm/trunk/Image/Canvas/Fonts/ vtigercrm/trunk/Image/Canvas/Fonts/README vtigercrm/trunk/Image/Canvas/Fonts/fontmap.txt vtigercrm/trunk/Image/Canvas/GD/ vtigercrm/trunk/Image/Canvas/GD.php vtigercrm/trunk/Image/Canvas/GD/JPG.php vtigercrm/trunk/Image/Canvas/GD/PNG.php vtigercrm/trunk/Image/Canvas/ImageMap.php vtigercrm/trunk/Image/Canvas/PDF.php vtigercrm/trunk/Image/Canvas/SVG.php vtigercrm/trunk/Image/Canvas/Tool.php vtigercrm/trunk/Image/Canvas/WithMap.php vtigercrm/trunk/Image/Color.php vtigercrm/trunk/Image/Graph/ vtigercrm/trunk/Image/Graph.php vtigercrm/trunk/Image/Graph/Axis/ vtigercrm/trunk/Image/Graph/Axis.php vtigercrm/trunk/Image/Graph/Axis/Category.php vtigercrm/trunk/Image/Graph/Axis/Logarithmic.php vtigercrm/trunk/Image/Graph/Axis/Marker/ vtigercrm/trunk/Image/Graph/Axis/Marker/Area.php vtigercrm/trunk/Image/Graph/Axis/Marker/Line.php vtigercrm/trunk/Image/Graph/Axis/Radar.php vtigercrm/trunk/Image/Graph/Common.php vtigercrm/trunk/Image/Graph/Config.php vtigercrm/trunk/Image/Graph/Constants.php vtigercrm/trunk/Image/Graph/DataPreprocessor/ vtigercrm/trunk/Image/Graph/DataPreprocessor.php vtigercrm/trunk/Image/Graph/DataPreprocessor/Array.php vtigercrm/trunk/Image/Graph/DataPreprocessor/Currency.php vtigercrm/trunk/Image/Graph/DataPreprocessor/Date.php vtigercrm/trunk/Image/Graph/DataPreprocessor/Formatted.php vtigercrm/trunk/Image/Graph/DataPreprocessor/Function.php vtigercrm/trunk/Image/Graph/DataPreprocessor/NumberText.php vtigercrm/trunk/Image/Graph/DataPreprocessor/RomanNumerals.php vtigercrm/trunk/Image/Graph/DataPreprocessor/Sequential.php vtigercrm/trunk/Image/Graph/DataSelector/ vtigercrm/trunk/Image/Graph/DataSelector.php vtigercrm/trunk/Image/Graph/DataSelector/EveryNthPoint.php vtigercrm/trunk/Image/Graph/DataSelector/NoZeros.php vtigercrm/trunk/Image/Graph/DataSelector/Values.php vtigercrm/trunk/Image/Graph/Dataset/ vtigercrm/trunk/Image/Graph/Dataset.php vtigercrm/trunk/Image/Graph/Dataset/Function.php vtigercrm/trunk/Image/Graph/Dataset/Random.php vtigercrm/trunk/Image/Graph/Dataset/Sequential.php vtigercrm/trunk/Image/Graph/Dataset/Trivial.php vtigercrm/trunk/Image/Graph/Dataset/VectorFunction.php vtigercrm/trunk/Image/Graph/Element.php vtigercrm/trunk/Image/Graph/Figure/ vtigercrm/trunk/Image/Graph/Figure/Circle.php vtigercrm/trunk/Image/Graph/Figure/Ellipse.php vtigercrm/trunk/Image/Graph/Figure/Polygon.php vtigercrm/trunk/Image/Graph/Figure/Rectangle.php vtigercrm/trunk/Image/Graph/Fill/ vtigercrm/trunk/Image/Graph/Fill.php vtigercrm/trunk/Image/Graph/Fill/Array.php vtigercrm/trunk/Image/Graph/Fill/Gradient.php vtigercrm/trunk/Image/Graph/Fill/Image.php vtigercrm/trunk/Image/Graph/Font.php vtigercrm/trunk/Image/Graph/Grid/ vtigercrm/trunk/Image/Graph/Grid.php vtigercrm/trunk/Image/Graph/Grid/Bars.php vtigercrm/trunk/Image/Graph/Grid/Lines.php vtigercrm/trunk/Image/Graph/Grid/Polar.php vtigercrm/trunk/Image/Graph/Images/ vtigercrm/trunk/Image/Graph/Images/Icons/ vtigercrm/trunk/Image/Graph/Images/Icons/pinpoint.png (with props) vtigercrm/trunk/Image/Graph/Images/Icons/pinpointr.png (with props) vtigercrm/trunk/Image/Graph/Images/Maps/ vtigercrm/trunk/Image/Graph/Images/Maps/README vtigercrm/trunk/Image/Graph/Layout/ vtigercrm/trunk/Image/Graph/Layout.php vtigercrm/trunk/Image/Graph/Layout/Horizontal.php vtigercrm/trunk/Image/Graph/Layout/Matrix.php vtigercrm/trunk/Image/Graph/Layout/Vertical.php vtigercrm/trunk/Image/Graph/Legend.php vtigercrm/trunk/Image/Graph/Line/ vtigercrm/trunk/Image/Graph/Line/Array.php vtigercrm/trunk/Image/Graph/Line/Dashed.php vtigercrm/trunk/Image/Graph/Line/Dotted.php vtigercrm/trunk/Image/Graph/Line/Formatted.php vtigercrm/trunk/Image/Graph/Line/Solid.php vtigercrm/trunk/Image/Graph/Logo.php vtigercrm/trunk/Image/Graph/Marker/ vtigercrm/trunk/Image/Graph/Marker.php vtigercrm/trunk/Image/Graph/Marker/Array.php vtigercrm/trunk/Image/Graph/Marker/Asterisk.php vtigercrm/trunk/Image/Graph/Marker/Average.php vtigercrm/trunk/Image/Graph/Marker/Box.php vtigercrm/trunk/Image/Graph/Marker/Bubble.php vtigercrm/trunk/Image/Graph/Marker/Circle.php vtigercrm/trunk/Image/Graph/Marker/Cross.php vtigercrm/trunk/Image/Graph/Marker/Diamond.php vtigercrm/trunk/Image/Graph/Marker/Icon.php vtigercrm/trunk/Image/Graph/Marker/Pinpoint.php vtigercrm/trunk/Image/Graph/Marker/Plus.php vtigercrm/trunk/Image/Graph/Marker/Pointing/ vtigercrm/trunk/Image/Graph/Marker/Pointing.php vtigercrm/trunk/Image/Graph/Marker/Pointing/Angular.php vtigercrm/trunk/Image/Graph/Marker/Pointing/Radial.php vtigercrm/trunk/Image/Graph/Marker/ReversePinpoint.php vtigercrm/trunk/Image/Graph/Marker/Star.php vtigercrm/trunk/Image/Graph/Marker/Triangle.php vtigercrm/trunk/Image/Graph/Marker/Value.php vtigercrm/trunk/Image/Graph/Plot/ vtigercrm/trunk/Image/Graph/Plot.php vtigercrm/trunk/Image/Graph/Plot/Area.php vtigercrm/trunk/Image/Graph/Plot/Band.php vtigercrm/trunk/Image/Graph/Plot/Bar.php vtigercrm/trunk/Image/Graph/Plot/BoxWhisker.php vtigercrm/trunk/Image/Graph/Plot/CandleStick.php vtigercrm/trunk/Image/Graph/Plot/Dot.php vtigercrm/trunk/Image/Graph/Plot/Fit/ vtigercrm/trunk/Image/Graph/Plot/Fit/Line.php vtigercrm/trunk/Image/Graph/Plot/Impulse.php vtigercrm/trunk/Image/Graph/Plot/Line.php vtigercrm/trunk/Image/Graph/Plot/Odo.php vtigercrm/trunk/Image/Graph/Plot/Pie.php vtigercrm/trunk/Image/Graph/Plot/Radar.php vtigercrm/trunk/Image/Graph/Plot/Smoothed/ vtigercrm/trunk/Image/Graph/Plot/Smoothed/Area.php vtigercrm/trunk/Image/Graph/Plot/Smoothed/Bezier.php vtigercrm/trunk/Image/Graph/Plot/Smoothed/Line.php vtigercrm/trunk/Image/Graph/Plot/Smoothed/Radar.php vtigercrm/trunk/Image/Graph/Plot/Step.php vtigercrm/trunk/Image/Graph/Plotarea/ vtigercrm/trunk/Image/Graph/Plotarea.php vtigercrm/trunk/Image/Graph/Plotarea/Element.php vtigercrm/trunk/Image/Graph/Plotarea/Map.php vtigercrm/trunk/Image/Graph/Plotarea/Radar.php vtigercrm/trunk/Image/Graph/Simple.php vtigercrm/trunk/Image/Graph/Title.php vtigercrm/trunk/Image/Graph/Tool.php vtigercrm/trunk/PEAR.php vtigercrm/trunk/include/utils/GraphUtils.php Removed: vtigercrm/trunk/jpgraph/ Modified: vtigercrm/trunk/modules/Dashboard/Chart_lead_source_by_outcome.php vtigercrm/trunk/modules/Dashboard/Chart_outcome_by_month.php vtigercrm/trunk/modules/Dashboard/Chart_pipeline_by_lead_source.php vtigercrm/trunk/modules/Dashboard/Chart_pipeline_by_sales_stage.php vtigercrm/trunk/modules/Dashboard/display_charts.php vtigercrm/trunk/modules/Dashboard/horizontal_bargraph.php vtigercrm/trunk/modules/Dashboard/pie_graph.php vtigercrm/trunk/modules/Dashboard/vertical_bargraph.php vtigercrm/trunk/modules/Potentials/Charts.php Modified: vtigercrm/trunk/modules/Dashboard/Chart_lead_source_by_outcome.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/Chart_lead_source_by_outcome.php (original) +++ vtigercrm/trunk/modules/Dashboard/Chart_lead_source_by_outcome.php Wed Apr 5 02:24:29 2006 @@ -101,10 +101,6 @@ $cache_file_name = $id_hash."_lead_source_by_outcome_".$current_language."_".crc32(implode('',$datax)).".png"; $log->debug("cache file name is: $cache_file_name"); -if (substr(phpversion(), 0, 1) == "5") { // php5 } - echo "Charts not supported in PHP 5."; -} -else { if(isPermitted('Potentials','index')=="yes") { $draw_this = new jpgraph(); @@ -147,4 +143,4 @@ { echo $mod_strings['LBL_NO_PERMISSION']; } -}?> +?> Modified: vtigercrm/trunk/modules/Dashboard/Chart_outcome_by_month.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/Chart_outcome_by_month.php (original) +++ vtigercrm/trunk/modules/Dashboard/Chart_outcome_by_month.php Wed Apr 5 02:24:29 2006 @@ -102,10 +102,6 @@ $cache_file_name = $id_hash."_outcome_by_month_".$current_language."_".crc32($date_start.$date_end).".png"; $log->debug("cache file name is: $cache_file_name"); -if (substr(phpversion(), 0, 1) == "5") { // php5 } - echo "Charts not supported in PHP 5."; -} -else { if(isPermitted('Potentials','index')=="yes") { $draw_this = new jpgraph(); @@ -170,4 +166,4 @@ echo $mod_strings['LBL_NO_PERMISSION']; } echo get_validate_chart_js(); -}?> +?> Modified: vtigercrm/trunk/modules/Dashboard/Chart_pipeline_by_lead_source.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/Chart_pipeline_by_lead_source.php (original) +++ vtigercrm/trunk/modules/Dashboard/Chart_pipeline_by_lead_source.php Wed Apr 5 02:24:29 2006 @@ -101,10 +101,6 @@ $cache_file_name = $id_hash."_pipeline_by_lead_source_".$current_language."_".crc32(implode('',$datax)).".png"; $log->debug("cache file name is: $cache_file_name"); -if (substr(phpversion(), 0, 1) == "5") { // php5 } - echo "Charts not supported in PHP 5."; -} -else { if(isPermitted('Potentials','index')=="yes") { $draw_this = new jpgraph(); @@ -147,4 +143,4 @@ { echo $mod_strings['LBL_NO_PERMISSION']; } -}?> +?> Modified: vtigercrm/trunk/modules/Dashboard/Chart_pipeline_by_sales_stage.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/Chart_pipeline_by_sales_stage.php (original) +++ vtigercrm/trunk/modules/Dashboard/Chart_pipeline_by_sales_stage.php Wed Apr 5 02:24:29 2006 @@ -136,10 +136,6 @@ $cache_file_name = $id_hash."_pipeline_".$current_language."_".crc32(implode('',$datax)).$date_start.$date_end.".png"; $log->debug("cache file name is: $cache_file_name"); -if (substr(phpversion(), 0, 1) == "5") { // php5 } - echo "Charts not supported in PHP 5."; -} -else { if(isPermitted('Potentials','index')=="yes") { $draw_this = new jpgraph(); @@ -210,4 +206,4 @@ echo $mod_strings['LBL_NO_PERMISSION']; } //echo get_validate_chart_js(); -}?> +?> Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/display_charts.php (original) +++ vtigercrm/trunk/modules/Dashboard/display_charts.php Wed Apr 5 02:24:29 2006 @@ -110,7 +110,7 @@ $test_target_val=$graph_details[7]; - $width=350; + $width=600; $height=400; $top=30; $left=140; @@ -205,7 +205,7 @@
    "; - $sHTML .= render_graph($tmp_dir."pie_".$cache_file_name,$html_imagename."_pie",$cnt_val,$name_val,450,300,40,$right,$top,$bottom,$title,$target_val,"pie"); + $sHTML .= render_graph($tmp_dir."pie_".$cache_file_name,$html_imagename."_pie",$cnt_val,$name_val,$width,$height,40,$right,$top,$bottom,$title,$target_val,"pie"); $sHTML .= "
    '; - $dir_name=getModuleDirName($module); - $output .= ''.$navigation_array['allflag'].' '; + $output .= ''.$navigation_array['allflag'].' '; if(($navigation_array['prev']) != 0) { - $output .= ' '; - $output .= ' '; + $output .= ' '; + $output .= ' '; } else @@ -1815,13 +1811,13 @@ $output .=''.$i.' '; } else{ - $output .= ''.$i.' '; + $output .= ''.$i.' '; } } if(($navigation_array['next']) !=0) { - $output .= ' '; - $output .= ' '; + $output .= ' '; + $output .= ' '; } else { From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 05:41:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 09:41:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4898 - /vtigercrm/trunk/modules/CustomView/CustomView.php Message-ID: <20060405094103.04B1F5C70D2@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 03:40:54 2006 New Revision: 4898 Log: query has been changed to get groupname and username in list view query Modified: vtigercrm/trunk/modules/CustomView/CustomView.php Modified: vtigercrm/trunk/modules/CustomView/CustomView.php ============================================================================== --- vtigercrm/trunk/modules/CustomView/CustomView.php (original) +++ vtigercrm/trunk/modules/CustomView/CustomView.php Wed Apr 5 03:40:54 2006 @@ -1135,17 +1135,17 @@ $listviewquery = substr($listquery, strpos($listquery,'from'),strlen($listquery)); if($module == "Activities" || $module == "Emails") { - $query = "select ".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid,activity.* ".$listviewquery; + $query = "select groups.groupname ,users.user_name,".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid,activity.* ".$listviewquery; }else if($module == "Notes") { - $query = "select ".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid,notes.* ".$listviewquery; + $query = "select groups.groupname ,users.user_name,".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid,notes.* ".$listviewquery; } else if($module == "Products") { - $query = "select ".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid,products.* ".$listviewquery; + $query = "select groups.groupname ,users.user_name,".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid,products.* ".$listviewquery; }else { - $query = "select ".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid ".$listviewquery; + $query = "select groups.groupname ,users.user_name,".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid ".$listviewquery; } $stdfiltersql = $this->getCVStdFilterSQL($viewid); $advfiltersql = $this->getCVAdvFilterSQL($viewid); From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 05:43:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 09:43:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4899 - /vtigercrm/trunk/themes/blue/images/currencydelete.gif Message-ID: <20060405094328.8B5055C7385@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 03:43:18 2006 New Revision: 4899 Log: image has been included for currency delete Added: vtigercrm/trunk/themes/blue/images/currencydelete.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 05:49:01 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 09:49:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4900 - /vtigercrm/trunk/pkg/bin/stopvTiger.bat Message-ID: <20060405094901.4B0875C70D2@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 03:48:52 2006 New Revision: 4900 Log: service name changed Modified: vtigercrm/trunk/pkg/bin/stopvTiger.bat Modified: vtigercrm/trunk/pkg/bin/stopvTiger.bat ============================================================================== --- vtigercrm/trunk/pkg/bin/stopvTiger.bat (original) +++ vtigercrm/trunk/pkg/bin/stopvTiger.bat Wed Apr 5 03:48:52 2006 @@ -34,11 +34,11 @@ echo "" echo "stopping vtigercrm5_beta apache service" echo "" -bin\apache -n vtigercrm4_5 -k stop +bin\apache -n vtigercrm5_beta -k stop echo "" echo "uninstalling vtigercrm5_beta apache service" echo "" -bin\apache -k uninstall -n vtigercrm4_5 +bin\apache -k uninstall -n vtigercrm5_beta rem .\bin\ShutdownApache.exe logs\httpd.pid goto StopMySQL From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 06:08:29 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 10:08:29 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4901 - /vtigercrm/trunk/include/utils/CommonUtils.php Message-ID: <20060405100829.4FF8B5C73AE@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 04:08:23 2006 New Revision: 4901 Log: API Docs added for functions 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 Wed Apr 5 04:08:23 2006 @@ -20,25 +20,9 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ - - -/** This function returns the name of the person. - * It currently returns "first last". It should not put the space if either name is not available. - * It should not return errors if either name is not available. - * If no names are present, it will return "" - * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. - * All Rights Reserved. - * Contributor(s): ______________________________________.. - */ - require_once('include/database/PearDatabase.php'); require_once('include/ComboUtil.php'); //new require_once('include/utils/utils.php'); //new - - - - - /** * Check if user id belongs to a system admin. @@ -832,7 +816,6 @@ $block_detail = Array(); $getBlockinfo = ""; $query="select blockid,blocklabel,show_title from blocks where tabid=$tabid and $disp_view=0 and visible = 0 order by sequence"; - //echo $query; $result = $adb->query($query); $noofrows = $adb->num_rows($result); @@ -861,19 +844,16 @@ if($block_label=='LBL_RELATED_PRODUCTS') { $getBlockInfo=getProductDetailsBlockInfo($mode,$module); - //echo '
    ';print_r($getBlockInfo);echo '
    '; } else { $getBlockInfo=getBlockInformation($module,$adb->query_result($result,$i,"blockid"),$mode,$col_fields,$tabid,$info_type); - //echo '
    ';print_r($getBlockInfo);echo '
    '; } } if(is_array($getBlockInfo)) { $block_detail[$block_title] = $getBlockInfo; - //echo '
    ';print_r($block_detail);echo '
    '; } } else @@ -906,7 +886,6 @@ } } - //echo '
    ';print_r($block_detail);echo '
    '; return $block_detail; } @@ -944,6 +923,11 @@ return $blockid; } +/** + * This function is used to get the Parent and Child tab relation array. + * Takes no parameter and get the data from parent_tabdata.php and tabdata.php + * This returns array type value + */ function getHeaderArray() { @@ -988,6 +972,12 @@ return $relatedtabs; } +/** + * This function is used to get the Parent Tab name for a given parent tab id. + * Takes the input parameter as $parenttabid - Parent tab id + * This returns value string type + */ + function getParentTabName($parenttabid) { global $adb; @@ -1004,6 +994,13 @@ } return $parent_tabname; } + +/** + * This function is used to get the Parent Tab name for a given module. + * Takes the input parameter as $module - module name + * This returns value string type + */ + function getParentTabFromModule($module) { @@ -1032,8 +1029,11 @@ } /** - * This function returns the parenttab and for the given module. - */ + * This function is used to get the Parent Tab name for a given module. + * Takes no parameter but gets the parenttab value from form request + * This returns value string type + */ + function getParentTab() { if(isset($_REQUEST['parenttab']) && $_REQUEST['parenttab'] !='') @@ -1216,7 +1216,13 @@ 'mode'=>$mode); return $return_value; } -//function to check whether same product name exists + + /** + * This function is used to generate file name if more than one image with same name is added to a given Product. + * Param $filename - product file name + * Param $exist - number time the file name is repeated. + */ + function file_exist_fn($filename,$exist) { global $uploaddir; @@ -1263,7 +1269,7 @@ } /** - * This function is used get the User Count . + * This function is used get the User Count. * It returns the array which has the total users ,admin users,and the non admin users */ @@ -1280,7 +1286,10 @@ } /** - * This function is used to create folders recursively . + * This function is used to create folders recursively. + * Param $dir - directory name + * Param $mode - directory access mode + * Param $recursive - create directory recursive, default true */ function mkdirs($dir, $mode = 0777, $recursive = true) @@ -1297,6 +1306,9 @@ return FALSE; } +/**This function returns the module name which has been set as default home view for a given user. + * Takes no parameter, but uses the user object $current_user. + */ function DefHomeView() { global $adb; @@ -1332,9 +1344,6 @@ } } } - - - /** * Function to write the tabid and name to a flat file tabdata.txt so that the data @@ -1511,11 +1520,4 @@ return $filepath; } - - - - - - - ?> From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 06:09:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 10:09:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4902 - /vtigercrm/trunk/include/utils/ListViewUtils.php Message-ID: <20060405100921.585185C73AE@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 04:09:15 2006 New Revision: 4902 Log: query has been changed 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 Wed Apr 5 04:09:15 2006 @@ -1372,7 +1372,7 @@ } if($module == "Activities") { - $query = " select crmentity.crmid,crmentity.smownerid,crmentity.setype, activity.*, contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, account.accountid, account.accountname, recurringevents.recurringtype from activity inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid= cntactivityrel.contactid left join seactivityrel on seactivityrel.activityid = activity.activityid left join activitygrouprelation on activitygrouprelation.activityid=crmentity.crmid left join groups on groups.groupname=activitygrouprelation.groupname left outer join account on account.accountid = contactdetails.accountid left outer join recurringevents on recurringevents.activityid=activity.activityid WHERE crmentity.deleted=0 and (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task') ".$where ; + $query = " select crmentity.crmid,crmentity.smownerid,crmentity.setype, activity.*, contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, account.accountid, account.accountname, recurringevents.recurringtype from activity inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid= cntactivityrel.contactid left join seactivityrel on seactivityrel.activityid = activity.activityid left join activitygrouprelation on activitygrouprelation.activityid=crmentity.crmid left join groups on groups.groupname=activitygrouprelation.groupname left join users on users.id=crmentity.smownerid left outer join account on account.accountid = contactdetails.accountid left outer join recurringevents on recurringevents.activityid=activity.activityid WHERE crmentity.deleted=0 and (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task') ".$where ; if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3) { $sec_parameter=getListViewSecurityParameter($module); From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 06:21:38 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 10:21:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4903 - /vtigercrm/trunk/modules/CustomView/CustomView.php Message-ID: <20060405102138.5073E5C739F@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 04:21:33 2006 New Revision: 4903 Log: query has been changed for notes and products Modified: vtigercrm/trunk/modules/CustomView/CustomView.php Modified: vtigercrm/trunk/modules/CustomView/CustomView.php ============================================================================== --- vtigercrm/trunk/modules/CustomView/CustomView.php (original) +++ vtigercrm/trunk/modules/CustomView/CustomView.php Wed Apr 5 04:21:33 2006 @@ -1138,11 +1138,11 @@ $query = "select groups.groupname ,users.user_name,".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid,activity.* ".$listviewquery; }else if($module == "Notes") { - $query = "select groups.groupname ,users.user_name,".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid,notes.* ".$listviewquery; + $query = "select ".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid,notes.* ".$listviewquery; } else if($module == "Products") { - $query = "select groups.groupname ,users.user_name,".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid,products.* ".$listviewquery; + $query = "select ".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid,products.* ".$listviewquery; }else { $query = "select groups.groupname ,users.user_name,".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid ".$listviewquery; From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 06:37:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 10:37:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4904 - /vtigercrm/trunk/modules/Users/Security.php Message-ID: <20060405103703.DA1645C73C7@vtiger.fosslabs.com> Author: don Date: Wed Apr 5 04:36:59 2006 New Revision: 4904 Log: parentmodule marketing added and campagins moved to that module Modified: vtigercrm/trunk/modules/Users/Security.php Modified: vtigercrm/trunk/modules/Users/Security.php ============================================================================== --- vtigercrm/trunk/modules/Users/Security.php (original) +++ vtigercrm/trunk/modules/Users/Security.php Wed Apr 5 04:36:59 2006 @@ -2040,48 +2040,51 @@ } //added by jeri for category view from db $this->db->query("insert into parenttab values - (1,'My Home Page',1,0), - (2,'Sales',2,0), - (3,'Support',3,0), - (5,'Analytics',5,0), - (6,'Inventory',6,0), - (7,'Tools',7,0), - (8,'Settings',8,0)"); + (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) + "); $this->db->query("insert into parenttabrel values - (1,9,2), - (1,17,3), - (1,10,4), - (1,3,1), - (2,7,1), - (2,6,2), - (2,4,3), - (2,2,4), - (2,20,5), - (2,22,6), - (2,23,7), - (2,14,8), - (2,19,9), - (2,8,10), - (3,13,1), - (3,15,2), - (3,6,3), - (3,4,4), - (3,14,5), - (3,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), - (2,26,7), - (7,27,2), - (7,8,3)"); + (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)"); + //rss feeds From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 06:47:04 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 10:47:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4905 - /vtigercrm/trunk/Smarty/templates/QuickCreate.tpl Message-ID: <20060405104704.5E77D5C3719@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 04:46:58 2006 New Revision: 4905 Log: Added QuickCreate tpl file for smartification of new quick create UI - Ahmed Added: vtigercrm/trunk/Smarty/templates/QuickCreate.tpl From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 06:47:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 10:47:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4906 - /vtigercrm/trunk/quickcreate.php Message-ID: <20060405104800.12A455C73C7@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 04:47:52 2006 New Revision: 4906 Log: Added QuickCreate php file for smartification of new quick create UI - Ahmed Added: vtigercrm/trunk/quickcreate.php From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 06:52:14 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 10:52:14 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4907 - /vtigercrm/trunk/themes/blue/style.css Message-ID: <20060405105214.507175C371A@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 04:52:09 2006 New Revision: 4907 Log: Added quick create css - Ahmed Modified: vtigercrm/trunk/themes/blue/style.css Modified: vtigercrm/trunk/themes/blue/style.css ============================================================================== --- vtigercrm/trunk/themes/blue/style.css (original) +++ vtigercrm/trunk/themes/blue/style.css Wed Apr 5 04:52:09 2006 @@ -1555,3 +1555,39 @@ background-color:#000066; opacity:.7; } + +/*quickcreate css*/ + +.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:#ededed; + +} From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 07:10:19 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 11:10:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4908 - /vtigercrm/trunk/Smarty/templates/Header.tpl Message-ID: <20060405111019.AFC155C73C8@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 05:10:11 2006 New Revision: 4908 Log: Made changes in the Header.tpl file to get the new quick create form - ahmed 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 Wed Apr 5 05:10:11 2006 @@ -56,7 +56,7 @@ {foreach key=maintabs item=detail from=$HEADERS} {if $maintabs eq $CATEGORY} - {foreach key=number item=module from=$detail} @@ -255,6 +255,7 @@
    +
    + + + {* Begining of Slide Menu *} From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 07:15:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 11:15:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4909 - /vtigercrm/trunk/include/utils/CommonUtils.php Message-ID: <20060405111500.5A97B5C73D2@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 05:14:56 2006 New Revision: 4909 Log: Added Quick Create Function - ahmed 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 Wed Apr 5 05:14:56 2006 @@ -1520,4 +1520,48 @@ return $filepath; } + + + +function QuickCreate($module) +{ + global $adb; + global $mod_strings; + +$tabid = getTabid($module); +$category = getParentTab(); +$quickcreate_query = "select * from field where quickcreate=0 and tabid = ".$tabid." order by quickcreatesequence"; +$result = $adb->query($quickcreate_query); +$noofrows = $adb->num_rows($result); + +for($i=0; $i<$noofrows; $i++) +{ + $fieldtablename = $adb->query_result($result,$i,'tablename'); + $fieldcolname = $adb->query_result($result,$i,"columnname"); + $uitype = $adb->query_result($result,$i,"uitype"); + $fieldname = $adb->query_result($result,$i,"fieldname"); + $fieldlabel = $adb->query_result($result,$i,"fieldlabel"); + $maxlength = $adb->query_result($result,$i,"maximumlength"); + $generatedtype = $adb->query_result($result,$i,"generatedtype"); + $custfld = getOutputHtml($uitype, $fieldname, $fieldlabel, $maxlength, $col_fields,$generatedtype,$module); + //echo '
    ';print_r($custfld);echo '
    '; + $qcreate_arr[]=$custfld; +} +for ($i=0,$j=0;$i $key1,1 => $key2); +} + return $return_data; +} + + ?> From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 07:18:46 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 11:18:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4910 - in /vtigercrm/trunk/themes/blue/images: qcBg.gif qcName.gif Message-ID: <20060405111846.EECB85C73D2@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 05:18:40 2006 New Revision: 4910 Log: Added two images required for quickcreate Added: vtigercrm/trunk/themes/blue/images/qcBg.gif (with props) vtigercrm/trunk/themes/blue/images/qcName.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 07:38:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 11:38:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4911 - /vtigercrm/trunk/modules/Settings/CurrencyListView.php Message-ID: <20060405113843.EF95E5C73CE@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 05:38:39 2006 New Revision: 4911 Log: image name has been changed Modified: vtigercrm/trunk/modules/Settings/CurrencyListView.php Modified: vtigercrm/trunk/modules/Settings/CurrencyListView.php ============================================================================== --- vtigercrm/trunk/modules/Settings/CurrencyListView.php (original) +++ vtigercrm/trunk/modules/Settings/CurrencyListView.php Wed Apr 5 05:38:39 2006 @@ -33,7 +33,7 @@ if($temprow["defaultid"] != '-11') { $currency_element['name'] = ''.$temprow["currency_name"].''; - $currency_element['tool']= 'Edit | Delete'; + $currency_element['tool']= 'Edit | Delete'; } else $currency_element['tool']= ''; From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 07:45:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 11:45:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4912 - /vtigercrm/trunk/modules/CustomView/CustomView.php Message-ID: <20060405114551.170335C73DD@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 05:45:44 2006 New Revision: 4912 Log: changes made for campaign and vendors modules user and group relation Modified: vtigercrm/trunk/modules/CustomView/CustomView.php Modified: vtigercrm/trunk/modules/CustomView/CustomView.php ============================================================================== --- vtigercrm/trunk/modules/CustomView/CustomView.php (original) +++ vtigercrm/trunk/modules/CustomView/CustomView.php Wed Apr 5 05:45:44 2006 @@ -1143,7 +1143,16 @@ else if($module == "Products") { $query = "select ".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid,products.* ".$listviewquery; - }else + } + else if($module == "Campaigns") + { + $query = "select users.user_name,".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid ".$listviewquery; + } + else if($module == "Vendors") + { + $query = "select ".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid ".$listviewquery; + } + else { $query = "select groups.groupname ,users.user_name,".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid ".$listviewquery; } From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 08:46:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 12:46:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4913 - /vtigercrm/trunk/include/utils/ListViewUtils.php Message-ID: <20060405124634.485515C73DC@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 06:46:29 2006 New Revision: 4913 Log: listview query has been changed for leads and campaigns modules 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 Wed Apr 5 06:46:29 2006 @@ -1343,7 +1343,7 @@ } if($module == "Leads") { - $query = "select crmentity.crmid, leaddetails.firstname, leaddetails.lastname, leaddetails.company, leadaddress.phone, leadsubdetails.website, leaddetails.email, crmentity.smownerid, leadscf.* from leaddetails inner join crmentity on crmentity.crmid=leaddetails.leadid inner join leadsubdetails on leadsubdetails.leadsubscriptionid=leaddetails.leadid inner join leadaddress on leadaddress.leadaddressid=leadsubdetails.leadsubscriptionid inner join leadscf on leaddetails.leadid = leadscf.leadid left join leadgrouprelation on leadscf.leadid=leadgrouprelation.leadid left join groups on groups.groupname=leadgrouprelation.groupname where crmentity.deleted=0 and leaddetails.converted=0 "; + $query = "select crmentity.crmid, leaddetails.firstname, leaddetails.lastname, leaddetails.company, leadaddress.phone, leadsubdetails.website, leaddetails.email, crmentity.smownerid, leadscf.* from leaddetails inner join crmentity on crmentity.crmid=leaddetails.leadid inner join leadsubdetails on leadsubdetails.leadsubscriptionid=leaddetails.leadid inner join leadaddress on leadaddress.leadaddressid=leadsubdetails.leadsubscriptionid inner join leadscf on leaddetails.leadid = leadscf.leadid left join leadgrouprelation on leadscf.leadid=leadgrouprelation.leadid left join groups on groups.groupname=leadgrouprelation.groupname left join users on users.id=crmentity.smownerid where crmentity.deleted=0 and leaddetails.converted=0 "; if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3) { $sec_parameter=getListViewSecurityParameter($module); @@ -1448,7 +1448,7 @@ { //Query modified to sort by assigned to //query modified -Code contribute by Geoff(http://forums.vtiger.com/viewtopic.php?t=3376) - $query = "select crmentity.*,campaign.* from campaign inner join crmentity on crmentity.crmid = campaign.campaignid where crmentity.deleted=0".$where; + $query = "select crmentity.*,campaign.* from campaign inner join crmentity on crmentity.crmid = campaign.campaignid left join users on users.id=crmentity.smownerid where crmentity.deleted=0".$where; if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3) { $sec_parameter=getListViewSecurityParameter($module); From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 10:21:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 14:21:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4914 - /vtigercrm/trunk/modules/Settings/language/en_us.lang.php Message-ID: <20060405142113.2C4535C7409@vtiger.fosslabs.com> Author: don Date: Wed Apr 5 08:21:08 2006 New Revision: 4914 Log: lang strings added for email notification 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 Wed Apr 5 08:21:08 2006 @@ -540,6 +540,9 @@ 'LBL_ANNOUNCEMENT'=>'Announcements', 'LBL_SETTING_ANNOUNCEMENT'=>'Announcement', 'LBL_ANNOUNCEMENT_INFO'=>'Type the announcement text below, and click the save button.', +'LBL_EMAIL_CONTENTS'=>'Email Contents', +'LBL_SUBJECT'=>'Subject', +'LBL_MESSAGE'=>'Message', ); From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 10:22:08 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 14:22:08 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4915 - in /vtigercrm/trunk/Smarty/templates/Settings: EditEmailNotofication.tpl EmailNotofication.tpl EmailNotoficationContents.tpl Message-ID: <20060405142208.BE5E95C7409@vtiger.fosslabs.com> Author: don Date: Wed Apr 5 08:21:59 2006 New Revision: 4915 Log: files added as the new UI integrated and Smartified for Email notification Added: vtigercrm/trunk/Smarty/templates/Settings/EditEmailNotofication.tpl vtigercrm/trunk/Smarty/templates/Settings/EmailNotofication.tpl (with props) vtigercrm/trunk/Smarty/templates/Settings/EmailNotoficationContents.tpl From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 10:23:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 14:23:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4916 - in /vtigercrm/trunk/modules/Users: EditNotification.php SaveNotification.php listnotificationschedulers.php Message-ID: <20060405142322.527195C73F6@vtiger.fosslabs.com> Author: don Date: Wed Apr 5 08:23:15 2006 New Revision: 4916 Log: new UI integrated for EmailNotification Modified: vtigercrm/trunk/modules/Users/EditNotification.php vtigercrm/trunk/modules/Users/SaveNotification.php vtigercrm/trunk/modules/Users/listnotificationschedulers.php Modified: vtigercrm/trunk/modules/Users/EditNotification.php ============================================================================== --- vtigercrm/trunk/modules/Users/EditNotification.php (original) +++ vtigercrm/trunk/modules/Users/EditNotification.php Wed Apr 5 08:23:15 2006 @@ -9,52 +9,40 @@ * ********************************************************************************/ -require_once('XTemplate/xtpl.php'); +require_once('Smarty_setup.php'); global $mod_strings; global $app_strings; global $app_list_strings; - -echo get_module_title($mod_strings['LBL_MODULE_NAME'], $mod_strings['LBL_MODULE_NAME'].' : '.$mod_strings['LBL_HDR_EMAIL_SCHDS'], true); -echo '

    '; global $adb; global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); +$smarty = new vtigerCRM_Smarty; if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { $id = $_REQUEST['record']; - $mode = 'edit'; - $xtpl=new XTemplate ('modules/Users/EditNotification.html'); - $xtpl->assign("MOD", $mod_strings); - $xtpl->assign("APP", $app_strings); - + $sql="select * from notificationscheduler where schedulednotificationid = ".$id; $result = $adb->query($sql); if($adb->num_rows($result) ==1); { - $label = $mod_strings[$adb->query_result($result,0,'label')]; - $notification_subject = $adb->query_result($result,0,'notificationsubject'); - $notification_body = $adb->query_result($result,0,'notificationbody'); + $notification = Array(); + $notification['active'] = $adb->query_result($result,0,'active'); + $notification['subject'] = $adb->query_result($result,0,'notificationsubject'); + $notification['body'] = $adb->query_result($result,0,'notificationbody'); + $notification['name'] = $mod_strings[$adb->query_result($result,0,'label')]; + $notification['id'] = $adb->query_result($result,0,'schedulednotificationid'); + } + + $smarty->assign("NOTIFY_DETAILS",$notification); +} - $xtpl->assign("RETURN_MODULE","Users"); - $xtpl->assign("RETURN_ACTION","listnotificationschedulers"); - $xtpl->assign("RECORD_ID",$id); - - if (isset($label)) - $xtpl->assign("LABEL",$label); - if (isset($notification_subject)) - $xtpl->assign("SUBNOTIFY",$notification_subject); - if (isset($notification_body)) - $xtpl->assign("BODYNOTIFY",$notification_body); - } - $xtpl->parse("main"); - $xtpl->out("main"); -} -else -{ - header("Location:index.php?module=Users&action=listnotificationschedulers"); -} +$smarty->assign("MOD", return_module_language($current_language,'Settings')); +$smarty->assign("IMAGE_PATH",$image_path); +$smarty->assign("APP", $app_strings); +$smarty->assign("CMOD", $mod_strings); +$smarty->display("Settings/EditEmailNotofication.tpl"); ?> Modified: vtigercrm/trunk/modules/Users/SaveNotification.php ============================================================================== --- vtigercrm/trunk/modules/Users/SaveNotification.php (original) +++ vtigercrm/trunk/modules/Users/SaveNotification.php Wed Apr 5 08:23:15 2006 @@ -14,9 +14,9 @@ if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { - $query="UPDATE notificationscheduler set notificationsubject='".$_REQUEST['notifysubject']."', notificationbody='".$_REQUEST['notifybody']."' where schedulednotificationid=".$_REQUEST['record']; + $query="UPDATE notificationscheduler set notificationsubject='".$_REQUEST['notifysubject']."', notificationbody='".$_REQUEST['notifybody']."', active =".$_REQUEST['active']." where schedulednotificationid=".$_REQUEST['record']; $adb->query($query); } -$loc = "Location: index.php?action=listnotificationschedulers&module=Users"; +$loc = "Location: index.php?action=UsersAjax&file=listnotificationschedulers&module=Users&directmode=ajax"; header($loc); ?> Modified: vtigercrm/trunk/modules/Users/listnotificationschedulers.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 10:24:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 14:24:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4917 - /vtigercrm/trunk/modules/Users/EditNotification.html Message-ID: <20060405142456.9EE1F5C73FB@vtiger.fosslabs.com> Author: don Date: Wed Apr 5 08:24:52 2006 New Revision: 4917 Log: file removed as the email notofication has been smartified Removed: vtigercrm/trunk/modules/Users/EditNotification.html From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 10:32:08 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 14:32:08 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4918 - /vtigercrm/trunk/modules/Users/listnotificationschedulers.php Message-ID: <20060405143208.532FA5C7404@vtiger.fosslabs.com> Author: don Date: Wed Apr 5 08:31:58 2006 New Revision: 4918 Log: status changed into images Modified: vtigercrm/trunk/modules/Users/listnotificationschedulers.php Modified: vtigercrm/trunk/modules/Users/listnotificationschedulers.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 10:37:19 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 14:37:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4919 - in /vtigercrm/trunk/Smarty/templates/Settings: EditEmailNotofication.tpl EmailNotofication.tpl EmailNotoficationContents.tpl Message-ID: <20060405143719.7986C5C7410@vtiger.fosslabs.com> Author: don Date: Wed Apr 5 08:37:14 2006 New Revision: 4919 Log: file removed to change the names Removed: vtigercrm/trunk/Smarty/templates/Settings/EditEmailNotofication.tpl vtigercrm/trunk/Smarty/templates/Settings/EmailNotofication.tpl vtigercrm/trunk/Smarty/templates/Settings/EmailNotoficationContents.tpl From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 10:39:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 14:39:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4920 - in /vtigercrm/trunk/modules/Users: EditNotification.php listnotificationschedulers.php Message-ID: <20060405143942.8EA915C740A@vtiger.fosslabs.com> Author: don Date: Wed Apr 5 08:39:36 2006 New Revision: 4920 Log: code changed as the names for the tpl has been changed Modified: vtigercrm/trunk/modules/Users/EditNotification.php vtigercrm/trunk/modules/Users/listnotificationschedulers.php Modified: vtigercrm/trunk/modules/Users/EditNotification.php ============================================================================== --- vtigercrm/trunk/modules/Users/EditNotification.php (original) +++ vtigercrm/trunk/modules/Users/EditNotification.php Wed Apr 5 08:39:36 2006 @@ -44,5 +44,5 @@ $smarty->assign("IMAGE_PATH",$image_path); $smarty->assign("APP", $app_strings); $smarty->assign("CMOD", $mod_strings); -$smarty->display("Settings/EditEmailNotofication.tpl"); +$smarty->display("Settings/EditEmailNotification.tpl"); ?> Modified: vtigercrm/trunk/modules/Users/listnotificationschedulers.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 10:44:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 14:44:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4921 - /vtigercrm/trunk/include/utils/utils.php Message-ID: <20060405144448.E06D75C740A@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 08:44:44 2006 New Revision: 4921 Log: logs has been removed 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 Wed Apr 5 08:44:44 2006 @@ -744,8 +744,6 @@ { if (file_exists('tabdata.php') && (filesize('tabdata.php') != 0)) { - global $log; - $log->info("the file exists"); include('tabdata.php'); $tabname = array_search($tabid,$tab_info_array); } From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 10:45:25 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 05 Apr 2006 14:45:25 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4922 - /vtigercrm/trunk/include/utils/CommonUtils.php Message-ID: <20060405144525.CC4385C740A@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 08:45:21 2006 New Revision: 4922 Log: logs has been removed 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 Wed Apr 5 08:45:21 2006 @@ -242,8 +242,6 @@ if (file_exists('tabdata.php') && (filesize('tabdata.php') != 0)) { - global $log; - $log->info("the file exists"); include('tabdata.php'); $tabid= $tab_info_array[$module]; } From vtiger-tickets at vtiger.fosslabs.com Wed Apr 5 12:17:41 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 05 Apr 2006 16:17:41 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2387=3A_C?= =?utf-8?q?all_to_undefined_function_error_when_creating_portal_user?= Message-ID: <076.5ccbf2328eba397e11c342285c9a84f1@vtiger.fosslabs.com> #87: Call to undefined function error when creating portal user ---------------------------------------+------------------------------------ Reporter: james at itextension.com | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: customer portal, contacts | ---------------------------------------+------------------------------------ In Contacts module, create or edit a Contact and check the "Portal User" checkbox. The following is the error output: Fatal error: Call to undefined function: makerandompassword() in /opt/CA01.HOUSE/data/www/crm.jenxnetwork.com/public_html/modules/Contacts/Save.php on line 169 -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Apr 5 12:18:09 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 05 Apr 2006 16:18:09 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2387=3A_C?= =?utf-8?q?all_to_undefined_function_error_when_creating_portal_user?= In-Reply-To: <076.5ccbf2328eba397e11c342285c9a84f1@vtiger.fosslabs.com> References: <076.5ccbf2328eba397e11c342285c9a84f1@vtiger.fosslabs.com> Message-ID: <085.df3dc07d5f8086f9f7b8a597ec73283d@vtiger.fosslabs.com> #87: Call to undefined function error when creating portal user ------------------------------------+--------------------------------------- Reporter: james at itextension.com | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: customer portal, contacts ------------------------------------+--------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Apr 5 14:17:54 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 05 Apr 2006 18:17:54 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2387=3A_C?= =?utf-8?q?all_to_undefined_function_error_when_creating_portal_user?= In-Reply-To: <076.5ccbf2328eba397e11c342285c9a84f1@vtiger.fosslabs.com> References: <076.5ccbf2328eba397e11c342285c9a84f1@vtiger.fosslabs.com> Message-ID: <085.b551fb905891bd252b81584228de322d@vtiger.fosslabs.com> #87: Call to undefined function error when creating portal user ------------------------------------+--------------------------------------- Reporter: james at itextension.com | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: customer portal, contacts ------------------------------------+--------------------------------------- Comment (by james at itextension.com): Found the fix -- moved function makeRandomPassword() above the line where it's called. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 23:31:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 03:31:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4923 - /vtigercrm/trunk/modules/Users/EditInventoryNotification.html Message-ID: <20060406033113.8A4495C7582@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 21:31:06 2006 New Revision: 4923 Log: file removed as inventory notification smartified Removed: vtigercrm/trunk/modules/Users/EditInventoryNotification.html From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 23:33:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 03:33:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4924 - in /vtigercrm/trunk: Smarty/templates/Settings/ modules/Users/ Message-ID: <20060406033359.97BED5C7582@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 21:33:49 2006 New Revision: 4924 Log: files added and changes made accordingly to integrate new UI for Inventory notification Added: vtigercrm/trunk/Smarty/templates/Settings/EditInventoryNotify.tpl vtigercrm/trunk/Smarty/templates/Settings/InventoryNotify.tpl (with props) vtigercrm/trunk/Smarty/templates/Settings/InventoryNotifyContents.tpl Modified: vtigercrm/trunk/modules/Users/EditInventoryNotification.php vtigercrm/trunk/modules/Users/SaveInventoryNotification.php vtigercrm/trunk/modules/Users/listinventorynotifications.php Modified: vtigercrm/trunk/modules/Users/EditInventoryNotification.php ============================================================================== --- vtigercrm/trunk/modules/Users/EditInventoryNotification.php (original) +++ vtigercrm/trunk/modules/Users/EditInventoryNotification.php Wed Apr 5 21:33:49 2006 @@ -9,13 +9,10 @@ * ********************************************************************************/ -require_once('XTemplate/xtpl.php'); +require_once('Smarty_setup.php'); global $mod_strings; global $app_strings; global $app_list_strings; - -echo get_module_title($mod_strings['LBL_MODULE_NAME'], $mod_strings['INVENTORYNOTIFICATION'], true); -echo '

    '; global $adb; global $theme; @@ -23,14 +20,10 @@ $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); +$smarty = new vtigerCRM_Smarty; if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { $id = $_REQUEST['record']; - $mode = 'edit'; - $xtpl=new XTemplate ('modules/Users/EditInventoryNotification.html'); - $xtpl->assign("MOD", $mod_strings); - $xtpl->assign("APP", $app_strings); - $sql="select * from inventorynotification where notificationid = ".$id; $result = $adb->query($sql); if($adb->num_rows($result) ==1); @@ -38,23 +31,24 @@ $label = $mod_strings[$adb->query_result($result,0,'notificationname')]; $notification_subject = $adb->query_result($result,0,'notificationsubject'); $notification_body = $adb->query_result($result,0,'notificationbody'); + $notification_id = $adb->query_result($result,0,'notificationid'); - $xtpl->assign("RETURN_MODULE","Users"); - $xtpl->assign("RETURN_ACTION","listinventorynotifications"); - $xtpl->assign("RECORD_ID",$id); - - if (isset($label)) - $xtpl->assign("LABEL",$label); - if (isset($notification_subject)) - $xtpl->assign("SUBNOTIFY",$notification_subject); - if (isset($notification_body)) - $xtpl->assign("BODYNOTIFY",$notification_body); + $notification = Array(); + $notification['label'] = $label; + $notification['subject'] = $notification_subject; + $notification['body'] = $notification_body; + $notification['id'] = $notification_id; } - $xtpl->parse("main"); - $xtpl->out("main"); + + $smarty->assign("NOTIFY_DETAILS",$notification); + $smarty->assign("MOD", return_module_language($current_language,'Settings')); + $smarty->assign("IMAGE_PATH",$image_path); + $smarty->assign("APP", $app_strings); + $smarty->assign("CMOD", $mod_strings); + $smarty->display("Settings/EditInventoryNotify.tpl"); } else { - header("Location:index.php?module=Users&action=listnotificationschedulers"); + header("Location:index.php?module=Users&action=listnotificationschedulers&directmode=ajax"); } ?> Modified: vtigercrm/trunk/modules/Users/SaveInventoryNotification.php ============================================================================== --- vtigercrm/trunk/modules/Users/SaveInventoryNotification.php (original) +++ vtigercrm/trunk/modules/Users/SaveInventoryNotification.php Wed Apr 5 21:33:49 2006 @@ -17,6 +17,6 @@ $query="UPDATE inventorynotification set notificationsubject='".$_REQUEST['notifysubject']."', notificationbody='".$_REQUEST['notifybody']."' where notificationid=".$_REQUEST['record']; $adb->query($query); } -$loc = "Location: index.php?action=listinventorynotifications&module=Users"; +$loc = "Location: index.php?action=UsersAjax&file=listinventorynotifications&module=Users&directmode=ajax"; header($loc); ?> Modified: vtigercrm/trunk/modules/Users/listinventorynotifications.php ============================================================================== --- vtigercrm/trunk/modules/Users/listinventorynotifications.php (original) +++ vtigercrm/trunk/modules/Users/listinventorynotifications.php Wed Apr 5 21:33:49 2006 @@ -11,55 +11,35 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); +require_once('Smarty_setup.php'); global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; -?> - - -Untitled Document - - - - -
    - -

    - - - - - -query($query); $num_rows = $adb->num_rows($result); -$out = ''; +$output = Array(); for($i=0; $i<$num_rows; $i++) { + $out = Array(); $not_id = $adb->query_result($result,$i,'notificationid'); $not_mod = $adb->query_result($result,$i,'notificationname'); $not_des = $adb->query_result($result,$i,'label'); - if($row_list%2 ==1) - { - $ListRow = "oddListRow"; - } - else - { - $ListRow = "evenListRow"; - } - $out .= ''; - $out .=''; - $out .= ''; - $out .= ''; + $out ['notificationname'] = $mod_strings[$not_mod]; + $out ['label'] = $mod_strings[$not_des]; + $out ['id'] = $not_id; + $output [] = $out; } - - echo $out; -?> -
    '.$mod_strings[$not_mod].''.$mod_strings[$not_des].'
    - - - +$smarty->assign("NOTIFICATION",$output); +$smarty->assign("MOD", return_module_language($current_language,'Settings')); +$smarty->assign("IMAGE_PATH",$image_path); +$smarty->assign("APP", $app_strings); +$smarty->assign("CMOD", $mod_strings); + +if($_REQUEST['directmode'] != '') + $smarty->display("Settings/InventoryNotifyContents.tpl"); +else + $smarty->display("Settings/InventoryNotify.tpl"); From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 5 23:44:14 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 03:44:14 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4925 - /vtigercrm/trunk/Smarty/templates/Settings/InventoryNotifyContents.tpl Message-ID: <20060406034414.45ADE5C758A@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 5 21:44:10 2006 New Revision: 4925 Log: id passed as argument Modified: vtigercrm/trunk/Smarty/templates/Settings/InventoryNotifyContents.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings/InventoryNotifyContents.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/InventoryNotifyContents.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/InventoryNotifyContents.tpl Wed Apr 5 21:44:10 2006 @@ -12,7 +12,7 @@ {$smarty.foreach.notifyfor.iteration} {$elements.notificationname} {$elements.label} - + {/foreach} From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 05:44:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 09:44:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4926 - /vtigercrm/trunk/modules/Leads/LeadsAjax.php Message-ID: <20060406094455.E18424E42AA@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 03:44:49 2006 New Revision: 4926 Log: Added the quickcreate.php file for ajaxification of Quick Create Module - Ahmed Modified: vtigercrm/trunk/modules/Leads/LeadsAjax.php Modified: vtigercrm/trunk/modules/Leads/LeadsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Leads/LeadsAjax.php (original) +++ vtigercrm/trunk/modules/Leads/LeadsAjax.php Thu Apr 6 03:44:49 2006 @@ -45,5 +45,6 @@ else { require_once('include/Ajax/CommonAjax.php'); + require_once('quickcreate.php'); } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 05:51:04 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 09:51:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4927 - /vtigercrm/trunk/modules/Accounts/AccountsAjax.php Message-ID: <20060406095104.B517C4E36B3@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 03:50:59 2006 New Revision: 4927 Log: Added the quickcreate.php file for ajaxification of Quick Create Module - Ahmed Modified: vtigercrm/trunk/modules/Accounts/AccountsAjax.php Modified: vtigercrm/trunk/modules/Accounts/AccountsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/AccountsAjax.php (original) +++ vtigercrm/trunk/modules/Accounts/AccountsAjax.php Thu Apr 6 03:50:59 2006 @@ -46,5 +46,6 @@ else { require_once('include/Ajax/CommonAjax.php'); + require_once('quickcreate.php'); } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 05:53:54 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 09:53:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4928 - /vtigercrm/trunk/modules/Contacts/ContactsAjax.php Message-ID: <20060406095354.23B514E4338@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 03:53:48 2006 New Revision: 4928 Log: Added the quickcreate.php file for ajaxification of Quick Create Module - Ahmed Modified: vtigercrm/trunk/modules/Contacts/ContactsAjax.php Modified: vtigercrm/trunk/modules/Contacts/ContactsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/ContactsAjax.php (original) +++ vtigercrm/trunk/modules/Contacts/ContactsAjax.php Thu Apr 6 03:53:48 2006 @@ -47,5 +47,6 @@ else { require_once('include/Ajax/CommonAjax.php'); + require_once('quickcreate.php'); } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 05:54:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 09:54:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4929 - /vtigercrm/trunk/modules/Potentials/PotentialsAjax.php Message-ID: <20060406095427.E83EE4E4338@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 03:54:22 2006 New Revision: 4929 Log: Added the quickcreate.php file for ajaxification of Quick Create Module - Ahmed Modified: vtigercrm/trunk/modules/Potentials/PotentialsAjax.php Modified: vtigercrm/trunk/modules/Potentials/PotentialsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/PotentialsAjax.php (original) +++ vtigercrm/trunk/modules/Potentials/PotentialsAjax.php Thu Apr 6 03:54:22 2006 @@ -46,5 +46,6 @@ else { require_once('include/Ajax/CommonAjax.php'); + require_once('quickcreate.php'); } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 05:55:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 09:55:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4930 - /vtigercrm/trunk/modules/Activities/ActivitiesAjax.php Message-ID: <20060406095513.D7A394E489A@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 03:55:08 2006 New Revision: 4930 Log: Added the quickcreate.php file for ajaxification of Quick Create Module - Ahmed Modified: vtigercrm/trunk/modules/Activities/ActivitiesAjax.php Modified: vtigercrm/trunk/modules/Activities/ActivitiesAjax.php ============================================================================== --- vtigercrm/trunk/modules/Activities/ActivitiesAjax.php (original) +++ vtigercrm/trunk/modules/Activities/ActivitiesAjax.php Thu Apr 6 03:55:08 2006 @@ -46,5 +46,6 @@ else { require_once('include/Ajax/CommonAjax.php'); + require_once('quickcreate.php'); } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 05:56:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 09:56:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4931 - /vtigercrm/trunk/modules/Notes/NotesAjax.php Message-ID: <20060406095624.4A5994E36B3@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 03:56:18 2006 New Revision: 4931 Log: Added the quickcreate.php file for ajaxification of Quick Create Module - Ahmed Modified: vtigercrm/trunk/modules/Notes/NotesAjax.php Modified: vtigercrm/trunk/modules/Notes/NotesAjax.php ============================================================================== --- vtigercrm/trunk/modules/Notes/NotesAjax.php (original) +++ vtigercrm/trunk/modules/Notes/NotesAjax.php Thu Apr 6 03:56:18 2006 @@ -46,5 +46,6 @@ else { require_once('include/Ajax/CommonAjax.php'); + require_once('quickcreate.php'); } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 06:05:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 10:05:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4932 - /vtigercrm/trunk/modules/Emails/EmailsAjax.php Message-ID: <20060406100512.E26AC4E4C50@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 04:05:07 2006 New Revision: 4932 Log: Added the quickcreate.php file for ajaxification of Quick Create Module - Ahmed Modified: vtigercrm/trunk/modules/Emails/EmailsAjax.php Modified: vtigercrm/trunk/modules/Emails/EmailsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Emails/EmailsAjax.php (original) +++ vtigercrm/trunk/modules/Emails/EmailsAjax.php Thu Apr 6 04:05:07 2006 @@ -46,5 +46,6 @@ else { require_once('include/Ajax/CommonAjax.php'); + require_once('quickcreate.php'); } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 06:06:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 10:06:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4933 - /vtigercrm/trunk/modules/HelpDesk/HelpDeskAjax.php Message-ID: <20060406100613.E5A2D4E4C50@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 04:06:07 2006 New Revision: 4933 Log: Added the quickcreate.php file for ajaxification of Quick Create Module - Ahmed Modified: vtigercrm/trunk/modules/HelpDesk/HelpDeskAjax.php Modified: vtigercrm/trunk/modules/HelpDesk/HelpDeskAjax.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/HelpDeskAjax.php (original) +++ vtigercrm/trunk/modules/HelpDesk/HelpDeskAjax.php Thu Apr 6 04:06:07 2006 @@ -47,5 +47,6 @@ else { require_once('include/Ajax/CommonAjax.php'); + require_once('quickcreate.php'); } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 06:06:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 10:06:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4934 - /vtigercrm/trunk/modules/Products/ProductsAjax.php Message-ID: <20060406100652.93E4D4E4C50@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 04:06:47 2006 New Revision: 4934 Log: Added the quickcreate.php file for ajaxification of Quick Create Module - Ahmed Modified: vtigercrm/trunk/modules/Products/ProductsAjax.php Modified: vtigercrm/trunk/modules/Products/ProductsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Products/ProductsAjax.php (original) +++ vtigercrm/trunk/modules/Products/ProductsAjax.php Thu Apr 6 04:06:47 2006 @@ -46,5 +46,6 @@ else { require_once('include/Ajax/CommonAjax.php'); + require_once('quickcreate.php'); } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 06:07:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 10:07:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4935 - /vtigercrm/trunk/modules/Campaigns/CampaignsAjax.php Message-ID: <20060406100734.4D1E34E4C50@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 04:07:29 2006 New Revision: 4935 Log: Added the quickcreate.php file for ajaxification of Quick Create Module - Ahmed Modified: vtigercrm/trunk/modules/Campaigns/CampaignsAjax.php Modified: vtigercrm/trunk/modules/Campaigns/CampaignsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/CampaignsAjax.php (original) +++ vtigercrm/trunk/modules/Campaigns/CampaignsAjax.php Thu Apr 6 04:07:29 2006 @@ -46,5 +46,6 @@ else { require_once('include/Ajax/CommonAjax.php'); + require_once('quickcreate.php'); } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 09:09:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 13:09:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4936 - in /vtigercrm/trunk: Smarty/templates/ Smarty/templates/Settings/ modules/Settings/ modules/Settings/language/ themes/blue/images/ Message-ID: <20060406130943.5BBBD4E535F@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 07:09:20 2006 New Revision: 4936 Log: files added and code modified to integrate new UI for picklistsettings Added: vtigercrm/trunk/Smarty/templates/Settings/EditPickList.tpl vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl vtigercrm/trunk/Smarty/templates/Settings/PickListContents.tpl vtigercrm/trunk/modules/Settings/PickList.php vtigercrm/trunk/themes/blue/images/one.gif (with props) vtigercrm/trunk/themes/blue/images/picklistEditor.gif (with props) vtigercrm/trunk/themes/blue/images/two.gif (with props) Modified: vtigercrm/trunk/Smarty/templates/Settings.tpl vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl vtigercrm/trunk/modules/Settings/EditComboField.php vtigercrm/trunk/modules/Settings/UpdateComboValues.php vtigercrm/trunk/modules/Settings/language/en_us.lang.php Modified: vtigercrm/trunk/Smarty/templates/Settings.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings.tpl Thu Apr 6 07:09:20 2006 @@ -70,8 +70,8 @@ {$MOD.LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS}
    {$MOD.LBL_CUSTOM_FIELD_SETTINGS} -{$MOD.LBL_EDIT_PICKLIST_VALUES}
    -{$MOD.LBL_PICKLIST_SETTINGS} +{$MOD.LBL_EDIT_PICKLIST_VALUES}
    +{$MOD.LBL_PICKLIST_SETTINGS} {$MOD.LBL_FIELD_ORDERING_DESC}
    {$MOD.LBL_FIELD_ORDERING} Modified: vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl (original) +++ vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl Thu Apr 6 07:09:20 2006 @@ -35,7 +35,7 @@ Modified: vtigercrm/trunk/modules/Settings/EditComboField.php ============================================================================== --- vtigercrm/trunk/modules/Settings/EditComboField.php (original) +++ vtigercrm/trunk/modules/Settings/EditComboField.php Thu Apr 6 07:09:20 2006 @@ -9,41 +9,35 @@ * ********************************************************************************/ require_once('include/database/PearDatabase.php'); -require_once('XTemplate/xtpl.php'); +require_once('Smarty_setup.php'); global $mod_strings; global $app_strings; global $app_list_strings; -$fld_module=$_REQUEST["fld_module"]; -$fld_name=$_REQUEST["fld_name"]; -$tableName=$_REQUEST["table_name"]; -$columnName=$_REQUEST["column_name"]; - -echo get_module_title("Settings", $mod_strings['LBL_MODULE_NAME'].": ".$fld_module." ".$mod_strings['EditPickListValues'], true); -echo '
    '; +$tableName=$_REQUEST["fieldname"]; +$moduleName=$_REQUEST["fld_module"]; global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); -$xtpl=new XTemplate ('modules/Settings/EditField.html'); -$xtpl->assign("MOD", $mod_strings); -$xtpl->assign("APP", $app_strings); -$xtpl->assign("FIELDNAME", $fld_name); -$xtpl->assign("TABLENAME", $tableName); -$xtpl->assign("COLUMNNAME", $columnName); -$xtpl->assign("FIELDMODULE", $fld_module); +$smarty = new vtigerCRM_Smarty; $query = "select * from ".$tableName ;//." order by sortorderid"; $result = $adb->query($query); $fldVal=''; while($row = $adb->fetch_array($result)) { - $fldVal .= $row[$columnName]; + $fldVal .= $row[$tableName]; $fldVal .= "\n"; } -$xtpl->assign("FLDVALUES", $fldVal); -$xtpl->parse("main"); -$xtpl->out("main"); +$smarty->assign("ENTRIES",$fldVal); +$smarty->assign("MODULE",$moduleName); +$smarty->assign("FIELDNAME",$tableName); +$smarty->assign("MOD", return_module_language($current_language,'Settings')); +$smarty->assign("IMAGE_PATH",$image_path); +$smarty->assign("APP", $app_strings); +$smarty->assign("CMOD", $mod_strings); +$smarty->display("Settings/EditPickList.tpl"); ?> Modified: vtigercrm/trunk/modules/Settings/UpdateComboValues.php ============================================================================== --- vtigercrm/trunk/modules/Settings/UpdateComboValues.php (original) +++ vtigercrm/trunk/modules/Settings/UpdateComboValues.php Thu Apr 6 07:09:20 2006 @@ -9,16 +9,14 @@ * ********************************************************************************/ require_once('include/database/PearDatabase.php'); -$fld_module=$_REQUEST["field_module"]; -$fldName=$_REQUEST["field_name"]; +$fld_module=$_REQUEST["fld_module"]; $tableName=$_REQUEST["table_name"]; -$columnName=$_REQUEST["column_name"]; $fldPickList = $_REQUEST['listarea']; //Deleting the already existing values -//$delquery="truncate ".$tableName; $delquery="delete from ".$tableName; $adb->query($delquery); + $pickArray = explode("\n",$fldPickList); $count = count($pickArray); @@ -36,9 +34,8 @@ $query = "insert into ".$tableName." values('".$pickArray[$i]."')"; else $query = "insert into ".$tableName." values('','".$pickArray[$i]."',".$i.",1)"; - - $adb->query($query); + $adb->query($query); } } -header("Location:index.php?module=Settings&action=EditComboField&fld_module=".$fld_module."&fld_name=".$fldName."&table_name=".$tableName."&column_name=".$columnName); +header("Location:index.php?action=SettingsAjax&module=Settings&directmode=ajax&file=PickList&fld_module=".$fld_module); ?> 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 Apr 6 07:09:20 2006 @@ -543,6 +543,12 @@ 'LBL_EMAIL_CONTENTS'=>'Email Contents', 'LBL_SUBJECT'=>'Subject', 'LBL_MESSAGE'=>'Message', +'LBL_PICKLIST_EDITOR'=>'Picklist Editor', +'LBL_PICKLIST_AVAIL'=>'Picklists Availabe in', +'LBL_PICKLIST_AVAILINFO1'=>'The picklists available in', +'LBL_PICKLIST_AVAILINFO2'=>'are shown below. Click Edit to modify the contents of the list.', +'LBL_EDIT_PICKLIST'=>'Edit Pick List', +'LBL_PICKLIST_SAVEINFO'=>'Type the entries one - by - one below and click the Save button to save the list.', ); From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 09:18:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 13:18:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4937 - in /vtigercrm/trunk/Smarty/templates/Settings: EditEmailNotofication.tpl EmailNotofication.tpl EmailNotoficationContents.tpl Message-ID: <20060406131822.CBEDD4E9570@vtiger.fosslabs.com> Author: don Date: Thu Apr 6 07:18:13 2006 New Revision: 4937 Log: files added to integrate new UI for email notification Added: vtigercrm/trunk/Smarty/templates/Settings/EditEmailNotofication.tpl vtigercrm/trunk/Smarty/templates/Settings/EmailNotofication.tpl (with props) vtigercrm/trunk/Smarty/templates/Settings/EmailNotoficationContents.tpl From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 09:21:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 13:21:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4938 - /vtigercrm/trunk/quickcreate.php Message-ID: <20060406132123.7CB894E9570@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 07:21:18 2006 New Revision: 4938 Log: changes made to integrate new UI Modified: vtigercrm/trunk/quickcreate.php Modified: vtigercrm/trunk/quickcreate.php ============================================================================== --- vtigercrm/trunk/quickcreate.php (original) +++ vtigercrm/trunk/quickcreate.php Thu Apr 6 07:21:18 2006 @@ -4,7 +4,7 @@ require_once("include/utils/CommonUtils.php"); require_once("include/FormValidationUtil.php"); -global $mod_strings; +global $mod_strings,$current_user; global $app_strings; global $adb; global $app_list_strings; @@ -18,13 +18,19 @@ $smarty = new vtigerCRM_Smarty; $qcreate_array = QuickCreate("$module"); -$smarty->assign("QUICKCREATE", $qcreate_array); +$validationData = $qcreate_array['data']; +$data = split_validationdataArray($validationData); +$smarty->assign("QUICKCREATE", $qcreate_array['form']); $smarty->assign("THEME",$theme); $smarty->assign("APP",$app_strings); $smarty->assign("MOD",$mod_strings); $smarty->assign("THEME",$theme); $smarty->assign("IMAGE_PATH",$image_path); $smarty->assign("MODULE",$module); +$smarty->assign("USERID",$current_user->id); +$smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); +$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); +$smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); $smarty->assign("CATEGORY",$category); $smarty->display("QuickCreate.tpl"); From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 09:29:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 13:29:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4939 - in /vtigercrm/trunk/include/utils: CommonUtils.php DetailViewUtils.php EditViewUtils.php GraphUtils.php InventoryUtils.php export.php Message-ID: <20060406132912.7416C4E9715@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 07:29:00 2006 New Revision: 4939 Log: Docs added for function Modified: vtigercrm/trunk/include/utils/CommonUtils.php vtigercrm/trunk/include/utils/DetailViewUtils.php vtigercrm/trunk/include/utils/EditViewUtils.php vtigercrm/trunk/include/utils/GraphUtils.php vtigercrm/trunk/include/utils/InventoryUtils.php vtigercrm/trunk/include/utils/export.php Modified: vtigercrm/trunk/include/utils/CommonUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/CommonUtils.php (original) +++ vtigercrm/trunk/include/utils/CommonUtils.php Thu Apr 6 07:29:00 2006 @@ -1519,6 +1519,11 @@ return $filepath; } +/** + * This function is used to get the Quick create form field parameters for a given module. + * Param $module - module name + * returns the value in array format + */ function QuickCreate($module) Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/DetailViewUtils.php (original) +++ vtigercrm/trunk/include/utils/DetailViewUtils.php Thu Apr 6 07:29:00 2006 @@ -20,22 +20,21 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ - - -/** This function returns the name of the person. - * It currently returns "first last". It should not put the space if either name is not available. - * It should not return errors if either name is not available. - * If no names are present, it will return "" - * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. - * All Rights Reserved. - * Contributor(s): ______________________________________.. - */ - - - require_once('include/database/PearDatabase.php'); require_once('include/ComboUtil.php'); //new require_once('include/utils/CommonUtils.php'); //new + + +/** This function returns the detail view form field and and its properties in array format. + * Param $uitype - UI type of the field + * Param $fieldname - Form field name + * Param $fieldlabel - Form field label name + * Param $col_fields - array contains the fieldname and values + * Param $generatedtype - Field generated type (default is 1) + * Param $tabid - tab id to which the Field belongs to (default is "") + * Return type is an array + */ + function getDetailViewOutputHtml($uitype, $fieldname, $fieldlabel, $col_fields,$generatedtype,$tabid='') { global $adb; @@ -732,6 +731,11 @@ return $label_fld; } +/** This function returns a HTML output of associated products for a given entity (Quotes,Invoice,Sales order or Purchase order) + * Param $module - module name + * Param $focus - module object + * Return type string + */ function getDetailAssociatedProducts($module,$focus) { @@ -838,6 +842,12 @@ } +/** This function returns the related tab details for a given entity or a module. +* Param $module - module name +* Param $focus - module object +* Return type is an array +*/ + function getRelatedLists($module,$focus) { global $adb; @@ -873,6 +883,13 @@ return $focus_list; } +/** This function returns the detailed block information of a record in a module. +* Param $module - module name +* Param $block - block id +* Param $col_fields - column fields array for the module +* Param $tabid - tab id +* Return type is an array +*/ function getDetailBlockInformation($module, $block,$col_fields,$tabid) { Modified: vtigercrm/trunk/include/utils/EditViewUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/EditViewUtils.php (original) +++ vtigercrm/trunk/include/utils/EditViewUtils.php Thu Apr 6 07:29:00 2006 @@ -20,20 +20,20 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ - - -/** This function returns the name of the person. - * It currently returns "first last". It should not put the space if either name is not available. - * It should not return errors if either name is not available. - * If no names are present, it will return "" - * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. - * All Rights Reserved. - * Contributor(s): ______________________________________.. - */ - require_once('include/database/PearDatabase.php'); require_once('include/ComboUtil.php'); //new require_once('include/utils/CommonUtils.php'); //new + +/** This function returns the field details for a given fieldname. + * Param $uitype - UI type of the field + * Param $fieldname - Form field name + * Param $fieldlabel - Form field label name + * Param $maxlength - maximum length of the field + * Param $col_fields - array contains the fieldname and values + * Param $generatedtype - Field generated type (default is 1) + * Param $module_name - module name + * Return type is an array + */ function getOutputHtml($uitype, $fieldname, $fieldlabel, $maxlength, $col_fields,$generatedtype,$module_name) { @@ -962,9 +962,12 @@ return $final_arr; } - - - +/** This function returns the invoice object populated with the details from sales order object. +* Param $focus - Invoice object +* Param $so_focus - Sales order focus +* Param $soid - sales order id +* Return type is an object array +*/ function getConvertSoToInvoice($focus,$so_focus,$soid) { @@ -999,6 +1002,12 @@ } +/** This function returns the invoice object populated with the details from quote object. +* Param $focus - Invoice object +* Param $quote_focus - Quote order focus +* Param $quoteid - quote id +* Return type is an object array +*/ function getConvertQuoteToInvoice($focus,$quote_focus,$quoteid) @@ -1027,6 +1036,12 @@ } +/** This function returns the sales order object populated with the details from quote object. +* Param $focus - Sales order object +* Param $quote_focus - Quote order focus +* Param $quoteid - quote id +* Return type is an object array +*/ function getConvertQuoteToSoObject($focus,$quote_focus,$quoteid) { @@ -1058,6 +1073,13 @@ } +/** This function returns the detailed list of products associated to a given entity or a record. +* Param $module - module name +* Param $focus - module object +* Param $seid - sales entity id +* Return type is an object array +*/ + function getAssociatedProducts($module,$focus,$seid='') { @@ -1142,6 +1164,13 @@ } +/** This function returns the no of products associated to the given entity or a record. +* Param $module - module name +* Param $focus - module object +* Param $seid - sales entity id +* Return type is an object array +*/ + function getNoOfAssocProducts($module,$focus,$seid='') { global $adb; @@ -1177,9 +1206,15 @@ return $num_rows; } - - - +/** This function returns the detail block information of a record for given block id. +* Param $module - module name +* Param $block - block name +* Param $mode - view type (detail/edit/create) +* Param $col_fields - fields array +* Param $tabid - tab id +* Param $info_type - information type (basic/advance) default "" +* Return type is an object array +*/ function getBlockInformation($module, $block, $mode, $col_fields,$tabid,$info_type='') { @@ -1276,6 +1311,12 @@ } +/** This function returns the data type of the fields, with field label, which is used for javascript validation. +* Param $validationData - array of fieldnames with datatype +* Return type array +*/ + + function split_validationdataArray($validationData) { $fieldName = ''; Modified: vtigercrm/trunk/include/utils/GraphUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/GraphUtils.php (original) +++ vtigercrm/trunk/include/utils/GraphUtils.php Thu Apr 6 07:29:00 2006 @@ -26,6 +26,10 @@ DEFINE("FF_FONT1",'Verdana'); +/**This function is used to get the font name when a language code is given +* Param $locale - language code +* Return type string +*/ function calculate_font_name($locale) { @@ -48,6 +52,11 @@ return FF_FONT1; } +/**This function is used to generate the color format. +* Param $count - language code +* Return type string +*/ + function color_generator($count = 1, $start = '33CCFF', $step = '221133') { // explode color strings to RGB array @@ -69,4 +78,4 @@ } return $result; } -?> +?> Modified: vtigercrm/trunk/include/utils/InventoryUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/InventoryUtils.php (original) +++ vtigercrm/trunk/include/utils/InventoryUtils.php Thu Apr 6 07:29:00 2006 @@ -50,6 +50,16 @@ return $productBlock; } +/** + * This function updates the stock information once the product is ordered. + * Param $productid - product id + * Param $qty - product quantity in no's + * Param $mode - mode type + * Param $ext_prod_arr - existing products + * Param $module - module name + * return type void + */ + function updateStk($product_id,$qty,$mode,$ext_prod_arr,$module) { global $adb; @@ -118,6 +128,17 @@ } } +/** + * This function sends a mail to the handler whenever the product reaches the reorder level. + * Param $product_id - product id + * Param $upd_qty - updated product quantity in no's + * Param $prod_name - product name + * Param $qtyinstk - quantity in stock + * Param $qty - quantity + * Param $module - module name + * return type void + */ + function sendPrdStckMail($product_id,$upd_qty,$prod_name,$qtyinstk,$qty,$module) { global $current_user; @@ -173,6 +194,10 @@ } } +/**This function is used to get the quantity in stock of a given product +*Param $product_id - product id +*Returns type numeric +*/ function getPrdQtyInStck($product_id) { global $adb; @@ -182,6 +207,11 @@ return $qtyinstck; } +/**This function is used to get the reorder level of a product +*Param $product_id - product id +*Returns type numeric +*/ + function getPrdReOrderLevel($product_id) { global $adb; @@ -191,6 +221,11 @@ return $reorderlevel; } +/**This function is used to get the handler for a given product +*Param $product_id - product id +*Returns type numeric +*/ + function getPrdHandler($product_id) { global $adb; Modified: vtigercrm/trunk/include/utils/export.php ============================================================================== --- vtigercrm/trunk/include/utils/export.php (original) +++ vtigercrm/trunk/include/utils/export.php Thu Apr 6 07:29:00 2006 @@ -51,13 +51,20 @@ die("you can't export!"); } -//Function added to convert line breaks to space in description during export +/**Function convert line breaks to space in description during export + * Pram $str - text + * retrun type string +*/ function br2nl_vt($str) { $str = preg_replace("/(\r\n)/", " ", $str); return $str; } +/**This function exports all the data for a given module + * Param $type - module name + * Return type text +*/ function export_all($type) { $contact_fields = Array(); From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 09:30:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 13:30:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4940 - in /vtigercrm/trunk/Smarty/templates/Settings: EditEmailNotofication.tpl EmailNotofication.tpl EmailNotoficationContents.tpl Message-ID: <20060406133013.CDA1B4E992C@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 07:30:08 2006 New Revision: 4940 Log: file deleted to rename it Removed: vtigercrm/trunk/Smarty/templates/Settings/EditEmailNotofication.tpl vtigercrm/trunk/Smarty/templates/Settings/EmailNotofication.tpl vtigercrm/trunk/Smarty/templates/Settings/EmailNotoficationContents.tpl From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 09:30:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 13:30:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4941 - in /vtigercrm/trunk/Smarty/templates/Settings: EditEmailNotification.tpl EmailNotification.tpl EmailNotificationContents.tpl Message-ID: <20060406133048.2466D4E992C@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 07:30:41 2006 New Revision: 4941 Log: file name changed Added: vtigercrm/trunk/Smarty/templates/Settings/EditEmailNotification.tpl vtigercrm/trunk/Smarty/templates/Settings/EmailNotification.tpl (with props) vtigercrm/trunk/Smarty/templates/Settings/EmailNotificationContents.tpl From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 09:33:31 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 13:33:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4942 - /vtigercrm/trunk/Smarty/templates/QuickCreate.tpl Message-ID: <20060406133331.D1CBF4E9715@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 07:33:26 2006 New Revision: 4942 Log: changes made for quickcreate functionality Modified: vtigercrm/trunk/Smarty/templates/QuickCreate.tpl Modified: vtigercrm/trunk/Smarty/templates/QuickCreate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/QuickCreate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/QuickCreate.tpl Thu Apr 6 07:33:26 2006 @@ -1,14 +1,13 @@ - - - vtiger CRM 5 - Free, Commercial grade Open Source CRM - - - - + + + - -
    +{include file='QuickCreateHidden.tpl'}
    @@ -365,9 +364,9 @@ - +
    - +
    @@ -378,6 +377,5 @@
    -
    + -v From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 09:34:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 13:34:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4943 - /vtigercrm/trunk/Smarty/templates/Settings/EmailNotification.tpl Message-ID: <20060406133400.318824E992C@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 07:33:55 2006 New Revision: 4943 Log: issue in notification has been fixed Modified: vtigercrm/trunk/Smarty/templates/Settings/EmailNotification.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings/EmailNotification.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/EmailNotification.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/EmailNotification.tpl Thu Apr 6 07:33:55 2006 @@ -16,7 +16,7 @@
    - {include file='Settings/EmailNotoficationContents.tpl'} + {include file='Settings/EmailNotificationContents.tpl'}
    @@ -31,7 +31,7 @@ {include file='SettingsSubMenu.tpl'} - + {literal} '; - - -return $list; -} ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 10:16:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 14:16:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4955 - /vtigercrm/trunk/Smarty/templates/CustomFieldList.tpl Message-ID: <20060406141620.E0C144EA9A2@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 08:16:15 2006 New Revision: 4955 Log: new UI has been integrated Added: vtigercrm/trunk/Smarty/templates/CustomFieldList.tpl From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 10:16:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 14:16:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4956 - /vtigercrm/trunk/Smarty/templates/CustomFieldEntries.tpl Message-ID: <20060406141649.2413D4EA9A2@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 08:16:44 2006 New Revision: 4956 Log: new UI has been integrated Added: vtigercrm/trunk/Smarty/templates/CustomFieldEntries.tpl From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 10:24:45 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 14:24:45 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4957 - /vtigercrm/trunk/include/images/loginAlpha.gif Message-ID: <20060406142445.431BC4EAFF7@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 08:24:38 2006 New Revision: 4957 Log: image for alpha 5 added Modified: vtigercrm/trunk/include/images/loginAlpha.gif Modified: vtigercrm/trunk/include/images/loginAlpha.gif ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 10:36:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 14:36:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4958 - /vtigercrm/trunk/modules/Users/Login.php Message-ID: <20060406143621.549704EB2F6@vtiger.fosslabs.com> Author: richie Date: Thu Apr 6 08:36:13 2006 New Revision: 4958 Log: Alpha4 references changed to Alpha5. Message Changed Modified: vtigercrm/trunk/modules/Users/Login.php Modified: vtigercrm/trunk/modules/Users/Login.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 10:40:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 14:40:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4959 - /vtigercrm/trunk/Smarty/templates/QuickCreateHidden.tpl Message-ID: <20060406144028.1293C4EB5CF@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 08:40:24 2006 New Revision: 4959 Log: QuickCreateHidden.tpl added for quickcreate hidden fields Added: vtigercrm/trunk/Smarty/templates/QuickCreateHidden.tpl From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 10:46:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 14:46:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4960 - /vtigercrm/trunk/Smarty/templates/ListView.tpl Message-ID: <20060406144621.0C75C4EB789@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 08:46:17 2006 New Revision: 4960 Log: title message has been changed for chat icon 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 Thu Apr 6 08:46:17 2006 @@ -59,7 +59,7 @@ Create {$MODULE}... {/if} Search in {$MODULE}... - Search in {$MODULE}... + Chat... From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 10:53:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 14:53:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4961 - /vtigercrm/trunk/modules/Users/TemplateMerge.php Message-ID: <20060406145307.51D144EB676@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 08:53:03 2006 New Revision: 4961 Log: Removed the FCKEditor Check for the Template Merge Ahmed Modified: vtigercrm/trunk/modules/Users/TemplateMerge.php Modified: vtigercrm/trunk/modules/Users/TemplateMerge.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 10:55:38 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 14:55:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4962 - /vtigercrm/trunk/modules/Potentials/PotentialsAjax.php Message-ID: <20060406145538.D8B834EBA1B@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 08:55:34 2006 New Revision: 4962 Log: Made changes for ajaxification of quick create Modified: vtigercrm/trunk/modules/Potentials/PotentialsAjax.php Modified: vtigercrm/trunk/modules/Potentials/PotentialsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/PotentialsAjax.php (original) +++ vtigercrm/trunk/modules/Potentials/PotentialsAjax.php Thu Apr 6 08:55:34 2006 @@ -43,9 +43,13 @@ echo ":#:FAILURE"; } } + +elseif($_REQUEST['ajaxmode'] == 'qcreate') +{ + require_once('quickcreate.php'); +} else { require_once('include/Ajax/CommonAjax.php'); - require_once('quickcreate.php'); } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 10:57:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 14:57:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4963 - /vtigercrm/trunk/modules/Products/ProductsAjax.php Message-ID: <20060406145707.03C234EBA1B@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 08:57:04 2006 New Revision: 4963 Log: Made changes for ajaxification of quick create Modified: vtigercrm/trunk/modules/Products/ProductsAjax.php Modified: vtigercrm/trunk/modules/Products/ProductsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Products/ProductsAjax.php (original) +++ vtigercrm/trunk/modules/Products/ProductsAjax.php Thu Apr 6 08:57:04 2006 @@ -43,9 +43,13 @@ echo ":#:FAILURE"; } } + +elseif($_REQUEST['ajaxmode'] == 'qcreate') +{ + require_once('quickcreate.php'); +} else { require_once('include/Ajax/CommonAjax.php'); - require_once('quickcreate.php'); } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 11:12:18 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 15:12:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4964 - /vtigercrm/trunk/modules/Notes/NotesAjax.php Message-ID: <20060406151218.DB5864EBDFE@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 09:12:14 2006 New Revision: 4964 Log: Made changes for ajaxification of quick create Modified: vtigercrm/trunk/modules/Notes/NotesAjax.php Modified: vtigercrm/trunk/modules/Notes/NotesAjax.php ============================================================================== --- vtigercrm/trunk/modules/Notes/NotesAjax.php (original) +++ vtigercrm/trunk/modules/Notes/NotesAjax.php Thu Apr 6 09:12:14 2006 @@ -43,9 +43,12 @@ echo ":#:FAILURE"; } } +elseif($_REQUEST['ajaxmode'] == 'qcreate') +{ + require_once('quickcreate.php'); +} else { require_once('include/Ajax/CommonAjax.php'); - require_once('quickcreate.php'); } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 13:15:53 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 17:15:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4965 - in /vtigercrm/trunk: Smarty/templates/ themes/blue/images/ Message-ID: <20060406171553.94D1F4FDF39@vtiger.fosslabs.com> Author: don Date: Thu Apr 6 11:15:35 2006 New Revision: 4965 Log: files added to integrate new UI for Rss Added: vtigercrm/trunk/Smarty/templates/Rss.tpl vtigercrm/trunk/themes/blue/images/rssHeader.gif (with props) vtigercrm/trunk/themes/blue/images/rssdelete.gif (with props) vtigercrm/trunk/themes/blue/images/rssforward.gif (with props) vtigercrm/trunk/themes/blue/images/rssframeHdr.gif (with props) vtigercrm/trunk/themes/blue/images/rssimage.gif (with props) vtigercrm/trunk/themes/blue/images/rssroot.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 13:16:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 17:16:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4966 - in /vtigercrm/trunk/modules/Rss: ListView.php Rss.js Rss.php Message-ID: <20060406171658.47FC24FDE6A@vtiger.fosslabs.com> Author: don Date: Thu Apr 6 11:16:52 2006 New Revision: 4966 Log: changes made to integrate new UI for Rss Modified: vtigercrm/trunk/modules/Rss/ListView.php vtigercrm/trunk/modules/Rss/Rss.js vtigercrm/trunk/modules/Rss/Rss.php Modified: vtigercrm/trunk/modules/Rss/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Rss/ListView.php (original) +++ vtigercrm/trunk/modules/Rss/ListView.php Thu Apr 6 11:16:52 2006 @@ -8,8 +8,8 @@ * All Rights Reserved. * ********************************************************************************/ -require_once('XTemplate/xtpl.php'); require_once("data/Tracker.php"); +require_once('Smarty_setup.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -35,7 +35,7 @@ $recordid = $_REQUEST[record]; } -$rss_form=new XTemplate ('modules/Rss/ListView.html'); +$rss_form = new vtigerCRM_Smarty; $rss_form->assign("MOD", $mod_strings); $rss_form->assign("APP", $app_strings); $rss_form->assign("IMAGEPATH",$image_path); @@ -46,7 +46,7 @@ $oRss = new vtigerRSS(); if(isset($_REQUEST[record])) { - $recordid = $_REQUEST[record]; + $recordid = $_REQUEST[record]; $url = $oRss->getRssUrlfromId($recordid); if($oRss->setRSSUrl($url)) { @@ -55,6 +55,7 @@ { $rss_html = "No RSS Feeds are selected"; } + $rss_form->assign("TITLE",gerRssTitle($recordid)); }else { $rss_html = $oRss->getStarredRssHTML(); @@ -64,29 +65,23 @@ require_once("modules/".$currentModule."/Forms.php"); if (function_exists('get_rssfeeds_form')) { - $rss_form->assign("RSSFEEDS_TITLE","
    Add 
    "); + $rss_form->assign("RSSFEEDS_TITLE"," Add RSS Feed"); $rss_form->assign("RSSFEEDS", get_rssfeeds_form()); } } - -//$all_rss_html = $oRss->getAllRssFeeds(); -//$stared_rss_html = $oRss->getStaredRssFeeds(); -//$crm_rss_html = $oRss->getCRMRssFeeds(); -//$category_rss_html = $oRss->getRSSCategoryHTML(); -//$top_stared_rss_html = $oRss->getTopStarredRSSFeeds(); -//print_r($rss_hdr_html); -//$rss_form->assign("TOPSTARSSFEEDS",$top_stared_rss_html); -//$rss_form->assign("RSSHEADERDETAILS",$rss_hdr_html); $rss_form->assign("RSSDETAILS",$rss_html); -//$rss_form->assign("ALLRSSFEEDS",$all_rss_html); -//$rss_form->assign("STAREDFEEDS",$stared_rss_html); -//$rss_form->assign("CRMRSSFEEDS",$crm_rss_html); -//$rss_form->assign("CATEGORYFEEDS",$category_rss_html); //<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>// -$rss_form->parse("main"); -$rss_form->out("main"); - +$rss_form->display("Rss.tpl"); +function gerRssTitle($id) +{ + global $adb; + $query = 'select * from rss where rssid ='.$id; + $result = $adb->query($query); + $title = $adb->query_result($result,0,'rsstitle'); + return $title; + +} ?> Modified: vtigercrm/trunk/modules/Rss/Rss.js ============================================================================== --- vtigercrm/trunk/modules/Rss/Rss.js (original) +++ vtigercrm/trunk/modules/Rss/Rss.js Thu Apr 6 11:16:52 2006 @@ -53,4 +53,8 @@ } return true; } - +function display(url,list) +{ + document.getElementById('rsstitle').innerHTML = list; + document.getElementById('mysite').src = url; +} Modified: vtigercrm/trunk/modules/Rss/Rss.php ============================================================================== --- vtigercrm/trunk/modules/Rss/Rss.php (original) +++ vtigercrm/trunk/modules/Rss/Rss.php Thu Apr 6 11:16:52 2006 @@ -99,7 +99,7 @@ foreach($this->rss_object as $key=>$item) { $i = $i + 1; - $shtml .= "
  • $item[title]
    • "; + $shtml .= "
  • $item[title]
    • "; if($i == 10) { return $shtml; @@ -320,7 +320,7 @@ "; $shtml .= ""; if(isset($this->rss_object)) @@ -328,7 +328,7 @@ if(count($this->rss_object) > 10) { $shtml .= ""; } } @@ -374,7 +374,7 @@ { $shtml .= "Today at "; } - $shtml .= " rss_link\" target=\"_blank\">".$allrssrow['rsstitle'].""; + $shtml .= " rss_link."',this)\";>".$allrssrow['rsstitle'].""; $shtml .= ""; $shtml .= ""; } @@ -383,7 +383,7 @@ if(count($this->rss_object) > 10) { $shtml .= ""; } } From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 6 13:52:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 06 Apr 2006 17:52:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4967 - in /vtigercrm/trunk/modules/Migration: Migration.php MigrationCheck.php MigrationStep2.php ModifyDatabase/42P2_to_50Alpha.php Message-ID: <20060406175212.E760E4FEE29@vtiger.fosslabs.com> Author: don Date: Thu Apr 6 11:52:01 2006 New Revision: 4967 Log: * Added migration queries after 4.5 dev3 release Modified: vtigercrm/trunk/modules/Migration/Migration.php vtigercrm/trunk/modules/Migration/MigrationCheck.php vtigercrm/trunk/modules/Migration/MigrationStep2.php vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Modified: vtigercrm/trunk/modules/Migration/Migration.php ============================================================================== --- vtigercrm/trunk/modules/Migration/Migration.php (original) +++ vtigercrm/trunk/modules/Migration/Migration.php Thu Apr 6 11:52:01 2006 @@ -98,6 +98,9 @@ $conn->query($sql); echo '
    Current Database has been created.'; + + //Added to avoid the No Database Selected error when execute the queries + $conn->connect(); } function applyDumpData($host_name,$mysql_port,$mysql_username,$mysql_password,$dbname,$dumpfile) Modified: vtigercrm/trunk/modules/Migration/MigrationCheck.php ============================================================================== --- vtigercrm/trunk/modules/Migration/MigrationCheck.php (original) +++ vtigercrm/trunk/modules/Migration/MigrationCheck.php Thu Apr 6 11:52:01 2006 @@ -9,7 +9,7 @@ * ********************************************************************************/ -include("config.php"); +include("config.inc.php"); $old_version = $_REQUEST['old_version']; $latest_version = $_REQUEST['latest_version']; @@ -23,8 +23,8 @@ //new database values get from the current vtigerCRM's config.php global $dbconfig; -$new_host_name = $dbconfig['db_host_name']; -$new_mysql_username = $dbconfig['db_user_name']; +$new_host_name = $dbconfig['db_hostname']; +$new_mysql_username = $dbconfig['db_username']; $new_mysql_password = $dbconfig['db_password']; $new_dbname = $dbconfig['db_name']; Modified: vtigercrm/trunk/modules/Migration/MigrationStep2.php ============================================================================== --- vtigercrm/trunk/modules/Migration/MigrationStep2.php (original) +++ vtigercrm/trunk/modules/Migration/MigrationStep2.php Thu Apr 6 11:52:01 2006 @@ -75,12 +75,12 @@ //TODO - Check whether the given file is Dump file and then apply to the new database echo '
    Going to apply the Dump file to the new database.'; - include("config.php"); + include("config.inc.php"); global $dbconfig; - $new_host_name = $dbconfig['db_host_name']; + $new_host_name = $dbconfig['db_hostname']; $new_dbname = $dbconfig['db_name']; - $new_mysql_username = $dbconfig['db_user_name']; + $new_mysql_username = $dbconfig['db_username']; $new_mysql_password = $dbconfig['db_password']; $conn = new PearDatabase("mysql",$new_host_name,$new_dbname,$new_mysql_username,$new_mysql_password); Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php ============================================================================== --- vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php (original) +++ vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Thu Apr 6 11:52:01 2006 @@ -18,6 +18,17 @@ echo "

    Database Modifications for 4.2 Patch2 ==> 5.0(Alpha) Dev 3 Starts here.....
    "; /****************** 5.0(Alpha) dev version 1 Database changes -- Starts*********************/ + +//Added the announcement table creation to avoid the error +$ann_query = "CREATE TABLE `announcement` ( + `creatorid` int(19) NOT NULL, + `announcement` text, + `title` varchar(255) default NULL, + `time` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, + PRIMARY KEY (`creatorid`), + KEY `announcement_UK01` (`creatorid`) + ) ENGINE=InnoDB DEFAULT CHARSET=latin1"; +Execute($ann_query); //Added Primay Keys for the left out tables $alter_array1 = Array( @@ -61,7 +72,7 @@ `globalactionpermission` int(19) default NULL, PRIMARY KEY (`profileid`,`globalactionid`), CONSTRAINT `fk_profile2globalpermissions` FOREIGN KEY (`profileid`) REFERENCES `profile` (`profileid`) ON DELETE CASCADE - ) TYPE=InnoDB"; + )"; $status = $conn->query($create_sql1); echo '
    '.$status.' ==> '.$create_sql1; @@ -815,13 +826,1789 @@ - - +$conn->println("Database Modifications for 5.0(Alpha) Dev 3 ==> 5.0 Alpha starts here."); +echo "

    Database Modifications for 5.0(Alpha) Dev3 ==> 5.0 Alpha starts here.....
    "; +$alter_query_array6 = Array( + "ALTER TABLE users ADD column activity_view VARCHAR(25) DEFAULT 'Today' AFTER homeorder", + "ALTER TABLE activity ADD column notime CHAR(3) DEFAULT '0' AFTER location" + ); +foreach($alter_query_array6 as $query) +{ + Execute($query); +} + +$insert_field_array1 = Array( + "Insert into field values (9,".$conn->getUniqueID("field").",'notime','activity',1,56,'notime','No Time',1,0,0,100,20,1,3,'C~O',1,'')", + "Insert into field values (16,".$conn->getUniqueID("field").",'notime','activity',1,56,'notime','No Time',1,0,0,100,18,1,1,'C~O',1,'')" + ); +foreach($insert_field_array1 as $query) +{ + Execute($query); +} + +$alter_query_array7 = Array( + "alter table vendor add column pobox varchar(30) after state", + "alter table leadaddress add column pobox varchar(30) after state", + "alter table accountbillads add column pobox varchar(30) after state", + "alter table accountshipads add column pobox varchar(30) after state", + "alter table contactaddress add column mailingpobox varchar(30) after mailingstate", + "alter table contactaddress add column otherpobox varchar(30) after otherstate", + "alter table quotesbillads add column bill_pobox varchar(30) after bill_street", + "alter table quotesshipads add column ship_pobox varchar(30) after ship_street", + "alter table pobillads add column bill_pobox varchar(30) after bill_street", + "alter table poshipads add column ship_pobox varchar(30) after ship_street", + "alter table sobillads add column bill_pobox varchar(30) after bill_street", + "alter table soshipads add column ship_pobox varchar(30) after ship_street", + "alter table invoicebillads add column bill_pobox varchar(30) after bill_street", + "alter table invoiceshipads add column ship_pobox varchar(30) after ship_street" + ); +foreach($alter_query_array7 as $query) +{ + Execute($query); +} + +$insert_field_array2 = Array( + "insert into field values (23,".$conn->getUniqueID("field").",'bill_pobox','invoicebillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,2,1,'V~O',1,'')", + "insert into field values (23,".$conn->getUniqueID("field").",'ship_pobox','invoiceshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,2,1,'V~O',1,'')", + + "insert into field values (6,".$conn->getUniqueID("field").",'pobox','accountbillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,2,1,'V~O',1,'')", + "insert into field values (6,".$conn->getUniqueID("field").",'pobox','accountshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,2,1,'V~O',1,'')", + + "insert into field values (7,".$conn->getUniqueID("field").",'pobox','leadaddress',1,'1','pobox','Po Box',1,0,0,100,2,2,1,'V~O',1,'')", + + "insert into field values (4,".$conn->getUniqueID("field").",'mailingpobox','contactaddress',1,'1','mailingpobox','Mailing Po Box',1,0,0,100,3,2,1,'V~O',1,'')", + "insert into field values (4,".$conn->getUniqueID("field").",'otherpobox','contactaddress',1,'1','otherpobox','Other Po Box',1,0,0,100,4,2,1,'V~O',1,'')", + + "insert into field values (18,".$conn->getUniqueID("field").",'pobox','vendor',1,'1','pobox','Po Box',1,0,0,100,2,2,1,'V~O',1,'')", + + "insert into field values (20,".$conn->getUniqueID("field").",'bill_pobox','quotesbillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,2,1,'V~O',1,'')", + "insert into field values (20,".$conn->getUniqueID("field").",'ship_pobox','quotesshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,2,1,'V~O',1,'')", + + "insert into field values (21,".$conn->getUniqueID("field").",'bill_pobox','pobillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,2,1,'V~O',1,'')", + "insert into field values (21,".$conn->getUniqueID("field").",'ship_pobox','poshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,2,1,'V~O',1,'')", + + "insert into field values (22,".$conn->getUniqueID("field").",'bill_pobox','sobillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,2,1,'V~O',1,'')", + "insert into field values (22,".$conn->getUniqueID("field").",'ship_pobox','soshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,2,1,'V~O',1,'')" + ); +foreach($insert_field_array2 as $query) +{ + Execute($query); +} + + +$fieldname =array('bill_city','bill_state','bill_code','bill_country','ship_city','ship_state','ship_code','ship_country'); +$tablename = array('accountbillads','quotesbillads','pobillads','sobillads','invoicebillads','accountshipads','quotesshipads','poshipads','soshipads','invoiceshipads'); +$sequence = array(5,7,9,11,6,8,10,12); +$k = 0; +$n = 0; +for($j = 0;$j < 8;$j++) +{ + if($j == 4) + $n = $n+5; + for($i = 0;$i < 5;$i++) + { + $query1 = "update field set sequence=".$sequence[$j]." where tablename='".$tablename[$n+$i]."' && fieldname='".$fieldname[$j]."'"; + Execute($query1); + } +} + +$fieldname = array('code','city','country','state'); +$tablename = 'leadaddress'; +$sequence = array(3,4,5,6); +for($i = 0;$i < 4;$i++) +{ + $query2 = "update field set sequence=".$sequence[$i]." where tablename='".$tablename."' && fieldname='".$fieldname[$i]."'"; + Execute($query2); +} + +$fieldname = array('city','state','postalcode','country'); +$tablename = 'vendor'; +$sequence = array(3,4,5,6); + +for($i = 0;$i < 4;$i++) +{ + $query3 = "update field set sequence=".$sequence[$i]." where tablename='".$tablename."' && fieldname='".$fieldname[$i]."'"; + Execute($query3); +} + +$fieldname = array('mailingcity','othercity','mailingstate','otherstate','mailingzip','otherzip','mailingcountry','othercountry'); +$tablename = 'contactaddress'; +$sequence = array(5,6,7,8,9,10,11,12); + +for($i = 0;$i < 8;$i++) +{ + $query = "update field set sequence=".$sequence[$i]." where tablename='".$tablename."' && fieldname='".$fieldname[$i]."'"; + Execute($query); +} + +$query_array1 = Array( + "update field set tablename='crmentity' where tabid=10 and fieldname='description'", + "update field set tablename='attachments' where tabid=10 and fieldname='filename'", + "drop table emails", + + "alter table activity drop column description", + "update field set tablename='crmentity' where tabid in (9,16) and fieldname='description'", + + "update tab set name='PurchaseOrder',tablabel='PurchaseOrder' where tabid=21", + "update tab set presence=0 where tabid=22 and name='SalesOrder'", + + "delete from actionmapping where actionname='SalesOrderDetailView'", + "delete from actionmapping where actionname='SalesOrderEditView'", + "delete from actionmapping where actionname='SaveSalesOrder'", + "delete from actionmapping where actionname='DeleteSalesOrder'", + + "insert into field values (13,".$conn->getUniqueID("field").",'filename','attachments',1,'61','filename','Attachment',1,0,0,100,12,2,1,'V~O',0,1)", + + "alter table troubletickets add column filename varchar(50) default NULL after title" + ); +foreach($query_array1 as $query) +{ + Execute($query); +} + +$create_query3 = "create table parenttab(parenttabid int(19) not null, parenttab_label varchar(100) not null, sequence int(10) not null, visible int(2) not null default '0', Primary Key(parenttabid))"; +Execute($create_query3); +$create_query4 = "create table parenttabrel(parenttabid int(3) not null, tabid int(3) not null,sequence int(3) not null)"; +Execute($create_query4); + +$insert_query_array4 = Array( + "insert into 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 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) " + ); +foreach($insert_query_array4 as $query) +{ + Execute($query); +} + + +$create_query5 = "CREATE TABLE blocks ( blockid int(19) NOT NULL, tabid int(19) NOT NULL, blocklabel varchar(100) NOT NULL, sequence int(19) NOT NULL, show_title int(2) NOT NULL, visible int(2) NOT NULL DEFAULT 0, create_view int(2) NOT NULL DEFAULT 0, edit_view int(2) NOT NULL DEFAULT 0, detail_view int(2) NOT NULL DEFAULT 0, PRIMARY KEY (blockid))"; +Execute($create_query5); + +$update_query_array1 = Array( + "update field set block=2 where tabid=2 and block=5", + "update field set block=3 where tabid=2 and block=2", + + "update field set block=4 where tabid=4 and block=1", + "update field set block=5 where tabid=4 and block=5", + "update field set block=6 where tabid=4 and block=4", + "update field set block=7 where tabid=4 and block=2", + "update field set block=8 where tabid=4 and block=3", + + "update field set block=9 where tabid=6 and block=1", + "update field set block=10 where tabid=6 and block=5", + "update field set block=11 where tabid=6 and block=2", + "update field set block=12 where tabid=6 and block=3", + + "update field set block=13 where tabid=7 and block=1", + "update field set block=14 where tabid=7 and block=5", + "update field set block=15 where tabid=7 and block=2", + "update field set block=16 where tabid=7 and block=3", + + "update field set block=17 where tabid=8 and block=1", + "update field set block=17 where tabid=8 and block=2", + "update field set block=18 where tabid=8 and block=3", + + "update field set block=19 where tabid=9 and block=1", + "update field set block=19 where tabid=9 and block=7", + "update field set block=20 where tabid=9 and block=2", + + "update field set block=21 where tabid=10 and block=1", + "update field set block=22 where tabid=10 and block=2", + "update field set block=23 where tabid=10 and block=3", + "update field set block=23 where tabid=10 and block=4", + "update field set block=24 where tabid=10 and block=5", + + "update field set block=25 where tabid=13 and block=1", + "update field set block=26 where tabid=13 and block=2", + "update field set block=27 where tabid=13 and block=5", + "update field set block=28 where tabid=13 and block=3", + "update field set block=29 where tabid=13 and block=4", + "update field set block=30 where tabid=13 and block=6", + + "update field set block=31 where tabid=14 and block=1", + "update field set block=32 where tabid=14 and block=2", + "update field set block=33 where tabid=14 and block=3", + "update field set block=34 where tabid=14 and block=5", + "update field set block=35 where tabid=14 and block=6", + "update field set block=36 where tabid=14 and block=4", + + "update field set block=37 where tabid=15 and block=1", + "update field set block=38 where tabid=15 and block=2", + "update field set block=39 where tabid=15 and block=3", + "update field set block=40 where tabid=15 and block=4", + + "update field set block=41 where tabid=16 and block=1", + "update field set block=42 where tabid=16 and block=7", + "update field set block=43 where tabid=16 and block=2", + + "update field set block=44 where tabid=18 and block=1", + "update field set block=45 where tabid=18 and block=5", + "update field set block=36 where tabid=18 and block=2", + "update field set block=47 where tabid=18 and block=3", + + "update field set block=48 where tabid=19 and block=1", + "update field set block=49 where tabid=19 and block=5", + "update field set block=50 where tabid=19 and block=2", + + "update field set block=51 where tabid=20 and block=1", + "update field set block=52 where tabid=20 and block=5", + "update field set block=53 where tabid=20 and block=2", + "update field set block=55 where tabid=20 and block=6", + "update field set block=56 where tabid=20 and block=3", + + "update field set block=57 where tabid=21 and block=1", + "update field set block=58 where tabid=21 and block=5", + "update field set block=59 where tabid=21 and block=2", + "update field set block=61 where tabid=21 and block=6", + "update field set block=62 where tabid=21 and block=3", + + "update field set block=63 where tabid=22 and block=1", + "update field set block=64 where tabid=22 and block=5", + "update field set block=65 where tabid=22 and block=2", + "update field set block=67 where tabid=22 and block=6", + "update field set block=68 where tabid=22 and block=3", + + + "update field set block=69 where tabid=23 and block=1", + "update field set block=70 where tabid=23 and block=5", + "update field set block=71 where tabid=23 and block=2", + "update field set block=73 where tabid=23 and block=6", + "update field set block=74 where tabid=23 and block=3", + ); +foreach($update_query_array1 as $query) +{ + Execute($query); +} + +$insert_query_array5 = Array( + "insert into blocks values (1,2,'LBL_OPPORTUNITY_INFORMATION',1,0,0,0,0,0)", + "insert into blocks values (2,2,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)", + "insert into blocks values (3,2,'LBL_DESCRIPTION_INFORMATION',3,0,0,0,0,0)", + "insert into blocks values (4,4,'LBL_CONTACT_INFORMATION',1,0,0,0,0,0)", + "insert into blocks values (5,4,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)", + "insert into blocks values (6,4,'LBL_CUSTOMER_PORTAL_INFORMATION',3,0,0,0,0,0)", + "insert into blocks values (7,4,'LBL_ADDRESS_INFORMATION',4,0,0,0,0,0)", + "insert into blocks values (8,4,'LBL_DESCRIPTION_INFORMATION',5,0,0,0,0,0)", + "insert into blocks values (9,6,'LBL_ACCOUNT_INFORMATION',1,0,0,0,0,0)", + "insert into blocks values (10,6,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)", + "insert into blocks values (11,6,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)", + "insert into blocks values (12,6,'LBL_DESCRIPTION_INFORMATION',4,0,0,0,0,0)", + "insert into blocks values (13,7,'LBL_LEAD_INFORMATION',1,0,0,0,0,0)", + "insert into blocks values (14,7,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)", + "insert into blocks values (15,7,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)", + "insert into blocks values (16,7,'LBL_DESCRIPTION_INFORMATION',4,0,0,0,0,0)", + "insert into blocks values (17,8,'LBL_NOTE_INFORMATION',1,0,0,0,0,0)", + "insert into blocks values (18,8,'',2,1,0,0,0,0)", + "insert into blocks values (19,9,'LBL_TASK_INFORMATION',1,0,0,0,0,0)", + "insert into blocks values (20,9,'',2,1,0,0,0,0)", + "insert into blocks values (21,10,'LBL_EMAIL_INFORMATION',1,0,0,0,0,0)", + "insert into blocks values (22,10,'',2,1,0,0,0,0)", + "insert into blocks values (23,10,'',3,1,0,0,0,0)", + "insert into blocks values (24,10,'',4,1,0,0,0,0)", + "insert into blocks values (25,13,'LBL_TICKET_INFORMATION',1,0,0,0,0,0)", + "insert into blocks values (26,13,'',2,1,0,0,0,0)", + "insert into blocks values (27,13,'LBL_CUSTOM_INFORMATION',3,0,0,0,0,0)", + "insert into blocks values (28,13,'LBL_DESCRIPTION_INFORMATION',4,0,0,0,0,0)", + "insert into blocks values (29,13,'LBL_TICKET_RESOLUTION',5,0,0,1,0,0)", + "insert into blocks values (30,13,'LBL_COMMENTS',6,0,0,1,0,0)", + "insert into blocks values (31,14,'LBL_PRODUCT_INFORMATION',1,0,0,0,0,0)", + "insert into blocks values (32,14,'LBL_PRICING_INFORMATION',2,0,0,0,0,0)", + "insert into blocks values (33,14,'LBL_STOCK_INFORMATION',3,0,0,0,0,0)", + "insert into blocks values (34,14,'LBL_CUSTOM_INFORMATION',4,0,0,0,0,0)", + "insert into blocks values (35,14,'LBL_IMAGE_INFORMATION',5,0,0,0,0,0)", + "insert into blocks values (36,14,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)", + "insert into blocks values (37,15,'LBL_FAQ_INFORMATION',1,0,0,0,0,0)", + "insert into blocks values (38,15,'',2,1,0,0,0,0)", + "insert into blocks values (39,15,'',3,1,0,0,0,0)", + "insert into blocks values (40,15,'LBL_COMMENT_INFORMATION',4,0,0,1,0,0)", + "insert into blocks values (41,16,'LBL_EVENT_INFORMATION',1,0,0,0,0,0)", + "insert into blocks values (42,16,'',2,1,0,0,0,0)", + "insert into blocks values (43,16,'',3,1,0,0,0,0)", + "insert into blocks values (44,18,'LBL_VENDOR_INFORMATION',1,0,0,0,0,0)", + "insert into blocks values (45,18,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)", + "insert into blocks values (46,18,'LBL_VENDOR_ADDRESS_INFORMATION',3,0,0,0,0,0)", + "insert into blocks values (47,18,'LBL_DESCRIPTION_INFORMATION',4,0,0,0,0,0)", + "insert into blocks values (48,19,'LBL_PRICEBOOK_INFORMATION',1,0,0,0,0,0)", + "insert into blocks values (49,19,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)", + "insert into blocks values (50,19,'LBL_DESCRIPTION_INFORMATION',3,0,0,0,0,0)", + "insert into blocks values (51,20,'LBL_QUOTE_INFORMATION',1,0,0,0,0,0)", + "insert into blocks values (52,20,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)", + "insert into blocks values (53,20,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)", + "insert into blocks values (54,20,'LBL_RELATED_PRODUCTS',4,0,0,0,0,0)", + "insert into blocks values (55,20,'LBL_TERMS_INFORMATION',5,0,0,0,0,0)", + "insert into blocks values (56,20,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)", + "insert into blocks values (57,21,'LBL_PO_INFORMATION',1,0,0,0,0,0)", + "insert into blocks values (58,21,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)", + "insert into blocks values (59,21,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)", + "insert into blocks values (60,21,'LBL_RELATED_PRODUCTS',4,0,0,0,0,0)", + "insert into blocks values (61,21,'LBL_TERMS_INFORMATION',5,0,0,0,0,0)", + "insert into blocks values (62,21,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)", + "insert into blocks values (63,22,'LBL_SO_INFORMATION',1,0,0,0,0,0)", + "insert into blocks values (64,22,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)", + "insert into blocks values (65,22,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)", + "insert into blocks values (66,22,'LBL_RELATED_PRODUCTS',4,0,0,0,0,0)", + "insert into blocks values (67,22,'LBL_TERMS_INFORMATION',5,0,0,0,0,0)", + "insert into blocks values (68,22,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)", + "insert into blocks values (69,23,'LBL_INVOICE_INFORMATION',1,0,0,0,0,0)", + "insert into blocks values (70,23,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)", + "insert into blocks values (71,23,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)", + "insert into blocks values (72,23,'LBL_RELATED_PRODUCTS',4,0,0,0,0,0)", + "insert into blocks values (73,23,'LBL_TERMS_INFORMATION',5,0,0,0,0,0)", + "insert into blocks values (74,23,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)" + ); +foreach($insert_query_array5 as $query) +{ + Execute($query); +} + +$update_query_array2 = Array( + "update tab set name='Vendors', tablabel='Vendors' where tabid=18", + "update tab set name='PriceBooks', tablabel='PriceBooks' where tabid=19", + "update tab set presence=0 where tabid in(18,19)", + "update relatedlists set label='PriceBooks' where tabid=14 and related_tabid=19" + ); +foreach($update_query_array2 as $query) +{ + Execute($query); +} + +$delete_query1 = "delete from actionmapping where actionname in ('SavePriceBook','SaveVendor','PriceBookEditView','VendorEditView','DeletePriceBook','DeleteVendor','PriceBookDetailView','VendorDetailView')"; +Execute($query); + +$insert_query_array6 = Array( + "insert into customview values(".$conn->getUniqueID('customview').",'All',1,0,'Leads')", + "insert into customview values(".$conn->getUniqueID('customview').",'All',1,0,'Accounts')", + "insert into customview values(".$conn->getUniqueID('customview').",'All',1,0,'Contacts')", + "insert into customview values(".$conn->getUniqueID('customview').",'All',1,0,'Potentials')", + "insert into customview values(".$conn->getUniqueID('customview').",'All',1,0,'HelpDesk')", + "insert into customview values(".$conn->getUniqueID('customview').",'All',1,0,'Quotes')", + "insert into customview values(".$conn->getUniqueID('customview').",'All',1,0,'Activities')", + "insert into customview values(".$conn->getUniqueID('customview').",'All',1,0,'Emails')", + "insert into customview values(".$conn->getUniqueID('customview').",'All',1,0,'Invoice')", + "insert into customview values(".$conn->getUniqueID('customview').",'All',1,0,'Notes')", + "insert into customview values(".$conn->getUniqueID('customview').",'All',1,0,'PriceBooks')", + "insert into customview values(".$conn->getUniqueID('customview').",'All',1,0,'Products')", + "insert into customview values(".$conn->getUniqueID('customview').",'All',1,0,'PurchaseOrder')", + + "insert into customview values(".$conn->getUniqueID('customview').",'All',1,0,'SalesOrder')", + "insert into customview values(".$conn->getUniqueID('customview').",'All',1,0,'Vendors')", + "insert into customview values(".$conn->getUniqueID('customview').",'All',1,0,'Faq')" + ); +foreach($insert_query_array6 as $query) +{ + Execute($query); +} + +$res=$conn->query("select cvid from customview where viewname='All' and entitytype='Leads'"); +$cvid = $conn->query_result($res,0,"cvid"); + +$insert_query_array7 = Array( + "insert into cvcolumnlist values ($cvid,0,'leaddetails:lastname:lastname:Leads_Last_Name:V')", + "insert into cvcolumnlist values ($cvid,1,'leaddetails:firstname:firstname:Leads_First_Name:V')", + "insert into cvcolumnlist values ($cvid,2,'leaddetails:company:company:Leads_Company:V')", + "insert into cvcolumnlist values ($cvid,3,'leadaddress:phone:phone:Leads_Phone:V')", + "insert into cvcolumnlist values ($cvid,4,'leadsubdetails:website:website:Leads_Website:V')", + "insert into cvcolumnlist values ($cvid,5,'leaddetails:email:email:Leads_Email:V')", + "insert into cvcolumnlist values ($cvid,6,'crmentity:smownerid:assigned_user_id:Leads_Assigned_To:V')" + ); +foreach($insert_query_array7 as $query) +{ + Execute($query); +} + +$res=$conn->query("select cvid from customview where viewname='All' and entitytype='Accounts'"); +$cvid = $conn->query_result($res,0,"cvid"); + +$insert_query_array8 = Array( + "insert into cvcolumnlist values ($cvid,0,'account:accountname:accountname:Accounts_Account_Name:V')", + "insert into cvcolumnlist values ($cvid,1,'accountbillads:city:city:Accounts_City:V')", + "insert into cvcolumnlist values ($cvid,2,'account:website:website:Accounts_Website:V')", + "insert into cvcolumnlist values ($cvid,3,'account:phone:phone:Accounts_Phone:V')", + "insert into cvcolumnlist values ($cvid,4,'crmentity:smownerid:assigned_user_id:Accounts_Assigned_To:V')" + ); +foreach($insert_query_array8 as $query) +{ + Execute($query); +} + +$res=$conn->query("select cvid from customview where viewname='All' and entitytype='Contacts'"); +$cvid = $conn->query_result($res,0,"cvid"); + +$insert_query_array9 = Array( + "insert into cvcolumnlist values ($cvid,0,'contactdetails:firstname:firstname:Contacts_First_Name:V')", + "insert into cvcolumnlist values ($cvid,1,'contactdetails:lastname:lastname:Contacts_Last_Name:V')", + "insert into cvcolumnlist values ($cvid,2,'contactdetails:title:title:Contacts_Title:V')", + "insert into cvcolumnlist values ($cvid,3,'account:accountname:accountname:Contacts_Account_Name:V')", + "insert into cvcolumnlist values ($cvid,4,'contactdetails:email:email:Contacts_Email:V')", + "insert into cvcolumnlist values ($cvid,5,'contactdetails:phone:phone:Contacts_Phone_Name:V')", + "insert into cvcolumnlist values ($cvid,6,'crmentity:smownerid:assigned_user_id:Contacts_Assigned_To:V')" + ); +foreach($insert_query_array9 as $query) +{ + Execute($query); +} + +$res=$conn->query("select cvid from customview where viewname='All' and entitytype='Potentials'"); +$cvid = $conn->query_result($res,0,"cvid"); + +$insert_query_array10 = Array( + "insert into cvcolumnlist values ($cvid,0,'potential:potentialname:potentialname:Potentials_Potential_Name:V')", + "insert into cvcolumnlist values ($cvid,1,'potential:accountid:account_id:Potentials_Account_Name:V')", + "insert into cvcolumnlist values ($cvid,2,'potential:amount:amount:Potentials_Amount:N')", + "insert into cvcolumnlist values ($cvid,3,'potential:closingdate:closingdate:Potentials_Expected_Close_Date:D')", + "insert into cvcolumnlist values ($cvid,4,'crmentity:smownerid:assigned_user_id:Potentials_Assigned_To:V')" + ); +foreach($insert_query_array10 as $query) +{ + Execute($query); +} + +$res=$conn->query("select cvid from customview where viewname='All' and entitytype='HelpDesk'"); +$cvid = $conn->query_result($res,0,"cvid"); + +$insert_query_array11 = Array( + "insert into cvcolumnlist values ($cvid,0,'crmentity:crmid::HelpDesk_Ticket_ID:I')", + "insert into cvcolumnlist values ($cvid,1,'troubletickets:title:ticket_title:HelpDesk_Title:V')", + "insert into cvcolumnlist values ($cvid,2,'troubletickets:parent_id:parent_id:HelpDesk_Related_to:I')", + "insert into cvcolumnlist values ($cvid,3,'troubletickets:status:ticketstatus:HelpDesk_Status:V')", + "insert into cvcolumnlist values ($cvid,4,'troubletickets:priority:ticketpriorities:HelpDesk_Priority:V')", + "insert into cvcolumnlist values ($cvid,5,'crmentity:smownerid:assigned_user_id:HelpDesk_Assigned_To:V')" + ); +foreach($insert_query_array11 as $query) +{ + Execute($query); +} + + +$res=$conn->query("select cvid from customview where viewname='All' and entitytype='Quotes'"); +$cvid = $conn->query_result($res,0,"cvid"); + +$insert_query_array12 = Array( + "insert into cvcolumnlist values ($cvid,0,'crmentity:crmid::Quotes_Quote_ID:I')", + "insert into cvcolumnlist values ($cvid,1,'quotes:subject:subject:Quotes_Subject:V')", + "insert into cvcolumnlist values ($cvid,2,'quotes:quotestage:quotestage:Quotes_Quote_Stage:V')", + "insert into cvcolumnlist values ($cvid,3,'quotes:potentialid:potential_id:Quotes_Potential_Name:I')", + "insert into cvcolumnlist values ($cvid,4,'quotes:accountid:account_id:Quotes_Account_Name:I')", + "insert into cvcolumnlist values ($cvid,5,'quotes:total:hdnGrandTotal:Quotes_Total:I')", + "insert into cvcolumnlist values ($cvid,6,'crmentity:smownerid:assigned_user_id:Quotes_Assigned_To:V')" + ); +foreach($insert_query_array12 as $query) +{ + Execute($query); +} + +$res=$conn->query("select cvid from customview where viewname='All' and entitytype='Activities'"); +$cvid = $conn->query_result($res,0,"cvid"); + +$insert_query_array13 = Array( + "insert into cvcolumnlist values ($cvid,0,'activity:status:status:Activities_Status:V')", + "insert into cvcolumnlist values ($cvid,1,'activity:activitytype:activitytype:Activities_Type:V')", + "insert into cvcolumnlist values ($cvid,2,'activity:subject:subject:Activities_Subject:V')", + "insert into cvcolumnlist values ($cvid,3,'contactdetails:lastname:lastname:Activities_Contact_Name:V')", + "insert into cvcolumnlist values ($cvid,4,'seactivityrel:activityid:activityid:Activities_Related_To:V')", + "insert into cvcolumnlist values ($cvid,5,'activity:date_start:date_start:Activities_Start_Date:D')", + "insert into cvcolumnlist values ($cvid,6,'activity:due_date:due_date:Activities_End_Date:D')", + "insert into cvcolumnlist values ($cvid,7,'crmentity:smownerid:assigned_user_id:Activities_Assigned_To:V')" + ); +foreach($insert_query_array13 as $query) +{ + Execute($query); +} + + +$res=$conn->query("select cvid from customview where viewname='All' and entitytype='Emails'"); +$cvid = $conn->query_result($res,0,"cvid"); + +$insert_query_array14 = Array( + "insert into cvcolumnlist values ($cvid,0,'activity:subject:subject:Emails_Subject:V')", + "insert into cvcolumnlist values ($cvid,1,'seactivityrel:activityid:activityid:Emails_Related_To:I')", + "insert into cvcolumnlist values ($cvid,2,'activity:date_start:date_start:Emails_Date_Sent:D')", + "insert into cvcolumnlist values ($cvid,3,'crmentity:smownerid:assigned_user_id:Emails_Assigned_To:V')" + ); +foreach($insert_query_array14 as $query) +{ + Execute($query); +} + +$res=$conn->query("select cvid from customview where viewname='All' and entitytype='Invoice'"); +$cvid = $conn->query_result($res,0,"cvid"); + +$insert_query_array15 = Array( + "insert into cvcolumnlist values ($cvid,0,'crmentity:crmid::Invoice_Invoice_Id:I')", + "insert into cvcolumnlist values ($cvid,1,'invoice:subject:subject:Invoice_Subject:V')", + "insert into cvcolumnlist values ($cvid,2,'invoice:salesorderid:salesorder_id:Invoice_Sales_Order:V')", + "insert into cvcolumnlist values ($cvid,3,'invoice:invoicestatus:invoicestatus:Invoice_Status:V')", + "insert into cvcolumnlist values ($cvid,4,'invoice:total:hdnGrandTotal:Invoice_Total:I')", + "insert into cvcolumnlist values ($cvid,5,'crmentity:smownerid:assigned_user_id:Invoice_Assigned_To:V')" + ); +foreach($insert_query_array15 as $query) +{ + Execute($query); +} + + +$res=$conn->query("select cvid from customview where viewname='All' and entitytype='Notes'"); +$cvid = $conn->query_result($res,0,"cvid"); + +$insert_query_array16 = Array( + "insert into cvcolumnlist values ($cvid,0,'notes:title:title:Notes_Title:V')", + "insert into cvcolumnlist values ($cvid,1,'notes:contact_id:contact_id:Notes_Contact_Name:I')", + "insert into cvcolumnlist values ($cvid,2,'senotesrel:crmid:crmid:Notes_Related_To:I')", + "insert into cvcolumnlist values ($cvid,3,'notes:filename:filename:Notes_File:V')", + "insert into cvcolumnlist values ($cvid,4,'crmentity:modifiedtime:modifiedtime:Notes_Modified_Time:V')" + ); +foreach($insert_query_array16 as $query) +{ + Execute($query); +} + +$res=$conn->query("select cvid from customview where viewname='All' and entitytype='PriceBooks'"); +$cvid = $conn->query_result($res,0,"cvid"); + +$insert_query_array17 = Array( + "insert into cvcolumnlist values ($cvid,1,'pricebook:bookname:bookname:PriceBooks_Price_Book_Name:V')", + "insert into cvcolumnlist values ($cvid,2,'pricebook:active:active:PriceBooks_Active:V')" + ); +foreach($insert_query_array17 as $query) +{ + Execute($query); +} + + +$res=$conn->query("select cvid from customview where viewname='All' and entitytype='Products'"); +$cvid = $conn->query_result($res,0,"cvid"); + +$insert_query_array18 = Array( + "insert into cvcolumnlist values ($cvid,0,'products:productname:productname:Products_Product_Name:V')", + "insert into cvcolumnlist values ($cvid,1,'products:productcode:productcode:Products_Product_Code:V')", + "insert into cvcolumnlist values ($cvid,2,'products:commissionrate:commissionrate:Products_Commission_Rate:V')", + "insert into cvcolumnlist values ($cvid,3,'products:qty_per_unit:qty_per_unit:Products_Qty/Unit:V')", + "insert into cvcolumnlist values ($cvid,4,'products:unit_price:unit_price:Products_Unit_Price:V')" + ); +foreach($insert_query_array18 as $query) +{ + Execute($query); +} + +$res=$conn->query("select cvid from customview where viewname='All' and entitytype='PurchaseOrder'"); +$cvid = $conn->query_result($res,0,"cvid"); + +$insert_query_array19 = Array( + "insert into cvcolumnlist values($cvid,0,'crmentity:crmid::PurchaseOrder_Order_Id:I')", + "insert into cvcolumnlist values($cvid,1,'purchaseorder:subject:subject:PurchaseOrder_Subject:V')", + "insert into cvcolumnlist values($cvid,2,'purchaseorder:vendorid:vendor_id:PurchaseOrder_Vendor_Name:I')", + "insert into cvcolumnlist values($cvid,3,'purchaseorder:tracking_no:tracking_no:PurchaseOrder_Tracking_Number:V')", + "insert into cvcolumnlist values($cvid,4,'crmentity:smownerid:assigned_user_id:PurchaseOrder_Assigned_To:V')" + ); +foreach($insert_query_array19 as $query) +{ + Execute($query); +} + +$res=$conn->query("select cvid from customview where viewname='All' and entitytype='SalesOrder'"); +$cvid = $conn->query_result($res,0,"cvid"); + +$insert_query_array20 = Array( + "insert into cvcolumnlist values ($cvid,0,'crmentity:crmid::SalesOrder_Order_Id:I')", + "insert into cvcolumnlist values ($cvid,1,'salesorder:subject:subject:SalesOrder_Subject:V')", + "insert into cvcolumnlist values ($cvid,2,'account:accountid:account_id:SalesOrder_Account_Name:V')", + "insert into cvcolumnlist values ($cvid,3,'quotes:quoteid:quote_id:SalesOrder_Quote_Name:I')", + "insert into cvcolumnlist values ($cvid,4,'salesorder:total:hdnGrandTotal:SalesOrder_Total:V')", + "insert into cvcolumnlist values ($cvid,5,'crmentity:smownerid:assigned_user_id:SalesOrder_Assigned_To:V')" + ); +foreach($insert_query_array20 as $query) +{ + Execute($query); +} + +$res=$conn->query("select cvid from customview where viewname='All' and entitytype='Vendors'"); +$cvid = $conn->query_result($res,0,"cvid"); + +$insert_query_array21 = Array( + "insert into cvcolumnlist values ($cvid,0,'vendor:vendorname:vendorname:Vendors_Vendor_Name:V')", + "insert into cvcolumnlist values ($cvid,1,'vendor:phone:phone:Vendors_Phone:V')", + "insert into cvcolumnlist values ($cvid,2,'vendor:email:email:Vendors_Email:V')", + "insert into cvcolumnlist values ($cvid,3,'vendor:category:category:Vendors_Category:V')" + ); +foreach($insert_query_array21 as $query) +{ + Execute($query); +} + +$res=$conn->query("select cvid from customview where viewname='All' and entitytype='Faq'"); +$cvid = $conn->query_result($res,0,"cvid"); + +$insert_query_array22 = Array( + "insert into cvcolumnlist values ($cvid,0,'faq:id::Faq_FAQ_Id:I')", + "insert into cvcolumnlist values ($cvid,1,'faq:question:question:Faq_Question:V')", + "insert into cvcolumnlist values ($cvid,2,'faq:category:faqcategories:Faq_Category:V')", + "insert into cvcolumnlist values ($cvid,3,'faq:product_id:product_id:Faq_Product_Name:I')", + "insert into cvcolumnlist values ($cvid,4,'crmentity:createdtime:createdtime:Faq_Created_Time:D')", + "insert into cvcolumnlist values ($cvid,5,'crmentity:modifiedtime:modifiedtime:Faq_Modified_Time:D')" + ); +foreach($insert_query_array22 as $query) +{ + Execute($query); +} + + +$update_query_array3 = Array( + "update field set uitype=53 where tabid=2 and columnname='smownerid'", + "update field set uitype=53 where tabid=4 and columnname='smownerid'", + "update field set uitype=53 where tabid=20 and columnname='smownerid'", + "update field set uitype=53 where tabid=22 and columnname='smownerid'", + "update field set uitype=53 where tabid=23 and columnname='smownerid'" + ); +foreach($update_query_array3 as $query) +{ + Execute($query); +} + +$create_query6 = "CREATE TABLE accountgrouprelation ( accountid int(19) NOT NULL default '0', groupname varchar(100) default NULL, PRIMARY KEY (`accountid`))"; +Execute($create_query6); + +$alter_query_array8 = Array( + "alter table accountgrouprelation ADD CONSTRAINT fk_accountgrouprelation FOREIGN KEY (accountid) REFERENCES account(accountid) ON DELETE CASCADE", + "alter table accountgrouprelation ADD CONSTRAINT fk_accountgrouprelation2 FOREIGN KEY (groupname) REFERENCES groups(name) ON DELETE CASCADE" + ); +foreach($alter_query_array8 as $query) +{ + Execute($query); +} + +$create_query7 = "CREATE TABLE contactgrouprelation ( contactid int(19) NOT NULL default '0', groupname varchar(100) default NULL, PRIMARY KEY (`contactid`))"; +Execute($create_query7); + +$alter_query_array9 = Array( + "alter table contactgrouprelation ADD CONSTRAINT fk_contactgrouprelation FOREIGN KEY (contactid) REFERENCES contactdetails(contactid) ON DELETE CASCADE", + "alter table contactgrouprelation ADD CONSTRAINT fk_contactgrouprelation2 FOREIGN KEY (groupname) REFERENCES groups(name) ON DELETE CASCADE" + ); +foreach($alter_query_array9 as $query) +{ + Execute($query); +} + + +$create_query10 = "CREATE TABLE potentialgrouprelation ( potentialid int(19) NOT NULL default '0', groupname varchar(100) default NULL, PRIMARY KEY (`potentialid`))"; +Execute($create_query10); + +$alter_query_array10 = Array( + "alter table potentialgrouprelation ADD CONSTRAINT fk_potentialgrouprelation FOREIGN KEY (potentialid) REFERENCES potential(potentialid) ON DELETE CASCADE", + "alter table potentialgrouprelation ADD CONSTRAINT fk_potentialgrouprelation2 FOREIGN KEY (groupname) REFERENCES groups(name) ON DELETE CASCADE" + ); +foreach($alter_query_array10 as $query) +{ + Execute($query); +} + +$create_query11 = "CREATE TABLE quotegrouprelation ( quoteid int(19) NOT NULL default '0', groupname varchar(100) default NULL, PRIMARY KEY (`quoteid`) )"; +Execute($create_query11); + +$alter_query_array11 = Array( + "alter table quotegrouprelation ADD CONSTRAINT fk_quotegrouprelation FOREIGN KEY (quoteid) REFERENCES quotes(quoteid) ON DELETE CASCADE", + "alter table quotegrouprelation ADD CONSTRAINT fk_quotegrouprelation2 FOREIGN KEY (groupname) REFERENCES groups(name) ON DELETE CASCADE" + ); +foreach($alter_query_array11 as $query) +{ + Execute($query); +} + +$create_query12 = "CREATE TABLE sogrouprelation ( salesorderid int(19) NOT NULL default '0', groupname varchar(100) default NULL, PRIMARY KEY (`salesorderid`) )"; +Execute($create_query12); + +$alter_query_array12 = Array( + "alter table sogrouprelation ADD CONSTRAINT fk_sogrouprelation FOREIGN KEY (salesorderid) REFERENCES salesorder(salesorderid) ON DELETE CASCADE", + "alter table sogrouprelation ADD CONSTRAINT fk_sogrouprelation2 FOREIGN KEY (groupname) REFERENCES groups(name) ON DELETE CASCADE" + ); +foreach($alter_query_array12 as $query) +{ + Execute($query); +} + +$create_query13 = "CREATE TABLE invoicegrouprelation ( invoiceid int(19) NOT NULL default '0', groupname varchar(100) default NULL, PRIMARY KEY (`invoiceid`))"; +Execute($create_query13); + +$alter_query_array13 = Array( + "alter table invoicegrouprelation ADD CONSTRAINT fk_invoicegrouprelation FOREIGN KEY (invoiceid) REFERENCES invoice(invoiceid) ON DELETE CASCADE", + "alter table invoicegrouprelation ADD CONSTRAINT fk_invoicegrouprelation2 FOREIGN KEY (groupname) REFERENCES groups(name) ON DELETE CASCADE" + ); +foreach($alter_query_array13 as $query) +{ + Execute($query); +} + +$create_query14 = "CREATE TABLE pogrouprelation ( purchaseorderid int(19) NOT NULL default '0', groupname varchar(100) default NULL, PRIMARY KEY (`purchaseorderid`))"; +Execute($create_query14); + +$alter_query_array14 = Array( + "alter table pogrouprelation ADD CONSTRAINT fk_pogrouprelation FOREIGN KEY (purchaseorderid) REFERENCES purchaseorder(purchaseorderid) ON DELETE CASCADE", + "alter table pogrouprelation ADD CONSTRAINT fk_productgrouprelation2 FOREIGN KEY (groupname) REFERENCES groups(name) ON DELETE CASCADE" + ); +foreach($alter_query_array14 as $query) +{ + Execute($query); +} + +$alter_query1 = "ALTER TABLE users ADD column lead_view VARCHAR(25) DEFAULT 'Today' AFTER homeorder"; +Execute($alter_query1); + +$update_query1 = "update users set homeorder = 'ALVT,PLVT,QLTQ,CVLVT,HLT,OLV,GRT,OLTSO,ILTI,MNL'"; +Execute($update_query1); + +$alter_query2 = "ALTER TABLE products change column imagename imagename text"; +Execute($alter_query2); + +$alter_query3 = "alter table systems modify server varchar(50), modify server_username varchar(50), modify server_password varchar(50), add column smtp_auth char(5)"; +Execute($alter_query3); + +$alter_query_array15 = Array( + "alter table users add column imagename varchar(250)", + "alter table users add column tagcloud varchar(250)" + ); +foreach($alter_query_array15 as $query) +{ + Execute($query); +} + +$alter_query_array16 = Array( + "alter table systems change column server server varchar(80) default NULL", + "alter table systems change column server_username server_username varchar(80) default NULL" + ); +foreach($alter_query_array16 as $query) +{ + Execute($query); +} + + +$create_query15 = "create table portal(portalid int(19), portalname varchar(255) NOT NULL, portalurl varchar(255) NOT NULL,sequence int(3) NOT NULL, PRIMARY KEY (portalid))"; +Execute($create_query15); + +$alter_query_array = Array( + "alter table attachments drop column attachmentsize", + "alter table attachments drop column attachmentcontents" + ); +foreach($alter_query_array as $query) +{ + Execute($query); +} + +$update_query2 = "UPDATE field SET fieldlabel = 'Reference' WHERE tabid = 4 and tablename = 'contactdetails'"; +Execute($update_query2); + +$alter_query = "ALTER TABLE field ADD column info_type varchar(20) default NULL after quickcreatesequence"; +Execute($alter_query); + +$update_query_array4 = Array( + "UPDATE field SET info_type = 'BAS'", + + "UPDATE field SET info_type = 'ADV' WHERE tabid = 7 and fieldlabel = 'Website'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 7 and fieldlabel = 'Industry'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 7 and fieldlabel = 'Annual Revenue'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 7 and fieldlabel = 'No Of Employees'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 7 and fieldlabel = 'Yahoo Id'", + + "UPDATE field SET info_type = 'ADV' WHERE tabid = 6 and fieldlabel = 'Ticker Symbol'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 6 and fieldlabel = 'Other Phone'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 6 and fieldlabel = 'Member Of'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 6 and fieldlabel = 'Employees'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 6 and fieldlabel = 'Other Email'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 6 and fieldlabel = 'Ownership'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 6 and fieldlabel = 'Rating'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 6 and fieldlabel = 'industry'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 6 and fieldlabel = 'SIC Code'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 6 and fieldlabel = 'Type'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 6 and fieldlabel = 'Annual Revenue'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 6 and fieldlabel = 'Email Opt Out'", + + "UPDATE field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Home Phone'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Department'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Birthdate'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Email'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Reports To'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Assistant'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Yahoo Id'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Assistant Phone'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Do Not Call'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Email Opt Out'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Reference'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Portal User'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Support Start Date'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Support End Date'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Contact Image'", + + "UPDATE field SET info_type = 'ADV' WHERE tabid = 14 and fieldlabel = 'Usage Unit'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 14 and fieldlabel = 'Qty/Unit'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 14 and fieldlabel = 'Qty In Stock'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 14 and fieldlabel = 'Reorder Level'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 14 and fieldlabel = 'Handler'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 14 and fieldlabel = 'Qty In Demand'", + "UPDATE field SET info_type = 'ADV' WHERE tabid = 14 and fieldlabel = 'Product Image'" + ); +foreach($update_query_array4 as $query) +{ + Execute($query); +} + + +$create_query16 = "CREATE TABLE `chat_msg` ( `id` bigint(20) NOT NULL auto_increment, `chat_from` bigint(20) NOT NULL default '0', `chat_to` bigint(20) NOT NULL default '0', `born` timestamp NULL default '0000-00-00 00:00:00', `msg` varchar(255) NOT NULL, PRIMARY KEY (`id`), KEY `chat_to` (`chat_to`), KEY `chat_from` (`chat_from`), KEY `born` (`born`)) ENGINE=InnoDB"; +Execute($create_query16); +$create_query17 = "CREATE TABLE `chat_pchat` ( `id` bigint(20) NOT NULL auto_increment, `msg` bigint(20) NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `msg` (`msg`)) ENGINE=InnoDB"; +Execute($create_query17); + +$create_query18 = "CREATE TABLE `chat_pvchat` ( `id` bigint(20) NOT NULL auto_increment, `msg` bigint(20) NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `msg` (`msg`)) ENGINE=InnoDB"; +Execute($create_query18); + +$create_query19 = "CREATE TABLE `chat_users` ( `id` bigint(20) NOT NULL auto_increment, `nick` varchar(50) NOT NULL, `session` varchar(50) NOT NULL, `ip` varchar(20) NOT NULL default '000.000.000.000', `ping` timestamp NULL default '0000-00-00 00:00:00', PRIMARY KEY (`id`), UNIQUE KEY `session` (`session`), UNIQUE KEY `nick` (`nick`), KEY `ping` (`ping`)) ENGINE=InnoDB"; +Execute($create_query19); + +$alter_query_array17 = Array( + "ALTER TABLE `chat_msg` ADD CONSTRAINT `chat_msg_ibfk_1` FOREIGN KEY (`chat_from`) REFERENCES `chat_users` (`id`) ON DELETE CASCADE", + + "ALTER TABLE `chat_pchat` ADD CONSTRAINT `chat_pchat_ibfk_1` FOREIGN KEY (`msg`) REFERENCES `chat_msg` (`id`) ON DELETE CASCADE", + + "ALTER TABLE `chat_pvchat` ADD CONSTRAINT `chat_pvchat_ibfk_1` FOREIGN KEY (`msg`) REFERENCES `chat_msg` (`id`) ON DELETE CASCADE" + ); +foreach($alter_query_array17 as $query) +{ + Execute($query); +} + +$create_query20 = "CREATE TABLE freetags ( id int(19) NOT NULL, tag varchar(50) NOT NULL default '', raw_tag varchar(50) NOT NULL default '', PRIMARY KEY (id)) TYPE=MyISAM"; +Execute($create_query20); + +$create_query21 = "CREATE TABLE freetagged_objects ( tag_id int(19) NOT NULL default '0', tagger_id int(19) NOT NULL default '0', object_id int(19) NOT NULL default '0', tagged_on datetime NOT NULL default '0000-00-00 00:00:00', module varchar(50) NOT NULL default '', PRIMARY KEY (`tag_id`,`tagger_id`,`object_id`), KEY `tag_id_index` (`tag_id`), KEY `tagger_id_index` (`tagger_id`), KEY `object_id_index` (`object_id`) +) TYPE=MyISAM"; +Execute($create_query21); + +$alter_query4 = "alter table profile add column description text"; +Execute($alter_query4); + +$alter_query5 = "alter table contactdetails add column imagename varchar(250) after currency"; +Execute($alter_query5); + +$alter_query = "ALTER TABLE contactdetails ADD column reference varchar(3) default NULL after imagename"; +Execute($alter_query); + +$insert_query_array23 = Array( + "insert into blocks values(75,4,'LBL_IMAGE_INFORMATION',5,0,0,0,0,0)", + "insert into field values(4,".$conn->getUniqueID("field").",'imagename','contactdetails',1,'69','imagename','Contact Image',1,0,0,100,1,75,1,'V~O',1,null,'ADV')", + + "Insert into field values(9,".$conn->getUniqueID("field").",'visibility','activity',1,15,'visibility','Visibility',1,0,0,100,17,19,3,'V~O',1,null,'BAS')", + "Insert into field values(16,".$conn->getUniqueID("field").",'visibility','activity',1,15,'visibility','Visibility',1,0,0,100,19,41,1,'V~O',1,null,'BAS')" + ); +foreach($insert_query_array23 as $query) +{ + Execute($query); +} + +$alter_query6 = "alter table activity add column visibility varchar(50) NOT NULL after notime"; +Execute($alter_query6); + +$create_query22 = "CREATE TABLE `visibility` ( `visibilityid` int(19) NOT NULL auto_increment, `visibility` varchar(200) NOT NULL default '', `sortorderid` int(19) NOT NULL default '0', `presence` int(1) NOT NULL default '1', PRIMARY KEY (`visibilityid`), UNIQUE KEY `Visibility_VLY` (`visibility`)) ENGINE=InnoDB"; +Execute($create_query22); + + +$create_query23 = "CREATE TABLE `sharedcalendar` ( `userid` int(19) NOT NULL default '0', `sharedid` int(19) NOT NULL default '0', PRIMARY KEY (`userid`,`sharedid`)) ENGINE=MyISAM"; +Execute($create_query23); + +$insert_query6 = "INSERT INTO tab VALUES(26,'Campaigns',0,23,'Campaigns',null,null,1)"; +Execute($insert_query6); +$insert_query7 = "INSERT INTO parenttabrel VALUES(2,26,1)"; +Execute($insert_query7); + +$insert_query8 = "insert into blocks values(76,26,'LBL_CAMPAIGN_INFORMATION',1,0,0,0,0,0)"; +Execute($insert_query8); +$insert_query9 = "insert into blocks values(77,26,'LBL_DESCRIPTION_INFORMATION',2,0,0,0,0,0)"; +Execute($insert_query9); + +$insert_query_array24 = Array( + "insert into field values(26,".$conn->getUniqueID("field").",'campaignname','campaign',1,'2','campaignname','Campaign Name',1,0,0,100,1,76,1,'V~M',0,1,'BAS')", + "insert into field values(26,".$conn->getUniqueID("field").",'campaigntype','campaign',1,15,'campaigntype','Campaign Type',1,0,0,100,2,76,1,'N~O',0,5,'BAS')", + "insert into field values(26,".$conn->getUniqueID("field").",'campaignstatus','campaign',1,15,'campaignstatus','Campaign Status',1,0,0,100,3,76,1,'N~O',0,5,'BAS')", + "insert into field values(26,".$conn->getUniqueID("field").",'closingdate','campaign',1,'23','closingdate','Expected Close Date',1,0,0,100,5,76,1,'D~M',0,3,'BAS')", + "insert into field values(26,".$conn->getUniqueID("field").",'expectedrevenue','campaign',1,'15','expectedrevenue','Expected Revenue',1,0,0,100,6,76,1,'V~O',1,null,'BAS')", + "insert into field values(26,".$conn->getUniqueID("field").",'budgetcost','campaign',1,'1','budgetcost','Budget Cost',1,0,0,100,7,76,1,'V~O',1,null,'BAS')", + "insert into field values(26,".$conn->getUniqueID("field").",'actualcost','campaign',1,'15','actualcost','Actual Cost',1,0,0,100,8,76,1,'V~O',1,null,'BAS')", + "insert into field values(26,".$conn->getUniqueID("field").",'expectedresponse','campaign',1,'16','expectedresponse','Expected Response',1,0,0,100,9,76,1,'V~O',0,4,'BAS')", + "insert into field values(26,".$conn->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,10,76,1,'V~M',1,null,'BAS')", + "insert into field values(26,".$conn->getUniqueID("field").",'numsent','campaign',1,'9','numsent','Num Sent',1,0,0,100,11,76,1,'N~O',1,null,'BAS')", + "insert into field values(26,".$conn->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,13,76,2,'T~O',1,null,'BAS')", + "insert into field values(26,".$conn->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,14,76,2,'T~O',1,null,'BAS')", + "insert into field values(26,".$conn->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,77,1,'V~O',1,null,'BAS')" + ); +foreach($insert_query_array24 as $query) +{ + Execute($query); +} + + +$insert_query_array25 = Array( + "insert into relatedlists values (".$conn->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Contacts").",'get_contacts',1,'Contacts',0)", + "insert into relatedlists values (".$conn->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Leads").",'get_leads',2,'Leads',0)" + ); +foreach($insert_query_array25 as $query) +{ + Execute($query); +} + + +$insert_query_array26 = Array( + "insert into field values (7,".$conn->getUniqueID("field").",'campaignid','leaddetails',1,'51','campaignid','Campaign Name',1,0,0,100,6,4,3,'I~O',1,null,'BAS')", + "insert into field values (4,".$conn->getUniqueID("field").",'campaignid','contactdetails',1,'51','campaignid','Campaign Name',1,0,0,100,6,4,3,'I~O',1,null,'BAS')" + ); +foreach($insert_query_array26 as $query) +{ + Execute($query); +} + + +$create_query24 = "CREATE TABLE `campaign` ( + `campaignname` varchar(255) NOT NULL default '', + `campaigntype` varchar(255) default NULL, + `campaignstatus` varchar(255) default NULL, + `expectedrevenue` decimal(11,3) default NULL, + `budgetcost` decimal(11,3) default NULL, + `actualcost` decimal(11,3) default NULL, + `expectedresponse` decimal(10,0) default NULL, + `numsent` decimal(11,0) default NULL, + `campaignid` int(7) default NULL, + `closingdate` date default NULL, + PRIMARY KEY (`campaignname`), + KEY `idx_campaignid` (`campaignid`), + KEY `idx_campaignname` (`campaignname`) +) ENGINE=InnoDB"; +Execute($create_query24); + +$create_query25 = "CREATE TABLE `campaigncontrel` ( + `campaignid` int(19) NOT NULL default '0', + `contactid` int(19) NOT NULL default '0', + PRIMARY KEY (`campaignid`), + KEY `CampaignContRel_IDX1` (`contactid`), + CONSTRAINT `fk_CampaignContRel2` FOREIGN KEY (`contactid`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE +) ENGINE=InnoDB"; +Execute($create_query25); + +$create_query26 = "CREATE TABLE `campaignleadrel` ( + `campaignid` int(19) NOT NULL default '0', + `leadid` int(19) NOT NULL default '0', + PRIMARY KEY (`campaignid`), + KEY `CampaignLeadRel_IDX1` (`leadid`), + CONSTRAINT `fk_CampaignLeadRel2` FOREIGN KEY (`leadid`) REFERENCES `leaddetails` (`leadid`) ON DELETE CASCADE +) ENGINE=InnoDB"; +Execute($create_query26); + +$alter_query_array18 = Array( + "alter table leaddetails add column campaignid int(19) default NULL after leadid", + "alter table contactdetails add column campaignid int(19) default NULL after accountid", + //"alter table notes drop PRIMARY KEY contact_id", + "alter table notes drop PRIMARY KEY , add primary key(notesid)", + "update field set uitype=99 where fieldname='update_log' and tabid=13" + ); +foreach($alter_query_array18 as $query) +{ + Execute($query); +} + + + +echo "

    Database Modifications for Indexing and some missded tables starts here.....
    "; +//Added queries which are for indexing and the missing tables - Mickie - on 06-04-2006 + +$query_array = Array( + +"ALTER TABLE `accountgrouprelation` DROP INDEX `fk_accountgrouprelation2`", +"ALTER TABLE `accountscf` DROP COLUMN `cf_356`", +"ALTER TABLE `activity` DROP INDEX `status`", +"ALTER TABLE `attachments` DROP INDEX `attachmentsid`", +"ALTER TABLE `carrier` DROP INDEX `carrier_UK0`", +"ALTER TABLE `chat_msg` DROP INDEX `chat_to`", +"ALTER TABLE `chat_msg` DROP INDEX `chat_from`", +"ALTER TABLE `chat_msg` DROP INDEX `born`", +"ALTER TABLE `chat_pchat` DROP INDEX `msg`", +"ALTER TABLE `chat_pvchat` DROP INDEX `msg`", +"ALTER TABLE `chat_users` DROP INDEX `session`", +"ALTER TABLE `chat_users` DROP INDEX `nick`", +"ALTER TABLE `chat_users` DROP INDEX `ping`", +"ALTER TABLE `contactgrouprelation` DROP INDEX `fk_contactgrouprelation2`", +"ALTER TABLE `customview` DROP INDEX `customview`", +"ALTER TABLE `def_org_field` DROP INDEX `tabid`", +"ALTER TABLE `field` DROP INDEX `tabid`", +"ALTER TABLE `freetagged_objects` DROP INDEX `tagger_id_index`", +"ALTER TABLE `freetagged_objects` DROP INDEX `object_id_index`", +"ALTER TABLE `groups` DROP INDEX `groupname`", +"ALTER TABLE `invoicegrouprelation` DROP INDEX `fk_invoicegrouprelation2`", +"ALTER TABLE `leadscf` DROP COLUMN `cf_354`", +"ALTER TABLE `leadscf` DROP COLUMN `cf_358`", +"ALTER TABLE `leadscf` DROP COLUMN `cf_360`", +"ALTER TABLE `pogrouprelation` DROP INDEX `fk_productgrouprelation2`", +"ALTER TABLE `potential` DROP INDEX `potentialid`", +"ALTER TABLE `potentialgrouprelation` DROP INDEX `fk_potentialgrouprelation2`", +"ALTER TABLE `profile2field` DROP INDEX `tabid`", +"ALTER TABLE `profile2tab` DROP INDEX `idx_profile2tab`", +"ALTER TABLE `quotegrouprelation` DROP INDEX `fk_quotegrouprelation2`", +"ALTER TABLE `reportmodules` DROP INDEX `reportmodules_IDX0`", +"ALTER TABLE `reportsortcol` DROP INDEX `reportsortcol_IDX0`", +"ALTER TABLE `reportsummary` DROP INDEX `reportsummary_IDX0`", +"ALTER TABLE `seattachmentsrel` DROP INDEX `attachmentsid`", +"ALTER TABLE `sogrouprelation` DROP INDEX `fk_sogrouprelation2`", +"ALTER TABLE `soproductrel` DROP COLUMN `shortdescription`", +"ALTER TABLE `tab` DROP INDEX `tabid`", +"ALTER TABLE `troubletickets` DROP INDEX `status`", +"ALTER TABLE `accountgrouprelation` TYPE=InnoDB, COMMENT='', ROW_FORMAT=COMPACT", +"ALTER TABLE `activity_reminder` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED", +"ALTER TABLE `activsubtype` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `contactgrouprelation` TYPE=InnoDB, COMMENT='', ROW_FORMAT=COMPACT", +//"DROP TABLE `crmentity_seq`", +"ALTER TABLE `currency_info` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `customerdetails` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +//"DROP TABLE `customfield_sequence_seq`", +"ALTER TABLE `customview_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED", +"ALTER TABLE `def_org_field` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED", +"ALTER TABLE `def_org_share` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED", +"ALTER TABLE `def_org_share_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED", +"ALTER TABLE `defaultcv` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `durationhrs` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `durationmins` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `emailtemplates` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `emailtemplates_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED", +"ALTER TABLE `faqcategories` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `faqstatus` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `field_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED", +"ALTER TABLE `files` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `freetagged_objects` TYPE=InnoDB, COMMENT='', ROW_FORMAT=COMPACT", +"ALTER TABLE `group2grouprel` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED", +"ALTER TABLE `group2role` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `group2rs` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +//"DROP TABLE `groups_seq`", +"ALTER TABLE `headers` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `import_maps` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `inventorynotification_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED", +"ALTER TABLE `invoicegrouprelation` TYPE=InnoDB, COMMENT='', ROW_FORMAT=COMPACT", +"ALTER TABLE `loginhistory` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `mail_accounts` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `notificationscheduler_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED", +"ALTER TABLE `ownernotify` TYPE=InnoDB, COMMENT='', ROW_FORMAT=COMPACT", +"ALTER TABLE `parenttabrel` TYPE=InnoDB, COMMENT='', ROW_FORMAT=COMPACT", +"ALTER TABLE `pogrouprelation` TYPE=InnoDB, COMMENT='', ROW_FORMAT=COMPACT", +"ALTER TABLE `portal` TYPE=InnoDB, COMMENT='', ROW_FORMAT=COMPACT", +"ALTER TABLE `portalinfo` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `potentialgrouprelation` TYPE=InnoDB, COMMENT='', ROW_FORMAT=COMPACT", +"ALTER TABLE `profile2field` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED", +"ALTER TABLE `profile2globalpermissions` TYPE=InnoDB, COMMENT='', ROW_FORMAT=COMPACT", +"ALTER TABLE `profile2standardpermissions` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED", +"ALTER TABLE `profile2tab` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED", +"ALTER TABLE `profile2utility` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED", +"ALTER TABLE `profile_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED", +"ALTER TABLE `quotegrouprelation` TYPE=InnoDB, COMMENT='', ROW_FORMAT=COMPACT", +"ALTER TABLE `rating` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `relatedlists` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `relatedlists_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED", +"ALTER TABLE `role2profile` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `role_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED", +"ALTER TABLE `rss` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `sales_stage` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `salutationtype` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `selectquery_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED", +"ALTER TABLE `sogrouprelation` TYPE=InnoDB, COMMENT='', ROW_FORMAT=COMPACT", +"ALTER TABLE `systems` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `taskpriority` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `taskstatus` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `ticketcategories` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `ticketpriorities` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `ticketseverities` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `ticketstatus` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `ticketstracktime` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED", +"ALTER TABLE `tracker` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `users2group` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED", +"ALTER TABLE `users_last_import` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", +"ALTER TABLE `users_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED", +"ALTER TABLE `wordtemplates` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC", + +"CREATE TABLE `actualcost` ( + `actualcostid` int(19) NOT NULL auto_increment, + `actualcost` varchar(200) NOT NULL, + `sortorderid` int(19) NOT NULL default '0', + `presence` int(1) NOT NULL default '1', + PRIMARY KEY (`actualcostid`), + UNIQUE KEY `CampaignActCst_UK01` (`actualcost`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"CREATE TABLE `campaignstatus` ( + `campaignstatusid` int(19) NOT NULL auto_increment, + `campaignstatus` varchar(200) NOT NULL, + `sortorderid` int(19) NOT NULL default '0', + `presence` int(1) NOT NULL default '1', + PRIMARY KEY (`campaignstatusid`), + KEY `Campaignstatus_UK01` (`campaignstatus`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"CREATE TABLE `campaigntype` ( + `campaigntypeid` int(19) NOT NULL auto_increment, + `campaigntype` varchar(200) NOT NULL, + `sortorderid` int(19) NOT NULL default '0', + `presence` int(1) NOT NULL default '1', + PRIMARY KEY (`campaigntypeid`), + UNIQUE KEY `Campaigntype_UK01` (`campaigntype`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"CREATE TABLE `currency_info_seq` ( + `id` int(11) NOT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1", + +"CREATE TABLE `datashare_grp2grp` ( + `shareid` int(19) NOT NULL, + `share_groupid` int(19) default NULL, + `to_groupid` int(19) default NULL, + `permission` int(19) default NULL, + PRIMARY KEY (`shareid`), + KEY `idx_datashare_grp2grp_share_groupid` (`share_groupid`), + KEY `idx_datashare_grp2grp_to_groupid` (`to_groupid`), + CONSTRAINT `fk_datashare_grp2grp2` FOREIGN KEY (`to_groupid`) REFERENCES `groups` (`groupid`) ON DELETE CASCADE, + CONSTRAINT `fk_datashare_grp2grp1` FOREIGN KEY (`share_groupid`) REFERENCES `groups` (`groupid`) ON DELETE CASCADE, + CONSTRAINT `fk_datashare_grp2grp789` FOREIGN KEY (`shareid`) REFERENCES `datashare_module_rel` (`shareid`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"CREATE TABLE `datashare_grp2role` ( + `shareid` int(19) NOT NULL, + `share_groupid` int(19) default NULL, + `to_roleid` varchar(255) default NULL, + `permission` int(19) default NULL, + PRIMARY KEY (`shareid`), + KEY `idx_datashare_grp2role_share_groupid` (`share_groupid`), + KEY `idx_datashare_grp2role_to_roleid` (`to_roleid`), + CONSTRAINT `fk_datashare_grp2role2` FOREIGN KEY (`to_roleid`) REFERENCES `role` (`roleid`) ON DELETE CASCADE, + CONSTRAINT `fk_datashare_grp2role1` FOREIGN KEY (`share_groupid`) REFERENCES `groups` (`groupid`) ON DELETE CASCADE, + CONSTRAINT `fk_datashare_grp2role345` FOREIGN KEY (`shareid`) REFERENCES `datashare_module_rel` (`shareid`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"CREATE TABLE `datashare_grp2rs` ( + `shareid` int(19) NOT NULL, + `share_groupid` int(19) default NULL, + `to_roleandsubid` varchar(255) default NULL, + `permission` int(19) default NULL, + PRIMARY KEY (`shareid`), + KEY `idx_datashare_grp2rs_share_groupid` (`share_groupid`), + KEY `idx_datashare_grp2rs_to_roleandsubid` (`to_roleandsubid`), + CONSTRAINT `fk_datashare_grp2rs3` FOREIGN KEY (`to_roleandsubid`) REFERENCES `role` (`roleid`) ON DELETE CASCADE, + CONSTRAINT `fk_datashare_grp2rs1` FOREIGN KEY (`share_groupid`) REFERENCES `groups` (`groupid`) ON DELETE CASCADE, + CONSTRAINT `fk_datashare_grp2rs36` FOREIGN KEY (`shareid`) REFERENCES `datashare_module_rel` (`shareid`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"CREATE TABLE `datashare_module_rel` ( + `shareid` int(19) NOT NULL, + `tabid` int(19) NOT NULL, + `relationtype` varchar(200) default NULL, + PRIMARY KEY (`shareid`), + KEY `idx_datashare_module_rel_tabid` (`tabid`), + CONSTRAINT `fk_datashare_module_rel456` FOREIGN KEY (`tabid`) REFERENCES `tab` (`tabid`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"CREATE TABLE `datashare_relatedmodule_permission` ( + `shareid` int(19) NOT NULL, + `datashare_relatedmodule_id` int(19) NOT NULL, + `permission` int(19) default NULL, + PRIMARY KEY (`shareid`,`datashare_relatedmodule_id`), + KEY `datashare_relatedmodule_permission_UK1` (`shareid`,`permission`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"CREATE TABLE `datashare_relatedmodules` ( + `datashare_relatedmodule_id` int(19) NOT NULL, + `tabid` int(19) default NULL, + `relatedto_tabid` int(19) default NULL, + PRIMARY KEY (`datashare_relatedmodule_id`), + KEY `idx_datashare_relatedmodules_tabid` (`tabid`), + KEY `idx_datashare_relatedmodules_relatedto_tabid` (`relatedto_tabid`), + CONSTRAINT `fk_datashare_relatedmodules1` FOREIGN KEY (`relatedto_tabid`) REFERENCES `tab` (`tabid`) ON DELETE CASCADE, + CONSTRAINT `fk_datashare_relatedmodules123` FOREIGN KEY (`tabid`) REFERENCES `tab` (`tabid`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"CREATE TABLE `datashare_relatedmodules_seq` ( + `id` int(11) NOT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1", + +"CREATE TABLE `datashare_role2group` ( + `shareid` int(19) NOT NULL, + `share_roleid` varchar(255) default NULL, + `to_groupid` int(19) default NULL, + `permission` int(19) default NULL, + PRIMARY KEY (`shareid`), + KEY `idx_datashare_role2group_share_roleid` (`share_roleid`), + KEY `idx_datashare_role2group_to_groupid` (`to_groupid`), + CONSTRAINT `fk_datashare_role2group3` FOREIGN KEY (`to_groupid`) REFERENCES `groups` (`groupid`) ON DELETE CASCADE, + CONSTRAINT `fk_datashare_role2group1` FOREIGN KEY (`share_roleid`) REFERENCES `role` (`roleid`) ON DELETE CASCADE, + CONSTRAINT `fk_datashare_role2group568` FOREIGN KEY (`shareid`) REFERENCES `datashare_module_rel` (`shareid`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"CREATE TABLE `datashare_role2role` ( + `shareid` int(19) NOT NULL, + `share_roleid` varchar(255) default NULL, + `to_roleid` varchar(255) default NULL, + `permission` int(19) default NULL, + PRIMARY KEY (`shareid`), + KEY `idx_datashare_role2role_share_roleid` (`share_roleid`), + KEY `idx_datashare_role2role_to_roleid` (`to_roleid`), + CONSTRAINT `fk_datashare_role2role3` FOREIGN KEY (`to_roleid`) REFERENCES `role` (`roleid`) ON DELETE CASCADE, + CONSTRAINT `fk_datashare_role2role1` FOREIGN KEY (`share_roleid`) REFERENCES `role` (`roleid`) ON DELETE CASCADE, + CONSTRAINT `fk_datashare_role2role345` FOREIGN KEY (`shareid`) REFERENCES `datashare_module_rel` (`shareid`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"CREATE TABLE `datashare_role2rs` ( + `shareid` int(19) NOT NULL, + `share_roleid` varchar(255) default NULL, + `to_roleandsubid` varchar(255) default NULL, + `permission` int(19) default NULL, + PRIMARY KEY (`shareid`), + KEY `idx_datashare_role2s_share_roleid` (`share_roleid`), + KEY `idx_datashare_role2s_to_roleandsubid` (`to_roleandsubid`), + CONSTRAINT `fk_datashare_role2rs3` FOREIGN KEY (`to_roleandsubid`) REFERENCES `role` (`roleid`) ON DELETE CASCADE, + CONSTRAINT `fk_datashare_role2rs1` FOREIGN KEY (`share_roleid`) REFERENCES `role` (`roleid`) ON DELETE CASCADE, + CONSTRAINT `fk_datashare_role2rs987` FOREIGN KEY (`shareid`) REFERENCES `datashare_module_rel` (`shareid`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"CREATE TABLE `datashare_rs2grp` ( + `shareid` int(19) NOT NULL, + `share_roleandsubid` varchar(255) default NULL, + `to_groupid` int(19) default NULL, + `permission` int(19) default NULL, + PRIMARY KEY (`shareid`), + KEY `idx_datashare_rs2grp_share_roleandsubid` (`share_roleandsubid`), + KEY `idx_datashare_rs2grp_to_groupid` (`to_groupid`), + CONSTRAINT `fk_datashare_rs2grp2` FOREIGN KEY (`to_groupid`) REFERENCES `groups` (`groupid`) ON DELETE CASCADE, + CONSTRAINT `fk_datashare_rs2grp1` FOREIGN KEY (`share_roleandsubid`) REFERENCES `role` (`roleid`) ON DELETE CASCADE, + CONSTRAINT `fk_datashare_rs2grpQ2` FOREIGN KEY (`shareid`) REFERENCES `datashare_module_rel` (`shareid`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"CREATE TABLE `datashare_rs2role` ( + `shareid` int(19) NOT NULL, + `share_roleandsubid` varchar(255) default NULL, + `to_roleid` varchar(255) default NULL, + `permission` int(19) default NULL, + PRIMARY KEY (`shareid`), + KEY `idx_datashare_rs2role_share_roleandsubid` (`share_roleandsubid`), + KEY `idx_datashare_rs2role_to_roleid` (`to_roleid`), + CONSTRAINT `fk_datashare_rs2role2` FOREIGN KEY (`to_roleid`) REFERENCES `role` (`roleid`) ON DELETE CASCADE, + CONSTRAINT `fk_datashare_rs2role1` FOREIGN KEY (`share_roleandsubid`) REFERENCES `role` (`roleid`) ON DELETE CASCADE, + CONSTRAINT `fk_datashare_rs2role122` FOREIGN KEY (`shareid`) REFERENCES `datashare_module_rel` (`shareid`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"CREATE TABLE `datashare_rs2rs` ( + `shareid` int(19) NOT NULL, + `share_roleandsubid` varchar(255) default NULL, + `to_roleandsubid` varchar(255) default NULL, + `permission` int(19) default NULL, + PRIMARY KEY (`shareid`), + KEY `idx_datashare_rs2rs_share_roleandsubid` (`share_roleandsubid`), + KEY `idx_datashare_rs2rs_to_roleandsubid` (`to_roleandsubid`), + CONSTRAINT `fk_datashare_rs2rs2` FOREIGN KEY (`to_roleandsubid`) REFERENCES `role` (`roleid`) ON DELETE CASCADE, + CONSTRAINT `fk_datashare_rs2rs1` FOREIGN KEY (`share_roleandsubid`) REFERENCES `role` (`roleid`) ON DELETE CASCADE, + CONSTRAINT `fk_datashare_rs2rs353` FOREIGN KEY (`shareid`) REFERENCES `datashare_module_rel` (`shareid`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"CREATE TABLE `expectedresponse` ( + `expectedresponseid` int(19) NOT NULL auto_increment, + `expectedresponse` varchar(200) NOT NULL, + `sortorderid` int(19) NOT NULL default '0', + `presence` int(1) NOT NULL default '1', + PRIMARY KEY (`expectedresponseid`), + UNIQUE KEY `CampaignExpRes_UK01` (`expectedresponse`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"CREATE TABLE `expectedrevenue` ( + `expectedrevenueid` int(19) NOT NULL auto_increment, + `expectedrevenue` varchar(200) NOT NULL, + `sortorderid` int(19) NOT NULL default '0', + `presence` int(1) NOT NULL default '1', + PRIMARY KEY (`expectedrevenueid`), + UNIQUE KEY `CampaignExpRev_UK01` (`expectedrevenue`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"CREATE TABLE `tmp_read_group_rel_sharing_per` ( + `userid` int(11) NOT NULL, + `tabid` int(11) NOT NULL, + `relatedtabid` int(11) NOT NULL, + `sharedgroupid` int(11) NOT NULL, + PRIMARY KEY (`userid`,`tabid`,`relatedtabid`,`sharedgroupid`), + KEY `tmp_read_group_rel_sharing_per_UK1` (`userid`,`sharedgroupid`,`tabid`), + KEY `fk_tmp_read_group_rel_sharing_per2` (`tabid`), + KEY `fk_tmp_read_group_rel_sharing_per4` (`relatedtabid`), + KEY `fk_tmp_read_group_rel_sharing_per3` (`sharedgroupid`), + CONSTRAINT `fk_tmp_read_group_rel_sharing_per3` FOREIGN KEY (`sharedgroupid`) REFERENCES `groups` (`groupid`) ON DELETE CASCADE, + CONSTRAINT `fk_tmp_read_group_rel_sharing_per1` FOREIGN KEY (`userid`) REFERENCES `users` (`id`) ON DELETE CASCADE, + CONSTRAINT `fk_tmp_read_group_rel_sharing_per2` FOREIGN KEY (`tabid`) REFERENCES `tab` (`tabid`) ON DELETE CASCADE, + CONSTRAINT `fk_tmp_read_group_rel_sharing_per4` FOREIGN KEY (`relatedtabid`) REFERENCES `tab` (`tabid`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"CREATE TABLE `tmp_read_group_sharing_per` ( + `userid` int(11) NOT NULL, + `tabid` int(11) NOT NULL, + `sharedgroupid` int(11) NOT NULL, + PRIMARY KEY (`userid`,`tabid`,`sharedgroupid`), + KEY `tmp_read_group_sharing_per_UK1` (`userid`,`sharedgroupid`), + KEY `fk_tmp_read_group_sharing_per2` (`tabid`), + KEY `fk_tmp_read_group_sharing_per3` (`sharedgroupid`), + CONSTRAINT `fk_tmp_read_group_sharing_per3` FOREIGN KEY (`sharedgroupid`) REFERENCES `groups` (`groupid`) ON DELETE CASCADE, + CONSTRAINT `fk_tmp_read_group_sharing_per1` FOREIGN KEY (`userid`) REFERENCES `users` (`id`) ON DELETE CASCADE, + CONSTRAINT `fk_tmp_read_group_sharing_per2` FOREIGN KEY (`tabid`) REFERENCES `tab` (`tabid`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"CREATE TABLE `tmp_read_user_rel_sharing_per` ( + `userid` int(11) NOT NULL, + `tabid` int(11) NOT NULL, + `relatedtabid` int(11) NOT NULL, + `shareduserid` int(11) NOT NULL, + PRIMARY KEY (`userid`,`tabid`,`relatedtabid`,`shareduserid`), + KEY `tmp_read_user_rel_sharing_per_UK1` (`userid`,`shareduserid`,`relatedtabid`), + KEY `fk_tmp_read_user_rel_sharing_per2` (`tabid`), + KEY `fk_tmp_read_user_rel_sharing_per4` (`relatedtabid`), + KEY `fk_tmp_read_user_rel_sharing_per3` (`shareduserid`), + CONSTRAINT `fk_tmp_read_user_rel_sharing_per3` FOREIGN KEY (`shareduserid`) REFERENCES `users` (`id`) ON DELETE CASCADE, + CONSTRAINT `fk_tmp_read_user_rel_sharing_per1` FOREIGN KEY (`userid`) REFERENCES `users` (`id`) ON DELETE CASCADE, + CONSTRAINT `fk_tmp_read_user_rel_sharing_per2` FOREIGN KEY (`tabid`) REFERENCES `tab` (`tabid`) ON DELETE CASCADE, + CONSTRAINT `fk_tmp_read_user_rel_sharing_per4` FOREIGN KEY (`relatedtabid`) REFERENCES `tab` (`tabid`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"CREATE TABLE `tmp_read_user_sharing_per` ( + `userid` int(11) NOT NULL, + `tabid` int(11) NOT NULL, + `shareduserid` int(11) NOT NULL, + PRIMARY KEY (`userid`,`tabid`,`shareduserid`), + KEY `tmp_read_user_sharing_per_UK1` (`userid`,`shareduserid`), + KEY `fk_tmp_read_user_sharing_per2` (`tabid`), + KEY `fk_tmp_read_user_sharing_per3` (`shareduserid`), + CONSTRAINT `fk_tmp_read_user_sharing_per3` FOREIGN KEY (`shareduserid`) REFERENCES `users` (`id`) ON DELETE CASCADE, + CONSTRAINT `fk_tmp_read_user_sharing_per1` FOREIGN KEY (`userid`) REFERENCES `users` (`id`) ON DELETE CASCADE, + CONSTRAINT `fk_tmp_read_user_sharing_per2` FOREIGN KEY (`tabid`) REFERENCES `tab` (`tabid`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"CREATE TABLE `tmp_write_group_rel_sharing_per` ( + `userid` int(11) NOT NULL, + `tabid` int(11) NOT NULL, + `relatedtabid` int(11) NOT NULL, + `sharedgroupid` int(11) NOT NULL, + PRIMARY KEY (`userid`,`tabid`,`relatedtabid`,`sharedgroupid`), + KEY `tmp_write_group_rel_sharing_per_UK1` (`userid`,`sharedgroupid`,`tabid`), + KEY `fk_tmp_write_group_rel_sharing_per2` (`tabid`), + KEY `fk_tmp_write_group_rel_sharing_per4` (`relatedtabid`), + KEY `fk_tmp_write_group_rel_sharing_per3` (`sharedgroupid`), + CONSTRAINT `fk_tmp_write_group_rel_sharing_per3` FOREIGN KEY (`sharedgroupid`) REFERENCES `groups` (`groupid`) ON DELETE CASCADE, + CONSTRAINT `fk_tmp_write_group_rel_sharing_per1` FOREIGN KEY (`userid`) REFERENCES `users` (`id`) ON DELETE CASCADE, + CONSTRAINT `fk_tmp_write_group_rel_sharing_per2` FOREIGN KEY (`tabid`) REFERENCES `tab` (`tabid`) ON DELETE CASCADE, + CONSTRAINT `fk_tmp_write_group_rel_sharing_per4` FOREIGN KEY (`relatedtabid`) REFERENCES `tab` (`tabid`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"CREATE TABLE `tmp_write_group_sharing_per` ( + `userid` int(11) NOT NULL, + `tabid` int(11) NOT NULL, + `sharedgroupid` int(11) NOT NULL, + PRIMARY KEY (`userid`,`tabid`,`sharedgroupid`), + KEY `tmp_write_group_sharing_per_UK1` (`userid`,`sharedgroupid`), + KEY `fk_tmp_write_group_sharing_per2` (`tabid`), + KEY `fk_tmp_write_group_sharing_per3` (`sharedgroupid`), + CONSTRAINT `fk_tmp_write_group_sharing_per3` FOREIGN KEY (`sharedgroupid`) REFERENCES `groups` (`groupid`) ON DELETE CASCADE, + CONSTRAINT `fk_tmp_write_group_sharing_per1` FOREIGN KEY (`userid`) REFERENCES `users` (`id`) ON DELETE CASCADE, + CONSTRAINT `fk_tmp_write_group_sharing_per2` FOREIGN KEY (`tabid`) REFERENCES `tab` (`tabid`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"CREATE TABLE `tmp_write_user_rel_sharing_per` ( + `userid` int(11) NOT NULL, + `tabid` int(11) NOT NULL, + `relatedtabid` int(11) NOT NULL, + `shareduserid` int(11) NOT NULL, + PRIMARY KEY (`userid`,`tabid`,`relatedtabid`,`shareduserid`), + KEY `tmp_write_user_rel_sharing_per_UK1` (`userid`,`shareduserid`,`tabid`), + KEY `fk_tmp_write_user_rel_sharing_per2` (`tabid`), + KEY `fk_tmp_write_user_rel_sharing_per4` (`relatedtabid`), + KEY `fk_tmp_write_user_rel_sharing_per3` (`shareduserid`), + CONSTRAINT `fk_tmp_write_user_rel_sharing_per3` FOREIGN KEY (`shareduserid`) REFERENCES `users` (`id`) ON DELETE CASCADE, + CONSTRAINT `fk_tmp_write_user_rel_sharing_per1` FOREIGN KEY (`userid`) REFERENCES `users` (`id`) ON DELETE CASCADE, + CONSTRAINT `fk_tmp_write_user_rel_sharing_per2` FOREIGN KEY (`tabid`) REFERENCES `tab` (`tabid`) ON DELETE CASCADE, + CONSTRAINT `fk_tmp_write_user_rel_sharing_per4` FOREIGN KEY (`relatedtabid`) REFERENCES `tab` (`tabid`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"CREATE TABLE `tmp_write_user_sharing_per` ( + `userid` int(11) NOT NULL, + `tabid` int(11) NOT NULL, + `shareduserid` int(11) NOT NULL, + PRIMARY KEY (`userid`,`tabid`,`shareduserid`), + KEY `tmp_write_user_sharing_per_UK1` (`userid`,`shareduserid`), + KEY `fk_tmp_write_user_sharing_per2` (`tabid`), + KEY `fk_tmp_write_user_sharing_per3` (`shareduserid`), + CONSTRAINT `fk_tmp_write_user_sharing_per3` FOREIGN KEY (`shareduserid`) REFERENCES `users` (`id`) ON DELETE CASCADE, + CONSTRAINT `fk_tmp_write_user_sharing_per1` FOREIGN KEY (`userid`) REFERENCES `users` (`id`) ON DELETE CASCADE, + CONSTRAINT `fk_tmp_write_user_sharing_per2` FOREIGN KEY (`tabid`) REFERENCES `tab` (`tabid`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + +"ALTER TABLE `account` MODIFY COLUMN `website` VARCHAR(100) COLLATE latin1_swedish_ci DEFAULT NULL", +"ALTER TABLE `account` MODIFY COLUMN `emailoptout` VARCHAR(3) COLLATE latin1_swedish_ci DEFAULT '0'", +"ALTER TABLE `accountgrouprelation` MODIFY COLUMN `accountid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `actionmapping` MODIFY COLUMN `actionid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `activity` MODIFY COLUMN `date_start` DATE NOT NULL UNIQUE", +"ALTER TABLE `activity` MODIFY COLUMN `sendnotification` VARCHAR(3) COLLATE latin1_swedish_ci NOT NULL DEFAULT '0'", +"ALTER TABLE `activity` MODIFY COLUMN `duration_hours` VARCHAR(2) COLLATE latin1_swedish_ci DEFAULT NULL", +"ALTER TABLE `activity` MODIFY COLUMN `duration_minutes` VARCHAR(2) COLLATE latin1_swedish_ci DEFAULT NULL", +"ALTER TABLE `activity` MODIFY COLUMN `notime` VARCHAR(3) COLLATE latin1_swedish_ci NOT NULL DEFAULT '0'", +"ALTER TABLE `activity_reminder` MODIFY COLUMN `activity_id` INTEGER(11) NOT NULL PRIMARY KEY", +"ALTER TABLE `activity_reminder` MODIFY COLUMN `reminder_time` INTEGER(11) NOT NULL", +"ALTER TABLE `activity_reminder` MODIFY COLUMN `reminder_sent` INTEGER(2) NOT NULL", +"ALTER TABLE `activity_reminder` MODIFY COLUMN `recurringid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `activitygrouprelation` MODIFY COLUMN `activityid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `announcement` MODIFY COLUMN `creatorid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `attachments` MODIFY COLUMN `attachmentsid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `blocks` MODIFY COLUMN `blockid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `blocks` MODIFY COLUMN `tabid` INTEGER(19) NOT NULL UNIQUE", +"ALTER TABLE `blocks` MODIFY COLUMN `sequence` INTEGER(10) DEFAULT NULL", +"ALTER TABLE `blocks` MODIFY COLUMN `show_title` INTEGER(2) DEFAULT NULL", +"ALTER TABLE `campaign` MODIFY COLUMN `campaignname` VARCHAR(255) COLLATE latin1_swedish_ci DEFAULT NULL UNIQUE", +"ALTER TABLE `campaign` MODIFY COLUMN `campaignstatus` VARCHAR(255) COLLATE latin1_swedish_ci DEFAULT NULL UNIQUE", +"ALTER TABLE `campaign` MODIFY COLUMN `expectedrevenue` VARCHAR(255) DEFAULT NULL", +"ALTER TABLE `campaign` MODIFY COLUMN `budgetcost` VARCHAR(255) DEFAULT NULL", +"ALTER TABLE `campaign` MODIFY COLUMN `actualcost` VARCHAR(255) DEFAULT NULL", +"ALTER TABLE `campaign` MODIFY COLUMN `expectedresponse` VARCHAR(255) DEFAULT NULL", +"ALTER TABLE `campaign` MODIFY COLUMN `campaignid` INTEGER(11) NOT NULL PRIMARY KEY", +"ALTER TABLE `chat_msg` MODIFY COLUMN `id` INTEGER(20) NOT NULL AUTO_INCREMENT PRIMARY KEY", +"ALTER TABLE `chat_msg` MODIFY COLUMN `chat_from` INTEGER(20) NOT NULL DEFAULT '0' UNIQUE", +"ALTER TABLE `chat_msg` MODIFY COLUMN `chat_to` INTEGER(20) NOT NULL DEFAULT '0' UNIQUE", +"ALTER TABLE `chat_msg` MODIFY COLUMN `born` DATETIME DEFAULT '0000-00-00 00:00:00' UNIQUE", +"ALTER TABLE `chat_pchat` MODIFY COLUMN `id` INTEGER(20) NOT NULL AUTO_INCREMENT PRIMARY KEY", +"ALTER TABLE `chat_pchat` MODIFY COLUMN `msg` INTEGER(20) DEFAULT '0'", +"ALTER TABLE `chat_pvchat` MODIFY COLUMN `id` INTEGER(20) NOT NULL AUTO_INCREMENT PRIMARY KEY", +"ALTER TABLE `chat_pvchat` MODIFY COLUMN `msg` INTEGER(20) DEFAULT '0'", +"ALTER TABLE `chat_users` MODIFY COLUMN `id` INTEGER(20) NOT NULL AUTO_INCREMENT PRIMARY KEY", +"ALTER TABLE `chat_users` MODIFY COLUMN `nick` VARCHAR(50) COLLATE latin1_swedish_ci NOT NULL UNIQUE", +"ALTER TABLE `chat_users` MODIFY COLUMN `session` VARCHAR(50) COLLATE latin1_swedish_ci NOT NULL UNIQUE", +"ALTER TABLE `chat_users` MODIFY COLUMN `ping` DATETIME DEFAULT '0000-00-00 00:00:00' UNIQUE", +"ALTER TABLE `competitor` MODIFY COLUMN `competitorid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `contactdetails` MODIFY COLUMN `donotcall` VARCHAR(3) COLLATE latin1_swedish_ci DEFAULT NULL", +"ALTER TABLE `contactdetails` MODIFY COLUMN `emailoptout` VARCHAR(3) COLLATE latin1_swedish_ci DEFAULT '0'", +"ALTER TABLE `contactdetails` MODIFY COLUMN `imagename` VARCHAR(150) COLLATE latin1_swedish_ci DEFAULT NULL", +"ALTER TABLE `contactdetails` MODIFY COLUMN `reference` VARCHAR(3) COLLATE latin1_swedish_ci DEFAULT NULL", +"ALTER TABLE `contactgrouprelation` MODIFY COLUMN `contactid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `convertleadmapping` MODIFY COLUMN `leadfid` INTEGER(19) NOT NULL", +"ALTER TABLE `crmentity` MODIFY COLUMN `crmid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `crmentity` MODIFY COLUMN `description` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `crmentity` MODIFY COLUMN `createdtime` DATETIME NOT NULL", +"ALTER TABLE `crmentity` MODIFY COLUMN `modifiedtime` DATETIME NOT NULL", +"ALTER TABLE `currency_info` MODIFY COLUMN `currency_name` VARCHAR(100) COLLATE latin1_swedish_ci DEFAULT NULL", +"ALTER TABLE `currency_info` ADD COLUMN `id` INTEGER(11) NOT NULL AUTO_INCREMENT PRIMARY KEY", +"ALTER TABLE `currency_info` ADD COLUMN `conversion_rate` DECIMAL(5,3) DEFAULT NULL", +"ALTER TABLE `currency_info` ADD COLUMN `currency_status` VARCHAR(25) COLLATE latin1_swedish_ci DEFAULT NULL", +"ALTER TABLE `currency_info` ADD COLUMN `defaultid` VARCHAR(10) COLLATE latin1_swedish_ci NOT NULL DEFAULT '0'", +"ALTER TABLE `customaction` MODIFY COLUMN `cvid` INTEGER(19) NOT NULL UNIQUE", +"ALTER TABLE `customaction` MODIFY COLUMN `content` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `customerdetails` MODIFY COLUMN `customerid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `customerdetails` MODIFY COLUMN `portal` VARCHAR(3) COLLATE latin1_swedish_ci DEFAULT NULL", +"ALTER TABLE `customview` MODIFY COLUMN `cvid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `customview_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL", +"ALTER TABLE `cvadvfilter` MODIFY COLUMN `cvid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `cvadvfilter` MODIFY COLUMN `columnindex` INTEGER(11) NOT NULL PRIMARY KEY", +"ALTER TABLE `cvcolumnlist` MODIFY COLUMN `cvid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `cvcolumnlist` MODIFY COLUMN `columnindex` INTEGER(11) NOT NULL PRIMARY KEY", +"ALTER TABLE `cvstdfilter` MODIFY COLUMN `cvid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `dealintimation` MODIFY COLUMN `dealprobability` DECIMAL(3,2) NOT NULL DEFAULT '0.00'", +"ALTER TABLE `def_org_field` MODIFY COLUMN `fieldid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `def_org_share` MODIFY COLUMN `tabid` INTEGER(11) NOT NULL", +"ALTER TABLE `def_org_share` MODIFY COLUMN `permission` INTEGER(19) DEFAULT NULL UNIQUE", +"ALTER TABLE `def_org_share_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL", +"ALTER TABLE `defaultcv` MODIFY COLUMN `tabid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `defaultcv` MODIFY COLUMN `query` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `emailtemplates` MODIFY COLUMN `description` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `emailtemplates` MODIFY COLUMN `body` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `emailtemplates_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL", +"ALTER TABLE `faq` MODIFY COLUMN `question` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `faq` MODIFY COLUMN `answer` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `faqcomments` MODIFY COLUMN `comments` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `faqcomments` MODIFY COLUMN `createdtime` DATETIME NOT NULL", +"ALTER TABLE `field` MODIFY COLUMN `tabid` INTEGER(19) NOT NULL UNIQUE", +"ALTER TABLE `field` MODIFY COLUMN `readonly` INTEGER(1) NOT NULL", +"ALTER TABLE `field` MODIFY COLUMN `selected` INTEGER(1) NOT NULL", +"ALTER TABLE `field` MODIFY COLUMN `block` INTEGER(19) DEFAULT NULL UNIQUE", +"ALTER TABLE `field` MODIFY COLUMN `displaytype` INTEGER(19) DEFAULT NULL UNIQUE", +"ALTER TABLE `field` MODIFY COLUMN `quickcreate` INTEGER(10) NOT NULL DEFAULT '1'", +"ALTER TABLE `field_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL", +"ALTER TABLE `freetagged_objects` MODIFY COLUMN `tag_id` INTEGER(20) NOT NULL DEFAULT '0' PRIMARY KEY", +"ALTER TABLE `freetagged_objects` MODIFY COLUMN `tagger_id` INTEGER(20) NOT NULL DEFAULT '0' PRIMARY KEY", +"ALTER TABLE `freetagged_objects` MODIFY COLUMN `object_id` INTEGER(20) NOT NULL DEFAULT '0' PRIMARY KEY", +"ALTER TABLE `freetags` MODIFY COLUMN `id` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `group2grouprel` MODIFY COLUMN `groupid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `group2grouprel` MODIFY COLUMN `containsgroupid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `group2role` MODIFY COLUMN `groupid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `group2rs` MODIFY COLUMN `groupid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `groups` MODIFY COLUMN `groupid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `groups` MODIFY COLUMN `description` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `import_maps` MODIFY COLUMN `is_published` VARCHAR(3) COLLATE latin1_swedish_ci NOT NULL DEFAULT 'no'", +"ALTER TABLE `inventory_tandc` MODIFY COLUMN `id` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `inventory_tandc` MODIFY COLUMN `tandc` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `inventory_tandc_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL", +"ALTER TABLE `inventorynotification` MODIFY COLUMN `notificationbody` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `inventorynotification_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL", +"ALTER TABLE `invoice` MODIFY COLUMN `salesorderid` INTEGER(19) DEFAULT NULL UNIQUE", +"ALTER TABLE `invoice` MODIFY COLUMN `terms_conditions` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `invoicegrouprelation` MODIFY COLUMN `invoiceid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `invoiceproductrel` MODIFY COLUMN `invoiceid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `invoiceproductrel` MODIFY COLUMN `productid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `lar` MODIFY COLUMN `createdon` DATE NOT NULL", +"ALTER TABLE `leaddetails` MODIFY COLUMN `leadid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `leaddetails` MODIFY COLUMN `comments` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `leadgrouprelation` MODIFY COLUMN `leadid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `mail_accounts` MODIFY COLUMN `account_id` INTEGER(11) NOT NULL PRIMARY KEY", +"ALTER TABLE `mail_accounts` MODIFY COLUMN `user_id` INTEGER(11) NOT NULL", +"ALTER TABLE `mail_accounts` ADD COLUMN `box_refresh` INTEGER(10) DEFAULT NULL", +"ALTER TABLE `mail_accounts` ADD COLUMN `mails_per_page` INTEGER(10) DEFAULT NULL", +"ALTER TABLE `mail_accounts` ADD COLUMN `ssltype` VARCHAR(50) COLLATE latin1_swedish_ci DEFAULT NULL", +"ALTER TABLE `mail_accounts` ADD COLUMN `sslmeth` VARCHAR(50) COLLATE latin1_swedish_ci DEFAULT NULL", +"ALTER TABLE `mail_accounts` ADD COLUMN `showbody` VARCHAR(10) COLLATE latin1_swedish_ci DEFAULT NULL", +"ALTER TABLE `notes` MODIFY COLUMN `contact_id` INTEGER(19) DEFAULT '0'", +"ALTER TABLE `notes` MODIFY COLUMN `notecontent` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `notificationscheduler` MODIFY COLUMN `notificationbody` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `notificationscheduler_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL", +"ALTER TABLE `opportunitystage` MODIFY COLUMN `probability` DECIMAL(3,2) DEFAULT '0.00'", +"ALTER TABLE `org_share_action2tab` MODIFY COLUMN `share_action_id` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `org_share_action2tab` MODIFY COLUMN `tabid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `org_share_action_mapping` MODIFY COLUMN `share_action_id` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `organizationdetails` MODIFY COLUMN `website` VARCHAR(100) COLLATE latin1_swedish_ci DEFAULT NULL", +"ALTER TABLE `organizationdetails` MODIFY COLUMN `logo` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `ownernotify` MODIFY COLUMN `crmid` INTEGER(19) DEFAULT NULL UNIQUE", +"ALTER TABLE `parenttab` MODIFY COLUMN `parenttabid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `parenttab` MODIFY COLUMN `sequence` INTEGER(10) NOT NULL", +"ALTER TABLE `parenttabrel` MODIFY COLUMN `parenttabid` INTEGER(3) NOT NULL", +"ALTER TABLE `parenttabrel` MODIFY COLUMN `tabid` INTEGER(3) NOT NULL UNIQUE", +"ALTER TABLE `parenttabrel` MODIFY COLUMN `sequence` INTEGER(3) NOT NULL", +"ALTER TABLE `pogrouprelation` MODIFY COLUMN `purchaseorderid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `poproductrel` MODIFY COLUMN `purchaseorderid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `poproductrel` MODIFY COLUMN `productid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `portal` MODIFY COLUMN `portalid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `portal` MODIFY COLUMN `portalname` VARCHAR(200) COLLATE latin1_swedish_ci NOT NULL UNIQUE", +"ALTER TABLE `portal` MODIFY COLUMN `sequence` INTEGER(3) NOT NULL", +"ALTER TABLE `portalinfo` MODIFY COLUMN `id` INTEGER(11) NOT NULL PRIMARY KEY", +"ALTER TABLE `portalinfo` MODIFY COLUMN `last_login_time` DATETIME NOT NULL", +"ALTER TABLE `portalinfo` MODIFY COLUMN `login_time` DATETIME NOT NULL", +"ALTER TABLE `portalinfo` MODIFY COLUMN `logout_time` DATETIME NOT NULL", +"ALTER TABLE `potcompetitorrel` MODIFY COLUMN `potentialid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `potcompetitorrel` MODIFY COLUMN `competitorid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `potential` MODIFY COLUMN `amount` DECIMAL(10,2) DEFAULT '0.00'", +"ALTER TABLE `potential` MODIFY COLUMN `description` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `potentialgrouprelation` MODIFY COLUMN `potentialid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `potstagehistory` MODIFY COLUMN `potentialid` INTEGER(19) NOT NULL UNIQUE", +"ALTER TABLE `potstagehistory` MODIFY COLUMN `probability` DECIMAL(3,2) DEFAULT NULL", +"ALTER TABLE `potstagehistory` MODIFY COLUMN `lastmodified` DATETIME NOT NULL", +"ALTER TABLE `pricebook` MODIFY COLUMN `description` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `pricebookproductrel` MODIFY COLUMN `pricebookid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `pricebookproductrel` MODIFY COLUMN `productid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `productcollaterals` MODIFY COLUMN `productid` INTEGER(11) NOT NULL PRIMARY KEY", +"ALTER TABLE `productcollaterals` MODIFY COLUMN `description` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `products` MODIFY COLUMN `productid` INTEGER(11) NOT NULL PRIMARY KEY", +"ALTER TABLE `products` MODIFY COLUMN `product_description` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `products` MODIFY COLUMN `commissionrate` DECIMAL(3,3) DEFAULT NULL", +"ALTER TABLE `profile2field` MODIFY COLUMN `profileid` INTEGER(11) NOT NULL PRIMARY KEY", +"ALTER TABLE `profile2field` MODIFY COLUMN `fieldid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `profile2globalpermissions` MODIFY COLUMN `profileid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `profile2globalpermissions` MODIFY COLUMN `globalactionid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `profile2standardpermissions` MODIFY COLUMN `profileid` INTEGER(11) NOT NULL PRIMARY KEY", +"ALTER TABLE `profile2standardpermissions` MODIFY COLUMN `tabid` INTEGER(10) NOT NULL PRIMARY KEY", +"ALTER TABLE `profile2standardpermissions` MODIFY COLUMN `Operation` INTEGER(10) NOT NULL PRIMARY KEY", +"ALTER TABLE `profile2utility` MODIFY COLUMN `profileid` INTEGER(11) NOT NULL PRIMARY KEY", +"ALTER TABLE `profile2utility` MODIFY COLUMN `tabid` INTEGER(11) NOT NULL PRIMARY KEY", +"ALTER TABLE `profile2utility` MODIFY COLUMN `activityid` INTEGER(11) NOT NULL PRIMARY KEY", +"ALTER TABLE `profile_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL", +"ALTER TABLE `purchaseorder` MODIFY COLUMN `quoteid` INTEGER(19) DEFAULT NULL UNIQUE", +"ALTER TABLE `purchaseorder` MODIFY COLUMN `vendorid` INTEGER(19) DEFAULT NULL UNIQUE", +"ALTER TABLE `purchaseorder` MODIFY COLUMN `contactid` INTEGER(19) DEFAULT NULL UNIQUE", +"ALTER TABLE `purchaseorder` MODIFY COLUMN `terms_conditions` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `quotegrouprelation` MODIFY COLUMN `quoteid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `quotes` MODIFY COLUMN `potentialid` INTEGER(19) DEFAULT NULL UNIQUE", +"ALTER TABLE `quotes` MODIFY COLUMN `quotestage` VARCHAR(200) COLLATE latin1_swedish_ci DEFAULT NULL", +"ALTER TABLE `quotes` MODIFY COLUMN `contactid` INTEGER(19) DEFAULT NULL UNIQUE", +"ALTER TABLE `quotes` MODIFY COLUMN `terms_conditions` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `quotesproductrel` MODIFY COLUMN `quoteid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `quotesproductrel` MODIFY COLUMN `productid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `recurringevents` MODIFY COLUMN `activityid` INTEGER(19) NOT NULL", +"ALTER TABLE `relatedlists` MODIFY COLUMN `relation_id` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `relatedlists_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL", +"ALTER TABLE `relcriteria` MODIFY COLUMN `queryid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `relcriteria` MODIFY COLUMN `columnindex` INTEGER(11) NOT NULL PRIMARY KEY", +"ALTER TABLE `report` MODIFY COLUMN `reportid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `report` MODIFY COLUMN `folderid` INTEGER(19) NOT NULL UNIQUE", +"ALTER TABLE `reportdatefilter` MODIFY COLUMN `datefilterid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `reportmodules` MODIFY COLUMN `reportmodulesid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `reportsortcol` MODIFY COLUMN `sortcolid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `reportsortcol` MODIFY COLUMN `reportid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `reportsummary` MODIFY COLUMN `reportsummaryid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `reportsummary` MODIFY COLUMN `summarytype` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `role2profile` MODIFY COLUMN `profileid` INTEGER(11) NOT NULL PRIMARY KEY", +"ALTER TABLE `role_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL", +"ALTER TABLE `rss` MODIFY COLUMN `rssid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `salesorder` MODIFY COLUMN `contactid` INTEGER(19) DEFAULT NULL UNIQUE", +"ALTER TABLE `salesorder` MODIFY COLUMN `vendorid` INTEGER(19) DEFAULT NULL UNIQUE", +"ALTER TABLE `salesorder` MODIFY COLUMN `terms_conditions` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `seactivityrel` MODIFY COLUMN `crmid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `seactivityrel` MODIFY COLUMN `activityid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `selectcolumn` MODIFY COLUMN `queryid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `selectquery` MODIFY COLUMN `queryid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `selectquery_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL", +"ALTER TABLE `sharedcalendar` MODIFY COLUMN `userid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `sharedcalendar` MODIFY COLUMN `sharedid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `sogrouprelation` MODIFY COLUMN `salesorderid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `soproductrel` MODIFY COLUMN `salesorderid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `soproductrel` MODIFY COLUMN `productid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `systems` MODIFY COLUMN `id` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `systems` MODIFY COLUMN `server` VARCHAR(30) COLLATE latin1_swedish_ci DEFAULT NULL", +"ALTER TABLE `systems` MODIFY COLUMN `server_username` VARCHAR(30) COLLATE latin1_swedish_ci DEFAULT NULL", +"ALTER TABLE `systems` MODIFY COLUMN `server_password` VARCHAR(30) COLLATE latin1_swedish_ci DEFAULT NULL", +"ALTER TABLE `ticketcomments` MODIFY COLUMN `comments` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `ticketcomments` MODIFY COLUMN `createdtime` DATETIME NOT NULL", +"ALTER TABLE `ticketgrouprelation` MODIFY COLUMN `ticketid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `troubletickets` MODIFY COLUMN `ticketid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `troubletickets` MODIFY COLUMN `description` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `troubletickets` MODIFY COLUMN `solution` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `troubletickets` MODIFY COLUMN `update_log` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `user2role` MODIFY COLUMN `userid` INTEGER(11) NOT NULL PRIMARY KEY", +"ALTER TABLE `user2role` MODIFY COLUMN `roleid` VARCHAR(255) COLLATE latin1_swedish_ci NOT NULL UNIQUE", +"ALTER TABLE `users` MODIFY COLUMN `is_admin` VARCHAR(3) COLLATE latin1_swedish_ci DEFAULT '0'", +"ALTER TABLE `users` MODIFY COLUMN `description` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `users` MODIFY COLUMN `user_preferences` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `users` MODIFY COLUMN `homeorder` VARCHAR(255) COLLATE latin1_swedish_ci DEFAULT 'ALVT,PLVT,QLTQ,CVLVT,HLT,OLV,GRT,OLTSO,ILTI,MNL'", +"ALTER TABLE `users` ADD COLUMN `currency_id` INTEGER(19) NOT NULL DEFAULT '1'", +"ALTER TABLE `users` ADD COLUMN `defhomeview` VARCHAR(100) COLLATE latin1_swedish_ci DEFAULT NULL", +"ALTER TABLE `users2group` MODIFY COLUMN `groupid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `users2group` MODIFY COLUMN `userid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `users_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL", +"ALTER TABLE `vendor` MODIFY COLUMN `street` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `vendor` MODIFY COLUMN `description` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `wordtemplates` MODIFY COLUMN `templateid` INTEGER(19) NOT NULL PRIMARY KEY", +"ALTER TABLE `wordtemplates` MODIFY COLUMN `description` TEXT COLLATE latin1_swedish_ci", +"ALTER TABLE `accountgrouprelation` ADD KEY `accountgrouprelation_IDX1` (`groupname`)", +"ALTER TABLE `activity` ADD KEY `status1` (`status`, `eventstatus`)", +"ALTER TABLE `attachments` ADD KEY `attachmentsid1` (`attachmentsid`)", +"ALTER TABLE `blocks` ADD KEY `block_tabid` (`tabid`)", +"ALTER TABLE `campaign` DROP PRIMARY KEY", +"ALTER TABLE `campaign` ADD PRIMARY KEY (`campaignid`)", +"ALTER TABLE `campaign` ADD KEY `idx_campaignstatus` (`campaignstatus`)", +"ALTER TABLE `campaignleadrel` DROP INDEX CampaignLeadRel_IDX1", +"ALTER TABLE `campaignleadrel` ADD INDEX `CampaignLeadRel_IDX1` (`leadid`, `campaignid`)", +"ALTER TABLE `carrier` ADD UNIQUE KEY `carrier_UK01` (`carrier`)", +"ALTER TABLE `chat_msg` ADD KEY `chat_msg_IDX0` (`chat_from`)", +"ALTER TABLE `chat_msg` ADD KEY `chat_msg_IDX1` (`chat_to`)", +"ALTER TABLE `chat_msg` ADD KEY `chat_msg_IDX2` (`born`)", +"ALTER TABLE `chat_pchat` ADD UNIQUE KEY `chat_pchat_UK0` (`msg`)", +"ALTER TABLE `chat_pvchat` ADD UNIQUE KEY `chat_pvchat_UK0` (`msg`)", +"ALTER TABLE `chat_users` ADD KEY `chat_users_IDX0` (`nick`)", +"ALTER TABLE `chat_users` ADD KEY `chat_users_IDX1` (`session`)", +"ALTER TABLE `chat_users` ADD KEY `chat_users_IDX2` (`ping`)", +"ALTER TABLE `contactgrouprelation` ADD KEY `contactgrouprelation_IDX1` (`groupname`)", +"ALTER TABLE `currency_info` DROP PRIMARY KEY", +"ALTER TABLE `currency_info` ADD PRIMARY KEY ()", +"ALTER TABLE `def_org_field` ADD KEY `tabid4` (`tabid`)", +"ALTER TABLE `def_org_share` ADD KEY `fk_def_org_share23` (`permission`)", +"ALTER TABLE `field` ADD KEY `tabid2` (`tabid`)", +"ALTER TABLE `field` ADD KEY `blockid` (`block`)", +"ALTER TABLE `field` ADD KEY `displaytypeid` (`displaytype`)", +"ALTER TABLE `freetagged_objects` DROP INDEX tag_id_index", +"ALTER TABLE `freetagged_objects` ADD INDEX `tag_id_index` (`tag_id`, `tagger_id`, `object_id`)", +"ALTER TABLE `group2grouprel` ADD KEY `fk_group2grouprel2` (`containsgroupid`)", +"ALTER TABLE `group2role` ADD KEY `fk_group2role2` (`roleid`)", +"ALTER TABLE `group2rs` ADD KEY `fk_group2rs2` (`roleandsubid`)", +"ALTER TABLE `groups` ADD KEY `idx_groups_123group` (`groupname`)", +"ALTER TABLE `invoice` ADD KEY `SoPo_IDX` (`invoiceid`)", +"ALTER TABLE `invoice` ADD KEY `fk_Invoice2` (`salesorderid`)", +"ALTER TABLE `invoicegrouprelation` ADD KEY `invoicegrouprelation_IDX1` (`groupname`, `invoiceid`)", +"ALTER TABLE `leadgrouprelation` ADD KEY `leadgrouprelation_IDX0` (`leadid`)", +"ALTER TABLE `moduleowners` ADD KEY `moduleowners_UK11` (`tabid`, `user_id`)", +"ALTER TABLE `org_share_action2tab` ADD KEY `fk_org_share_action2tab12345` (`tabid`)", +"ALTER TABLE `ownernotify` ADD KEY `ownernotify_UK1` (`crmid`, `flag`)", +"ALTER TABLE `parenttab` ADD KEY `parenttab_UK1` (`parenttabid`, `parenttab_label`, `visible`)", +"ALTER TABLE `parenttabrel` ADD KEY `parenttabrelUK01` (`tabid`, `parenttabid`)", +"ALTER TABLE `pogrouprelation` ADD KEY `pogrouprelation_IDX1` (`groupname`, `purchaseorderid`)", +"ALTER TABLE `portal` ADD KEY `portal_UK01` (`portalname`)", +"ALTER TABLE `potential` ADD KEY `potentialid1` (`potentialid`)", +"ALTER TABLE `potentialgrouprelation` ADD KEY `potentialgrouprelation_IDX1` (`groupname`)", +"ALTER TABLE `potstagehistory` DROP INDEX PotStageHistory_IDX1", +"ALTER TABLE `potstagehistory` ADD INDEX `PotStageHistory_IDX1` (`historyid`)", +"ALTER TABLE `potstagehistory` ADD KEY `fk_PotStageHistory` (`potentialid`)", +"ALTER TABLE `profile2field` ADD KEY `tabid3` (`tabid`, `profileid`)", +"ALTER TABLE `profile2globalpermissions` ADD KEY `idx_profile2globalpermissions` (`profileid`, `globalactionid`)", +"ALTER TABLE `profile2standardpermissions` ADD KEY `idx_prof2stad` (`profileid`, `tabid`, `Operation`)", +"ALTER TABLE `profile2tab` ADD KEY `idx_profile2tab1` (`profileid`, `tabid`)", +"ALTER TABLE `profile2utility` ADD KEY `idx_prof2utility` (`profileid`, `tabid`, `activityid`)", +"ALTER TABLE `purchaseorder` ADD KEY `PO_Vend_IDX` (`vendorid`)", +"ALTER TABLE `purchaseorder` ADD KEY `PO_Quote_IDX` (`quoteid`)", +"ALTER TABLE `purchaseorder` ADD KEY `PO_Contact_IDX` (`contactid`)", +"ALTER TABLE `quotegrouprelation` ADD KEY `quotegrouprelation_IDX1` (`groupname`)", +"ALTER TABLE `quotes` DROP INDEX quotestage", +"ALTER TABLE `quotes` ADD INDEX `quotestage` (`quoteid`)", +"ALTER TABLE `quotes` ADD KEY `potentialid2` (`potentialid`)", +"ALTER TABLE `quotes` ADD KEY `contactid` (`contactid`)", +"ALTER TABLE `recurringtype` ADD UNIQUE KEY `RecurringEvent_UK0` (`recurringtype`)", +"ALTER TABLE `reportsortcol` ADD KEY `FK1_reportsortcol` (`reportid`)", +"ALTER TABLE `role2profile` ADD KEY `idx_role2profileid1` (`roleid`, `profileid`)", +"ALTER TABLE `salesorder` ADD KEY `SoVend_IDX` (`vendorid`)", +"ALTER TABLE `salesorder` ADD KEY `SoContact_IDX` (`contactid`)", +"ALTER TABLE `seattachmentsrel` ADD KEY `attachmentsid2` (`attachmentsid`, `crmid`)", +"ALTER TABLE `selectquery` ADD KEY `selectquery_IDX0` (`queryid`)", +"ALTER TABLE `sogrouprelation` ADD KEY `sogrouprelation_IDX1` (`groupname`)", +"ALTER TABLE `tab` ADD KEY `tabid1` (`tabid`)", +"ALTER TABLE `taxclass` ADD UNIQUE KEY `carrier_UK02` (`taxclass`)", +"ALTER TABLE `troubletickets` ADD KEY `status2` (`status`)", +"ALTER TABLE `users2group` ADD KEY `idx_users2group` (`groupid`, `userid`)", +"ALTER TABLE `users2group` ADD KEY `fk_users2group2` (`userid`)", +"ALTER TABLE `accountgrouprelation` ADD CONSTRAINT `fk_accountgrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `groups` (`groupname`) ON DELETE CASCADE", +"ALTER TABLE `accountgrouprelation` ADD CONSTRAINT `fk_accountgrouprelation123` FOREIGN KEY (`accountid`) REFERENCES `account` (`accountid`) ON DELETE CASCADE", +"ALTER TABLE `campaigncontrel` ADD CONSTRAINT `fk_CampaignContRel1` FOREIGN KEY (`campaignid`) REFERENCES `campaign` (`campaignid`) ON DELETE CASCADE", +"ALTER TABLE `campaignleadrel` ADD CONSTRAINT `fk_CampaignLeadRel1234` FOREIGN KEY (`campaignid`) REFERENCES `campaign` (`campaignid`) ON DELETE CASCADE", +"ALTER TABLE `contactgrouprelation` ADD CONSTRAINT `fk_contactgrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `groups` (`groupname`) ON DELETE CASCADE", +"ALTER TABLE `contactgrouprelation` ADD CONSTRAINT `fk_contactgrouprelation123` FOREIGN KEY (`contactid`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE", +"ALTER TABLE `customaction` ADD CONSTRAINT `customaction_FK1` FOREIGN KEY (`cvid`) REFERENCES `customview` (`cvid`) ON DELETE CASCADE", +"ALTER TABLE `invoice` ADD CONSTRAINT `fk_Invoice2` FOREIGN KEY (`salesorderid`) REFERENCES `salesorder` (`salesorderid`) ON DELETE CASCADE", +"ALTER TABLE `invoicegrouprelation` ADD CONSTRAINT `fk_invoicegrouprelation234` FOREIGN KEY (`invoiceid`) REFERENCES `invoice` (`invoiceid`) ON DELETE CASCADE", +"ALTER TABLE `invoicegrouprelation` ADD CONSTRAINT `fk_invoicegrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `groups` (`groupname`) ON DELETE CASCADE", +"ALTER TABLE `org_share_action2tab` ADD CONSTRAINT `fk_org_share_action2tab12345` FOREIGN KEY (`tabid`) REFERENCES `tab` (`tabid`) ON DELETE CASCADE", +"ALTER TABLE `pogrouprelation` ADD CONSTRAINT `fk_pogrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `groups` (`groupname`) ON DELETE CASCADE", +"ALTER TABLE `pogrouprelation` ADD CONSTRAINT `fk_pogrouprelation123` FOREIGN KEY (`purchaseorderid`) REFERENCES `purchaseorder` (`purchaseorderid`) ON DELETE CASCADE", +"ALTER TABLE `potentialgrouprelation` ADD CONSTRAINT `fk_potentialgrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `groups` (`groupname`) ON DELETE CASCADE", +"ALTER TABLE `potentialgrouprelation` ADD CONSTRAINT `fk_potentialgrouprelation67` FOREIGN KEY (`potentialid`) REFERENCES `potential` (`potentialid`) ON DELETE CASCADE", +"ALTER TABLE `profile2globalpermissions` ADD CONSTRAINT `fk_profile2globalpermissions57` FOREIGN KEY (`profileid`) REFERENCES `profile` (`profileid`) ON DELETE CASCADE", +"ALTER TABLE `purchaseorder` ADD CONSTRAINT `fk_PO3` FOREIGN KEY (`contactid`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE", +"ALTER TABLE `purchaseorder` ADD CONSTRAINT `fk_PO2` FOREIGN KEY (`vendorid`) REFERENCES `vendor` (`vendorid`) ON DELETE CASCADE", +"ALTER TABLE `purchaseorder` ADD CONSTRAINT `fk_PO2345` FOREIGN KEY (`quoteid`) REFERENCES `quotes` (`quoteid`) ON DELETE CASCADE", +"ALTER TABLE `quotegrouprelation` ADD CONSTRAINT `fk_quotegrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `groups` (`groupname`) ON DELETE CASCADE", +"ALTER TABLE `quotegrouprelation` ADD CONSTRAINT `fk_quotegrouprelation132` FOREIGN KEY (`quoteid`) REFERENCES `quotes` (`quoteid`) ON DELETE CASCADE", +"ALTER TABLE `quotes` ADD CONSTRAINT `fk_Quotes3` FOREIGN KEY (`contactid`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE", +"ALTER TABLE `quotes` ADD CONSTRAINT `fk_Quotes2` FOREIGN KEY (`potentialid`) REFERENCES `potential` (`potentialid`) ON DELETE CASCADE", +"ALTER TABLE `salesorder` ADD CONSTRAINT `fk_SO4` FOREIGN KEY (`contactid`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE", +"ALTER TABLE `salesorder` ADD CONSTRAINT `fk_SO2` FOREIGN KEY (`vendorid`) REFERENCES `vendor` (`vendorid`) ON DELETE CASCADE", +"ALTER TABLE `sogrouprelation` ADD CONSTRAINT `fk_sogrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `groups` (`groupname`) ON DELETE CASCADE", +"ALTER TABLE `sogrouprelation` ADD CONSTRAINT `fk_sogrouprelation78` FOREIGN KEY (`salesorderid`) REFERENCES `salesorder` (`salesorderid`) ON DELETE CASCADE", +"ALTER TABLE `vendorcontactrel` ADD CONSTRAINT `fk_VendorContactRel45` FOREIGN KEY (`vendorid`) REFERENCES `vendor` (`vendorid`) ON DELETE CASCADE" + ); +foreach($query_array as $query) +{ + Execute($query); +} + + + + + +$conn->println("Database Modifications for 5.0(Alpha) Dev 3 ==> 5.0 Alpha ends here."); +echo "

    Database Modifications for 5.0(Alpha) Dev3 ==> 5.0 Alpha ends here.....
    "; $conn->println("Database Modifications for 4.2 Patch2 ==> 5.0(Alpha) Dev 3 ends here."); echo "

    Database Modifications for 4.2 Patch2 ==> 5.0(Alpha) Ends here.....
    "; + +function Execute($query) +{ + global $conn; + $status = $conn->query($query); + if(is_object($status)) + { + echo '
    '.$status.' ==> '.$query; + } + else + { + echo '

    '.$status.' ======> '.$query; + } +} //Added on 23-12-2005 which is used to populate the profile2field and def_org_field table entries for the field per tab //if we enter a field in field table then we must populate that field in these table for security access function populateFieldForSecurity($tabid,$fieldid) From vtiger-tickets at vtiger.fosslabs.com Thu Apr 6 13:57:23 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 06 Apr 2006 17:57:23 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2388=3A_L?= =?utf-8?q?ead_Import_problem?= Message-ID: <076.6b1d355b3033814bef6288146e7cc9fc@vtiger.fosslabs.com> #88: Lead Import problem -----------------------+---------------------------------------------------- Reporter: gterro | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- Dear Vtigers I Try to import leads or contacts and I get such error message Import Error: The directory _VT_IMPORTDIR_ does not exist or is not writable Please Any Idea Thanks terro -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 6 17:38:14 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 06 Apr 2006 21:38:14 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2363=3A_R?= =?utf-8?q?estricted_user_modifying_record_erases_hidden_fields?= In-Reply-To: <076.a87db8a72dfb88d9b3f12c6bcfde1dbf@vtiger.fosslabs.com> References: <076.a87db8a72dfb88d9b3f12c6bcfde1dbf@vtiger.fosslabs.com> Message-ID: <085.d87c1ade29ccf0c9bd9cf501c159247f@vtiger.fosslabs.com> #63: Restricted user modifying record erases hidden fields ------------------------+--------------------------------------------------- Reporter: mikecrowe | Owner: developer Type: defect | Status: reopened Priority: critical | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc2 Resolution: | Keywords: ------------------------+--------------------------------------------------- Comment (by quang.lam at ooline.fr): be careful, this change does not work for activity field -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 7 00:12:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 07 Apr 2006 04:12:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4968 - /vtigercrm/trunk/Smarty/templates/QuickCreate.tpl Message-ID: <20060407041232.98E6363B8A1@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 22:12:28 2006 New Revision: 4968 Log: Added onclick=hide('qcform') for the cancel button of qcreate - ahmed Modified: vtigercrm/trunk/Smarty/templates/QuickCreate.tpl Modified: vtigercrm/trunk/Smarty/templates/QuickCreate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/QuickCreate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/QuickCreate.tpl Thu Apr 6 22:12:28 2006 @@ -366,7 +366,7 @@
    "; $shtml .= " Today at"; - $shtml .= " rss_link\" target=\"_blank\">".$allrssrow['rsstitle'].""; + $shtml .= " rss_link."',this)\";>".$allrssrow['rsstitle'].""; $shtml .= "
      ".$rss_html."
    - rss_link\">More... + rss_link."',this)\";>More...
      ".$rss_html."
    - rss_link\">More... + rss_link."',this)\";>More...
    - +
    From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 7 01:41:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 07 Apr 2006 05:41:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4969 - /vtigercrm/trunk/themes/blue/style.css Message-ID: <20060407054143.9598863BDE1@vtiger.fosslabs.com> Author: don Date: Thu Apr 6 23:41:38 2006 New Revision: 4969 Log: style for new Rss has been added Modified: vtigercrm/trunk/themes/blue/style.css Modified: vtigercrm/trunk/themes/blue/style.css ============================================================================== --- vtigercrm/trunk/themes/blue/style.css (original) +++ vtigercrm/trunk/themes/blue/style.css Thu Apr 6 23:41:38 2006 @@ -1605,3 +1605,92 @@ border:0px solid #CCCCCC; } +/* RSS STYLES */ + +.subHdr{ + font-family:Arial, Helvetica, sans-serif; + font-size:12px; +color:#FFFFFF; + background-image:url(images/rssHeader.gif); + background-position:top left; + background-repeat:repeat-x; +height:27px; +padding:0px 10px 0px 10px; + vertical-align:middle; +} +.delBg{ + font-family:Arial, Helvetica, sans-serif; + font-size:12px; +color:#FFFFFF; + background-image:url(images/rssdelete.gif); + background-position:top left; + background-repeat:repeat-x; +height:27px; +padding:0px 10px 0px 10px; + vertical-align:middle; +} +#rssScroll{ + font-family:Arial, Helvetica, sans-serif ; + font-size:12px; + background-color:#FFFFFF; +width:100%; +height:150px; +overflow:auto; +border:0px solid #000000; +} + +.rssTable{ + font-family:Arial, Helvetica, sans-serif; + font-size:12px; +width:100%; +border:0px solid #000000; +} +.rssTable tr th{ + background-color:#F0F0F0; + text-align:left; + border-bottom:1px solid #E5E5E5; + border-top:1px solid #FFFFFF; +color:#000000; + font-weight:normal; + padding-left:5px; + padding-right:5px; +height:20px; +} + +.rssTable tr td{ + text-align:left; +border:0px solid #000000; + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + white-space:nowrap; +padding:5px; +height:20px; +} +.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; + font-size:12px; +color:#000000; + background-image:url(images/rssforward.gif); + background-position:top left; + background-repeat:repeat-x; +height:27px; +padding:0px 10px 0px 10px; + vertical-align:middle; + background-color:#D7D7D7; +} + From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 7 01:54:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 07 Apr 2006 05:54:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4970 - /vtigercrm/trunk/modules/Leads/LeadsAjax.php Message-ID: <20060407055423.9BE7B63BE09@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 6 23:54:17 2006 New Revision: 4970 Log: Added the quickcreate.php for ajaxification Ahmed Modified: vtigercrm/trunk/modules/Leads/LeadsAjax.php Modified: vtigercrm/trunk/modules/Leads/LeadsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Leads/LeadsAjax.php (original) +++ vtigercrm/trunk/modules/Leads/LeadsAjax.php Thu Apr 6 23:54:17 2006 @@ -42,9 +42,13 @@ echo ":#:FAILURE"; } } + +elseif($_REQUEST['ajaxmode'] == 'qcreate') +{ + require_once('quickcreate.php'); +} else { require_once('include/Ajax/CommonAjax.php'); - require_once('quickcreate.php'); } ?> From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 7 02:05:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 07 Apr 2006 06:05:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4971 - /vtigercrm/trunk/Smarty/templates/Settings/EmailNotificationContents.tpl Message-ID: <20060407060513.3823F63C012@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 7 00:05:09 2006 New Revision: 4971 Log: edit changed as image Modified: vtigercrm/trunk/Smarty/templates/Settings/EmailNotificationContents.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings/EmailNotificationContents.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/EmailNotificationContents.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/EmailNotificationContents.tpl Fri Apr 7 00:05:09 2006 @@ -13,7 +13,7 @@ {$elements.label} {$elements.schedulename} {$elements.active} - edit + {/foreach} From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 7 02:18:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 07 Apr 2006 06:18:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4972 - /vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl Message-ID: <20060407061807.AED5363C324@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 7 00:17:58 2006 New Revision: 4972 Log: position of the div has been changed Modified: vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl Fri Apr 7 00:17:58 2006 @@ -150,8 +150,8 @@ {include file='SettingsSubMenu.tpl'} - - + + {literal} Modified: vtigercrm/trunk/Smarty/templates/QuickCreate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/QuickCreate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/QuickCreate.tpl Fri Apr 7 02:24:27 2006 @@ -8,14 +8,14 @@ {include file='QuickCreateHidden.tpl'} - +
    - +
    - +
    Create {$MODULE}
    - +
    @@ -23,7 +23,6 @@ {foreach key=mainlabel item=maindata from=$subdata} - - - + + {elseif $uitype eq 50} @@ -168,29 +167,29 @@ {/if} {$fldlabel} - {/if} {elseif $uitype eq 57} - + {elseif $uitype eq 80} - + {elseif $uitype eq 78} - + {elseif $uitype eq 76} - + {elseif $uitype eq 17} - + {elseif $uitype eq 71 || $uitype eq 72} {elseif $uitype eq 357} @@ -353,11 +352,13 @@ {/foreach} + {else} + {/if} {/foreach} {/foreach} - +
    {assign var="uitype" value="$maindata[0][0]"} @@ -150,8 +149,8 @@ {assign var='popuptype' value = 'specific_contact_account_address'} {/if} {$fldlabel} Select  Select *{$fldlabel}  Select Select +  Select {if $uitype eq 75}  {$fldlabel} Select  Select {$fldlabel} Select  Select {$fldlabel} Select  Select {$fldlabel} Select  Select {$fldlabel}  http://   http://  @@ -266,7 +265,7 @@ - +  Select   
     
    @@ -372,7 +373,7 @@
    From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 7 04:27:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 07 Apr 2006 08:27:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4986 - /vtigercrm/trunk/log4php.properties Message-ID: <20060407082723.5EAE363E9A6@vtiger.fosslabs.com> Author: don Date: Fri Apr 7 02:27:19 2006 New Revision: 4986 Log: comments removed to fix the issue in windows Modified: vtigercrm/trunk/log4php.properties Modified: vtigercrm/trunk/log4php.properties ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 7 04:43:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 07 Apr 2006 08:43:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4987 - /vtigercrm/trunk/modules/Users/GroupDetailView.php Message-ID: <20060407084343.44C7563E9BB@vtiger.fosslabs.com> Author: don Date: Fri Apr 7 02:43:39 2006 New Revision: 4987 Log: issue in group detail view has been fixed Modified: vtigercrm/trunk/modules/Users/GroupDetailView.php Modified: vtigercrm/trunk/modules/Users/GroupDetailView.php ============================================================================== --- vtigercrm/trunk/modules/Users/GroupDetailView.php (original) +++ vtigercrm/trunk/modules/Users/GroupDetailView.php Fri Apr 7 02:43:39 2006 @@ -45,10 +45,9 @@ $row=1; $groupMember = $groupInfoArr[2]; $information = array(); - $memberinfo = array(); foreach($groupMember as $memberType=>$memberValue) { - + $memberinfo = array(); foreach($memberValue as $memberId) { $groupmembers = array(); @@ -88,7 +87,8 @@ $row++; $memberinfo [] = $groupmembers; } - $information[$memberDisplayType] = $memberinfo; + if(sizeof($memberinfo) >0) + $information[$memberDisplayType] = $memberinfo; } $returndata=array($groupfields,$information); return $returndata; From vtiger-tickets at vtiger.fosslabs.com Fri Apr 7 04:44:13 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 07 Apr 2006 08:44:13 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2389=3A_C?= =?utf-8?q?annot_change_admin_Password?= Message-ID: <076.2fbbb821e635faa80c32396756edac60@vtiger.fosslabs.com> #89: Cannot change admin Password ------------------------------------+--------------------------------------- Reporter: libregeek at gmail.com | Owner: developer Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: Cannot change password | ------------------------------------+--------------------------------------- Bug with Vtiger-5 alpha4. After successfully installing vtiger, the admin password cannot be changed. when the new password is entered into the Change Password Window and submitted, it redirects to the crm home page on the installation site. The password is not changed and we can login only using the old password. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 7 04:48:31 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 07 Apr 2006 08:48:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4988 - /vtigercrm/trunk/vtigercrm5_alpha_Security.html Message-ID: <20060407084831.F2EAE63E9E7@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 7 02:48:27 2006 New Revision: 4988 Log: document updated for alpha 5 release Modified: vtigercrm/trunk/vtigercrm5_alpha_Security.html Modified: vtigercrm/trunk/vtigercrm5_alpha_Security.html ============================================================================== --- vtigercrm/trunk/vtigercrm5_alpha_Security.html (original) +++ vtigercrm/trunk/vtigercrm5_alpha_Security.html Fri Apr 7 02:48:27 2006 @@ -1,7 +1,7 @@ - + -vtiger CRM 5 Alpha - Security Management Implementation + vtiger CRM 5: Security Management Implementation + - -

    vtiger CRM 5 Alpha - Security Management Implementation

    -

    Date: January 16, 2006 -

    The following functions are incorporated in the vtiger CRM 5 Alpha Security - Management implementation: -

    1. The Role is based on Organization Hierarchy. -

    2. The Roles can have one-to-multiple profiles. -

    3. Each User is associated with a role, which in turn associated with the profiles. -

    4. Profiles specify the access for various actions in each of the modules. -

    5. Group Support- Group can consists of:
    + +

    +

    vtiger CRM 5 - Security Management Implementation

    + Date: 06-04-2006

    +

    +Table of Contents:

    +
      +
    1. Introduction
      2. +
    2. Users
      3. +
    3. Roles
      4. +
    4. Profiles + +
      5. +
    5. Groups
      6. +
    6. Default + Organization Sharing Access
      7. +
    7. User Defined Sharing + Access + +
      8. +
    8. Organizational + Level Field Access
      9. +
    9. Known Issues & Limitations         
      10. +
    +

    1. Introduction

    +

    The vtiger CRM is a Customer Relationship Management + software for your organization-wide sales, marketing, customer support, + and product management requirements. Security Management is one of the primary modules in vtiger CRM that provides access level control (ACL) to various functions to the users according to their privileges in an organization.  With  User Management, + the users for your organization can be created and their access +privileges can be defined. +

    Security Management consists for the following sub-modules:

      -
    • Groups
      • -
    • Roles
      • -
    • Roles & Subordinates
      • -
    • Users
      • +
    • Users
      • +
    • Roles
      • +
    • Profiles
      • +
    • Groups
      • +
    • Default Organization Sharing Access
      • +
    • User Defined Sharing Rules
      • +
    • Default Organization Field Access
    -

    Note: In vtiger CRM 5.0 Alpha group level security has been implemented - only for the Leads, Tickets, FAQ, and Activities modules.

    -

    6.  Profiles override the Sharing Rules i.e. the Profile is the master:

    -

    For example, one of the users has sharing privilege to view others accounts. - But his profile does not allow him to view accounts. In this case,  the - user cannot view the accounts.
    -
    - 7. Default Organization Sharing Access:

    -

    Your organization's - sharing model sets the default access that users have to each other's data. - The default sharing access levels are listed below. 

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Type Default Access Level Controlled By
    AccountsPublic Read/Write Organization-wide defaults
    ActivitiesPrivate -

    Access to other users' activities is based on your  position in - the hierarchy.

    -

    Note that access to events in a calendar view is controlled by the organization-wide - calendar sharing.

    -
    Calendar AccessHide Details and Add EventsOrganization-wide defaults
    TicketsPublic Read/WriteOrganization-wide defaults
    ContactsPublic Read/Write Organization-wide defaults
    EmailsPublic Read/WriteOrganization-wide defaults
    LeadsPublic Read/WriteOrganization-wide defaults
    OpportunitiesPublic Read OnlyOrganization-wide defaults
    QuotesPublic Read/WriteOrganization-wide defaults 
    Sales OrderPublic Read/WriteOrganization-wide defaults
    Purchase OrderPublic Read/WriteOrganization-wide defaults
    InvoicePublic Read/WriteOrganization-wide defaults 
    -

    The following Sharing Permissions can be set :
    -
    - - - - - - - - - - - - - - - - - - - - - - - -
    Field Description
    PrivateOnly the record owner, and users above that role in the hierarchy, - can view, edit, and report on those records.
    Public Read OnlyAll users can view and report on records but not edit them. Only the - owner, and users above that role in the hierarchy, can edit those records.
    Public Read/WriteAll users can view, edit all records.
    Public Read/Write/DeleteAll users can view, edit and delete all records
    -

    Note: When Account is Private, the Related Potential, Ticket, Quote, - Sales Order, Purchase Order, and Invoice access is also set to private in Default - Organization Sharing model.

    -

    8.  Sharing Rules Specification by Administrator:

    +

    Back to Top

    +

    2. Users

    +

    Users in user management facilitate to + Add/Edit/Delete/View Users.  There + are two types of users in vtiger CRM software, Standard Users and Administrator users.
    +
    + Standard Users can perform only + CRUD (Create, Retrieve, Update, and Delete) operations on records such + as, leads, accounts, contacts, potentials, trouble tickets, and + others. Where as Administrators can manage the complete software that includes, managing users/groups & their access privileges, customizing vtiger CRM user interface, + creating communications templates and configuring all organization wide + settings.  In general Standard Users will not have access to the + Settings Panel and only Admin Users will have access to the Settings + Panel
    +
    + How to create a Administrator User and +Standard User?

    +

    In + the user creation screen there is a check box called Admin. When a user + is created with selecting the Admin option then the user is an + Administrator User and if the User is created without selecting the +Admin option then the user is a Standard User.

    + + + + +

    Notes

    +
      +
    • Each user created in the system must be associated with a ROLE
      • +
    • Admin User will have all privileges in the organization
      • +
    • Standard User's  privilege will be defined by his  Role
      • +
    +

    The other functions in User management are Change Password, Deactivate Users, List + Mail Server, Home Page Order, and View Login History.

    +

    Back to Top

    +

    3. Roles

    +

    The + organization level hierarchy can be defined using Roles. Roles control + the visibility level that users have in the organization’s + data. Users at any given role level + can always view, edit, delete  all data owned by users below them + in the hierarchy . For example, the Sales Manger can access/edit/delete all the + Sales Reps' records because they are in the higher hierarchical level + in + the role tree. The Sales Reps can access only their records.
    +
    +Roles in user management facilitate + to Add/Edit/Delete/View Roles. Multiple profile support is available in + roles i.e. a role can consists of one or more number of profiles.

    + + + + +

    Notes

    +
      +
    • Users in the higher level of hierarchy cannot view the records that are shared to their subordinate users
      • +
    • Role must be associated to at least one profile
      • +
    +

    Back to Top

    +

    4. Profiles

    +

    Profile + function provides access to vtiger CRM modules (tabs), standard + actions, utility actions , fields in various modules and global + permissions. Users associated to the specific profile can access the +functions that are assigned to them.

    +

    Profiles defines the access privileges for the +following:

    +

    4.1. + Global Privileges

    +

    Global Privileges define the global permissions for + all modules and all actions. Global Privileges consists of :

      -
    • Apart from the Default Organization Sharing Access, the administrator  - can also create Organization Level Sharing Rules for the following modules - to share the data between Roles, Roles&Subordinates and Groups : -
        -
      • Leads
        • -
      • Accounts/Contacts
        • -
      • Potentials
        • -
      • Emails
        • -
      • HelpDesk
        • -
      • Quotes
        • -
      • SalesOrder
        • -
      • Purchase Order
        • -
      • Invoices
        • -
      -
      • -
    • Sharing Rules can only extend the visibility and cannot hide the visibility  -    
      -
      • -
    • On creating the Sharing Rules, Access for the Related modules can also be - specified.
      -
      • -
    • Sharing Rules are created to share data between Roles, Roles&Subordinates - and Groups
      • +
    • View all: can view + all  module data in the organization
      • +
    • Edit all: can create/edit all module data in the organization
    -

    Notes on Data Sharing:
    +

    4.2. + Tab Privileges

    +

    Tab Privileges define the module tab level access + for the following modules:

    +

    Leads, Accounts, Contacts, Potentials, + Dashboards, Activities, Trouble Tickets, FAQ, Calendar, Price Books, + Purchase Orders,  Invoices, Reports, Notes, Emails, Products, +Vendors, Quotes, Sales Orders, RSS, Campaigns

    +

    4.3. + Standard Privileges

    +

    Standard Privileges define the permissions + for Create/Edit, View, Delete Actions in the following modules:

    +

    -Leads, Accounts, Contacts, + Potentials, Activities, + Trouble Tickets, FAQ, Price Books, Purchase Order,  Invoices, Notes, Emails, + Products, Vendors, Quotes, Sales Orders

    +

    4.4. Field + Privileges

    +

    Field Privileges define the + access permissions for the fields (standard fields/custom fields) in the following modules:

    +

    Leads, + Accounts, Contacts, Potentials, Activities, + Trouble Tickets, FAQ, Price Books, Purchase Orders,  Invoices, Notes, Emails, + Products, Vendors, Quotes, and Sales Orders.

    +

    You can also define Field Privileges for the custom fields.

    +

    4.5. + Utility Privileges

    +

    Utility Privileges define the permissions for the actions Import, Export, Merge, + Convert Lead 
    +         +
    + Profiles in user management + facilitate to Add/Edit/Delete/View Roles.

    + + + + +

    Notes

    +
      +
    • Global Privileges in Profiles override the permissions defined by Tab, Standard, Utility and Field Privileges.  For example, in a profile the access for Potentials tab is denied via Tab Privileges. Even then the Profile User can view the Potentials module data if the 'View all'  permission is allowed in the global privileges of that profile.
      • +
    • Privileges defined in the profile apply to only non-admin users. For admin users the permissions defined in profile is immaterial.
      • +
    • Profiles override the Default Organization Sharing Rules and the User defined Sharing Rules.  For example consider that the organization sharing rule allows an user to view the Potentials of other users. But the user cannot view the Potentials module because his profile does not allow him to access the Potential module.
      • +
    +

    Back to Top

    +

    5. Groups

    +

    Groups + can be created to manage a set of common records.  A group can + consist of the following:

    +
      +
    • Groups --> group can consists of sub groups. All the users + present in this sub group will also be in the main group.
      • +
    • Roles --> all + the users under the given role will be in the group
      • +
    • Roles and + Subordinates --> all the users under the given role and role + subordinates will be in the group.
      • +
    • User --> the specified user will + be present in the group
      • +
    +

    Users associated with a particular group can + access the records assigned to the group and perform the necessary CRUD + operations on the records.

    +

    Groups in + user management + facilitate to Add/Edit/Delete/View Roles. +

    + + + + +

    Notes

    +
      +
    • A user, role, role subordinate, group can be present in any number of groups
      • +
    • When a group is assigned as owner to a crmentity, all the members  of the group can access the entity. When the ownership is changed to any one member in the group  then only that member can access the entity and all other members in the group cannot access the entity. If in this  case it is required that all the members of the group should have access to the entity, then user defined sharing rule should be defined to share all the data between the group members
      • +
    +

    Back to Top

    +

    6. Default + Organization Sharing Access

    +

    Default Organization Sharing Access + controls the data sharing at organization level. Other users can access + the owners' records as per organization-level data (records in various + modules) access privilege. You can provide the following types of + access levels to vtiger CRM + modules:

    +
      +
    • Private: Only the record owner, and + users above + that role in the hierarchy, can view, edit, and delete on those + records.
      • +
    • Public: Read Only: All + users can view the records but cannot edit them. Only the owner, + and users above that role in the hierarchy, can edit/delete those + records.
      • +
    • Public: Read Create/Edit: All + users can view/create/edit the records but cannot delete them. Only the + owner, + and users above that role in the hierarchy, can delete those records.
      • +
    • Public: Read Create/Edit, Delete:  This sharing privilege provides global access for all the users. All + the users can view/create/edit/delete other users records in the + organization.
      • +
    +

    Default Organization sharing privileges can be defined for the + following modules:

    +

    Accounts & Contacts, Potentials, + Leads,  Emails, HelpDesk, Quotes, Purchase Order, Sales Order, + Invoice
    +
    + For Activities module the default organization sharing privilege value +is Private and it is a fixed value and this cannot be altered.
    +
    + By default, the default organization sharing privilege value for all +the modules will be Public:Read Create/Edit, Delete

    + + + + +

    Notes

    +

    If the Default Organization Sharing Privilege is set as Private for Accounts & Contacts, then the default organization sharing privilege value for the following modules will also be set as a private:

    +

    Potentials,  Emails, HelpDesk, Quotes, Purchase Order, Sales Order and Invoice

    +

    Back to Top

    +

    7. User Defined Sharing + Access

    +

    User Defined Sharing Rules + allows the administrators to selectively grant data access to a  set of Users. Data Sharing rules can be created to share data between + the following modules:

    +
      +
    • From Role to Role
      • +
    • From Role to Role + Subordinates
      • +
    • From Role to Group
      • +
    • From Role Subordinates to + Role
      • +
    • From Role Subordinates to + Role Subordinates
      • +
    • From Role Subordinates to + Groups
      • +
    • From Group to Role
      • +
    • From Group to Role + Subordinates
      • +
    • From Group to Group
      • +
    +

    Sharing Rules can be created for the + following modules:

    +

    1. Leads Sharing Rules:

    +

    Leads owned by + the Users of a given Role/Role + Subordinates/Group can be shared with users of a  Role/Role + Subordinates/Group in the permission of  Read Only/Read +Write.

    +

    These lead + related Emails will also be shared in the permission of + Read Only/ Read Write.
    +
    + 2. Accounts Sharing Rules: 

    -
      -
    • Regardless of the organization-wide defaults, users can always view and - edit all data owned by or shared with users below them in the role hierarchy.
      • -
    • While your sharing model controls visibility to records, user permissions - control what users can do to the records that are visible to them. For example, - if you share an account with other users, those users can only see the account - if they have the "Read" permission on accounts. Likewise, users who have the - "Edit" permission on contacts may still not be able to edit contacts they - do not own if they are working in a Private sharing model.
      • -
    • Administrators, and users with the "View All Data" or "Edit All Data" permissions, - have access to view or edit all data.
      • -
    • Only Administrators have access to configure the Access Privileges    -
      • -
    • You must have at least read access to a record to be able to add activities - or other associated records to it (for example associated products)
      • -
    -

    IMPORTANT:

    -

    The new security management support is provided for the following:

    -
      -
    • Home Page, Custom View, Reports, Dashboard, Activity History, and Calendar.
      -
      • -
    • Delete Handling of Roles, Groups is not fully functional.
      -
      • -
    • Editing of Groups will not function properly.
      -
      • -
    • In ListView, Related List View, Popup List View & Search List View - Sharing Rules for Related Modules are not implemented.
      -
      • -
    • Tab hiding in header is not implemented.
      -
      • -
    • Group Level Security support is implemented only for the Leads, Activities - and Tickets modules.
      -
      • -
    • Parent Type Security Handling is not implemented for the Products and Notes - modules.
      -
      • -
    • Read Only Support in field level security is not implemented.
      • -
    +

    Accounts owned + by the Users of a given Role/Role Subordinates/Group can be shared with +users of a  Role/Role Subordinates/Group in the permission of  Read Only/Read Write.

    +

    These account + related Potentials, Tickets, Quotes, Sales Order, Invoice, Emails will +also be shared in the permission of Read Only/ Read Write.

    + + + + +

    Note

    +

    Sharing Rules created for Accounts module will also apply to the contacts module

    +

    3. +Potentials Sharing Rules:

    +

    Potentials + owned by the Users of a given Role/Role + Subordinates/Group can be shared with users of a  Role/Role + Subordinates/Group in the permission of  Read Only/Read + Write.

    +

    These + potential related  Quotes and + Sales Order will also be shared in the permission of + Read Only/ Read Write.
    +
    + 4. + HelpDesk Sharing Rules:

    +

    + Tickets owned by the Users of a given Role/Role + Subordinates/Group can be shared with users of a  Role/Role + Subordinates/Group in the permission of  Read Only/Read + Write. 
    +            
    + 5. +Email Sharing Rules:

    +

    Emails owned by the Users of a given Role/Role + Subordinates/Group can be shared with users of a  Role/Role + Subordinates/Group in the permission of  Read Only/Read Write.
    +
    + 6. +Quotes Sharing Rules:

    +

    Quotes owned + by the Users of a given Role/Role + Subordinates/Group can be shared with users of a  Role/Role + Subordinates/Group in the permission of  Read Only/Read +Write.

    +

    These quote + related  Sales Order will also be shared in the permission of + Read Only/ Read Write.
    +
    + 7. +Purchase Order Sharing Rules:

    +

    Purchase Orders owned by the Users of a given Role/Role + Subordinates/Group can be shared with users of a  Role/Role + Subordinates/Group in the permission of  Read Only/Read Write.
    +
    + 8. +Sales Order Sharing Rules:

    +

    Sales Order + owned by the Users of a given Role/Role + Subordinates/Group can be shared with users of a  Role/Role + Subordinates/Group in the permission of  Read Only/Read + Write.

    +

    These sales + order related  Invoice will also be shared in the permission of + Read Only/ Read Write.
    +
    + 9. Invoice Sharing Rules:

    +

    + Invoices owned by the Users of a given Role/Role + Subordinates/Group can be shared with users of a  Role/Role + Subordinates/Group in the permission of  Read Only/Read Write.

    + + + + +

    Notes

    +
      +
    • Sharing Rules can be used only to widen the data access and they cannot be used to restrict data access
      • +
    • Any number of sharing rules can be defined for a single Role, Role Subordinates and Group
      • +
    • Sharing rules are applicable to all existing data and the data that will be created in future
      • +
    • Sharing Rules cannot be specified to share data between User to User. To achieve this, the two users should be put in two groups and the data sharing rule should be specified to share data between these two groups.
      • +
    +

    Back to Top

    +

    8. Default + Organization Field Access

    +

    + Default Organization Field Access function is used to control the visibility of the fields in various modules for + the entire organization. You can use this function to define your + organization level business process to some extent from vtiger CRM user + interface instead of programmatically defining the fields in various + modules.

    +

    With default organization field access, one can either show or hide a + field to the entire organization. Default Organization Field Privileges + can be defined for the following modules:

    +

    Leads, + Accounts, Contacts, Potentials, Activities, + Trouble Tickets, FAQ, Price Books, Purchase Order,  Invoice, Notes, Emails, + Products, Vendors, Quotes, and Sales Orders.

    + + + + +

    Notes

    +
      +
    • It is not possible to disable the mandatory fields in the modules. (for example, Last Name and Company fields in Leads module)
      • +
    • Default Organization field access overrides the profile level field access. For example your profile may allow to view the website field in leads. But you cannot view this field as it's access if denied in organization level field access
      • +
    • Default Organization level field access can be specified for custom fields also.
      • +
    • Changes made in Users, Roles, Profiles, Sharing Access and Field Access will not be reflected immediately. The user has to logout and login to  get the changes reflected.
      • +
    +

    Back to Top

    +

    9. Know Issues & Limitations

    +

    Security Management functions are not implemented for the +following modules:

    +
      +
    • Calendar, Import, Export, + Mass Delete, Change Owner, Change Status, Campaigns, Attachments and + Outlook Plugin
      • +
    • Non-admin users should be allowed to view + their Roles Subordinates, Profiles, and Groups.
      • +
    • When a group is deleted, handling to change + the current ownership to the entities owned by this group should be + done. +
    +

    Back to Top

    +

    +

    © vtiger.com. 2006 All rights reserved.

    From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 7 04:52:31 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 07 Apr 2006 08:52:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4989 - in /vtigercrm/trunk/Smarty/templates: CreateView.tpl salesEditView.tpl Message-ID: <20060407085231.8C96F63D7BD@vtiger.fosslabs.com> Author: don Date: Fri Apr 7 02:52:23 2006 New Revision: 4989 Log: fckeditor removed for Email module as ir has some issues Modified: vtigercrm/trunk/Smarty/templates/CreateView.tpl vtigercrm/trunk/Smarty/templates/salesEditView.tpl Modified: vtigercrm/trunk/Smarty/templates/CreateView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateView.tpl Fri Apr 7 02:52:23 2006 @@ -1037,9 +1037,6 @@ var oFCKeditor = null; - {if $MODULE eq 'Emails'} - oFCKeditor = new FCKeditor( "description" ) ; - {/if} {if $MODULE eq 'Notes'} oFCKeditor = new FCKeditor( "notecontent" ) ; {/if} Modified: vtigercrm/trunk/Smarty/templates/salesEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/salesEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/salesEditView.tpl Fri Apr 7 02:52:23 2006 @@ -656,9 +656,6 @@ '; + + +return $list; +} ?> From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 7 08:51:02 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 07 Apr 2006 12:51:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5001 - /vtigercrm/trunk/themes/blue/images/ Message-ID: <20060407125102.802E618714F@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 7 06:50:38 2006 New Revision: 5001 Log: new images added for settings Added: vtigercrm/trunk/themes/blue/images/announ.gif (with props) vtigercrm/trunk/themes/blue/images/assign.gif (with props) vtigercrm/trunk/themes/blue/images/backupserver.gif (with props) vtigercrm/trunk/themes/blue/images/block.gif (with props) vtigercrm/trunk/themes/blue/images/company.gif (with props) vtigercrm/trunk/themes/blue/images/custom.gif (with props) vtigercrm/trunk/themes/blue/images/groups.gif (with props) vtigercrm/trunk/themes/blue/images/inventory.gif (with props) vtigercrm/trunk/themes/blue/images/mailmarge.gif (with props) vtigercrm/trunk/themes/blue/images/migrate.gif (with props) vtigercrm/trunk/themes/blue/images/notification.gif (with props) vtigercrm/trunk/themes/blue/images/ogmailserver.gif (with props) vtigercrm/trunk/themes/blue/images/orgshar.gif (with props) vtigercrm/trunk/themes/blue/images/shareaccess.gif (with props) vtigercrm/trunk/themes/blue/images/system.gif (with props) vtigercrm/trunk/themes/blue/images/terms.gif (with props) Modified: vtigercrm/trunk/themes/blue/images/currency.gif vtigercrm/trunk/themes/blue/images/picklist.gif vtigercrm/trunk/themes/blue/images/profile.gif vtigercrm/trunk/themes/blue/images/roles.gif vtigercrm/trunk/themes/blue/images/user.gif Modified: vtigercrm/trunk/themes/blue/images/currency.gif ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/themes/blue/images/picklist.gif ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/themes/blue/images/profile.gif ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/themes/blue/images/roles.gif ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/themes/blue/images/user.gif ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 7 08:51:08 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 07 Apr 2006 12:51:08 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5002 - /vtigercrm/trunk/install/3confirmConfig.php Message-ID: <20060407125108.71A8D187256@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 7 06:51:04 2006 New Revision: 5002 Log: space removed Modified: vtigercrm/trunk/install/3confirmConfig.php Modified: vtigercrm/trunk/install/3confirmConfig.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 7 08:54:26 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 07 Apr 2006 12:54:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5003 - /vtigercrm/trunk/Release_Notes.html Message-ID: <20060407125426.EAE3165C61B@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 7 06:54:21 2006 New Revision: 5003 Log: Removed the Custom Field Smartification Modified: vtigercrm/trunk/Release_Notes.html Modified: vtigercrm/trunk/Release_Notes.html ============================================================================== --- vtigercrm/trunk/Release_Notes.html (original) +++ vtigercrm/trunk/Release_Notes.html Fri Apr 7 06:54:21 2006 @@ -100,7 +100,7 @@ 1 - Smarty template applied to Currency and Custom Fields list view features + Smarty template applied to Currency Configuration Feature 2 From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 7 08:56:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 07 Apr 2006 12:56:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5004 - /vtigercrm/trunk/Smarty/templates/Settings.tpl Message-ID: <20060407125627.5DF5165DB0C@vtiger.fosslabs.com> Author: don Date: Fri Apr 7 06:56:23 2006 New Revision: 5004 Log: new images added for Settings Modified: vtigercrm/trunk/Smarty/templates/Settings.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings.tpl Fri Apr 7 06:56:23 2006 @@ -15,18 +15,18 @@ - - - - @@ -35,17 +35,17 @@ - - - @@ -67,13 +67,13 @@
    {$MOD.LBL_CREATE_AND_MANAGE_USERS}
    +    		{$MOD.LBL_CREATE_AND_MANAGE_USERS}
    {$MOD.LBL_USERS}    		{$MOD.LBL_CREATE_AND_MANAGE_USER_ROLES}
    +    		{$MOD.LBL_CREATE_AND_MANAGE_USER_ROLES}
    {$MOD.LBL_ROLES}     		{$MOD.LBL_CREATE_AND_MANAGE_USER_PROFILES}
    +    		{$MOD.LBL_CREATE_AND_MANAGE_USER_PROFILES}
    {$MOD.LBL_PROFILES}     		{$MOD.LBL_CREATE_AND_MANAGE_USER_GROUPS}
    +    		{$MOD.LBL_CREATE_AND_MANAGE_USER_GROUPS}
    {$MOD.USERGROUPLIST}
    {$MOD.LBL_SETTING_DEFAULT_SHARING_ACCESS}
    +    		{$MOD.LBL_SETTING_DEFAULT_SHARING_ACCESS}
    {$MOD.LBL_DEFAULT_ORGANIZATION_SHARING_ACCESS}     		{$MOD.LBL_SETTING_DEFAULT_ORGANIZATION_FIELDS}
    +    		{$MOD.LBL_SETTING_DEFAULT_ORGANIZATION_FIELDS}
    {$MOD.LBL_DEFAULT_ORGANIZATION_FIELDS}    		{$MOD.LBL_ASSIGN_MODULE_OWNERS}
    -{$MOD.LBL_ASSIGN_MODULE_OWNERS} +    		{$MOD.LBL_ASSIGN_MODULE_OWNERS}
    +{$MOD.LBL_ASSIGN_MODULE_OWNERS} -    		{$MOD.LBL_SETTING_ANNOUNCEMENT}
    +    		{$MOD.LBL_SETTING_ANNOUNCEMENT}
    {$MOD.LBL_ANNOUNCEMENT}    		  
    - - - @@ -98,20 +98,20 @@ - - - - @@ -129,16 +129,16 @@
    {$MOD.LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS}
    +    		{$MOD.LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS}
    {$MOD.LBL_CUSTOM_FIELD_SETTINGS}    		{$MOD.LBL_EDIT_PICKLIST_VALUES}
    +    		{$MOD.LBL_EDIT_PICKLIST_VALUES}
    {$MOD.LBL_PICKLIST_SETTINGS}     		{$MOD.LBL_FIELD_ORDERING_DESC}
    +    		{$MOD.LBL_FIELD_ORDERING_DESC}
    {$MOD.LBL_FIELD_ORDERING}
    {$MOD.LBL_CREATE_EMAIL_TEMPLATES}
    {$MOD.EMAILTEMPLATES}    		{$MOD.LBL_UPLOAD_MSWORD_TEMPLATES}
    +    		{$MOD.LBL_UPLOAD_MSWORD_TEMPLATES}
    {$MOD.WORDINTEGRATION}     		{$MOD.LBL_SCHEDULE_EMAIL_NOTIFICATION}
    +    		{$MOD.LBL_SCHEDULE_EMAIL_NOTIFICATION}
    {$MOD.NOTIFICATIONSCHEDULERS}
     
    {$MOD.LBL_INVENTORY_NOTIFICATIONS}
    +    		{$MOD.LBL_INVENTORY_NOTIFICATIONS}
    {$MOD.INVENTORYNOTIFICATION}    		{$MOD.LBL_INVENTORY_TERMSANDCONDITIONS}
    +    		{$MOD.LBL_INVENTORY_TERMSANDCONDITIONS}
    {$MOD.INVENTORYTERMSANDCONDITIONS}
    - - - - @@ -147,11 +147,11 @@ - - From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 7 09:01:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 07 Apr 2006 13:01:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5005 - /vtigercrm/trunk/Smarty/templates/QuickCreateHidden.tpl Message-ID: <20060407130107.4ECC665DB58@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 7 07:01:02 2006 New Revision: 5005 Log: hidden field included Modified: vtigercrm/trunk/Smarty/templates/QuickCreateHidden.tpl Modified: vtigercrm/trunk/Smarty/templates/QuickCreateHidden.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/QuickCreateHidden.tpl (original) +++ vtigercrm/trunk/Smarty/templates/QuickCreateHidden.tpl Fri Apr 7 07:01:02 2006 @@ -69,6 +69,12 @@ +{elseif $MODULE eq 'Campaigns'} + + + + + {elseif $MODULE eq 'Products'} From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 7 09:09:19 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 07 Apr 2006 13:09:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5006 - /vtigercrm/trunk/index.php Message-ID: <20060407130919.AA479187243@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 7 07:09:14 2006 New Revision: 5006 Log: CustomFieldList has been removed Modified: vtigercrm/trunk/index.php Modified: vtigercrm/trunk/index.php ============================================================================== --- vtigercrm/trunk/index.php (original) +++ vtigercrm/trunk/index.php Fri Apr 7 07:09:14 2006 @@ -265,7 +265,7 @@ { $log->info("About to take action ".$action); $log->debug("in $action"); - if(ereg("^Save", $action) || ereg("^Delete", $action) || ereg("^Choose", $action) || ereg("^Popup", $action) || ereg("^ChangePassword", $action) || ereg("^Authenticate", $action) || ereg("^Logout", $action) || ereg("^Export",$action) || ereg("^add2db", $action) || ereg("^result", $action) || ereg("^LeadConvertToEntities", $action) || ereg("^downloadfile", $action) || ereg("^massdelete", $action) || ereg("^updateLeadDBStatus",$action) || ereg("^AddCustomFieldToDB", $action) || ereg("^updateRole",$action) || ereg("^UserInfoUtil",$action) || ereg("^deleteRole",$action) || ereg("^UpdateComboValues",$action) || ereg("^fieldtypes",$action) || ereg("^app_ins",$action) || ereg("^minical",$action) || ereg("^minitimer",$action) || ereg("^app_del",$action) || ereg("^send_mail",$action) || ereg("^populatetemplate",$action) || ereg("^TemplateMerge",$action) || ereg("^testemailtemplateusage",$action) || ereg("^saveemailtemplate",$action) || ereg("^lookupemailtemplate",$action) || ereg("^deletewordtemplate",$action) || ereg("^deleteemailtemplate",$action) || ereg("^CurrencyDelete",$action) || ereg("^deleteattachments",$action) || ereg("^MassDeleteUsers",$action) || ereg("^UpdateFieldLevelAccess",$action) || ereg("^UpdateDefaultFieldLevelAccess",$action) || ereg("^UpdateProfile",$action) || ereg("^updateRelations",$action) || ereg("^updateNotificationSchedulers",$action) || ereg("^Star",$action) || ereg("^addPbProductRelToDB",$action) || ereg("^UpdateListPrice",$action) || ereg("^PriceListPopup",$action) || ereg("^SalesOrderPopup",$action) || ereg("^CreatePDF",$action) || ereg("^CreateSOPDF",$action) || ereg("^redirect",$action) || ereg("^webmail",$action) || ereg("^left_main",$action) || ereg("^delete_message",$action) || ereg("^mime",$action) || ereg("^move_messages",$action) || ereg("^folders_create",$action) || ereg("^imap_general",$action) || ereg("^mime",$action) || ereg("^download",$action) || ereg("^about_us",$action) || ereg("^SendMailAction",$action) || ereg("^CreateXL",$action) || ereg("^savetermsandconditions",$action) || ereg("^home_rss",$action) || ereg("^ConvertAsFAQ",$action) || ereg("^Tickerdetail",$action) || ereg("^".$module."Ajax",$action) || ereg("^chat",$action) || ereg("^vtchat",$action) || ereg("^updateCalendarSharing",$action) || ereg("^disable_sharing",$action) || ereg("^HeadLines",$action) || ereg("^CustomFieldList",$action)) + if(ereg("^Save", $action) || ereg("^Delete", $action) || ereg("^Choose", $action) || ereg("^Popup", $action) || ereg("^ChangePassword", $action) || ereg("^Authenticate", $action) || ereg("^Logout", $action) || ereg("^Export",$action) || ereg("^add2db", $action) || ereg("^result", $action) || ereg("^LeadConvertToEntities", $action) || ereg("^downloadfile", $action) || ereg("^massdelete", $action) || ereg("^updateLeadDBStatus",$action) || ereg("^AddCustomFieldToDB", $action) || ereg("^updateRole",$action) || ereg("^UserInfoUtil",$action) || ereg("^deleteRole",$action) || ereg("^UpdateComboValues",$action) || ereg("^fieldtypes",$action) || ereg("^app_ins",$action) || ereg("^minical",$action) || ereg("^minitimer",$action) || ereg("^app_del",$action) || ereg("^send_mail",$action) || ereg("^populatetemplate",$action) || ereg("^TemplateMerge",$action) || ereg("^testemailtemplateusage",$action) || ereg("^saveemailtemplate",$action) || ereg("^lookupemailtemplate",$action) || ereg("^deletewordtemplate",$action) || ereg("^deleteemailtemplate",$action) || ereg("^CurrencyDelete",$action) || ereg("^deleteattachments",$action) || ereg("^MassDeleteUsers",$action) || ereg("^UpdateFieldLevelAccess",$action) || ereg("^UpdateDefaultFieldLevelAccess",$action) || ereg("^UpdateProfile",$action) || ereg("^updateRelations",$action) || ereg("^updateNotificationSchedulers",$action) || ereg("^Star",$action) || ereg("^addPbProductRelToDB",$action) || ereg("^UpdateListPrice",$action) || ereg("^PriceListPopup",$action) || ereg("^SalesOrderPopup",$action) || ereg("^CreatePDF",$action) || ereg("^CreateSOPDF",$action) || ereg("^redirect",$action) || ereg("^webmail",$action) || ereg("^left_main",$action) || ereg("^delete_message",$action) || ereg("^mime",$action) || ereg("^move_messages",$action) || ereg("^folders_create",$action) || ereg("^imap_general",$action) || ereg("^mime",$action) || ereg("^download",$action) || ereg("^about_us",$action) || ereg("^SendMailAction",$action) || ereg("^CreateXL",$action) || ereg("^savetermsandconditions",$action) || ereg("^home_rss",$action) || ereg("^ConvertAsFAQ",$action) || ereg("^Tickerdetail",$action) || ereg("^".$module."Ajax",$action) || ereg("^chat",$action) || ereg("^vtchat",$action) || ereg("^updateCalendarSharing",$action) || ereg("^disable_sharing",$action) || ereg("^HeadLines",$action)) { $skipHeaders=true; if(ereg("^Popup", $action) || ereg("^ChangePassword", $action) || ereg("^Export", $action) || ereg("^downloadfile", $action) || ereg("^fieldtypes",$action) || ereg("^lookupemailtemplate",$action) || ereg("^about_us",$action) || ereg("^home_rss",$action) || ereg("^".$module."Ajax",$action) || ereg("^chat",$action)|| ereg("^vtchat",$action) || ereg("^massdelete", $action)) @@ -585,7 +585,7 @@ $theme = $default_theme; } -if((!$viewAttachment) && (!$viewAttachment && $action != 'home_rss') && $action != 'Tickerdetail' && $action != $module."Ajax" && $action != "chat" && $action != "HeadLines" && $action != 'massdelete' && $action != 'CustomFieldList') +if((!$viewAttachment) && (!$viewAttachment && $action != 'home_rss') && $action != 'Tickerdetail' && $action != $module."Ajax" && $action != "chat" && $action != "HeadLines" && $action != 'massdelete') { // Under the SPL you do not have the right to remove this copyright statement. $copyrightstatement=" - -
    {$MOD.LBL_SPECIFY_COMPANY_DETAILS}
    +    		{$MOD.LBL_SPECIFY_COMPANY_DETAILS}
    {$MOD.LBL_ORGANIZATION_DETAILS}    		{$MOD.LBL_CONFIGURE_MAIL_SERVER}
    +    		{$MOD.LBL_CONFIGURE_MAIL_SERVER}
    {$MOD.LBL_EMAIL_CONFIG}    		{$MOD.LBL_CONFIGURE_BACKUP_SERVER}
    +    		{$MOD.LBL_CONFIGURE_BACKUP_SERVER}
    {$MOD.LBL_BACKUP_SERVER_CONFIGURATION}     		{$MOD.LBL_SYSTEM_CONFIGURATION}
    +    		{$MOD.LBL_SYSTEM_CONFIGURATION}
    {$MOD.LBL_SYSTEM_CONFIG}
    {$MOD.LBL_CURRENCY_CONFIGURATION}
    +    		{$MOD.LBL_CURRENCY_CONFIGURATION}
    {$MOD.LBL_CURRENCY_CONFIG}     		{$MOD.LBL_MIGRATION_INFO}
    +    		{$MOD.LBL_MIGRATION_INFO}
    {$MOD.LBL_MIGRATION}
    - - {include file='SettingsMenu.tpl'} - -
    @@ -251,9 +246,6 @@
    -
    {$JAVASCRIPT} - {include file = 'SettingsSubMenu.tpl'} - + From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 20 09:27:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 20 Apr 2006 13:27:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5193 - /vtigercrm/trunk/Smarty/templates/MyPrefEditView.tpl Message-ID: <20060420132710.492CB6AB273@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 20 07:27:05 2006 New Revision: 5193 Log: Removed the Settings Menu from My Preferences - Ahmed Modified: vtigercrm/trunk/Smarty/templates/MyPrefEditView.tpl Modified: vtigercrm/trunk/Smarty/templates/MyPrefEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/MyPrefEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/MyPrefEditView.tpl Thu Apr 20 07:27:05 2006 @@ -14,11 +14,6 @@ - - - - {include file='SettingsMenu.tpl'} - -
    @@ -373,8 +368,4 @@
    -
    - {$JAVASCRIPT} - {include file = 'SettingsSubMenu.tpl'} From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 09:31:08 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 13:31:08 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23717=3A_?= =?utf-8?q?Improper_record_count_after_import?= Message-ID: <076.8ebe8d6e1eb35e4dfb9a4767a5ef5a19@vtiger.fosslabs.com> #717: Improper record count after import --------------------------+------------------------------------------------- Reporter: saraj | Owner: mickie Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: Import Error | --------------------------+------------------------------------------------- During Lead import in 'Step 3 of 3 : Mapping Results' even after importing 10 records it show the message as '0 Import Succesfully Imported' -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 09:34:32 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 13:34:32 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23718=3A_?= =?utf-8?q?Remove_filter_links_in_import_listview?= Message-ID: <076.fdc5818c7b39d9818eec485ae438226d@vtiger.fosslabs.com> #718: Remove filter links in import listview -----------------------------+---------------------------------------------- Reporter: saraj | Owner: mickie Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: import listview | -----------------------------+---------------------------------------------- During Lead import in 'Step 3 of 3' the listview shown has Customview links such as 'filters New Edit Delete' and the 'All' Link takes you to Main listview. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 09:53:40 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 13:53:40 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23719=3A_?= =?utf-8?q?Hacking_attempt_during_import?= Message-ID: <076.49f0afa3aa1bf043577318e21de1ec26@vtiger.fosslabs.com> #719: Hacking attempt during import ------------------------------------+--------------------------------------- Reporter: saraj | Owner: mickie Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: Import Hacking attempt | ------------------------------------+--------------------------------------- In lead import in 'Step 3 of 3' when clicked on import more button 'Hacking attempt' exception is thrown. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 09:57:27 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 13:57:27 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23720=3A_?= =?utf-8?q?Remove_=27+addtag=27_link?= Message-ID: <076.23869c186c774dd330a03c5dc20c5419@vtiger.fosslabs.com> #720: Remove '+addtag' link -------------------------------+-------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: Addtag link Leads | -------------------------------+-------------------------------------------- In Lead detail view right corner we have a '+addtag' link, this when clicked shows the add tag form, even then the '+addtag' link is present this should be removed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 20 10:13:46 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 20 Apr 2006 14:13:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5194 - /vtigercrm/trunk/index.php Message-ID: <20060420141346.720AA6AB2AD@vtiger.fosslabs.com> Author: don Date: Thu Apr 20 08:13:36 2006 New Revision: 5194 Log: Removed Settings Module from skip security check Modified: vtigercrm/trunk/index.php Modified: vtigercrm/trunk/index.php ============================================================================== --- vtigercrm/trunk/index.php (original) +++ vtigercrm/trunk/index.php Thu Apr 20 08:13:36 2006 @@ -295,7 +295,7 @@ $skipHeaders=true; $skipFooters=true; } - if($module == 'Users' || $module == 'Home' || $module == 'Administration' || $module == 'uploads' || $module == 'Settings' || $module == 'Calendar') + if($module == 'Users' || $module == 'Home' || $module == 'Administration' || $module == 'uploads' || $module == 'Calendar') { $skipSecurityCheck=true; } From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 10:31:27 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 14:31:27 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23721=3A_?= =?utf-8?q?Parent_tab_shift?= Message-ID: <076.526e32eb34e2787149e3f31ae9ad3378@vtiger.fosslabs.com> #721: Parent tab shift ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: Parent tab | ------------------------+--------------------------------------------------- While accessing Sales->Contacts->import contacts the highlighted parent tab shifts to 'Support'. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 10:37:18 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 14:37:18 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23722=3A_?= =?utf-8?q?No_error_message_while_importing_without_mapping_the_fields?= Message-ID: <076.8b2946e476024ee97de7909111399e75@vtiger.fosslabs.com> #722: No error message while importing without mapping the fields -----------------------------+---------------------------------------------- Reporter: saraj | Owner: mickie Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: Import Contacts | -----------------------------+---------------------------------------------- While importing 500 contacts, if no field is mapped to Headers and 'Import Now' is clicked the message shows '500 Import Successfully Imported', but no records imported, also the message should be '500 Records Successfully'. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 10:46:32 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 14:46:32 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23443=3A_?= =?utf-8?q?Issue_in_contact_send_mail?= In-Reply-To: <076.430c5dc35b1c3f501f0bbe602ea65fa9@vtiger.fosslabs.com> References: <076.430c5dc35b1c3f501f0bbe602ea65fa9@vtiger.fosslabs.com> Message-ID: <085.e7c2ecbebb51311367f25322408ef2c8@vtiger.fosslabs.com> #443: Issue in contact send mail ------------------------+--------------------------------------------------- Reporter: don | Owner: mickie Type: defect | Status: assigned Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * status: new => assigned * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 10:47:39 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 14:47:39 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23455=3A_?= =?utf-8?q?Pagination_is_not_supported_in_global_search?= In-Reply-To: <076.6e392e06b9e61627753aa3ff916f1484@vtiger.fosslabs.com> References: <076.6e392e06b9e61627753aa3ff916f1484@vtiger.fosslabs.com> Message-ID: <085.ec46fa4495e71b58b4ab8c4cb300044e@vtiger.fosslabs.com> #455: Pagination is not supported in global search ------------------------+--------------------------------------------------- Reporter: don | Owner: mickie Type: defect | Status: assigned Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * status: new => assigned * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 10:48:42 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 14:48:42 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23459=3A_?= =?utf-8?q?Highliting_of_the_search_criteria_in_global_search?= In-Reply-To: <076.706f7ce59cca6fc3873088aa62ae8f98@vtiger.fosslabs.com> References: <076.706f7ce59cca6fc3873088aa62ae8f98@vtiger.fosslabs.com> Message-ID: <085.10c1b3700d703a51c7d8a59d326506e4@vtiger.fosslabs.com> #459: Highliting of the search criteria in global search ------------------------+--------------------------------------------------- Reporter: don | Owner: mickie Type: defect | Status: assigned Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * status: new => assigned * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 10:50:25 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 14:50:25 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23461=3A_?= =?utf-8?q?Issue_in_global_search_result_display_format?= In-Reply-To: <076.db55839c519a11f03b97df3c48274c83@vtiger.fosslabs.com> References: <076.db55839c519a11f03b97df3c48274c83@vtiger.fosslabs.com> Message-ID: <085.ffa3fffe292b990d7c9d6feb0b9feb46@vtiger.fosslabs.com> #461: Issue in global search result display format ------------------------+--------------------------------------------------- Reporter: don | Owner: mickie Type: defect | Status: assigned Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * status: new => assigned * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 10:51:28 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 14:51:28 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23470=3A_?= =?utf-8?q?Enhancement_in_Global_Search?= In-Reply-To: <076.8446f13ac07f4020e0afb305260d69b9@vtiger.fosslabs.com> References: <076.8446f13ac07f4020e0afb305260d69b9@vtiger.fosslabs.com> Message-ID: <085.5611a9729ab7ab102a6bcc86866204a0@vtiger.fosslabs.com> #470: Enhancement in Global Search ------------------------+--------------------------------------------------- Reporter: don | Owner: mickie Type: defect | Status: assigned Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * status: new => assigned * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 10:57:42 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 14:57:42 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23472=3A_?= =?utf-8?q?Search_result_count_is_missing_in_global_search?= In-Reply-To: <076.b8b6a34e31005f060bcb9a5e08e7ad43@vtiger.fosslabs.com> References: <076.b8b6a34e31005f060bcb9a5e08e7ad43@vtiger.fosslabs.com> Message-ID: <085.5381ef0b69cc16c58767b58b68e0dd14@vtiger.fosslabs.com> #472: Search result count is missing in global search ------------------------+--------------------------------------------------- Reporter: don | Owner: mickie Type: defect | Status: assigned Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * status: new => assigned * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 10:58:50 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 14:58:50 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23474=3A_?= =?utf-8?q?UI_issue_in_global_search?= In-Reply-To: <076.eeef6ec5ac3c4f9c7ea62de77ba3c172@vtiger.fosslabs.com> References: <076.eeef6ec5ac3c4f9c7ea62de77ba3c172@vtiger.fosslabs.com> Message-ID: <085.55d0b7779f9f33c29e003d2144639a0a@vtiger.fosslabs.com> #474: UI issue in global search ------------------------+--------------------------------------------------- Reporter: don | Owner: mickie Type: defect | Status: assigned Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * status: new => assigned * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 10:58:59 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 14:58:59 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23723=3A_?= =?utf-8?q?Parent_tab_not_highlighted?= Message-ID: <076.cd496fd3a80ac24dced660612366f644@vtiger.fosslabs.com> #723: Parent tab not highlighted ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: Parent tab | ------------------------+--------------------------------------------------- During Contact Import, in Step 3 of 3, Nither the Parent tab is highlighted nor the Module name is displayed in the menu bar. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 11:00:47 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 15:00:47 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23528=3A_?= =?utf-8?q?Select_Contact_Issue?= In-Reply-To: <076.f07c85055644e29178f6011a8d4b08e7@vtiger.fosslabs.com> References: <076.f07c85055644e29178f6011a8d4b08e7@vtiger.fosslabs.com> Message-ID: <085.07f6078fe5fdd6d72d7a52a5ed28340a@vtiger.fosslabs.com> #528: Select Contact Issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: philip Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Related Lists ---------------------------+------------------------------------------------ Changes (by mickie): * owner: developer => philip -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 11:01:28 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 15:01:28 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23607=3A_?= =?utf-8?q?Unable_to_create_new_ticket=2E?= In-Reply-To: <076.ec2f296a02d16f9111b0d6b6fd3ed24c@vtiger.fosslabs.com> References: <076.ec2f296a02d16f9111b0d6b6fd3ed24c@vtiger.fosslabs.com> Message-ID: <085.0cbfa5f273b8fd1eb58fa11a1d9fc381@vtiger.fosslabs.com> #607: Unable to create new ticket. ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mickie Type: defect | Status: assigned Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * status: new => assigned * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 11:02:14 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 15:02:14 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23611=3A_?= =?utf-8?q?Title_missing_in_Global_search_for_Campaigns_module?= In-Reply-To: <076.5534457e7415fafccee51d069cb46bf8@vtiger.fosslabs.com> References: <076.5534457e7415fafccee51d069cb46bf8@vtiger.fosslabs.com> Message-ID: <085.9507e320caeed2bfcba9b2b5cfc4a54c@vtiger.fosslabs.com> #611: Title missing in Global search for Campaigns module ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: mickie Type: defect | Status: assigned Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Security ---------------------------+------------------------------------------------ Changes (by mickie): * status: new => assigned * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 11:03:51 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 15:03:51 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23612=3A_?= =?utf-8?q?logs_in_Emails_module?= In-Reply-To: <076.605072bac9ef0b45dc981de0eb910dfc@vtiger.fosslabs.com> References: <076.605072bac9ef0b45dc981de0eb910dfc@vtiger.fosslabs.com> Message-ID: <085.e93fb48a25e65fa702b3796565550970@vtiger.fosslabs.com> #612: logs in Emails module --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: mickie Type: defect | Status: assigned Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: --------------------------------+------------------------------------------- Changes (by mickie): * status: new => assigned * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 11:04:30 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 15:04:30 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23615=3A_?= =?utf-8?q?Issue_in_email_editview?= In-Reply-To: <076.70b3d4b4709afdb2b590cc0efc2c6fd1@vtiger.fosslabs.com> References: <076.70b3d4b4709afdb2b590cc0efc2c6fd1@vtiger.fosslabs.com> Message-ID: <085.975c58852f7cf97862ebde4a54343aec@vtiger.fosslabs.com> #615: Issue in email editview --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: mickie Type: defect | Status: assigned Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: --------------------------------+------------------------------------------- Changes (by mickie): * status: new => assigned * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 11:05:15 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 15:05:15 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23676=3A_?= =?utf-8?q?Migration_Issues_-_Quick_Create_Potentials_Non_Functional?= In-Reply-To: <076.396c5f0dc651a29c5494394f2a4bac76@vtiger.fosslabs.com> References: <076.396c5f0dc651a29c5494394f2a4bac76@vtiger.fosslabs.com> Message-ID: <085.a4949dab31915bad1069eac067792c7c@vtiger.fosslabs.com> #676: Migration Issues - Quick Create Potentials Non Functional ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: assigned Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * status: new => assigned * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 20 11:06:25 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 20 Apr 2006 15:06:25 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5195 - /vtigercrm/trunk/Smarty/templates/DetailView.tpl Message-ID: <20060420150625.40CDF6AB2C2@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 20 09:06:20 2006 New Revision: 5195 Log: convertlead button type has been changed 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 Apr 20 09:06:20 2006 @@ -199,7 +199,7 @@ {/if} {if $MODULE eq 'Leads'} {if $CONVERTLEAD eq 'permitted'} -   +   {/if} {/if} From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 11:06:49 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 15:06:49 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23679=3A_?= =?utf-8?q?Migration_Issues_-_Exceptions_Thrown_in_Vendors?= In-Reply-To: <076.2af5095a13ae186cfdfff0e886a79dc2@vtiger.fosslabs.com> References: <076.2af5095a13ae186cfdfff0e886a79dc2@vtiger.fosslabs.com> Message-ID: <085.ffc439bfde7b44048aaf68bccc38abc4@vtiger.fosslabs.com> #679: Migration Issues - Exceptions Thrown in Vendors ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: assigned Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * status: new => assigned * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 11:07:53 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 15:07:53 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23682=3A_?= =?utf-8?q?Migration_Issues_-_Duplication_of_Purchase_Order_Returns_No_Val?= =?utf-8?q?ues?= In-Reply-To: <076.260f3255a06e7eaa5036495341824543@vtiger.fosslabs.com> References: <076.260f3255a06e7eaa5036495341824543@vtiger.fosslabs.com> Message-ID: <085.0811b72a5b7e429419337b50d77e7d18@vtiger.fosslabs.com> #682: Migration Issues - Duplication of Purchase Order Returns No Values ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: assigned Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * status: new => assigned * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 11:08:50 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 15:08:50 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23724=3A_?= =?utf-8?q?Save_Maping_Not_validated?= Message-ID: <076.6f363360800dc0069d98f1d72303001a@vtiger.fosslabs.com> #724: Save Maping Not validated -------------------------+-------------------------------------------------- Reporter: saraj | Owner: mickie Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: Save maping | -------------------------+-------------------------------------------------- While importing contact, in step 2 or 3 if 'Save maping' is checked and the field is set empty and contine import it does not throw any exception and the mapping does not get saved. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 11:08:53 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 15:08:53 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23687=3A_?= =?utf-8?q?Migration_Issues_-_Users_Link_in_Settings?= In-Reply-To: <076.fe8007d1417bdc1609b69fd5446e55e4@vtiger.fosslabs.com> References: <076.fe8007d1417bdc1609b69fd5446e55e4@vtiger.fosslabs.com> Message-ID: <085.b81b92084f0930b20c2ef4f78896fb6f@vtiger.fosslabs.com> #687: Migration Issues - Users Link in Settings ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: assigned Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * status: new => assigned * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 11:10:16 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 15:10:16 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23695=3A_?= =?utf-8?q?Migration_Issues_-_My_Preferences_throws_exception?= In-Reply-To: <076.d5c2f446b43753dbeb39d9660fb3e039@vtiger.fosslabs.com> References: <076.d5c2f446b43753dbeb39d9660fb3e039@vtiger.fosslabs.com> Message-ID: <085.2701d5751c96ddde8516686a319d0ba8@vtiger.fosslabs.com> #695: Migration Issues - My Preferences throws exception ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: assigned Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * status: new => assigned * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 11:13:32 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 15:13:32 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23725=3A_?= =?utf-8?q?Inconsistent_higlighting_of_parent_tab?= Message-ID: <076.5f5553ce99dcea645fe55b8d2ce2c004@vtiger.fosslabs.com> #725: Inconsistent higlighting of parent tab ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: Parent tab | ------------------------+--------------------------------------------------- While browsing Sales->Products-> import Products the parent tab shifts to 'Support' -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 11:15:16 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 15:15:16 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23536=3A_?= =?utf-8?q?Ticketsystem_Emails?= In-Reply-To: <076.c51ff6414ec289c44df50737baa910d6@vtiger.fosslabs.com> References: <076.c51ff6414ec289c44df50737baa910d6@vtiger.fosslabs.com> Message-ID: <085.7068d1036fc6ffe187defa04c5943671@vtiger.fosslabs.com> #536: Ticketsystem Emails -----------------------------+---------------------------------------------- Reporter: anonymous | Owner: mickie Type: enhancement | Status: assigned Priority: major | Milestone: Component: customerportal | Version: 5.0.0 Resolution: | Keywords: Ticket mail -----------------------------+---------------------------------------------- Changes (by mickie): * status: new => assigned * owner: developer => mickie Comment: In ticket system the notification mail contains email address. i accept. but the ticket details will sent only to the owner of the ticket and the related contact. other than these, no mail will sent to others. in which mail we can hide the email address? can you please let me explain in detail about this problem if i am wrong. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 11:16:45 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 15:16:45 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23363=3A_?= =?utf-8?q?Redirection_Issues_-_HelpDesk?= In-Reply-To: <076.c629bba7c27d91e7293e6a60bd6b5601@vtiger.fosslabs.com> References: <076.c629bba7c27d91e7293e6a60bd6b5601@vtiger.fosslabs.com> Message-ID: <085.f257bedbdb6c1f4d02a5728772ff3522@vtiger.fosslabs.com> #363: Redirection Issues - HelpDesk ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: assigned Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * status: new => assigned * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 11:18:38 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 15:18:38 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23689=3A_?= =?utf-8?q?Migration_Issues_-_Global_Access_Privileges_-_settings?= In-Reply-To: <076.3145637101ebdf830949cfecd724434c@vtiger.fosslabs.com> References: <076.3145637101ebdf830949cfecd724434c@vtiger.fosslabs.com> Message-ID: <085.f315a8ce4b0f75cc25ee2f85a2e55c00@vtiger.fosslabs.com> #689: Migration Issues - Global Access Privileges - settings ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: assigned Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * status: new => assigned * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 11:29:05 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 15:29:05 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23726=3A_?= =?utf-8?q?Records_imported_but_improper_message_and_no_import_listview?= Message-ID: <076.b862c11474936e902c562fd6cb797ecc@vtiger.fosslabs.com> #726: Records imported but improper message and no import listview ----------------------------+----------------------------------------------- Reporter: saraj | Owner: developer Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: Product import | ----------------------------+----------------------------------------------- I exported the existing products, and tried to import it back, it showed the following message. Step 3 of 3 : Mapping Results Success! 0 Import Succesfully Imported 0 records skipped because the id's either existed or where longer than 36 characters 0 records skipped because they were missing one or more required fields It didn't show the imported records in list view, but it imported all the records and this was seen inthe product list view. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 11:29:23 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 15:29:23 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23726=3A_?= =?utf-8?q?Records_imported_but_improper_message_and_no_import_listview?= In-Reply-To: <076.b862c11474936e902c562fd6cb797ecc@vtiger.fosslabs.com> References: <076.b862c11474936e902c562fd6cb797ecc@vtiger.fosslabs.com> Message-ID: <085.9ec34b9b238094a8c6b60a07df7e8b8a@vtiger.fosslabs.com> #726: Records imported but improper message and no import listview ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mickie Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Product import ------------------------+--------------------------------------------------- Changes (by saraj): * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 20 11:51:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 20 Apr 2006 15:51:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5196 - /vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl Message-ID: <20060420155141.CD1F66AB2DB@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 20 09:51:34 2006 New Revision: 5196 Log: Populated Merge Field Combo Values with initial value of None - Ahmed Modified: vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl Modified: vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl Thu Apr 20 09:51:34 2006 @@ -24,7 +24,7 @@ function init() {ldelim} - var blankOption = new Option('', ''); + var blankOption = new Option('--None--', '--None--'); var allOpts = new Object(0); var options = null; @@ -173,7 +173,7 @@ {$UMOD.LBL_SELECT_FIELD_TYPE}   {$UMOD.LBL_SELECT_FIELD} - +   {$UMOD.LBL_MERGE_FIELD_VALUE} From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 11:58:35 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 15:58:35 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23550=3A_?= =?utf-8?q?combo_box_in_emailtemplates_createview?= In-Reply-To: <076.78884aba025a76978f4584da2b44a3dd@vtiger.fosslabs.com> References: <076.78884aba025a76978f4584da2b44a3dd@vtiger.fosslabs.com> Message-ID: <085.e5ed7b7b901e994d1e9ba633ae0b3497@vtiger.fosslabs.com> #550: combo box in emailtemplates createview --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: ela Type: enhancement | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: assigned => closed Comment: The Default Selected Value is diplayed as None instead of empty. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 20 13:43:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 20 Apr 2006 17:43:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5197 - /vtigercrm/trunk/include/utils/UserInfoUtil.php Message-ID: <20060420174328.7B8AE6AB2F6@vtiger.fosslabs.com> Author: don Date: Thu Apr 20 11:43:21 2006 New Revision: 5197 Log: Security check added for Settings module in isPermitted() 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 Thu Apr 20 11:43:21 2006 @@ -1196,13 +1196,28 @@ require('user_privileges/user_privileges_'.$current_user->id.'.php'); require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); $permission = "no"; - if($module == 'Users' || $module == 'Home' || $module == 'Administration' || $module == 'uploads' || $module == 'Settings' || $module == 'Calendar') + if($module == 'Users' || $module == 'Home' || $module == 'Administration' || $module == 'uploads' || $module == 'Calendar') { //These modules dont have security right now $permission = "yes"; return $permission; } + + //Checking the Access for the Settings Module + if($module == 'Settings') + { + if(! $is_admin) + { + $permission = "no"; + } + else + { + $permission = "yes"; + } + return $permission; + } + //Checking whether the user is admin if($is_admin) { From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 13:44:35 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 17:44:35 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23683=3A_?= =?utf-8?q?Settings_Menu_should_not_be_shown_in_My_Preference_Page?= In-Reply-To: <076.bf8980ab378cbfb991ebb9daeafbe17b@vtiger.fosslabs.com> References: <076.bf8980ab378cbfb991ebb9daeafbe17b@vtiger.fosslabs.com> Message-ID: <085.b31c78888d216d753c3769df71a9b6a4@vtiger.fosslabs.com> #683: Settings Menu should not be shown in My Preference Page ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: ahmed Type: defect | Status: new Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Users ---------------------------+------------------------------------------------ Changes (by don): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 13:47:32 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 17:47:32 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23681=3A_?= =?utf-8?q?Security_Issue?= In-Reply-To: <076.dca335256be3201b348646b620f80668@vtiger.fosslabs.com> References: <076.dca335256be3201b348646b620f80668@vtiger.fosslabs.com> Message-ID: <085.1003afa055dd3cff79a01d9883578d71@vtiger.fosslabs.com> #681: Security Issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: Don Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: Security ---------------------------+------------------------------------------------ Changes (by don): * resolution: => invalid * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 13:51:36 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 20 Apr 2006 17:51:36 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23678=3A_?= =?utf-8?q?Home_Page_Security_Support_is_not_proper?= In-Reply-To: <076.0108077923a68a13c0fb45ff815a79d5@vtiger.fosslabs.com> References: <076.0108077923a68a13c0fb45ff815a79d5@vtiger.fosslabs.com> Message-ID: <085.76df27e6b92380ed9e2dd2f2fb221d93@vtiger.fosslabs.com> #678: Home Page Security Support is not proper ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Security ---------------------------+------------------------------------------------ Changes (by don): * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 20 15:24:35 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 20 Apr 2006 19:24:35 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5198 - in /vtigercrm/trunk: include/utils/ListViewUtils.php modules/Emails/DetailView.php modules/Emails/EditView.php modules/Emails/Save.php modules/Emails/mailsend.php Message-ID: <20060420192435.67BB26AB333@vtiger.fosslabs.com> Author: don Date: Thu Apr 20 13:24:26 2006 New Revision: 5198 Log: code changed to integrate new UI for Emails Modified: vtigercrm/trunk/include/utils/ListViewUtils.php vtigercrm/trunk/modules/Emails/DetailView.php vtigercrm/trunk/modules/Emails/EditView.php vtigercrm/trunk/modules/Emails/Save.php vtigercrm/trunk/modules/Emails/mailsend.php Modified: vtigercrm/trunk/include/utils/ListViewUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/ListViewUtils.php (original) +++ vtigercrm/trunk/include/utils/ListViewUtils.php Thu Apr 20 13:24:26 2006 @@ -681,6 +681,7 @@ } return $list_block; + } /**This function generates the List view entries in a popup list view @@ -1313,10 +1314,14 @@ $value = ''.$temp_val.''; } - else - { - $value = ''.$temp_val.''; - } + elseif($module == 'Emails') + { + $value = ''.$temp_val.''; + } + else + { + $value = ''.$temp_val.''; + } } } else Modified: vtigercrm/trunk/modules/Emails/DetailView.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/Emails/EditView.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/Emails/Save.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/Emails/mailsend.php ============================================================================== --- vtigercrm/trunk/modules/Emails/mailsend.php (original) +++ vtigercrm/trunk/modules/Emails/mailsend.php Thu Apr 20 13:24:26 2006 @@ -159,8 +159,12 @@ //The following function call is used to parse and form a encoded error message and then pass to result page $mail_error_str = getMailErrorString($mail_status_str); $adb->println("Mail Sending Process has been finished.\n\n"); - -header("Location:index.php?module=$returnmodule&action=$returnaction&record=$returnid&$returnset&$mail_error_str"); +if(isset($_REQUEST['popupaction']) && $_REQUEST['popupaction'] != '') +{ + $inputs=""; + echo $inputs; +} +//header("Location:index.php?module=$returnmodule&action=$returnaction&record=$returnid&$returnset&$mail_error_str"); ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 20 15:44:38 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 20 Apr 2006 19:44:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5199 - in /vtigercrm/trunk: Smarty/templates/ComposeEmail.tpl Smarty/templates/EmailDetails.tpl Smarty/templates/Emails.tpl themes/blue/images/composeMail.jpg themes/blue/images/mailHdr.jpg themes/blue/images/mailTitle.jpg Message-ID: <20060420194438.51DDF6AB336@vtiger.fosslabs.com> Author: don Date: Thu Apr 20 13:44:24 2006 New Revision: 5199 Log: new files added for new UI for Email Added: vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl vtigercrm/trunk/Smarty/templates/EmailDetails.tpl vtigercrm/trunk/themes/blue/images/composeMail.jpg (with props) vtigercrm/trunk/themes/blue/images/mailHdr.jpg (with props) vtigercrm/trunk/themes/blue/images/mailTitle.jpg (with props) Modified: vtigercrm/trunk/Smarty/templates/Emails.tpl Modified: vtigercrm/trunk/Smarty/templates/Emails.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Emails.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Emails.tpl Thu Apr 20 13:44:24 2006 @@ -1,4 +1,19 @@ +

    @@ -29,7 +44,7 @@     		-  Compose +  Compose @@ -135,13 +150,8 @@
      - - - - - - -
    From : 
    CC : 
    BCC :  
    Subject 
     
    +
    +
    @@ -159,4 +169,5 @@ + From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 23:37:43 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 03:37:43 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23727=3A_?= =?utf-8?q?Tab_order_is_wrong?= Message-ID: <076.ea581fa4aac1776c35ded59ffa1bb5b7@vtiger.fosslabs.com> #727: Tab order is wrong --------------------------+------------------------------------------------- Reporter: OnwealdTim | Owner: developer Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: ui tab order | --------------------------+------------------------------------------------- Tab order is invalid. Field layout is always two columns. Tab order alternates left and right. This is not natural. Here is a good example... try to create an account. Go the the billing address field. Type in the street address and hit tab. You would expect that your next field would be in the billing address... but it isn't. The cursor moves to the shipping address. So assume that the normal situation exists where there is only one address. With V5, you enter "billing street" then tab '''FOUR''' times to get to the "billing city". Then tab twice to "billing state". Then tab '''FOUR''' times to "billing country". I have marked this priority as "major" because it impacts usability. If no don't believe it is important, then demo that to a sales person and see if they don't gripe about having to tab so much. (sorry...venting here) -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 23:39:03 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 03:39:03 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23727=3A_?= =?utf-8?q?Tab_order_is_wrong?= In-Reply-To: <076.ea581fa4aac1776c35ded59ffa1bb5b7@vtiger.fosslabs.com> References: <076.ea581fa4aac1776c35ded59ffa1bb5b7@vtiger.fosslabs.com> Message-ID: <085.0885f6d776fc37f91bb53b6b15efff3d@vtiger.fosslabs.com> #727: Tab order is wrong -------------------------+-------------------------------------------------- Reporter: OnwealdTim | Owner: developer Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ui tab order -------------------------+-------------------------------------------------- Comment (by OnwealdTim): You can reach me at "Tsmith" email @onweald.com. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 20 23:46:05 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 03:46:05 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23728=3A_?= =?utf-8?q?Add_accounts_and_contacts_links_to_Marketing_tab?= Message-ID: <076.2b0185f2a18c096fb40efbfe665effd3@vtiger.fosslabs.com> #728: Add accounts and contacts links to Marketing tab -------------------------+-------------------------------------------------- Reporter: OnwealdTim | Owner: developer Type: enhancement | Status: new Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -------------------------+-------------------------------------------------- Just like Sales and Customer Service, Marketing users need access to accounts and contacts. It should be simple to add these links to the marketing tab. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 00:00:11 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 04:00:11 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23729=3A_?= =?utf-8?q?Need_appropriate_dashboard_for_sales_or_customer_service?= Message-ID: <076.9c59a58160b093b88ed4ee9faba261b3@vtiger.fosslabs.com> #729: Need appropriate dashboard for sales or customer service -------------------------+-------------------------------------------------- Reporter: OnwealdTim | Owner: developer Type: enhancement | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -------------------------+-------------------------------------------------- The homepage in version 4 was better because it let you get more done by viewing all the information you need at once. For example, what does a customer service person want to see immediately? 1. List of new support tickets 2. List of support tickets assigned to me 3. List of my activities not completed. For sales people: 1. List of activities not completed 2. List of new leads assigned to me 3. List of open opportunities I am working on So basically, everybody (Sales, Customer Service, Marketing) needs an appropriate home page that they can customize. Each home page would contain grids show filtered queries of tables. I like the look of the new home page but unfortunately, it doesn't help people get their work done. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 00:02:58 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 04:02:58 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23730=3A_?= =?utf-8?q?Hacking_Attempt_Issue_in_=22My_Group_Allocation=22?= Message-ID: <076.afb6bb7e87d60638729f9cb3596de7c6@vtiger.fosslabs.com> #730: Hacking Attempt Issue in "My Group Allocation" -----------------------+---------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- Click "My Group Allocation" tab in "My Home Page". Click an entity name (in my case "Individual Customization -Menu and RSS") Get error: Hacking Attempt Note that there is no html returned. Just the error text. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 00:05:28 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 04:05:28 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23731=3A_?= =?utf-8?q?Mark_as_Default_View_does_not_work?= Message-ID: <076.501758f748d7cf5f1d223fa12c0890b9@vtiger.fosslabs.com> #731: Mark as Default View does not work ------------------------+--------------------------------------------------- Reporter: OnwealdTim | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | ------------------------+--------------------------------------------------- Each tab on "My home at a glance" has the ability to set it as the default view. It does nothing that I can tell. I would expect that the next time I clicked on "My home" that I would see the selected tab. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 00:07:38 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 04:07:38 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23730=3A_?= =?utf-8?q?Hacking_Attempt_Issue_in_=22My_Group_Allocation=22?= In-Reply-To: <076.afb6bb7e87d60638729f9cb3596de7c6@vtiger.fosslabs.com> References: <076.afb6bb7e87d60638729f9cb3596de7c6@vtiger.fosslabs.com> Message-ID: <085.1e3a30edcacc21e62ad14f35e1564be5@vtiger.fosslabs.com> #730: Hacking Attempt Issue in "My Group Allocation" ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Comment (by OnwealdTim): BTW, this was reported by OnwealdTim -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 21 01:47:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 21 Apr 2006 05:47:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5200 - /vtigercrm/trunk/install/0welcome.php Message-ID: <20060421054737.6F63E6A6412@vtiger.fosslabs.com> Author: richie Date: Thu Apr 20 23:47:30 2006 New Revision: 5200 Log: msg formatted Modified: vtigercrm/trunk/install/0welcome.php Modified: vtigercrm/trunk/install/0welcome.php ============================================================================== Binary files - no diff available. From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 01:49:58 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 05:49:58 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23575=3A_?= =?utf-8?q?Slected_module_is_not_displayed?= In-Reply-To: <076.afbb6baa5fe07092c5316e5b81fd684e@vtiger.fosslabs.com> References: <076.afbb6baa5fe07092c5316e5b81fd684e@vtiger.fosslabs.com> Message-ID: <085.8ca54e5842fdedf556de34dd56b66716@vtiger.fosslabs.com> #575: Slected module is not displayed ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Custom Field ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => Custom Field -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 01:50:43 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 05:50:43 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23581=3A_?= =?utf-8?q?Improper_properties_for_default_custom_field?= In-Reply-To: <076.f22ea1b5a8ba85bc8dbaa620fde8f1c7@vtiger.fosslabs.com> References: <076.f22ea1b5a8ba85bc8dbaa620fde8f1c7@vtiger.fosslabs.com> Message-ID: <085.d2b670548066b6f77cbbc99e30fcd4e3@vtiger.fosslabs.com> #581: Improper properties for default custom field ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Custom Field ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => Custom Field -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 01:51:52 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 05:51:52 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23590=3A_?= =?utf-8?q?Does_not_have_new_UI?= In-Reply-To: <076.7b1cc95fea69a974fb443653b3b554c2@vtiger.fosslabs.com> References: <076.7b1cc95fea69a974fb443653b3b554c2@vtiger.fosslabs.com> Message-ID: <085.d11900d15914ab956a262b0e083a9d9b@vtiger.fosslabs.com> #590: Does not have new UI ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Need new UI ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => Need new UI -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 01:52:24 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 05:52:24 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23593=3A_?= =?utf-8?q?Module_link_disappears_in_Settings?= In-Reply-To: <076.938499b732b177ef0dad020e8bc0e62e@vtiger.fosslabs.com> References: <076.938499b732b177ef0dad020e8bc0e62e@vtiger.fosslabs.com> Message-ID: <085.9206c7ddeb5ef7eaa71c77a5ea34c355@vtiger.fosslabs.com> #593: Module link disappears in Settings ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Custom Field ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => Custom Field -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 01:53:00 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 05:53:00 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23597=3A_?= =?utf-8?q?Could_Not_Delete_Custom_field?= In-Reply-To: <076.9c60b0908294d48b138cbb0101c00ede@vtiger.fosslabs.com> References: <076.9c60b0908294d48b138cbb0101c00ede@vtiger.fosslabs.com> Message-ID: <085.ba4ea08932b79503bd115fa73c3fc83b@vtiger.fosslabs.com> #597: Could Not Delete Custom field ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Custom Field ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => Custom Field -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 01:53:54 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 05:53:54 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23570=3A_?= =?utf-8?q?Pick_List_icons_inconsistent?= In-Reply-To: <076.1ef32f153a483f1423972c5c8cf63f26@vtiger.fosslabs.com> References: <076.1ef32f153a483f1423972c5c8cf63f26@vtiger.fosslabs.com> Message-ID: <085.85eb5793d574bae18cf120ef40137417@vtiger.fosslabs.com> #570: Pick List icons inconsistent ------------------------+--------------------------------------------------- Reporter: saraj | Owner: ela Type: defect | Status: assigned Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Pick List icons Custom Field ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => Pick List icons Custom Field -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 01:55:31 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 05:55:31 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23600=3A_?= =?utf-8?q?Mispelled_column_name?= In-Reply-To: <076.b65b2c1314c1f9f04ba05babf632fd4a@vtiger.fosslabs.com> References: <076.b65b2c1314c1f9f04ba05babf632fd4a@vtiger.fosslabs.com> Message-ID: <085.b5077bb55bc78ce242e58d96fda0a88f@vtiger.fosslabs.com> #600: Mispelled column name ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by saraj): * status: assigned => new * owner: ela => mangai -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 21 01:57:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 21 Apr 2006 05:57:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5201 - /vtigercrm/trunk/install/1checkSystem.php Message-ID: <20060421055756.0188F6AB2BE@vtiger.fosslabs.com> Author: don Date: Thu Apr 20 23:57:52 2006 New Revision: 5201 Log: write permission check info changed for tabdata and parenttabdata Modified: vtigercrm/trunk/install/1checkSystem.php Modified: vtigercrm/trunk/install/1checkSystem.php ============================================================================== Binary files - no diff available. From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 01:57:55 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 05:57:55 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23600=3A_?= =?utf-8?q?Mispelled_column_name?= In-Reply-To: <076.b65b2c1314c1f9f04ba05babf632fd4a@vtiger.fosslabs.com> References: <076.b65b2c1314c1f9f04ba05babf632fd4a@vtiger.fosslabs.com> Message-ID: <085.79700a03c275a16176ac25adda815b67@vtiger.fosslabs.com> #600: Mispelled column name ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Custom Field column header ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => Custom Field column header -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 02:02:00 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 06:02:00 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23272=3A_?= =?utf-8?q?User_name_duplicated_in_popup?= In-Reply-To: <076.bcf5f8a6d18be7a4229ae7d427ac1f31@vtiger.fosslabs.com> References: <076.bcf5f8a6d18be7a4229ae7d427ac1f31@vtiger.fosslabs.com> Message-ID: <085.a079991bd27816397ff474f8dc347a40@vtiger.fosslabs.com> #272: User name duplicated in popup ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: User Popup ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => User Popup * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 02:13:10 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 06:13:10 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23284=3A_?= =?utf-8?q?Email_field_not_validated?= In-Reply-To: <076.8958de9cd73803ee58879a56b01fa34a@vtiger.fosslabs.com> References: <076.8958de9cd73803ee58879a56b01fa34a@vtiger.fosslabs.com> Message-ID: <085.8ef59f008445e1d6c45284f0168ae42f@vtiger.fosslabs.com> #284: Email field not validated ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Users Email Validation ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => Users Email Validation * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 02:14:30 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 06:14:30 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23304=3A_?= =?utf-8?q?Show_contents_on-mousover?= In-Reply-To: <076.12b5e03c26eb7033b97b03b38ef20578@vtiger.fosslabs.com> References: <076.12b5e03c26eb7033b97b03b38ef20578@vtiger.fosslabs.com> Message-ID: <085.4b70ae86359935f026734ae765ed750f@vtiger.fosslabs.com> #304: Show contents on-mousover ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: User Detail view ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => User Detail view * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 02:15:29 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 06:15:29 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23315=3A_?= =?utf-8?q?Check_if_user_already_exists=2C_in_the_same_page=2E?= In-Reply-To: <076.2e1aaf74031a03bfe756a227e3d670ca@vtiger.fosslabs.com> References: <076.2e1aaf74031a03bfe756a227e3d670ca@vtiger.fosslabs.com> Message-ID: <085.7eba493d31054f6a8d2d720c28d08272@vtiger.fosslabs.com> #315: Check if user already exists, in the same page. ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: User Create View Duplicate user ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => User Create View Duplicate user * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 02:16:33 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 06:16:33 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23316=3A_?= =?utf-8?q?Error_Message_merges_with_the_arrow?= In-Reply-To: <076.2e31abce995b69bf750fa51b6fc23dc7@vtiger.fosslabs.com> References: <076.2e31abce995b69bf750fa51b6fc23dc7@vtiger.fosslabs.com> Message-ID: <085.c8aaac84212a5479c1182231cf587788@vtiger.fosslabs.com> #316: Error Message merges with the arrow ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Duplicate user Error message ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => Duplicate user Error message * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 02:17:19 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 06:17:19 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23323=3A_?= =?utf-8?q?Error_Mesage_goes_out_of_Parent_Home_page=2E?= In-Reply-To: <076.86b7a11d76b69a5fb8170be99018757b@vtiger.fosslabs.com> References: <076.86b7a11d76b69a5fb8170be99018757b@vtiger.fosslabs.com> Message-ID: <085.9d8ceba918acf095da8c918488aed6be@vtiger.fosslabs.com> #323: Error Mesage goes out of Parent Home page. ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Create User ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => Create User * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 02:28:02 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 06:28:02 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23330=3A_?= =?utf-8?q?Existing_image_name_should_be_displayed_in_the_field?= In-Reply-To: <076.16fe0771edb6771801e498a1a0de5d62@vtiger.fosslabs.com> References: <076.16fe0771edb6771801e498a1a0de5d62@vtiger.fosslabs.com> Message-ID: <085.090ad60a8e2fc15f10b8257bbaaf9c1b@vtiger.fosslabs.com> #330: Existing image name should be displayed in the field ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Create User ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => Create User * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 02:29:07 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 06:29:07 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23333=3A_?= =?utf-8?q?No_css_for_Change_password_popup?= In-Reply-To: <076.166732b8cfc76c7f522640e2cbaa3eef@vtiger.fosslabs.com> References: <076.166732b8cfc76c7f522640e2cbaa3eef@vtiger.fosslabs.com> Message-ID: <085.f6df13e5b3e108a77011a22a6045aacd@vtiger.fosslabs.com> #333: No css for Change password popup ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: User Change Password popup ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => User Change Password popup * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 02:29:44 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 06:29:44 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23345=3A_?= =?utf-8?q?No_css/smartification_for_Login_History?= In-Reply-To: <076.6e3fb9b3ca30ba32d7be19a23d4a1c22@vtiger.fosslabs.com> References: <076.6e3fb9b3ca30ba32d7be19a23d4a1c22@vtiger.fosslabs.com> Message-ID: <085.1e00e6f6a1d1e989362f59b72f882237@vtiger.fosslabs.com> #345: No css/smartification for Login History ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Login History ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => Login History * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 02:40:44 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 06:40:44 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23353=3A_?= =?utf-8?q?Improper_redirection_after_saving_user_info=2E?= In-Reply-To: <076.16451aac6901713fe57067ba9815fe54@vtiger.fosslabs.com> References: <076.16451aac6901713fe57067ba9815fe54@vtiger.fosslabs.com> Message-ID: <085.80f521db16ca024ab38e2af4a71b426a@vtiger.fosslabs.com> #353: Improper redirection after saving user info. ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: User Save ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => User Save * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 02:42:06 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 06:42:06 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23356=3A_?= =?utf-8?q?My_Mail_Server_Details_link_is_broken?= In-Reply-To: <076.4278d8a764c99e1c7fce31d0bb54bc43@vtiger.fosslabs.com> References: <076.4278d8a764c99e1c7fce31d0bb54bc43@vtiger.fosslabs.com> Message-ID: <085.4d962aac374002162b4c7648ca5c631d@vtiger.fosslabs.com> #356: My Mail Server Details link is broken ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Mail Server ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => Mail Server * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 02:48:35 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 06:48:35 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23362=3A_?= =?utf-8?q?Password_change_button_not_working?= In-Reply-To: <076.04d872851b07e69b050f147c45a8fc45@vtiger.fosslabs.com> References: <076.04d872851b07e69b050f147c45a8fc45@vtiger.fosslabs.com> Message-ID: <085.cb787e196f889e394811ed5d9315e2ba@vtiger.fosslabs.com> #362: Password change button not working ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Users Password change ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => Users Password change * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 02:49:26 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 06:49:26 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23364=3A_?= =?utf-8?q?MY_photo_-_not_woking?= In-Reply-To: <076.f202743bc19114a43c94845f1c70b42e@vtiger.fosslabs.com> References: <076.f202743bc19114a43c94845f1c70b42e@vtiger.fosslabs.com> Message-ID: <085.ae52a1647132a29fc3462e74c74eb3d9@vtiger.fosslabs.com> #364: MY photo - not woking ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: User Image ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => User Image * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 02:50:48 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 06:50:48 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23373=3A_?= =?utf-8?q?no_css/smartification_for_user_popup?= In-Reply-To: <076.f6d4ea79d0fdd4a5716878c6e1ed2ab6@vtiger.fosslabs.com> References: <076.f6d4ea79d0fdd4a5716878c6e1ed2ab6@vtiger.fosslabs.com> Message-ID: <085.84185c0783eae5a94488cd1a1a75a700@vtiger.fosslabs.com> #373: no css/smartification for user popup ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: User Popup ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => User Popup * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 02:51:01 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 06:51:01 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23373=3A_?= =?utf-8?q?no_css/smartification_for_user_popup?= In-Reply-To: <076.f6d4ea79d0fdd4a5716878c6e1ed2ab6@vtiger.fosslabs.com> References: <076.f6d4ea79d0fdd4a5716878c6e1ed2ab6@vtiger.fosslabs.com> Message-ID: <085.bfe24e8973312ddd4496e67ef66354cd@vtiger.fosslabs.com> #373: no css/smartification for user popup ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: User Popup ------------------------+--------------------------------------------------- Changes (by saraj): * milestone: => 5.0.0 -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 02:52:14 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 06:52:14 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23378=3A_?= =?utf-8?q?Primay_email_id_missing_in_my_preference?= In-Reply-To: <076.9605de8a0a9544f75c23e69263630e20@vtiger.fosslabs.com> References: <076.9605de8a0a9544f75c23e69263630e20@vtiger.fosslabs.com> Message-ID: <085.2712b8e79f3f03cc865eb5980cea2a8d@vtiger.fosslabs.com> #378: Primay email id missing in my preference ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Email Field My preference ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => Email Field My preference * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 03:00:28 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 07:00:28 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23382=3A_?= =?utf-8?q?No_validation_when_user_data_edited?= In-Reply-To: <076.eadf7fb20abbf73be16f9e9f05ec9131@vtiger.fosslabs.com> References: <076.eadf7fb20abbf73be16f9e9f05ec9131@vtiger.fosslabs.com> Message-ID: <085.2ccdbf2be6e4127db3e0b5ad8f6445e6@vtiger.fosslabs.com> #382: No validation when user data edited ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: User update ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => User update * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 03:01:18 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 07:01:18 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23388=3A_?= =?utf-8?q?In_consistent_headings_in_Setting_pages?= In-Reply-To: <076.cd4fd81a0701b4d2a86d39847cf87427@vtiger.fosslabs.com> References: <076.cd4fd81a0701b4d2a86d39847cf87427@vtiger.fosslabs.com> Message-ID: <085.7ec0391e17bbda422b4cf4e08b013ddc@vtiger.fosslabs.com> #388: In consistent headings in Setting pages ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Settings ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => Settings * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 03:05:19 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 07:05:19 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23393=3A_?= =?utf-8?q?Problem_in_expand_collapse_in_Settings_module?= In-Reply-To: <076.7b27ce41ba1454e26c00bd24f88a4fa3@vtiger.fosslabs.com> References: <076.7b27ce41ba1454e26c00bd24f88a4fa3@vtiger.fosslabs.com> Message-ID: <085.da205177026b713922fc89086f03c792@vtiger.fosslabs.com> #393: Problem in expand collapse in Settings module ------------------------+--------------------------------------------------- Reporter: saraj | Owner: ela Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: UI problem ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => UI problem * owner: developer => ela -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 03:06:11 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 07:06:11 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23406=3A_?= =?utf-8?q?Campaigns_module_missing?= In-Reply-To: <076.69533f198515fd391ea1fa6897389004@vtiger.fosslabs.com> References: <076.69533f198515fd391ea1fa6897389004@vtiger.fosslabs.com> Message-ID: <085.0d1b929aed7f023aba79214d6f9a047b@vtiger.fosslabs.com> #406: Campaigns module missing ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Setting Assign Module Owners ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => Setting Assign Module Owners * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 03:07:39 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 07:07:39 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23410=3A_?= =?utf-8?q?Improper_redirection_on_clicking_cancel?= In-Reply-To: <076.04eee924b1ab2c373eba75721188a75f@vtiger.fosslabs.com> References: <076.04eee924b1ab2c373eba75721188a75f@vtiger.fosslabs.com> Message-ID: <085.b6cf0d03ec95a3252f78eeeda7d34e7b@vtiger.fosslabs.com> #410: Improper redirection on clicking cancel ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Settings Assign Moudle Owners ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => Settings Assign Moudle Owners * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 03:08:34 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 07:08:34 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23535=3A_?= =?utf-8?q?Feature_Explanation=2E=2E=2E=3F!_in_Settings?= In-Reply-To: <076.945b6b8539d74910f146ef63ca692def@vtiger.fosslabs.com> References: <076.945b6b8539d74910f146ef63ca692def@vtiger.fosslabs.com> Message-ID: <085.dc2bb3f1398299b4216fa641d27dec47@vtiger.fosslabs.com> #535: Feature Explanation...?! in Settings ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mangai Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Custom Field ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => Custom Field * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 03:09:27 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 07:09:27 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23552=3A_?= =?utf-8?q?Multi_select_combo_-_does_not_show_more_than_one?= In-Reply-To: <076.a29e2878cda6efdae6641e152e7459e0@vtiger.fosslabs.com> References: <076.a29e2878cda6efdae6641e152e7459e0@vtiger.fosslabs.com> Message-ID: <085.1dcd450b75a73da4a91e9e134d3d310f@vtiger.fosslabs.com> #552: Multi select combo - does not show more than one ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Pick List ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => Pick List * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 03:09:54 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 07:09:54 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23564=3A_?= =?utf-8?q?Image_missing_at_installation_Step_5_of_5?= In-Reply-To: <076.491f69969dbf544e4a7bd702ab6179d7@vtiger.fosslabs.com> References: <076.491f69969dbf544e4a7bd702ab6179d7@vtiger.fosslabs.com> Message-ID: <085.ef8d0b232731ca92032923f821caa1a5@vtiger.fosslabs.com> #564: Image missing at installation Step 5 of 5 ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Installation ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => Installation * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 21 03:10:38 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 21 Apr 2006 07:10:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5202 - /vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl Message-ID: <20060421071038.8B1B76AB2F2@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 21 01:10:34 2006 New Revision: 5202 Log: Missing Headers & Labels in Mail Merge Template Fixed - Ahmed Modified: vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl Modified: vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl Fri Apr 21 01:10:34 2006 @@ -62,11 +62,11 @@ - {$UMOD.LBL_UPLOAD_FILE} + {$UMOD.LBL_UPLOAD} - {$UMOD.LBL_FILE_MERGE} : + {$UMOD.LBL_MERGE_FILE}
    (Eg - .doc, .rtf files) From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 03:10:58 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 07:10:58 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23605=3A_?= =?utf-8?q?Incomplete_description_for_Pick_List_Editor?= In-Reply-To: <076.39e93a7028e5b13d3dd484adfef8ba8a@vtiger.fosslabs.com> References: <076.39e93a7028e5b13d3dd484adfef8ba8a@vtiger.fosslabs.com> Message-ID: <085.fc95a70efe6a58c16d6bd63199e77f49@vtiger.fosslabs.com> #605: Incomplete description for Pick List Editor ------------------------+--------------------------------------------------- Reporter: saraj | Owner: managai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Pick List ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => Pick List * owner: developer => managai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 03:11:15 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 07:11:15 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23605=3A_?= =?utf-8?q?Incomplete_description_for_Pick_List_Editor?= In-Reply-To: <076.39e93a7028e5b13d3dd484adfef8ba8a@vtiger.fosslabs.com> References: <076.39e93a7028e5b13d3dd484adfef8ba8a@vtiger.fosslabs.com> Message-ID: <085.a690884a81cac931413d6a256b418371@vtiger.fosslabs.com> #605: Incomplete description for Pick List Editor ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Pick List ------------------------+--------------------------------------------------- Changes (by saraj): * owner: managai => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 03:12:02 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 07:12:02 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23614=3A_?= =?utf-8?q?Edit_Pick_list_popup_is_half_displayed?= In-Reply-To: <076.19bd966bb5be11457c9445cff5c6903c@vtiger.fosslabs.com> References: <076.19bd966bb5be11457c9445cff5c6903c@vtiger.fosslabs.com> Message-ID: <085.fe43aefd787afc4f418a0fe7082b1d86@vtiger.fosslabs.com> #614: Edit Pick list popup is half displayed ------------------------+--------------------------------------------------- Reporter: saraj | Owner: ela Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Pick List Settings ------------------------+--------------------------------------------------- Changes (by saraj): * keywords: => Pick List Settings * owner: developer => ela -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 03:24:32 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 07:24:32 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23536=3A_?= =?utf-8?q?Ticketsystem_Emails?= In-Reply-To: <076.c51ff6414ec289c44df50737baa910d6@vtiger.fosslabs.com> References: <076.c51ff6414ec289c44df50737baa910d6@vtiger.fosslabs.com> Message-ID: <085.70fe23c749705aa1fa2c0dadeae18951@vtiger.fosslabs.com> #536: Ticketsystem Emails -----------------------------+---------------------------------------------- Reporter: anonymous | Owner: mickie Type: enhancement | Status: assigned Priority: major | Milestone: Component: customerportal | Version: 5.0.0 Resolution: | Keywords: Ticket mail -----------------------------+---------------------------------------------- Comment (by anonymous): Thanks for your answer. I mean the mail addresses in "Reported by:" and "Cc:" in the ticket itself wich can be viewed online. Yes, it is not neccassary to write my mail address in the fields, but I thought this would not be displayed in the online ticket and is only for internal use... The problem is that anyone (a Spambot for example) can visit this site to harvest email addresses. So, either you should put a warning note here that the email address will be viewable for anyone who visit this site, or you hide it for anonymous users, or you hide it completly. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 21 03:46:29 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 21 Apr 2006 07:46:29 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5203 - /vtigercrm/trunk/modules/Campaigns/ListView.php Message-ID: <20060421074629.16B2A6AB33A@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 21 01:46:25 2006 New Revision: 5203 Log: Advance Search link added Modified: vtigercrm/trunk/modules/Campaigns/ListView.php Modified: vtigercrm/trunk/modules/Campaigns/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/ListView.php (original) +++ vtigercrm/trunk/modules/Campaigns/ListView.php Fri Apr 21 01:46:25 2006 @@ -49,16 +49,16 @@ if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { - $where=Search($currentModule); + $where=getWhereCondition($currentModule); $url_string .="&query=true"; - if (isset($_REQUEST['campaignid'])) $campaignid = $_REQUEST['campaignid']; +/* if (isset($_REQUEST['campaignid'])) $campaignid = $_REQUEST['campaignid']; if (isset($_REQUEST['campaignname'])) $campaignname = $_REQUEST['campaignname']; if (isset($_REQUEST['campaigntype'])) $campaigntype = $_REQUEST['campaigntype']; if (isset($_REQUEST['campaignstatus'])) $campaignstatus = $_REQUEST['campaignstatus']; if (isset($_REQUEST['current_user_only'])) $current_user_only = $_REQUEST['current_user_only']; - +*/ } //<<<>>>>>> @@ -113,6 +113,7 @@ { $list_query .= ' and '.$where; } + //sort by "assignedto" and default sort by "ticketid"(DESC) if(isset($order_by) && $order_by != '') { @@ -185,6 +186,13 @@ $smarty->assign("LISTENTITY", $listview_entries); $smarty->assign("SELECT_SCRIPT", $view_script); $navigationOutput = getTableHeaderNavigation($navigation_array, $url_string,"Campaigns","index",$viewid); +$alphabetical = AlphabeticalSearch($currentModule,'index','campaignname','true','basic',"","","","",$viewid); +$fieldnames = getAdvSearchfields($module); +$criteria = getcriteria_options(); +$smarty->assign("CRITERIA", $criteria); +$smarty->assign("FIELDNAMES", $fieldnames); +$smarty->assign("ALPHABETICAL", $alphabetical); + $smarty->assign("NAVIGATION", $navigationOutput); $smarty->assign("RECORD_COUNTS", $record_string); From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 03:48:33 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 07:48:33 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2386=3A_H?= =?utf-8?q?elpDesk_Assigned_To_field_pulls_only_user_data_in_Custom_Views?= In-Reply-To: <076.f9eb297f705149b7cfa25e948aa290f1@vtiger.fosslabs.com> References: <076.f9eb297f705149b7cfa25e948aa290f1@vtiger.fosslabs.com> Message-ID: <085.08306ee46db3a8f8ace48534031d8d6d@vtiger.fosslabs.com> #86: HelpDesk Assigned To field pulls only user data in Custom Views ------------------------------------+--------------------------------------- Reporter: james at jenxnetwork.com | Owner: allanbush Type: defect | Status: assigned Priority: critical | Milestone: 4.2.4 Component: vtigercrm | Version: 4.2.3 Resolution: | Keywords: helpdesk, custom views ------------------------------------+--------------------------------------- Changes (by allanbush): * status: new => assigned * owner: Any Developer => allanbush Comment: I've added a patch which enables this for Activities, Emails, HelpDesk and Leads (unless I missed something that's the only places you can assign an entry to a group). It may be too late to check this in before the 4.2.4 release, I'll let Mike Fedyk make that call. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 21 04:10:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 21 Apr 2006 08:10:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5204 - in /vtigercrm/trunk/themes/blue/images: bookMark.gif btnL3AllMenu.gif uparrow.gif Message-ID: <20060421081057.8B76F6AB352@vtiger.fosslabs.com> Author: richie Date: Fri Apr 21 02:10:49 2006 New Revision: 5204 Log: Images added to integrate New UI for Home Page Added: vtigercrm/trunk/themes/blue/images/bookMark.gif (with props) vtigercrm/trunk/themes/blue/images/btnL3AllMenu.gif (with props) vtigercrm/trunk/themes/blue/images/uparrow.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 21 04:12:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 21 Apr 2006 08:12:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5205 - /vtigercrm/trunk/Smarty/templates/HomePage.tpl Message-ID: <20060421081220.A83BA6AB353@vtiger.fosslabs.com> Author: richie Date: Fri Apr 21 02:12:16 2006 New Revision: 5205 Log: Code Changed to integrate New UI for Home Page 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 Fri Apr 21 02:12:16 2006 @@ -1,46 +1,14 @@ - - - - + + + + + + + + + + + @@ -80,8 +48,12 @@ + + + +
    Open Calendar...Show World Clock... Open Calculator... Open All Menu...
    @@ -101,138 +73,157 @@ {* Main Contents Start Here *} - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - -
    - -
    - - - - - {* {foreach item=hometab from=$HOMEDETAILS} - {if $hometab.Title.3 neq ''} - - {/if} - {/foreach} *} - - - -
    My Home - At a Glance - - - - {$hometab.Title.3} -
    -
    -
     
    - - - - - - -
    - - {foreach item=hometab from=$HOMEDETAILS} - {if $hometab neq ''} - {if $hometab.Title.2 eq $HOMEDEFAULTVIEW} - - - - - - {else} - - - - - {/if} - {/if} - {/foreach} -
    {$hometab.Title.1}
    {$hometab.Title.1}
    -     		+ + + + +
    + +
    {foreach item=tabledetail from=$HOMEDETAILS} {if $tabledetail neq ''} - {if $tabledetail.Title.2 neq $HOMEDEFAULTVIEW} - +
    + +{* Quick Access Functionality *} +
    + + + + + - + + + + - - - - {foreach key=header item=headerdetail from=$tabledetail.Header} - - {/foreach} - - - - {foreach key=row item=detail from=$tabledetail.Entries} - - - {foreach key=label item=entries from=$detail} - - {/foreach} - - - {/foreach} - -
    Jump To +
    {$tabledetail.Title.1} (Mark as Default View) + + Home + Home + Activities + Calander + Email + Sales + + Leads + Accounts + Contacts + Potentials + Quotes + Sales Order + + Invoice + Campaigns + Products + Price Books + Notes + + Support + Help Desk + Faq + Accounts + Contacts + + Products + Notes + Analytics + Dashboard + Reports + Inventory + + Products + Vendors + Price Books + PurchaseOrder + SalesOrder + Quotes + + Invoice + + Tools + Rss + Portal + Notes + + Settings + Settings +
     
     {$headerdetail}
    {$entries}
    -
    -{/if} -{/foreach} -
     

    - - {if $TAGCLOUD_JS ne ''} - - - {/if} -
    -
    - - - - - - + + +{literal} + + + +{/literal} - + @@ -9,7 +9,8 @@
    @@ -30,7 +31,7 @@ From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 21 07:49:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 21 Apr 2006 11:49:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5222 - /vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl Message-ID: <20060421114900.83DA46A22A2@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 21 05:48:56 2006 New Revision: 5222 Log: Fixed the redirection issues & crumbs in Email Templates - Ahmed Modified: vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl Modified: vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl Fri Apr 21 05:48:56 2006 @@ -1,6 +1,6 @@ - + + @@ -101,8 +99,11 @@ - - + '; + +if(isPermitted("Potentials",'EditView') == 'yes') +{ +$convertlead .=' @@ -122,6 +123,11 @@ ('.$current_user->date_format.') + @@ -135,8 +141,9 @@

    - {$MOD.LBL_SETTINGS} > {$UMOD.LBL_EMAIL_TEMPLATE_INFORMATION} "{$TEMPLATENAME}" + {$MOD.LBL_SETTINGS} + > {$UMOD.LBL_EMAIL_TEMPLATE_INFORMATION} "{$TEMPLATENAME}"
    		 
    {$TEMPLATENAME}
    - {$TEMPLATENAME} Template - provided by vtiger CRM Team + {$TEMPLATENAME} Template
    '.$mod_strings['LBL_ACCOUNT_NAME'].'
    '.$mod_strings['LBL_DO_NOT_CREATE_NEW_POTENTIAL'].'
    - - + '; +} +$convertlead .='   @@ -149,6 +156,4 @@ '; echo $convertlead; -//$xtpl->assign("CALENDAR_DATEFORMAT", parse_calendardate($app_strings['NTC_DATE_FORMAT'])); - ?> From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 21 10:07:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 21 Apr 2006 14:07:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5237 - /vtigercrm/trunk/install/populateSeedData.php Message-ID: <20060421140710.86E696AB344@vtiger.fosslabs.com> Author: richie Date: Fri Apr 21 08:07:04 2006 New Revision: 5237 Log: entries for campaign added Modified: vtigercrm/trunk/install/populateSeedData.php Modified: vtigercrm/trunk/install/populateSeedData.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 21 10:07:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 21 Apr 2006 14:07:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5238 - /vtigercrm/trunk/schema/DatabaseSchema.xml Message-ID: <20060421140738.0C25A6AB344@vtiger.fosslabs.com> Author: richie Date: Fri Apr 21 08:07:33 2006 New Revision: 5238 Log: new fields added to campaign Modified: vtigercrm/trunk/schema/DatabaseSchema.xml Modified: vtigercrm/trunk/schema/DatabaseSchema.xml ============================================================================== --- vtigercrm/trunk/schema/DatabaseSchema.xml (original) +++ vtigercrm/trunk/schema/DatabaseSchema.xml Fri Apr 21 08:07:33 2006 @@ -1744,7 +1744,20 @@ - + + + + + + + + + + + + + + From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 21 10:07:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 21 Apr 2006 14:07:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5239 - /vtigercrm/trunk/modules/Campaigns/language/en_us.lang.php Message-ID: <20060421140749.25A536AB344@vtiger.fosslabs.com> Author: richie Date: Fri Apr 21 08:07:45 2006 New Revision: 5239 Log: new fields added to campaign Modified: vtigercrm/trunk/modules/Campaigns/language/en_us.lang.php Modified: vtigercrm/trunk/modules/Campaigns/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/Campaigns/language/en_us.lang.php Fri Apr 21 08:07:45 2006 @@ -44,7 +44,13 @@ 'TargetSize'=>'TargetSize', 'Sponsor'=>'Sponsor', +'Expected Sales Count'=>'Expected Sales Count', +'Expected Response Count'=>'Expected Response Count', +'Expected ROI'=>'Expected ROI', +'Actual Sales Count'=>'Actual Sales Count', +'Actual Response Count'=>'Actual Response Count', +'Actual ROI'=>'Actual ROI', ); From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 21 10:13:08 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 21 Apr 2006 14:13:08 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5240 - /vtigercrm/trunk/modules/Users/Security.php Message-ID: <20060421141308.728036AB455@vtiger.fosslabs.com> Author: richie Date: Fri Apr 21 08:13:03 2006 New Revision: 5240 Log: entries for campaign added Modified: vtigercrm/trunk/modules/Users/Security.php Modified: vtigercrm/trunk/modules/Users/Security.php ============================================================================== --- vtigercrm/trunk/modules/Users/Security.php (original) +++ vtigercrm/trunk/modules/Users/Security.php Fri Apr 21 08:13:03 2006 @@ -362,9 +362,9 @@ $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'product','campaign',1,59,'product','Product',1,0,0,100,3,76,1,'V~O',0,5,'BAS')"); $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'campaignstatus','campaign',1,15,'campaignstatus','Campaign Status',1,0,0,100,4,76,1,'V~O',0,5,'BAS')"); $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'closingdate','campaign',1,'23','closingdate','Expected Close Date',1,0,0,100,5,76,1,'D~M',0,3,'BAS')"); - $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'expectedrevenue','campaign',1,'15','expectedrevenue','Expected Revenue',1,0,0,100,6,76,1,'I~O',1,null,'BAS')"); + $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'expectedrevenue','campaign',1,'1','expectedrevenue','Expected Revenue',1,0,0,100,6,76,1,'I~O',1,null,'BAS')"); $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'budgetcost','campaign',1,'1','budgetcost','Budget Cost',1,0,0,100,7,76,1,'I~O',1,null,'BAS')"); - $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'actualcost','campaign',1,'15','actualcost','Actual Cost',1,0,0,100,8,76,1,'I~O',1,null,'BAS')"); + $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'actualcost','campaign',1,'1','actualcost','Actual Cost',1,0,0,100,8,76,1,'I~O',1,null,'BAS')"); $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'expectedresponse','campaign',1,'16','expectedresponse','Expected Response',1,0,0,100,9,76,1,'V~O',0,4,'BAS')"); $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,10,76,1,'V~M',1,null,'BAS')"); $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'numsent','campaign',1,'9','numsent','Num Sent',1,0,0,100,11,76,1,'N~O',1,null,'BAS')"); @@ -372,6 +372,12 @@ $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'targetaudience','campaign',1,'1','targetaudience','Target Audience',1,0,0,100,13,76,1,'V~O',1,null,'BAS')"); $this->db->query("insert into field values(26,".$this->db->getUniqueID("field").",'targetsize','campaign',1,'1','targetsize','TargetSize',1,0,0,100,14,76,1,'N~O',1,null,'BAS')"); +$this->db->query("insert into field values(26,".$this->db->getUniqueID("field").",'expectedresponsecount','campaign',1,'1','expectedresponsecount','Expected Response Count',1,0,0,100,17,76,1,'N~O',1,null,'BAS')"); +$this->db->query("insert into field values(26,".$this->db->getUniqueID("field").",'expectedsalescount','campaign',1,'1','expectedsalescount','Expected Sales Count',1,0,0,100,15,76,1,'N~O',1,null,'BAS')"); +$this->db->query("insert into field values(26,".$this->db->getUniqueID("field").",'expectedroi','campaign',1,'1','expectedroi','Expected ROI',1,0,0,100,19,76,1,'N~O',1,null,'BAS')"); +$this->db->query("insert into field values(26,".$this->db->getUniqueID("field").",'actualresponsecount','campaign',1,'1','actualresponsecount','Actual Response Count',1,0,0,100,18,76,1,'N~O',1,null,'BAS')"); +$this->db->query("insert into field values(26,".$this->db->getUniqueID("field").",'actualsalescount','campaign',1,'1','actualsalescount','Actual Sales Count',1,0,0,100,16,76,1,'N~O',1,null,'BAS')"); +$this->db->query("insert into field values(26,".$this->db->getUniqueID("field").",'actualroi','campaign',1,'1','actualroi','Actual ROI',1,0,0,100,20,76,1,'N~O',1,null,'BAS')"); $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,15,76,2,'T~O',1,null,'BAS')"); $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,16,76,2,'T~O',1,null,'BAS')"); From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 21 10:50:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 21 Apr 2006 14:50:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5241 - /vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl Message-ID: <20060421145049.3695C6AB461@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 21 08:50:44 2006 New Revision: 5241 Log: Fixed the Default Folder Selection for Edit Email Template - Ahmed Modified: vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl Modified: vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl Fri Apr 21 08:50:44 2006 @@ -144,10 +144,20 @@

    - + From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 10:51:56 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 14:51:56 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23660=3A_?= =?utf-8?q?Edit_Email_templates_-_folder_not_selected?= In-Reply-To: <076.29e376e162944559ac983660660e4deb@vtiger.fosslabs.com> References: <076.29e376e162944559ac983660660e4deb@vtiger.fosslabs.com> Message-ID: <085.28478a687c708eec8bece052b48f5dc8@vtiger.fosslabs.com> #660: Edit Email templates - folder not selected ------------------------+--------------------------------------------------- Reporter: saraj | Owner: ahmed Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Email template ------------------------+--------------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Fixed the Issue - Default Folder is getting selected in Edit Email Template -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 10:52:57 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 14:52:57 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23661=3A_?= =?utf-8?q?Email_template_-_Link_inactive?= In-Reply-To: <076.a0f1721081661b63e851a9ae7ba7b900@vtiger.fosslabs.com> References: <076.a0f1721081661b63e851a9ae7ba7b900@vtiger.fosslabs.com> Message-ID: <085.8937fb46f53768c3b89c664525ff4590@vtiger.fosslabs.com> #661: Email template - Link inactive ------------------------+--------------------------------------------------- Reporter: saraj | Owner: ahmed Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Email template ------------------------+--------------------------------------------------- Changes (by ahmed): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 10:54:10 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 14:54:10 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23661=3A_?= =?utf-8?q?Email_template_-_Link_inactive?= In-Reply-To: <076.a0f1721081661b63e851a9ae7ba7b900@vtiger.fosslabs.com> References: <076.a0f1721081661b63e851a9ae7ba7b900@vtiger.fosslabs.com> Message-ID: <085.56ef9f29f32b129a323de924bb2a3bfb@vtiger.fosslabs.com> #661: Email template - Link inactive ------------------------+--------------------------------------------------- Reporter: saraj | Owner: ahmed Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Email template ------------------------+--------------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue Fixed - the link "View sample Email" is active and working. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 10:54:53 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 14:54:53 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23663=3A_?= =?utf-8?q?Email_Template_name_-_typo_error?= In-Reply-To: <076.9ac9b70ca88ed5b1d50faf1360ad902d@vtiger.fosslabs.com> References: <076.9ac9b70ca88ed5b1d50faf1360ad902d@vtiger.fosslabs.com> Message-ID: <085.89b7744461a30c70521940a51dc5b3ce@vtiger.fosslabs.com> #663: Email Template name - typo error ------------------------+--------------------------------------------------- Reporter: saraj | Owner: ahmed Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Email template ------------------------+--------------------------------------------------- Changes (by ahmed): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 10:55:33 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 14:55:33 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23663=3A_?= =?utf-8?q?Email_Template_name_-_typo_error?= In-Reply-To: <076.9ac9b70ca88ed5b1d50faf1360ad902d@vtiger.fosslabs.com> References: <076.9ac9b70ca88ed5b1d50faf1360ad902d@vtiger.fosslabs.com> Message-ID: <085.3c44a1e7a2d81401df5f0aaa14d98a91@vtiger.fosslabs.com> #663: Email Template name - typo error ------------------------+--------------------------------------------------- Reporter: saraj | Owner: ahmed Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Email template ------------------------+--------------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Typo Error Fixed - Good replaced with Goods -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 21 11:14:14 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 21 Apr 2006 15:14:14 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5242 - /vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl Message-ID: <20060421151414.025F66AB46C@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 21 09:14:10 2006 New Revision: 5242 Log: parenttab added in Detail View & List View of Email Template - Ahmed Modified: vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl Modified: vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl Fri Apr 21 09:14:10 2006 @@ -82,7 +82,7 @@   -
    +
    {* *} @@ -102,9 +102,9 @@ {else} {/if} -  {$template.templatename} +  {$template.templatename} {$template.description} - View Sample Email + View Sample Email {/foreach} From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 11:15:12 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 15:15:12 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23526=3A_?= =?utf-8?q?parenttab_is_not_selected_in_Email_Templates?= In-Reply-To: <076.ee1ce31cc15b35115ca870efbfe083c4@vtiger.fosslabs.com> References: <076.ee1ce31cc15b35115ca870efbfe083c4@vtiger.fosslabs.com> Message-ID: <085.ae11d4260465ce40d12727f7814df548@vtiger.fosslabs.com> #526: parenttab is not selected in Email Templates --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: ahmed Type: defect | Status: new Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: --------------------------------+------------------------------------------- Changes (by ahmed): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 11:15:58 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 15:15:58 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23526=3A_?= =?utf-8?q?parenttab_is_not_selected_in_Email_Templates?= In-Reply-To: <076.ee1ce31cc15b35115ca870efbfe083c4@vtiger.fosslabs.com> References: <076.ee1ce31cc15b35115ca870efbfe083c4@vtiger.fosslabs.com> Message-ID: <085.a4111eb292be7d175204a1856b3aecb0@vtiger.fosslabs.com> #526: parenttab is not selected in Email Templates --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: ahmed Type: defect | Status: closed Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue Fixed - Parenttab is now getting selected as Settings -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 11:16:23 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 15:16:23 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23531=3A_?= =?utf-8?q?parrenttab_is_not_selected_for_detailview?= In-Reply-To: <076.e9e2f24c26be232acb486aa3346ff440@vtiger.fosslabs.com> References: <076.e9e2f24c26be232acb486aa3346ff440@vtiger.fosslabs.com> Message-ID: <085.caf8d5dfad00f567e70d80c853a16c33@vtiger.fosslabs.com> #531: parrenttab is not selected for detailview --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: ahmed Type: defect | Status: new Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: --------------------------------+------------------------------------------- Changes (by ahmed): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 11:17:01 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 15:17:01 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23531=3A_?= =?utf-8?q?parrenttab_is_not_selected_for_detailview?= In-Reply-To: <076.e9e2f24c26be232acb486aa3346ff440@vtiger.fosslabs.com> References: <076.e9e2f24c26be232acb486aa3346ff440@vtiger.fosslabs.com> Message-ID: <085.0220d8ecb6a33b47bd2b3f4166d569a7@vtiger.fosslabs.com> #531: parrenttab is not selected for detailview --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: ahmed Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue Fixed - Parenttab is now select with value as Settings -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 11:18:23 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 15:18:23 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23548=3A_?= =?utf-8?q?redirection_issue_in_email_template_creation?= In-Reply-To: <076.e12934318bebde0ef82f6cc8f0934264@vtiger.fosslabs.com> References: <076.e12934318bebde0ef82f6cc8f0934264@vtiger.fosslabs.com> Message-ID: <085.85cac487a08ce5d730116d23b837d1a3@vtiger.fosslabs.com> #548: redirection issue in email template creation --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: ahmed Type: defect | Status: new Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: --------------------------------+------------------------------------------- Changes (by ahmed): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 11:19:50 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 15:19:50 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23548=3A_?= =?utf-8?q?redirection_issue_in_email_template_creation?= In-Reply-To: <076.e12934318bebde0ef82f6cc8f0934264@vtiger.fosslabs.com> References: <076.e12934318bebde0ef82f6cc8f0934264@vtiger.fosslabs.com> Message-ID: <085.2973c35c990d0443509cf5d030bf9397@vtiger.fosslabs.com> #548: redirection issue in email template creation --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: ahmed Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Redirection Issue is Fixed - The page is getting redirected to Detail view after saving Create/Edit of Email Templates -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 11:20:45 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 15:20:45 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23546=3A_?= =?utf-8?q?link_to_Email_Templates?= In-Reply-To: <076.0276c69b9b3880e30b1f5d200ddc24ad@vtiger.fosslabs.com> References: <076.0276c69b9b3880e30b1f5d200ddc24ad@vtiger.fosslabs.com> Message-ID: <085.3da3d1872ed1e5d1df8b53c63bd105c8@vtiger.fosslabs.com> #546: link to Email Templates --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: ahmed Type: enhancement | Status: new Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: --------------------------------+------------------------------------------- Changes (by ahmed): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 21 11:21:43 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 21 Apr 2006 15:21:43 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23546=3A_?= =?utf-8?q?link_to_Email_Templates?= In-Reply-To: <076.0276c69b9b3880e30b1f5d200ddc24ad@vtiger.fosslabs.com> References: <076.0276c69b9b3880e30b1f5d200ddc24ad@vtiger.fosslabs.com> Message-ID: <085.0b1040f67e6a7e920010f18e0b2a6408@vtiger.fosslabs.com> #546: link to Email Templates --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: ahmed Type: enhancement | Status: closed Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue Fixed - The Link in the Edit View of Email Templates is now getting redirected to List view on click -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 22 02:56:02 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sat, 22 Apr 2006 06:56:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5243 - in /vtigercrm/trunk/modules/Migration: Migration.php ModifyDatabase/42P2_to_50Alpha.php Message-ID: <20060422065602.0AB386AB569@vtiger.fosslabs.com> Author: don Date: Sat Apr 22 00:55:56 2006 New Revision: 5243 Log: * Modified to capture all the failed and success queries and changed some queries Modified: vtigercrm/trunk/modules/Migration/Migration.php vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Modified: vtigercrm/trunk/modules/Migration/Migration.php ============================================================================== --- vtigercrm/trunk/modules/Migration/Migration.php (original) +++ vtigercrm/trunk/modules/Migration/Migration.php Sat Apr 22 00:55:56 2006 @@ -195,6 +195,13 @@ $this->conn->println("Inside the function modifyDatabase"); echo '

    Note : Please note that for each query the "Object" string will be displayed at the starting of the line if the query executed successfully. If the query fails then "Object" will not be displayed. we can find out the failed queries based on these Object display.'; $conn->println("\n\n\nMickie ---- Starts"); + + //Added variables to get the queries list and count + $query_count = 1; + $success_query_count = 1; + $failure_query_count = 1; + $success_query_array = Array(); + $failure_query_array = Array(); //To handle the file includes for each and every version //Here we have to decide which files should be included, where the files will be added newly for every public release Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php ============================================================================== --- vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php (original) +++ vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Sat Apr 22 00:55:56 2006 @@ -13,6 +13,8 @@ global $conn; +global $query_count, $success_query_count, $failure_query_count; +global $success_query_array, $failure_query_array; $conn->println("Database Modifications for 4.2 Patch2 ==> 5.0(Alpha) Dev 3 Starts here."); echo "

    Database Modifications for 4.2 Patch2 ==> 5.0(Alpha) Dev 3 Starts here.....
    "; @@ -1531,7 +1533,7 @@ Execute($query); } -$update_query2 = "UPDATE field SET fieldlabel = 'Reference' WHERE tabid = 4 and tablename = 'contactdetails'"; +$update_query2 = "UPDATE field SET fieldlabel = 'Reference' WHERE tabid = 4 and tablename = 'contactdetails' and fieldname='reference'"; Execute($update_query2); $alter_query = "ALTER TABLE field ADD column info_type varchar(20) default NULL after quickcreatesequence"; @@ -1894,6 +1896,15 @@ `id` int(11) NOT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1", +"CREATE TABLE `datashare_module_rel` ( + `shareid` int(19) NOT NULL, + `tabid` int(19) NOT NULL, + `relationtype` varchar(200) default NULL, + PRIMARY KEY (`shareid`), + KEY `idx_datashare_module_rel_tabid` (`tabid`), + CONSTRAINT `fk_datashare_module_rel456` FOREIGN KEY (`tabid`) REFERENCES `tab` (`tabid`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=latin1", + "CREATE TABLE `datashare_grp2grp` ( `shareid` int(19) NOT NULL, `share_groupid` int(19) default NULL, @@ -1931,15 +1942,6 @@ CONSTRAINT `fk_datashare_grp2rs3` FOREIGN KEY (`to_roleandsubid`) REFERENCES `role` (`roleid`) ON DELETE CASCADE, CONSTRAINT `fk_datashare_grp2rs1` FOREIGN KEY (`share_groupid`) REFERENCES `groups` (`groupid`) ON DELETE CASCADE, CONSTRAINT `fk_datashare_grp2rs36` FOREIGN KEY (`shareid`) REFERENCES `datashare_module_rel` (`shareid`) ON DELETE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1", - -"CREATE TABLE `datashare_module_rel` ( - `shareid` int(19) NOT NULL, - `tabid` int(19) NOT NULL, - `relationtype` varchar(200) default NULL, - PRIMARY KEY (`shareid`), - KEY `idx_datashare_module_rel_tabid` (`tabid`), - CONSTRAINT `fk_datashare_module_rel456` FOREIGN KEY (`tabid`) REFERENCES `tab` (`tabid`) ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=latin1", "CREATE TABLE `datashare_relatedmodule_permission` ( @@ -2227,11 +2229,6 @@ "ALTER TABLE `crmentity` MODIFY COLUMN `description` TEXT COLLATE latin1_swedish_ci", "ALTER TABLE `crmentity` MODIFY COLUMN `createdtime` DATETIME NOT NULL", "ALTER TABLE `crmentity` MODIFY COLUMN `modifiedtime` DATETIME NOT NULL", -"ALTER TABLE `currency_info` MODIFY COLUMN `currency_name` VARCHAR(100) COLLATE latin1_swedish_ci DEFAULT NULL", -"ALTER TABLE `currency_info` ADD COLUMN `id` INTEGER(11) NOT NULL AUTO_INCREMENT PRIMARY KEY", -"ALTER TABLE `currency_info` ADD COLUMN `conversion_rate` DECIMAL(5,3) DEFAULT NULL", -"ALTER TABLE `currency_info` ADD COLUMN `currency_status` VARCHAR(25) COLLATE latin1_swedish_ci DEFAULT NULL", -"ALTER TABLE `currency_info` ADD COLUMN `defaultid` VARCHAR(10) COLLATE latin1_swedish_ci NOT NULL DEFAULT '0'", "ALTER TABLE `customaction` MODIFY COLUMN `cvid` INTEGER(19) NOT NULL UNIQUE", "ALTER TABLE `customaction` MODIFY COLUMN `content` TEXT COLLATE latin1_swedish_ci", "ALTER TABLE `customerdetails` MODIFY COLUMN `customerid` INTEGER(19) NOT NULL PRIMARY KEY", @@ -2435,6 +2432,11 @@ "ALTER TABLE `chat_users` ADD KEY `chat_users_IDX2` (`ping`)", "ALTER TABLE `contactgrouprelation` ADD KEY `contactgrouprelation_IDX1` (`groupname`)", "ALTER TABLE `currency_info` DROP PRIMARY KEY", +"ALTER TABLE `currency_info` MODIFY COLUMN `currency_name` VARCHAR(100) COLLATE latin1_swedish_ci DEFAULT NULL", +"ALTER TABLE `currency_info` ADD COLUMN `id` INTEGER(11) NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST", +"ALTER TABLE `currency_info` ADD COLUMN `conversion_rate` DECIMAL(5,3) DEFAULT NULL", +"ALTER TABLE `currency_info` ADD COLUMN `currency_status` VARCHAR(25) COLLATE latin1_swedish_ci DEFAULT NULL", +"ALTER TABLE `currency_info` ADD COLUMN `defaultid` VARCHAR(10) COLLATE latin1_swedish_ci NOT NULL DEFAULT '0'", "ALTER TABLE `currency_info` ADD PRIMARY KEY ()", "ALTER TABLE `def_org_field` ADD KEY `tabid4` (`tabid`)", "ALTER TABLE `def_org_share` ADD KEY `fk_def_org_share23` (`permission`)", @@ -2523,6 +2525,25 @@ Execute($query); } +//Added on 22-04-06 - to add the Notify Owner field in Contacts and Accounts +$notify_owner_array = Array( + "update field set sequence=26 where tabid=4 and fieldname='modifiedtime'", + "update field set sequence=25 where tabid=4 and fieldname='createdtime'", + + "insert into field values(4,".$conn->getUniqueID("field").",'notify_owner','contactdetails',1,56,'notify_owner','Notify Owner',1,0,0,10,24,4,1,'C~O',1,NULL,'ADV')", + "alter table contactdetails add column notify_owner varchar(3) default 0 after reference", + + "update field set sequence=21 where tabid=6 and fieldname='modifiedtime'", + "update field set sequence=20 where tabid=6 and fieldname='createdtime'", + "update field set sequence=19 where tabid=6 and fieldname='assigned_user_id'", + + "insert into field values(6,".$conn->getUniqueID("field").",'notify_owner','account',1,56,'notify_owner','Notify Owner',1,0,0,10,18,9,1,'C~O',1,NULL,'ADV')", + "alter table account add column notify_owner varchar(3) default 0 after emailoptout" + ); +foreach($notify_owner_array as $query) +{ + Execute($query); +} @@ -2537,21 +2558,33 @@ echo "
    Database Modifications for 4.2 Patch2 ==> 5.0(Alpha) Ends here.....
    "; echo '
    Migration has been successfully completed. Data has been moved from your old vtiger to Latest vtigerCRM.'; echo '
    Please note down all the failed queries or please copy the whole table and save. This may be useful in future.    '; + + +echo '

    '; +echo '
    Total Number of Queries executed = '.$query_count; +echo '
    Total Number of Success Queries = '.$success_query_count; +echo '
    Total Number of Failure Queries = '.$failure_query_count; +//echo '
    Success Queries => ';print_r($success_query_array);echo '
    '; +//echo '
    Failure Queries => ';print_r($failure_query_array);echo '
    '; + + echo '


    '; echo ''; echo '


    '; - - - - +echo '
    Failed Queries are :

    '; +foreach($failure_query_array as $failed_query) + echo '
    '.$failed_query.''; +echo '

    '; function Execute($query) { - global $conn; + global $conn, $query_count, $success_query_count, $failure_query_count, $success_query_array, $failure_query_array; + $status = $conn->query($query); + $query_count++; if(is_object($status)) { echo ' @@ -2561,7 +2594,7 @@ '.$query.' '; //echo '
    '.$status.' ==> '.$query; - $success_query_array[] = $query; + $success_query_array[$success_query_count++] = $query; } else { @@ -2572,7 +2605,7 @@ '.$query.' '; //echo '

    '.$status.' ======> '.$query; - $failure_query_array[] = $query; + $failure_query_array[$failure_query_count++] = $query; } } From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 22 10:10:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sat, 22 Apr 2006 14:10:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5244 - /vtigercrm/trunk/modules/Users/language/en_us.lang.php Message-ID: <20060422141023.CC41E6AB61D@vtiger.fosslabs.com> Author: richie Date: Sat Apr 22 08:10:16 2006 New Revision: 5244 Log: Reassigned the List Header for Users and removed Department list Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 22 10:11:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sat, 22 Apr 2006 14:11:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5245 - /vtigercrm/trunk/modules/Users/User.php Message-ID: <20060422141106.2E8166AB624@vtiger.fosslabs.com> Author: richie Date: Sat Apr 22 08:11:01 2006 New Revision: 5245 Log: Rearranged the Listview of Users Module 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 Apr 22 08:11:01 2006 @@ -492,13 +492,13 @@ function getUserListViewHeader() { global $mod_strings; - $header_array=array($mod_strings['LBL_LIST_TOOLS'], + $header_array=array( + $mod_strings['LBL_LIST_TOOLS'], + $mod_strings['LBL_LIST_USER_NAME'], + $mod_strings['LBL_USER_ROLE'], + $mod_strings['LBL_LIST_EMAIL'], $mod_strings['LBL_LIST_NAME'], - $mod_strings['LBL_LIST_USER_NAME'], - $mod_strings['LBL_LIST_DEPARTMENT'], - $mod_strings['LBL_LIST_EMAIL'], - $mod_strings['LBL_USER_ROLE'], - $mod_strings['LBL_LIST_ADMIN']); + $mod_strings['LBL_LIST_ADMIN']); return $header_array; } @@ -520,7 +520,7 @@ $entries[]='Edit  Delete'; $entries[]=$this->db->query_result($result,$i-1,'first_name').' '.$this->db->query_result($result,$i-1,'last_name'); $entries[]=''.$this->db->query_result($result,$i-1,'user_name').''; - $entries[]=$this->db->query_result($result,$i-1,'department'); +// $entries[]=$this->db->query_result($result,$i-1,'department'); $entries[]=$this->db->query_result($result,$i-1,'email1'); $rolecode= fetchUserRole($this->db->query_result($result,$i-1,'id')); $entries[]=''.$roleinfo[$rolecode][0]; From vtiger-tickets at vtiger.fosslabs.com Sat Apr 22 10:12:09 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sat, 22 Apr 2006 14:12:09 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23139=3A_?= =?utf-8?q?user_list_view_not_proper?= In-Reply-To: <076.cf92dc58156e3952e7f8400a73d9ebed@vtiger.fosslabs.com> References: <076.cf92dc58156e3952e7f8400a73d9ebed@vtiger.fosslabs.com> Message-ID: <085.f595d5715bf22664a31cedbadd8fdf04@vtiger.fosslabs.com> #139: user list view not proper ------------------------+--------------------------------------------------- Reporter: richie | Owner: ahmed Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: tools ------------------------+--------------------------------------------------- Changes (by ahmed): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sat Apr 22 10:13:20 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sat, 22 Apr 2006 14:13:20 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23139=3A_?= =?utf-8?q?user_list_view_not_proper?= In-Reply-To: <076.cf92dc58156e3952e7f8400a73d9ebed@vtiger.fosslabs.com> References: <076.cf92dc58156e3952e7f8400a73d9ebed@vtiger.fosslabs.com> Message-ID: <085.53f122b41eef7a1f8142e725671ffcf4@vtiger.fosslabs.com> #139: user list view not proper ------------------------+--------------------------------------------------- Reporter: richie | Owner: ahmed Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: tools ------------------------+--------------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue Fixed - User List view made proper with intuitive headings, Removed department column too. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sat Apr 22 13:09:53 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sat, 22 Apr 2006 17:09:53 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23665=3A_?= =?utf-8?q?Pages_titles_need_to_be_more_descriptive?= In-Reply-To: <076.55f05ab788b002570f7aa354c0519de6@vtiger.fosslabs.com> References: <076.55f05ab788b002570f7aa354c0519de6@vtiger.fosslabs.com> Message-ID: <085.00155fbff2719a7645899a6aff575d27@vtiger.fosslabs.com> #665: Pages titles need to be more descriptive --------------------------+------------------------------------------------- Reporter: allanbush | Owner: developer Type: enhancement | Status: new Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: UI --------------------------+------------------------------------------------- Comment (by ncrossland): Could I suggest making the title user configurable? I would prefer not even to have the module name in the title - just the name of the customer or account. It would be possible to assign a different favicon to each module, so the icon of the tab would convey the module it belonged to. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Apr 23 11:34:03 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sun, 23 Apr 2006 15:34:03 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23733=3A_?= =?utf-8?q?Can=27t_add_products_to_quotes=2C_etc=2E?= Message-ID: <076.4109756da8bcd9540d179c9a4bfe8466@vtiger.fosslabs.com> #733: Can't add products to quotes, etc. ------------------------------------------+--------------------------------- Reporter: client.services.ny at gmail.com | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | ------------------------------------------+--------------------------------- Pulled down the Vtiger5 subversion repo, and installed on FC5. Install went well. Nothing seemed out of the ordinary. Went to put in some quotes and can't see any products to add. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Apr 23 12:28:58 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sun, 23 Apr 2006 16:28:58 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23733=3A_?= =?utf-8?q?Can=27t_add_products_to_quotes=2C_etc=2E?= In-Reply-To: <076.4109756da8bcd9540d179c9a4bfe8466@vtiger.fosslabs.com> References: <076.4109756da8bcd9540d179c9a4bfe8466@vtiger.fosslabs.com> Message-ID: <085.5b6ed386bd47dbe8edf0b187ff5fa7f1@vtiger.fosslabs.com> #733: Can't add products to quotes, etc. -------------------------------------------+-------------------------------- Reporter: client.services.ny at gmail.com | Owner: developer Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: -------------------------------------------+-------------------------------- Changes (by anonymous): * milestone: => 5.0.0 * priority: major => blocker -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Apr 23 12:29:58 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sun, 23 Apr 2006 16:29:58 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23733=3A_?= =?utf-8?q?Can=27t_add_products_to_quotes=2C_etc=2E?= In-Reply-To: <076.4109756da8bcd9540d179c9a4bfe8466@vtiger.fosslabs.com> References: <076.4109756da8bcd9540d179c9a4bfe8466@vtiger.fosslabs.com> Message-ID: <085.6356d2a5394ae3c3f650b0e98e0d7e33@vtiger.fosslabs.com> #733: Can't add products to quotes, etc. -------------------------------------------+-------------------------------- Reporter: client.services.ny at gmail.com | Owner: developer Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: -------------------------------------------+-------------------------------- Comment (by client.services.ny at gmail.com): Products were added. Pricebook was created. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 01:05:19 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 05:05:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5246 - /vtigercrm/branches/4.2.4/ Message-ID: <20060424050520.7C99659CF82@vtiger.fosslabs.com> Author: mmbrich Date: Sun Apr 23 23:05:15 2006 New Revision: 5246 Log: 4.2.4 branch Added: vtigercrm/branches/4.2.4/ - copied from r5245, vtigercrm/branches/4.2/ From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 01:26:13 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 05:26:13 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23555=3A_?= =?utf-8?q?parenttab_in_mailmerge_template_not_selected?= In-Reply-To: <076.d2fa66ec64af11b77a293fbea4edb079@vtiger.fosslabs.com> References: <076.d2fa66ec64af11b77a293fbea4edb079@vtiger.fosslabs.com> Message-ID: <085.c4e0ca7b3543c7e1f043d84db08815f4@vtiger.fosslabs.com> #555: parenttab in mailmerge template not selected --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: ahmed Type: defect | Status: new Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: --------------------------------+------------------------------------------- Changes (by ahmed): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 01:27:21 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 05:27:21 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23555=3A_?= =?utf-8?q?parenttab_in_mailmerge_template_not_selected?= In-Reply-To: <076.d2fa66ec64af11b77a293fbea4edb079@vtiger.fosslabs.com> References: <076.d2fa66ec64af11b77a293fbea4edb079@vtiger.fosslabs.com> Message-ID: <085.d6587b0b27b9ddecdf951cd7735a27a4@vtiger.fosslabs.com> #555: parenttab in mailmerge template not selected --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: ahmed Type: defect | Status: closed Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue Fixed - Parenttab Settings is now selected when we create a new mail merge template -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 01:36:21 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 05:36:21 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23664=3A_?= =?utf-8?q?Mail_Merge_template_-_field_label_missing?= In-Reply-To: <076.6222bb0fbf4fea358d5ea741def86716@vtiger.fosslabs.com> References: <076.6222bb0fbf4fea358d5ea741def86716@vtiger.fosslabs.com> Message-ID: <085.d88e59708f08444aba45649be07de260@vtiger.fosslabs.com> #664: Mail Merge template - field label missing ------------------------+--------------------------------------------------- Reporter: saraj | Owner: ela Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Mail Merger template ------------------------+--------------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: assigned => closed Comment: Issue Fixed - The field label is added by updating the language file. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 01:49:38 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 05:49:38 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23553=3A_?= =?utf-8?q?issue_in_cancel_button?= In-Reply-To: <076.1739a829c23df08f328b183d4285241c@vtiger.fosslabs.com> References: <076.1739a829c23df08f328b183d4285241c@vtiger.fosslabs.com> Message-ID: <085.5a29ad19959696774fedbf72d6664fbb@vtiger.fosslabs.com> #553: issue in cancel button --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: ahmed Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: --------------------------------+------------------------------------------- Changes (by ahmed): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 01:50:37 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 05:50:37 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23553=3A_?= =?utf-8?q?issue_in_cancel_button?= In-Reply-To: <076.1739a829c23df08f328b183d4285241c@vtiger.fosslabs.com> References: <076.1739a829c23df08f328b183d4285241c@vtiger.fosslabs.com> Message-ID: <085.6dae8d0c7c8d430b4639dbe5d1aa0c15@vtiger.fosslabs.com> #553: issue in cancel button --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: ahmed Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue Fixed - The alert message no more appears, Changed the type to 'button' for cancel value. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 02:14:19 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 06:14:19 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23143=3A_?= =?utf-8?q?Customize_Tab=2C_Home_PageOrder_remove?= In-Reply-To: <076.11dad4514a3d98794cf23cd3e224783e@vtiger.fosslabs.com> References: <076.11dad4514a3d98794cf23cd3e224783e@vtiger.fosslabs.com> Message-ID: <085.2b1d0ee51850ada262322c908b12cac9@vtiger.fosslabs.com> #143: Customize Tab, Home PageOrder remove ------------------------+--------------------------------------------------- Reporter: richie | Owner: ahmed Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: HomePageOrder,Customize Tab ------------------------+--------------------------------------------------- Changes (by ahmed): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 02:15:31 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 06:15:31 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23143=3A_?= =?utf-8?q?Customize_Tab=2C_Home_PageOrder_remove?= In-Reply-To: <076.11dad4514a3d98794cf23cd3e224783e@vtiger.fosslabs.com> References: <076.11dad4514a3d98794cf23cd3e224783e@vtiger.fosslabs.com> Message-ID: <085.8a0b686cef234c05752d01a8159b7c74@vtiger.fosslabs.com> #143: Customize Tab, Home PageOrder remove ------------------------+--------------------------------------------------- Reporter: richie | Owner: ahmed Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: HomePageOrder,Customize Tab ------------------------+--------------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue Fixed - Customize Tabs & HomePage Order Buttons Removed from User Detail View. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 02:52:47 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 06:52:47 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23163=3A_?= =?utf-8?q?mailserver_details_throws_exception?= In-Reply-To: <076.e8c6a6b2b25f7031e102264397786cd6@vtiger.fosslabs.com> References: <076.e8c6a6b2b25f7031e102264397786cd6@vtiger.fosslabs.com> Message-ID: <085.cfbca0c3e6cd4689947c24173d1af08c@vtiger.fosslabs.com> #163: mailserver details throws exception ------------------------+--------------------------------------------------- Reporter: richie | Owner: ahmed Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: mailserver details ------------------------+--------------------------------------------------- Changes (by ahmed): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 02:56:24 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 06:56:24 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23427=3A_?= =?utf-8?q?mailserver_details_fails?= In-Reply-To: <076.9e7e654229d664e748d9809d31b4de35@vtiger.fosslabs.com> References: <076.9e7e654229d664e748d9809d31b4de35@vtiger.fosslabs.com> Message-ID: <085.0cfe6a102f919b71f6fd6e9fcfd897c4@vtiger.fosslabs.com> #427: mailserver details fails ------------------------+--------------------------------------------------- Reporter: richie | Owner: ahmed Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: mailserver ------------------------+--------------------------------------------------- Changes (by ahmed): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 03:14:09 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 07:14:09 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23482=3A_?= =?utf-8?q?Issue_in_currency_configuratin?= In-Reply-To: <076.f78409040b96b8f9d78b271ef840470c@vtiger.fosslabs.com> References: <076.f78409040b96b8f9d78b271ef840470c@vtiger.fosslabs.com> Message-ID: <085.9f4d0964a733060ca91d15fa9c75217a@vtiger.fosslabs.com> #482: Issue in currency configuratin ------------------------+--------------------------------------------------- Reporter: don | Owner: mangai Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * resolution: => fixed * status: new => closed Comment: This has been fixed and integrated in SVN. It will be available in our next release. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 03:34:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 07:34:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5247 - /vtigercrm/trunk/modules/Users/Security.php Message-ID: <20060424073403.AFE3359D3F5@vtiger.fosslabs.com> Author: don Date: Mon Apr 24 01:33:58 2006 New Revision: 5247 Log: Add Rss Category has been added Modified: vtigercrm/trunk/modules/Users/Security.php Modified: vtigercrm/trunk/modules/Users/Security.php ============================================================================== --- vtigercrm/trunk/modules/Users/Security.php (original) +++ vtigercrm/trunk/modules/Users/Security.php Mon Apr 24 01:33:58 2006 @@ -354,6 +354,10 @@ //Potential Details -- END +//Rss entries being added + $this->db->query("insert into field values (24,".$this->db->getUniqueID("field").",'rsscategory','rss',1,'15','rsscategory','rsscategory',1,0,0,255,13,null,1,'V~O',1,null,'BAS')"); +//End of Rss entries + //campaign entries being added From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 03:37:10 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 07:37:10 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23708=3A_?= =?utf-8?q?Rss_folder_adding_is_not_available?= In-Reply-To: <076.76eff0c970275ddd20777607c8f4020d@vtiger.fosslabs.com> References: <076.76eff0c970275ddd20777607c8f4020d@vtiger.fosslabs.com> Message-ID: <085.c147076cd1d6fd1c21a84de930176c9c@vtiger.fosslabs.com> #708: Rss folder adding is not available ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: Jerrysgeorge Type: defect | Status: closed Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Rss ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 04:17:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 08:17:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5248 - /vtigercrm/trunk/modules/System/templates/classic/classic.css Message-ID: <20060424081730.85DA46D03A5@vtiger.fosslabs.com> Author: don Date: Mon Apr 24 02:17:25 2006 New Revision: 5248 Log: style changed as the settings Menu is included in for system configuration Modified: vtigercrm/trunk/modules/System/templates/classic/classic.css Modified: vtigercrm/trunk/modules/System/templates/classic/classic.css ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 04:21:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 08:21:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5249 - /vtigercrm/trunk/include/utils/export.php Message-ID: <20060424082149.17B6D6D03A5@vtiger.fosslabs.com> Author: don Date: Mon Apr 24 02:21:45 2006 New Revision: 5249 Log: Security Modified: vtigercrm/trunk/include/utils/export.php Modified: vtigercrm/trunk/include/utils/export.php ============================================================================== --- vtigercrm/trunk/include/utils/export.php (original) +++ vtigercrm/trunk/include/utils/export.php Mon Apr 24 02:21:45 2006 @@ -30,8 +30,10 @@ require_once('modules/Potentials/Opportunity.php'); require_once('modules/Users/User.php'); require_once('modules/Products/Product.php'); +require_once('include/utils/UserInfoUtil.php'); global $allow_exports; + session_start(); $current_user = new User(); @@ -46,9 +48,22 @@ } } + +//Security Check +if(isPermitted($_REQUEST['module'],"Export") == "no") +{ + $allow_exports="none"; +} + if ($allow_exports=='none' || ( $allow_exports=='admin' && ! is_admin($current_user) ) ) { - die("you can't export!"); + +?> + + References: <076.4c46ddeaf8a9bd9a0763c3db83037d45@vtiger.fosslabs.com> Message-ID: <085.3737d55fbbb60e86a91fccecefd63242@vtiger.fosslabs.com> #96: PDF-generation (invoice) sometimes fails -----------------------------------+---------------------------------------- Reporter: hpw at softechmatrix.nl | Owner: developer Type: defect | Status: reopened Priority: major | Milestone: Component: vtigercrm | Version: 4.2.3 Resolution: | Keywords: error pdf invoice order -----------------------------------+---------------------------------------- Changes (by hpw at softechmatrix.nl): * resolution: fixed => * status: closed => reopened Comment: I think my explanation was indeed not suffucient. I'll try to elaborate it: The user first creates an order, and generates the PDF for that order. No problem there. Next he generates an invoice from this order (NOTE that he does not go to the order-list, everything happens in the order-screen so far). The generated invoice appears and then the user generate the PDF for the invoice. This is the point where the error occurs. My diagnosis was based on this part of the error-message: headers already sent by (output started at C:\Program Files\xampp\htdocs\vtiger_crm\modules\Invoice\CreatePDF.php:375) and this part: FPDF error: Some data has already been output to browser, can't send PDF file It seems to me that the error occurs because the PDF-generation is not reset completely after generating the PDF. Going to an overview screen (like the orders list) seems to reset the problem as after that you can generate the PDF for the invoice without problems. NOTE: the problem is only happening when you generate a PDF for an order and immediately generate the invoice and subsequently also generate the PDF for the invoice. My client stumbled upon this while trying out the functionality of vTiger. In normal daily use I think there will almost always be a timespan between creating the order and creating the invoice. I reopened the ticket so you might test the solution with my additional information. I hope the solution is a sure fix. Thanks -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 05:11:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 09:11:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5250 - /vtigercrm/trunk/modules/System/systemconfig.php Message-ID: <20060424091120.E21B14E2804@vtiger.fosslabs.com> Author: don Date: Mon Apr 24 03:11:16 2006 New Revision: 5250 Log: Settings Menu added for System Informtion Modified: vtigercrm/trunk/modules/System/systemconfig.php Modified: vtigercrm/trunk/modules/System/systemconfig.php ============================================================================== Binary files - no diff available. From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 05:11:39 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 09:11:39 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23707=3A_?= =?utf-8?q?System_configuration_In_new_page?= In-Reply-To: <076.1e6b7b0720063ab885e855b2adc20aeb@vtiger.fosslabs.com> References: <076.1e6b7b0720063ab885e855b2adc20aeb@vtiger.fosslabs.com> Message-ID: <085.ffee5b561273ac43f17c84096eba9b47@vtiger.fosslabs.com> #707: System configuration In new page ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: system configuration ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 05:21:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 09:21:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5251 - /vtigercrm/trunk/Smarty/templates/Settings/EditCompanyInfo.tpl Message-ID: <20060424092157.CA0C259D56C@vtiger.fosslabs.com> Author: don Date: Mon Apr 24 03:21:53 2006 New Revision: 5251 Log: Company image made to show in the edit view of company details Modified: vtigercrm/trunk/Smarty/templates/Settings/EditCompanyInfo.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings/EditCompanyInfo.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/EditCompanyInfo.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/EditCompanyInfo.tpl Mon Apr 24 03:21:53 2006 @@ -30,7 +30,11 @@ + {if $ORGANIZATIONLOGONAME neq ''} + + {else} + {/if} From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 05:23:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 09:23:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5252 - /vtigercrm/trunk/modules/Settings/language/en_us.lang.php Message-ID: <20060424092355.C195A4E2804@vtiger.fosslabs.com> Author: don Date: Mon Apr 24 03:23:51 2006 New Revision: 5252 Log: Logo Name Changed to logo Ticket ID 706 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 Mon Apr 24 03:23:51 2006 @@ -482,7 +482,7 @@ 'LBL_ORGANIZATION_WEBSITE'=>'Website', 'LBL_ORGANIZATION_DETAILS'=>'Company Information', 'LBL_SPECIFY_COMPANY_DETAILS'=>' - Specify Company Information', -'LBL_ORGANIZATION_LOGO'=>'Logo Name', +'LBL_ORGANIZATION_LOGO'=>'Logo', 'LBL_UPLOAD'=>'Upload', 'LBL_FILENAME'=>'File Name', 'LBL_SETTINGS'=>'Settings', From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 05:23:59 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 09:23:59 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23706=3A_?= =?utf-8?q?Show_the_company_logo_during_edtion?= In-Reply-To: <076.2c8080811125d3f1140f7b8761aa9968@vtiger.fosslabs.com> References: <076.2c8080811125d3f1140f7b8761aa9968@vtiger.fosslabs.com> Message-ID: <085.127c6972dc358a713f9e66b401ee23f6@vtiger.fosslabs.com> #706: Show the company logo during edtion ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Company Logo ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 05:28:35 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 09:28:35 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5253 - /vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl Message-ID: <20060424092835.66FB56D198D@vtiger.fosslabs.com> Author: saraj Date: Mon Apr 24 03:28:29 2006 New Revision: 5253 Log: Default Folder Name selected now in Create/Edit View of Email Templates - Ahmed Modified: vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl Modified: vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl Mon Apr 24 03:28:29 2006 @@ -144,8 +144,8 @@

    - {foreach item=arr from=$FOLDERNAME} @@ -158,6 +158,12 @@ {/foreach} + {else} + + {/if}
      {$ORGANIZATIONNAME} {$ERRORFLAG}
    @@ -200,7 +206,7 @@   {$UMOD.LBL_MERGE_FIELD_VALUE} - + ({$UMOD.LBL_COPY_AND_PASTE_MERGE_FIELD}) + + + From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 11:16:31 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 15:16:31 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23197=3A_?= =?utf-8?q?missing_cancel_in_picklist?= In-Reply-To: <076.ac3b820c333eea49d38881f9080aa48d@vtiger.fosslabs.com> References: <076.ac3b820c333eea49d38881f9080aa48d@vtiger.fosslabs.com> Message-ID: <085.4aade0d2fa5ded0c787ce33ecded6444@vtiger.fosslabs.com> #197: missing cancel in picklist ------------------------+--------------------------------------------------- Reporter: richie | Owner: richie Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed Comment: Changeset 5285 has the fix for this issue -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 11:17:28 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 15:17:28 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23206=3A_?= =?utf-8?q?unable_to_save_outgoing_mail_server_info?= In-Reply-To: <076.8e9907477ed00259bc1939ad6c9185b6@vtiger.fosslabs.com> References: <076.8e9907477ed00259bc1939ad6c9185b6@vtiger.fosslabs.com> Message-ID: <085.143be31586f8015ae2dd5dcd292a59ea@vtiger.fosslabs.com> #206: unable to save outgoing mail server info ------------------------+--------------------------------------------------- Reporter: richie | Owner: richie Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: outgoing mailserver info ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 11:17:40 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 15:17:40 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23631=3A_?= =?utf-8?q?Migration_Issues_-_Accounts_click_throws_exception?= In-Reply-To: <076.3d1f994e1687a0767573fdae64126183@vtiger.fosslabs.com> References: <076.3d1f994e1687a0767573fdae64126183@vtiger.fosslabs.com> Message-ID: <085.d8ed009fa80654b9d88533f7974cc208@vtiger.fosslabs.com> #631: Migration Issues - Accounts click throws exception ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Migration ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * keywords: => Migration * status: assigned => closed Comment: This issue has been fixed and has been checkedin in the svn. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 11:18:52 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 15:18:52 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23654=3A_?= =?utf-8?q?Migration_Issues_-_Exceptions_Thrown_in_Contacts_Module?= In-Reply-To: <076.fba129ee4b692f89f63d56a783b481a9@vtiger.fosslabs.com> References: <076.fba129ee4b692f89f63d56a783b481a9@vtiger.fosslabs.com> Message-ID: <085.f158da1c3c32a295d0ecaef01a248fab@vtiger.fosslabs.com> #654: Migration Issues - Exceptions Thrown in Contacts Module ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Migration ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * keywords: => Migration * status: assigned => closed Comment: This issue has been fixed and has been checkedin in the svn. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 11:19:32 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 15:19:32 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23655=3A_?= =?utf-8?q?Migration_Issues_-_Potentials_Module_Non_functional?= In-Reply-To: <076.6ed48a3ea7c455abea96901ebc95c4f0@vtiger.fosslabs.com> References: <076.6ed48a3ea7c455abea96901ebc95c4f0@vtiger.fosslabs.com> Message-ID: <085.574789cac6d0996bf0e6594bf83ca1cf@vtiger.fosslabs.com> #655: Migration Issues - Potentials Module Non functional ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Migration ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * keywords: => Migration * status: assigned => closed Comment: This issue has been fixed and has been checkedin in the svn. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 11:20:14 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 15:20:14 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23677=3A_?= =?utf-8?q?Migration_Issues_-_Products_Module_throws_exception?= In-Reply-To: <076.dff424836ab0be00ef6a6b263f6854c1@vtiger.fosslabs.com> References: <076.dff424836ab0be00ef6a6b263f6854c1@vtiger.fosslabs.com> Message-ID: <085.80710c525aa90461500e79c58b5d566c@vtiger.fosslabs.com> #677: Migration Issues - Products Module throws exception ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Migration ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * keywords: => Migration * status: assigned => closed Comment: This issue has been fixed and has been checkedin in the svn. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 11:23:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 15:23:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5288 - /vtigercrm/trunk/include/utils/CommonUtils.php Message-ID: <20060424152334.EE2BD40E6DC@vtiger.fosslabs.com> Author: saraj Date: Mon Apr 24 09:23:29 2006 New Revision: 5288 Log: Added new function getQuickCreateModules for getting all module with quick create feature in the Header combo - Ahmed 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 Mon Apr 24 09:23:29 2006 @@ -1495,6 +1495,31 @@ } /** + * This function is used to get the all the modules that have Quick Create Feature. + * Returns Tab Name and Tablabel. + */ + +function getQuickCreateModules() +{ + global $adb; + global $mod_strings; + +$qc_query = "select distinct tablabel,tab.name from field inner join tab on tab.tabid = field.tabid where quickcreate=0 order by tab.tablabel"; +$result = $adb->query($qc_query); +$noofrows = $adb->num_rows($result); +$qcmodule_array = Array(); +for($i = 0; $i < $noofrows; $i++) +{ + $tablabel = $adb->query_result($result,$i,'tablabel'); + $tabname = $adb->query_result($result,$i,'name'); + $return_qcmodule[] = $tablabel; + $return_qcmodule[] = $tabname; +} + $return_qcmodule = array_chunk($return_qcmodule,2); + return $return_qcmodule; +} + +/** * This function is used to get the Quick create form field parameters for a given module. * Param $module - module name * returns the value in array format From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 11:30:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 15:30:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5289 - /vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl Message-ID: <20060424153033.DB2F740E747@vtiger.fosslabs.com> Author: don Date: Mon Apr 24 09:30:29 2006 New Revision: 5289 Log: Fixed the caption issue Modified: vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl Modified: vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl Mon Apr 24 09:30:29 2006 @@ -130,14 +130,14 @@ - Tabs for "{$PROFILE_NAME}"
    - Select the tabs / modules to be shown + Standard Action Privileges for "{$PROFILE_NAME}"
    + Select the standard actions to be permitted - 12 selected, 9 remaining +   @@ -197,14 +197,14 @@ - Tabs for "{$PROFILE_NAME}"
    - Select the tabs / modules to be shown + Tab Privileges for "{$PROFILE_NAME}"
    + Select the tabs/modules to be permitted - 12 selected, 9 remaining +   @@ -261,14 +261,14 @@ - Tabs for "{$PROFILE_NAME}"
    - Select the tabs / modules to be shown + Utility Action Privileges for "{$PROFILE_NAME}"
    + Select the utility actions to be permitted - 12 selected, 9 remaining +   @@ -327,8 +327,8 @@ - Tabs for "{$PROFILE_NAME}"
    - Select the tabs / modules to be shown + Field Privileges for "{$PROFILE_NAME}"
    + Select the fields to be permitted From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 11:32:02 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 15:32:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5290 - /vtigercrm/trunk/Smarty/templates/Header.tpl Message-ID: <20060424153202.252A640E73C@vtiger.fosslabs.com> Author: saraj Date: Mon Apr 24 09:31:57 2006 New Revision: 5290 Log: Made Requisite Changes for Quick Create Module - Ahmed 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 Mon Apr 24 09:31:57 2006 @@ -54,16 +54,11 @@ {/foreach} - {foreach key=maintabs item=detail from=$HEADERS} - {if $maintabs eq $CATEGORY} - - {/if} + From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 11:34:16 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 15:34:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5291 - in /vtigercrm/trunk: Smarty/templates/UserDetailView.tpl Smarty/templates/UserEditView.tpl modules/Users/Save.php Message-ID: <20060424153416.4230D40E746@vtiger.fosslabs.com> Author: don Date: Mon Apr 24 09:34:08 2006 New Revision: 5291 Log: Parenttab Issue in Users has been fixed Ticket ID 669 Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl vtigercrm/trunk/Smarty/templates/UserEditView.tpl vtigercrm/trunk/modules/Users/Save.php Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Mon Apr 24 09:34:08 2006 @@ -27,6 +27,7 @@ + Modified: vtigercrm/trunk/Smarty/templates/UserEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserEditView.tpl Mon Apr 24 09:34:08 2006 @@ -37,6 +37,7 @@ +   Modified: vtigercrm/trunk/modules/Users/Save.php ============================================================================== Binary files - no diff available. From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 11:34:36 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 15:34:36 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23669=3A_?= =?utf-8?q?Parenttab_Missing_for_all_operations_from_Users_DetailView?= In-Reply-To: <076.50efb7ae96c893dc52a96040c59f4ec7@vtiger.fosslabs.com> References: <076.50efb7ae96c893dc52a96040c59f4ec7@vtiger.fosslabs.com> Message-ID: <085.75c895b1e712c5f4c1b9b94ce71fd25b@vtiger.fosslabs.com> #669: Parenttab Missing for all operations from Users DetailView ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Users ---------------------------+------------------------------------------------ Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 11:37:05 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 15:37:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5292 - /vtigercrm/trunk/themes/blue/header.php Message-ID: <20060424153705.94C9440E746@vtiger.fosslabs.com> Author: saraj Date: Mon Apr 24 09:37:01 2006 New Revision: 5292 Log: Added a new array that has all the modules having quickcreate feature & assigning it to a variable QCMODULE - Ahmed Modified: vtigercrm/trunk/themes/blue/header.php Modified: vtigercrm/trunk/themes/blue/header.php ============================================================================== --- vtigercrm/trunk/themes/blue/header.php (original) +++ vtigercrm/trunk/themes/blue/header.php Mon Apr 24 09:37:01 2006 @@ -62,6 +62,9 @@ $smarty->assign("THEME",$theme); $smarty->assign("IMAGEPATH",$image_path); +$qc_modules = getQuickCreateModules(); +$smarty->assign("QCMODULE", $qc_modules); + $smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); $smarty->assign("MODULE_NAME", $currentModule); From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 11:41:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 15:41:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5293 - /vtigercrm/trunk/modules/Settings/add2db.php Message-ID: <20060424154149.ADC3740E738@vtiger.fosslabs.com> Author: don Date: Mon Apr 24 09:41:45 2006 New Revision: 5293 Log: parenttab issue has been fixed Ticket ID 598 Modified: vtigercrm/trunk/modules/Settings/add2db.php Modified: vtigercrm/trunk/modules/Settings/add2db.php ============================================================================== --- vtigercrm/trunk/modules/Settings/add2db.php (original) +++ vtigercrm/trunk/modules/Settings/add2db.php Mon Apr 24 09:41:45 2006 @@ -136,12 +136,12 @@ if($savelogo=="true") { - header("Location: index.php?module=Settings&action=OrganizationConfig"); + header("Location: index.php?parenttab=Settings&module=Settings&action=OrganizationConfig"); } elseif($savelogo=="false") { - header("Location: index.php?module=Settings&action=EditCompanyDetails&flag=".$error_flag); + header("Location: index.php?parenttab=Settings&module=Settings&action=EditCompanyDetails&flag=".$error_flag); } From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 11:42:12 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 15:42:12 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23598=3A_?= =?utf-8?q?parenttab_is_not_selected_in_companyinformation?= In-Reply-To: <076.611351575d0f773ca7d5cc4fe6b00916@vtiger.fosslabs.com> References: <076.611351575d0f773ca7d5cc4fe6b00916@vtiger.fosslabs.com> Message-ID: <085.9b8c2f18626f723c981eae802b28ed21@vtiger.fosslabs.com> #598: parenttab is not selected in companyinformation --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 11:44:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 15:44:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5294 - /vtigercrm/trunk/Smarty/templates/EditProfile.tpl Message-ID: <20060424154441.1305140E73C@vtiger.fosslabs.com> Author: don Date: Mon Apr 24 09:44:37 2006 New Revision: 5294 Log: Fixed the caption issues Modified: vtigercrm/trunk/Smarty/templates/EditProfile.tpl Modified: vtigercrm/trunk/Smarty/templates/EditProfile.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/EditProfile.tpl (original) +++ vtigercrm/trunk/Smarty/templates/EditProfile.tpl Mon Apr 24 09:44:37 2006 @@ -132,14 +132,14 @@ - Tabs for "{$PROFILE_NAME}"
    - Select the tabs / modules to be shown + Standard Privileges for "{$PROFILE_NAME}"
    + Select the standard actions to be permitted - 12 selected, 9 remaining + &nsbp; @@ -199,14 +199,13 @@ - Tabs for "{$PROFILE_NAME}"
    - Select the tabs / modules to be shown + Tab Privileges for "{$PROFILE_NAME}"
    + Select the tabs/modules to be permitted - 12 selected, 9 remaining @@ -263,14 +262,14 @@ - Tabs for "{$PROFILE_NAME}"
    - Select the tabs / modules to be shown + Utility Privileges for "{$PROFILE_NAME}"
    + Select the utility actions to be permitted - 12 selected, 9 remaining +   @@ -329,8 +328,8 @@ - Tabs for "{$PROFILE_NAME}"
    - Select the tabs / modules to be shown + Field Privileges for "{$PROFILE_NAME}"
    + Select the fields to be permitted From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 11:47:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 15:47:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5295 - /vtigercrm/trunk/Smarty/templates/Settings/CompanyInfo.tpl Message-ID: <20060424154750.1817B40E73C@vtiger.fosslabs.com> Author: don Date: Mon Apr 24 09:47:46 2006 New Revision: 5295 Log: Company website made to open in a new Window Modified: vtigercrm/trunk/Smarty/templates/Settings/CompanyInfo.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings/CompanyInfo.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/CompanyInfo.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/CompanyInfo.tpl Mon Apr 24 09:47:46 2006 @@ -73,7 +73,7 @@ {$ORGANIZATIONPHONE} {$MOD.LBL_ORGANIZATION_WEBSITE} : -     {$ORGANIZATIONWEBSITE} + {$ORGANIZATIONWEBSITE} {$MOD.LBL_ORGANIZATION_FAX} : From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 11:48:03 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 15:48:03 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23594=3A_?= =?utf-8?q?new_window_for_company_website?= In-Reply-To: <076.5284d108ceddba6095782827b9f01b06@vtiger.fosslabs.com> References: <076.5284d108ceddba6095782827b9f01b06@vtiger.fosslabs.com> Message-ID: <085.4d6b1df5892c59645a047968ee39c0c5@vtiger.fosslabs.com> #594: new window for company website --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 11:48:28 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 15:48:28 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23592=3A_?= =?utf-8?q?No_Tab_Security_support_for_Faq_and_Portal?= In-Reply-To: <076.4fb8656631aa096eed05bda565def3c7@vtiger.fosslabs.com> References: <076.4fb8656631aa096eed05bda565def3c7@vtiger.fosslabs.com> Message-ID: <085.20073c35323248f99c3c79c8920a727d@vtiger.fosslabs.com> #592: No Tab Security support for Faq and Portal ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Security ---------------------------+------------------------------------------------ Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 11:49:53 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 15:49:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5296 - in /vtigercrm/trunk: Popup.php include/utils/ListViewUtils.php Message-ID: <20060424154953.A0C7B40E723@vtiger.fosslabs.com> Author: saraj Date: Mon Apr 24 09:49:47 2006 New Revision: 5296 Log: changes made to show non-selected records in the popup Modified: vtigercrm/trunk/Popup.php vtigercrm/trunk/include/utils/ListViewUtils.php Modified: vtigercrm/trunk/Popup.php ============================================================================== --- vtigercrm/trunk/Popup.php (original) +++ vtigercrm/trunk/Popup.php Mon Apr 24 09:49:47 2006 @@ -492,8 +492,11 @@ $query = 'select pricebook.*, pricebookproductrel.productid, pricebookproductrel.listprice, crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime from pricebook inner join pricebookproductrel on pricebookproductrel.pricebookid = pricebook.pricebookid inner join crmentity on crmentity.crmid = pricebook.pricebookid where pricebookproductrel.productid='.$productid.' and crmentity.deleted=0'; } else - $query = getListQuery($currentModule); - +{ + $where_relquery = getRelCheckquery($currentModule,$_REQUEST['return_module'],$_REQUEST['recordid']); + $query = getListQuery($currentModule,$where_relquery); +} + if(isset($where) && $where != '') { $query .= ' and '.$where; Modified: vtigercrm/trunk/include/utils/ListViewUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/ListViewUtils.php (original) +++ vtigercrm/trunk/include/utils/ListViewUtils.php Mon Apr 24 09:49:47 2006 @@ -1875,4 +1875,33 @@ return $output; } +/**This function return the entity ids that need to be excluded in popup listview for a given record +Param $currentmodule - modulename of the entity to be selected +Param $returnmodule - modulename for which the entity is assingned +Param $recordid - the record id for which the entity is assigned +Return tyep string. +*/ +function getRelCheckquery($currentmodule,$returnmodule,$recordid) +{ + global $adb; + $skip_id = Array(); + $where_relquery = ""; + + if($currentmodule=="Contacts" && $returnmodule == "Potentials") + { + $query = "select contactid from contpotentialrel where potentialid = ".$recordid; + $result = $adb->query($query); + if($adb->num_rows($result)!=0) + { + for($k=0;$k < $adb->num_rows($result);$k++) + { + $skip_id[]=$adb->query_result($result,$k,"contactid"); + } + $skipids = constructList($skip_id,'INTEGER'); + $where_relquery = "and contactdetails.contactid not in ".$skipids; + } + } + return $where_relquery; +} + ?> From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 11:49:55 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 15:49:55 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23591=3A_?= =?utf-8?q?Profile_link_is_wrong_in_role_detailview?= In-Reply-To: <076.53484beb82e337b08bda71c19b77893d@vtiger.fosslabs.com> References: <076.53484beb82e337b08bda71c19b77893d@vtiger.fosslabs.com> Message-ID: <085.e0469ef4269e6e2439e334a6d619cbd6@vtiger.fosslabs.com> #591: Profile link is wrong in role detailview ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: ela Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by jerrydgeorge): * resolution: => fixed * status: assigned => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 11:51:32 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 15:51:32 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23427=3A_?= =?utf-8?q?mailserver_details_fails?= In-Reply-To: <076.9e7e654229d664e748d9809d31b4de35@vtiger.fosslabs.com> References: <076.9e7e654229d664e748d9809d31b4de35@vtiger.fosslabs.com> Message-ID: <085.4ed5cffc41d762dbd78b5eaa23948af1@vtiger.fosslabs.com> #427: mailserver details fails ------------------------+--------------------------------------------------- Reporter: richie | Owner: richie Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: mailserver ------------------------+--------------------------------------------------- Changes (by richie): * owner: ahmed => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 11:51:36 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 15:51:36 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23434=3A_?= =?utf-8?q?Duplicate_contacts_not_working?= In-Reply-To: <076.9d9d6f6764390bbb73fe76c0dbf40e3c@vtiger.fosslabs.com> References: <076.9d9d6f6764390bbb73fe76c0dbf40e3c@vtiger.fosslabs.com> Message-ID: <085.0949a0c3e0affe02dd72423292fe1a1d@vtiger.fosslabs.com> #434: Duplicate contacts not working ------------------------+--------------------------------------------------- Reporter: don | Owner: richie Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 11:51:40 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 15:51:40 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23436=3A_?= =?utf-8?q?Mass_Change_Owner_option_is_missing_in_contacts?= In-Reply-To: <076.2a85e9ca07304adbf6788d457c3f9084@vtiger.fosslabs.com> References: <076.2a85e9ca07304adbf6788d457c3f9084@vtiger.fosslabs.com> Message-ID: <085.f02bba847bca11c0b4687a066381bdf5@vtiger.fosslabs.com> #436: Mass Change Owner option is missing in contacts ------------------------+--------------------------------------------------- Reporter: don | Owner: richie Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 11:51:46 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 15:51:46 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23101=3A_?= =?utf-8?q?Cancel_is_not_working_in_notes_editview?= In-Reply-To: <076.0bcf8c55c0755817b23252914667adc3@vtiger.fosslabs.com> References: <076.0bcf8c55c0755817b23252914667adc3@vtiger.fosslabs.com> Message-ID: <085.ed8042bab55177ca989cfcf3aeb16a37@vtiger.fosslabs.com> #101: Cancel is not working in notes editview ------------------------+--------------------------------------------------- Reporter: Minnie | Owner: richie Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: cancel button ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 11:51:49 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 15:51:49 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23109=3A_?= =?utf-8?q?Issue_in_Mass_Delete?= In-Reply-To: <076.ca39a8dd0e1a26f9efcc5fecf629d930@vtiger.fosslabs.com> References: <076.ca39a8dd0e1a26f9efcc5fecf629d930@vtiger.fosslabs.com> Message-ID: <085.3e3d9064b577a333a87f9c2ce2b9d302@vtiger.fosslabs.com> #109: Issue in Mass Delete ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: richie Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Accounts,MassDelete ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 11:51:54 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 15:51:54 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23120=3A_?= =?utf-8?q?Issue_in_Mass_Delete?= In-Reply-To: <076.52335e78ac6b04c98e0c3aae3b5564f0@vtiger.fosslabs.com> References: <076.52335e78ac6b04c98e0c3aae3b5564f0@vtiger.fosslabs.com> Message-ID: <085.6450be7a59621d22c2a7362f8a6e915f@vtiger.fosslabs.com> #120: Issue in Mass Delete ------------------------+--------------------------------------------------- Reporter: jeri | Owner: richie Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: massdelete ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 11:51:58 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 15:51:58 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23123=3A_?= =?utf-8?q?can_not_delete_email?= In-Reply-To: <076.eeb10874885266140e84ce5cf9bfd4cc@vtiger.fosslabs.com> References: <076.eeb10874885266140e84ce5cf9bfd4cc@vtiger.fosslabs.com> Message-ID: <085.faeda41dca78c03f8c4f8c7afc922010@vtiger.fosslabs.com> #123: can not delete email --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: richie Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: can not delete email --------------------------------+------------------------------------------- Changes (by richie): * owner: philip => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 11:52:01 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 15:52:01 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23322=3A_?= =?utf-8?q?quick_edit_of_Description_field_is_not_working?= In-Reply-To: <076.cbc407907f556cdd833010ab07611ffc@vtiger.fosslabs.com> References: <076.cbc407907f556cdd833010ab07611ffc@vtiger.fosslabs.com> Message-ID: <085.e964c3d9d28b75e2ddc06bb93afde048@vtiger.fosslabs.com> #322: quick edit of Description field is not working ------------------------+--------------------------------------------------- Reporter: don | Owner: richie Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 11:52:05 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 15:52:05 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23341=3A_?= =?utf-8?q?Issue_in_duplication_of_tab?= In-Reply-To: <076.dd81b801a269e17c7e74219cbdac9a20@vtiger.fosslabs.com> References: <076.dd81b801a269e17c7e74219cbdac9a20@vtiger.fosslabs.com> Message-ID: <085.a1747aa03b15060903e727bdfac88a28@vtiger.fosslabs.com> #341: Issue in duplication of tab ------------------------+--------------------------------------------------- Reporter: don | Owner: richie Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 11:52:08 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 15:52:08 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23723=3A_?= =?utf-8?q?Parent_tab_not_highlighted?= In-Reply-To: <076.cd496fd3a80ac24dced660612366f644@vtiger.fosslabs.com> References: <076.cd496fd3a80ac24dced660612366f644@vtiger.fosslabs.com> Message-ID: <085.36d6dc2b7a08063c249a2441ced64971@vtiger.fosslabs.com> #723: Parent tab not highlighted ------------------------+--------------------------------------------------- Reporter: saraj | Owner: richie Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Parent tab ------------------------+--------------------------------------------------- Changes (by richie): * owner: jerrydgeorge => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 11:52:13 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 15:52:13 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23261=3A_?= =?utf-8?q?Delete_User__Pop-up_-_Typo?= In-Reply-To: <076.08912867dcb0f1ce45081a7806548cbf@vtiger.fosslabs.com> References: <076.08912867dcb0f1ce45081a7806548cbf@vtiger.fosslabs.com> Message-ID: <085.2b918d1661fa0482e9b0bf15ccebb5c2@vtiger.fosslabs.com> #261: Delete User Pop-up - Typo ------------------------+--------------------------------------------------- Reporter: gopal | Owner: richie Type: defect | Status: new Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 11:54:38 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 15:54:38 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23545=3A_?= =?utf-8?q?Issue_in_tag_fields?= In-Reply-To: <076.91411a9272aff4f8629259ca2f0e2a67@vtiger.fosslabs.com> References: <076.91411a9272aff4f8629259ca2f0e2a67@vtiger.fosslabs.com> Message-ID: <085.920be7dc761e078f2e1c6e0ccb12aad9@vtiger.fosslabs.com> #545: Issue in tag fields ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: global Search ---------------------------+------------------------------------------------ Changes (by jerrydgeorge): * resolution: => invalid * status: new => closed Comment: Unable to reproduce -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 11:58:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 15:58:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5297 - /vtigercrm/trunk/modules/Users/UpdateDefaultFieldLevelAccess.php Message-ID: <20060424155849.B53A440E75B@vtiger.fosslabs.com> Author: don Date: Mon Apr 24 09:58:45 2006 New Revision: 5297 Log: parenttab issue in Org Filed Has been fixed Modified: vtigercrm/trunk/modules/Users/UpdateDefaultFieldLevelAccess.php Modified: vtigercrm/trunk/modules/Users/UpdateDefaultFieldLevelAccess.php ============================================================================== --- vtigercrm/trunk/modules/Users/UpdateDefaultFieldLevelAccess.php (original) +++ vtigercrm/trunk/modules/Users/UpdateDefaultFieldLevelAccess.php Mon Apr 24 09:58:45 2006 @@ -45,7 +45,7 @@ } } -$loc = "Location: index.php?action=DefaultFieldPermissions&module=Users&fld_module=".$_REQUEST['fld_module']; +$loc = "Location: index.php?action=DefaultFieldPermissions&module=Users&parenttab=Settings&fld_module=".$_REQUEST['fld_module']; header($loc); ?> From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 11:58:52 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 15:58:52 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23524=3A_?= =?utf-8?q?Parenttab_Missing_for_Field_Access?= In-Reply-To: <076.469538ce212063298c5f3bdf7aa19f4d@vtiger.fosslabs.com> References: <076.469538ce212063298c5f3bdf7aa19f4d@vtiger.fosslabs.com> Message-ID: <085.9e85a5556838409111f1879578d0132e@vtiger.fosslabs.com> #524: Parenttab Missing for Field Access ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 12:13:51 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 16:13:51 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23525=3A_?= =?utf-8?q?Organisation_Sharing_Privileges_parenttab_Issue?= In-Reply-To: <076.ba314e341f973e61476d89125d35f341@vtiger.fosslabs.com> References: <076.ba314e341f973e61476d89125d35f341@vtiger.fosslabs.com> Message-ID: <085.a8e7fe4213b1df2bff19bf20be25f675@vtiger.fosslabs.com> #525: Organisation Sharing Privileges parenttab Issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 12:13:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 16:13:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5298 - in /vtigercrm/trunk: Smarty/templates/ modules/Users/ Message-ID: <20060424161352.9829340E72D@vtiger.fosslabs.com> Author: don Date: Mon Apr 24 10:13:43 2006 New Revision: 5298 Log: UI issue in Orgsharing Detail view has been fixed ticket ID 525 Modified: vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl vtigercrm/trunk/Smarty/templates/OrgSharingEditView.tpl vtigercrm/trunk/modules/Users/CreateSharingRule.php vtigercrm/trunk/modules/Users/DeleteSharingRule.php vtigercrm/trunk/modules/Users/SaveOrgSharing.php vtigercrm/trunk/modules/Users/SaveSharingRule.php Modified: vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl Mon Apr 24 10:13:43 2006 @@ -60,8 +60,8 @@ Global Access Privileges - - + +   Modified: vtigercrm/trunk/Smarty/templates/OrgSharingEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/OrgSharingEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/OrgSharingEditView.tpl Mon Apr 24 10:13:43 2006 @@ -21,6 +21,7 @@
    + Global Access Privileges Modified: vtigercrm/trunk/modules/Users/CreateSharingRule.php ============================================================================== --- vtigercrm/trunk/modules/Users/CreateSharingRule.php (original) +++ vtigercrm/trunk/modules/Users/CreateSharingRule.php Mon Apr 24 10:13:43 2006 @@ -100,6 +100,7 @@ } $output.=' + Modified: vtigercrm/trunk/modules/Users/DeleteSharingRule.php ============================================================================== --- vtigercrm/trunk/modules/Users/DeleteSharingRule.php (original) +++ vtigercrm/trunk/modules/Users/DeleteSharingRule.php Mon Apr 24 10:13:43 2006 @@ -13,5 +13,5 @@ $shareid = $_REQUEST['shareid']; deleteSharingRule($shareid); -header("Location: index.php?module=Users&action=OrgSharingDetailView"); +header("Location: index.php?module=Users&action=OrgSharingDetailView&parenttab=Settings"); ?> Modified: vtigercrm/trunk/modules/Users/SaveOrgSharing.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/Users/SaveSharingRule.php ============================================================================== --- vtigercrm/trunk/modules/Users/SaveSharingRule.php (original) +++ vtigercrm/trunk/modules/Users/SaveSharingRule.php Mon Apr 24 10:13:43 2006 @@ -58,6 +58,6 @@ -$loc = "Location: index.php?action=OrgSharingDetailView&module=Users"; +$loc = "Location: index.php?action=OrgSharingDetailView&module=Users&parenttab=Settings"; header($loc); ?> From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 12:15:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 16:15:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5299 - /vtigercrm/trunk/Smarty/templates/FieldAccess.tpl Message-ID: <20060424161523.7FFD140E74A@vtiger.fosslabs.com> Author: don Date: Mon Apr 24 10:15:19 2006 New Revision: 5299 Log: Fixed the Label Issue Modified: vtigercrm/trunk/Smarty/templates/FieldAccess.tpl Modified: vtigercrm/trunk/Smarty/templates/FieldAccess.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/FieldAccess.tpl (original) +++ vtigercrm/trunk/Smarty/templates/FieldAccess.tpl Mon Apr 24 10:15:19 2006 @@ -8,7 +8,7 @@ From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 12:19:47 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 16:19:47 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5300 - /vtigercrm/trunk/modules/Users/SaveRole.php Message-ID: <20060424161947.B325540E763@vtiger.fosslabs.com> Author: don Date: Mon Apr 24 10:19:43 2006 New Revision: 5300 Log: Parenttab missing issue fixed Modified: vtigercrm/trunk/modules/Users/SaveRole.php Modified: vtigercrm/trunk/modules/Users/SaveRole.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 12:39:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 16:39:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5301 - /vtigercrm/trunk/Smarty/templates/RoleDetailView.tpl Message-ID: <20060424163959.17D7A40E755@vtiger.fosslabs.com> Author: don Date: Mon Apr 24 10:39:55 2006 New Revision: 5301 Log: Delete Button added in role detail view Modified: vtigercrm/trunk/Smarty/templates/RoleDetailView.tpl Modified: vtigercrm/trunk/Smarty/templates/RoleDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/RoleDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/RoleDetailView.tpl Mon Apr 24 10:39:55 2006 @@ -31,7 +31,7 @@ @@ -98,5 +98,21 @@

    -{$MOD.LBL_SETTINGS} > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_PROFILES} +{$MOD.LBL_SETTINGS} > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_DEFAULT_ORGANIZATION_FIELDS}
    {$ROLE_NAME} - +  
    + {include file='SettingsSubMenu.tpl'} +
    + From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 13:04:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 17:04:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5302 - in /vtigercrm/trunk/Smarty/templates: CreateProfile.tpl CreateProfile1.tpl EditProfile.tpl ProfileDetailView.tpl UserProfile.tpl Message-ID: <20060424170410.95E4B40E76F@vtiger.fosslabs.com> Author: don Date: Mon Apr 24 11:04:03 2006 New Revision: 5302 Log: Issue in Profile Parenttab has been fixed Modified: vtigercrm/trunk/Smarty/templates/CreateProfile.tpl vtigercrm/trunk/Smarty/templates/CreateProfile1.tpl vtigercrm/trunk/Smarty/templates/EditProfile.tpl vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl vtigercrm/trunk/Smarty/templates/UserProfile.tpl Modified: vtigercrm/trunk/Smarty/templates/CreateProfile.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateProfile.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateProfile.tpl Mon Apr 24 11:04:03 2006 @@ -10,6 +10,7 @@ +
    {$MOD.LBL_SETTINGS} > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_PROFILES} @@ -30,18 +31,18 @@ {$CMOD.LBL_NEW_PROFILE_NAME} - + {$CMOD.LBL_DESCRIPTION} - +      -   +   @@ -64,4 +65,18 @@ {include file='SettingsSubMenu.tpl'} - + Modified: vtigercrm/trunk/Smarty/templates/CreateProfile1.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateProfile1.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateProfile1.tpl Mon Apr 24 11:04:03 2006 @@ -12,6 +12,7 @@ +
    {$MOD.LBL_SETTINGS} > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_PROFILES} Modified: vtigercrm/trunk/Smarty/templates/EditProfile.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/EditProfile.tpl (original) +++ vtigercrm/trunk/Smarty/templates/EditProfile.tpl Mon Apr 24 11:04:03 2006 @@ -34,6 +34,7 @@ + Modified: vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl Mon Apr 24 11:04:03 2006 @@ -35,6 +35,7 @@ + Modified: vtigercrm/trunk/Smarty/templates/UserProfile.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserProfile.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserProfile.tpl Mon Apr 24 11:04:03 2006 @@ -10,6 +10,7 @@ +
    {$MOD.LBL_SETTINGS} > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_PROFILES} From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 13:06:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 17:06:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5303 - in /vtigercrm/trunk/modules/Users: DeleteProfile.php SaveProfile.php UpdateProfileChanges.php Message-ID: <20060424170620.3953340E76F@vtiger.fosslabs.com> Author: don Date: Mon Apr 24 11:06:14 2006 New Revision: 5303 Log: parenttab issue in profiles has been fixed Modified: vtigercrm/trunk/modules/Users/DeleteProfile.php vtigercrm/trunk/modules/Users/SaveProfile.php vtigercrm/trunk/modules/Users/UpdateProfileChanges.php Modified: vtigercrm/trunk/modules/Users/DeleteProfile.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/Users/SaveProfile.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/Users/UpdateProfileChanges.php ============================================================================== --- vtigercrm/trunk/modules/Users/UpdateProfileChanges.php (original) +++ vtigercrm/trunk/modules/Users/UpdateProfileChanges.php Mon Apr 24 11:06:14 2006 @@ -170,7 +170,7 @@ } } - $loc = "Location: index.php?action=".$return_action."&module=Users&mode=view&profileid=".$profileid; + $loc = "Location: index.php?action=".$return_action."&module=Users&mode=view&parenttab=Settings&profileid=".$profileid; header($loc); function getPermissionValue($req_per) From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 13:10:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 17:10:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5304 - /vtigercrm/trunk/modules/Users/SaveGroup.php Message-ID: <20060424171030.E101740E74A@vtiger.fosslabs.com> Author: don Date: Mon Apr 24 11:10:26 2006 New Revision: 5304 Log: parenttab issue has been fixed Modified: vtigercrm/trunk/modules/Users/SaveGroup.php Modified: vtigercrm/trunk/modules/Users/SaveGroup.php ============================================================================== --- vtigercrm/trunk/modules/Users/SaveGroup.php (original) +++ vtigercrm/trunk/modules/Users/SaveGroup.php Mon Apr 24 11:10:26 2006 @@ -99,11 +99,11 @@ $groupId=createGroup($groupName,$groupMemberArray,$description); //Inserting into role Table //$roleId = createRole($rolename,$parentRoleId,$profile_array); - $loc = "Location: index.php?action=".$returnaction."&module=Users&groupId=".$groupId; + $loc = "Location: index.php?action=".$returnaction."&parenttab=Settings&module=Users&groupId=".$groupId; } else { - $loc = "Location: index.php?action=createnewgroup&module=Users&groupname=".$groupName."&desc=".$description."&error=true"; + $loc = "Location: index.php?action=createnewgroup&parenttab=Settings&module=Users&groupname=".$groupName."&desc=".$description."&error=true"; } From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 13:10:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 17:10:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5305 - /vtigercrm/trunk/include/utils/CommonUtils.php Message-ID: <20060424171050.B801840E74A@vtiger.fosslabs.com> Author: saraj Date: Mon Apr 24 11:10:46 2006 New Revision: 5305 Log: Security Check Enabled for Quick Create - Ahmed 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 Mon Apr 24 11:10:46 2006 @@ -1512,8 +1512,11 @@ { $tablabel = $adb->query_result($result,$i,'tablabel'); $tabname = $adb->query_result($result,$i,'name'); - $return_qcmodule[] = $tablabel; - $return_qcmodule[] = $tabname; + if(isPermitted($tabname,'EditView','') == 'yes') + { + $return_qcmodule[] = $tablabel; + $return_qcmodule[] = $tabname; + } } $return_qcmodule = array_chunk($return_qcmodule,2); return $return_qcmodule; From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 13:17:38 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 17:17:38 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2396=3A_P?= =?utf-8?q?DF-generation_=28invoice=29_sometimes_fails?= In-Reply-To: <076.4c46ddeaf8a9bd9a0763c3db83037d45@vtiger.fosslabs.com> References: <076.4c46ddeaf8a9bd9a0763c3db83037d45@vtiger.fosslabs.com> Message-ID: <085.dcc4c29143b860e58598dfcdb297ed39@vtiger.fosslabs.com> #96: PDF-generation (invoice) sometimes fails -----------------------------------+---------------------------------------- Reporter: hpw at softechmatrix.nl | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 4.2.4 Component: vtigercrm | Version: 4.2.3 Resolution: fixed | Keywords: error pdf invoice order -----------------------------------+---------------------------------------- Changes (by allanbush): * resolution: => fixed * milestone: => 4.2.4 * status: reopened => closed Comment: Thank you for the detailed explanation and your attempt at explaining the cause. Changeset [5113] has been tested with your steps to reproduce and the problem no longer presents its self. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 18:30:21 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 22:30:21 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2317=3A_A?= =?utf-8?q?dd_postgresql_support_to_4=2E2_branch?= In-Reply-To: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> References: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> Message-ID: <085.5093868e3a0545c6425de9603a4ceea5@vtiger.fosslabs.com> #17: Add postgresql support to 4.2 branch ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Resolution: | Keywords: database postgresql ------------------------+--------------------------------------------------- Comment (by jeffk): (In [5306]) refs #62 and #17. merging source:vtigercrm/branches/4.2_postgresql_integration back to source:vtigercrm/branches/4.2. This closes the postgresql_integration branch. Some work will remain to properly support both mysql and postgresql (e.g. in source:vtigercrm/branches/4.2/config.inc.php) What follows is a journal of how this merge was performed: My present working copy is: $ svn info Path: . URL: http://jeffk at vtiger.fosslabs.com/svn/vtiger/vtigercrm/branches/4.2_postgresql_integration Repository Root: http://jeffk at vtiger.fosslabs.com/svn/vtiger Repository UUID: 83ef7b00-670c-0410-b3e3-e45103aa6900 Revision: 5305 Node Kind: directory Schedule: normal Last Changed Author: jeffk Last Changed Rev: 5114 Last Changed Date: 2006-04-13 19:47:22 -0400 (Thu, 13 Apr 2006) Check that there are no changes in my working copy to commit: $ svn diff (there are none) Check for late changes to the original (target) branch that I should merge first: $ svn diff -r 5113:HEAD http://jeffk at vtiger.fosslabs.com/svn/vtiger/vtigercrm/branches/4.2 (there are none) Switch my working copy to the original (target) branch. This is a good preview of files affected by the coming merge of the two branches. $ svn switch http://jeffk at vtiger.fosslabs.com/svn/vtiger/vtigercrm/branches/4.2 U config.inc.php U sendreminder.php U modules/Accounts/ListViewTop.php U modules/Accounts/Account.php U modules/Accounts/Popup_picker.php U modules/Accounts/Popup.php U modules/Accounts/ListView.php U modules/Accounts/AccountFormBase.php U modules/Quotes/Quote.php U modules/Quotes/Delete.php U modules/Quotes/Popup.php U modules/Quotes/ListView.php U modules/Potentials/Popup.php U modules/Potentials/ListView.php U modules/Potentials/Opportunity.php U modules/Leads/Popup.php U modules/Leads/Lead.php U modules/Leads/ListView.php U modules/Leads/LeadConvertToEntities.php U modules/Home/UnifiedSearch.php U modules/Notes/Delete.php U modules/Notes/ListView.php U modules/Invoice/Invoice.php U modules/Invoice/ListView.php U modules/Orders/SalesOrderListView.php U modules/Orders/SalesOrder.php U modules/Orders/Order.php U modules/Orders/DeleteSalesOrder.php U modules/Orders/PopupSalesOrder.php U modules/Orders/ListView.php U modules/Reports/ReportRun.php U modules/Reports/SaveReportFolder.php U modules/Reports/Save.php U modules/Reports/Reports.php U modules/Reports/PopulateReports.php U modules/HelpDesk/HelpDesk.php U modules/HelpDesk/FaqList.php U modules/HelpDesk/ListView.php U modules/Settings/SaveConvertLead.php U modules/Settings/DeleteCustomField.php U modules/Settings/UpdateComboValues.php U modules/Users/User.php U modules/Users/SaveProfile.php U modules/Users/SaveOrgSharing.php U modules/Users/massdelete.php U modules/Users/LoginHistory.php U modules/Users/saveemailtemplate.php U modules/Users/ListView.php U modules/Users/Security.php U modules/Users/updateLeadDBStatus.php U modules/Users/UserInfoUtil.php U modules/Users/SaveRole.php U modules/Products/Popup.php U modules/Products/AddProductsToPriceBook.php U modules/Products/VendorPopup.php U modules/Products/ListView.php U modules/Products/Delete.php U modules/Products/PriceBookListView.php U modules/Products/Product.php U modules/Products/VendorListView.php U modules/Activities/Activity.php U modules/Activities/ListView.php U modules/Activities/RenderRelatedListUI.php U modules/Activities/OpenListView.php U modules/CustomView/Save.php U modules/CustomView/CustomView.php U modules/Faq/ListView.php U modules/uploads/add2db.php U modules/Calendar/appointment.pinc U modules/Import/UsersLastImport.php U modules/Emails/Email.php U modules/Emails/ListView.php U modules/Meetings/ListView.php U modules/Contacts/Contact.php U modules/Contacts/Popup.php U modules/Contacts/SaveBusinessCard.php U modules/Contacts/ListView.php U data/CRMEntity.php U data/SugarBean.php U include/RelatedListView.php U include/database/PearDatabase.php U include/PopulateComboValues.php U include/utils.php U soap.php U contactserialize.php U schema/DatabaseSchema.xml U install/5createTables.inc.php U install/4createConfigFile.php U install/1checkSystem.php U install/2setConfig.php U install/populateSeedData.php U install/3confirmConfig.php U adodb/adodb.inc.php U adodb/adodb-lib.inc.php U adodb/drivers/adodb-mysql.inc.php Updated to revision 5305. Confirm my working copy info: $ svn info Path: . URL: http://jeffk at vtiger.fosslabs.com/svn/vtiger/vtigercrm/branches/4.2 Repository Root: http://jeffk at vtiger.fosslabs.com/svn/vtiger Repository UUID: 83ef7b00-670c-0410-b3e3-e45103aa6900 Revision: 5305 Node Kind: directory Schedule: normal Last Changed Author: allanbush Last Changed Rev: 5113 Last Changed Date: 2006-04-13 17:25:30 -0400 (Thu, 13 Apr 2006) Perform the actual merge. The form is 'svn merge URL1 URL2'. This updates your working copy with the diff between URL1 and URL2. You confirm the correctness of the merge, write an appropriate message referencing trac tickets, and commit. Since we've been keeping the diff minimized with regular update merges, this merge should a) apply cleanly, and b) represent only the required changes to add postgresql support to vtigercrm-4.2.4. This changeset will be a very useful reference for the equivalent effort on the vtigercrm/trunk $ svn merge http://jeffk at vtiger.fosslabs.com/svn/vtiger/vtigercrm/branches/4.2 http://jeffk at vtiger.fosslabs.com/svn/vtiger/vtigercrm/branches/4.2_postgresql_integration U config.inc.php U sendreminder.php U modules/Accounts/ListViewTop.php U modules/Accounts/Account.php U modules/Accounts/Popup_picker.php U modules/Accounts/Popup.php U modules/Accounts/ListView.php U modules/Accounts/AccountFormBase.php U modules/Quotes/Quote.php U modules/Quotes/Delete.php U modules/Quotes/Popup.php U modules/Quotes/ListView.php U modules/Potentials/Popup.php U modules/Potentials/ListView.php U modules/Potentials/Opportunity.php U modules/Leads/Popup.php U modules/Leads/Lead.php U modules/Leads/ListView.php U modules/Leads/LeadConvertToEntities.php U modules/Home/UnifiedSearch.php U modules/Notes/Delete.php U modules/Notes/ListView.php U modules/Invoice/Invoice.php U modules/Invoice/ListView.php U modules/Orders/SalesOrderListView.php U modules/Orders/SalesOrder.php U modules/Orders/Order.php U modules/Orders/DeleteSalesOrder.php U modules/Orders/PopupSalesOrder.php U modules/Orders/ListView.php U modules/Reports/ReportRun.php U modules/Reports/SaveReportFolder.php U modules/Reports/Save.php U modules/Reports/Reports.php U modules/Reports/PopulateReports.php U modules/HelpDesk/HelpDesk.php U modules/HelpDesk/FaqList.php U modules/HelpDesk/ListView.php U modules/Settings/SaveConvertLead.php U modules/Settings/DeleteCustomField.php U modules/Settings/UpdateComboValues.php U modules/Users/User.php U modules/Users/SaveProfile.php U modules/Users/SaveOrgSharing.php U modules/Users/massdelete.php U modules/Users/LoginHistory.php U modules/Users/saveemailtemplate.php U modules/Users/ListView.php U modules/Users/Security.php U modules/Users/updateLeadDBStatus.php U modules/Users/UserInfoUtil.php U modules/Users/SaveRole.php U modules/Products/Popup.php U modules/Products/AddProductsToPriceBook.php U modules/Products/VendorPopup.php U modules/Products/ListView.php U modules/Products/Delete.php U modules/Products/PriceBookListView.php U modules/Products/Product.php U modules/Products/VendorListView.php U modules/Activities/Activity.php U modules/Activities/ListView.php U modules/Activities/RenderRelatedListUI.php U modules/Activities/OpenListView.php U modules/CustomView/Save.php U modules/CustomView/CustomView.php U modules/Faq/ListView.php U modules/uploads/add2db.php U modules/Calendar/appointment.pinc U modules/Import/UsersLastImport.php U modules/Emails/Email.php U modules/Emails/ListView.php U modules/Meetings/ListView.php U modules/Contacts/Contact.php U modules/Contacts/Popup.php U modules/Contacts/SaveBusinessCard.php U modules/Contacts/ListView.php U data/CRMEntity.php U data/SugarBean.php U include/RelatedListView.php U include/database/PearDatabase.php U include/PopulateComboValues.php U include/utils.php U soap.php U contactserialize.php U schema/DatabaseSchema.xml U install/5createTables.inc.php U install/4createConfigFile.php U install/1checkSystem.php U install/2setConfig.php U install/populateSeedData.php U install/3confirmConfig.php U adodb/adodb.inc.php U adodb/adodb-lib.inc.php U adodb/drivers/adodb-mysql.inc.php All files modified by the merge have indicator 'U', meaning clean update. If there had been any 'C' conflicts, you'd need to repair them manually. Please note that this is only a blind merge of the two branches. In addition to testing, there *will* need to be work done on the 4.2 branch to support both mysql and postgresql for the end user. This integration should be done as quickly as possible, and a vtigercrm/tags/vtigercrm-4.2.5 release created. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 18:30:20 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 24 Apr 2006 22:30:20 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2362=3A_a?= =?utf-8?q?dd_postgresql_support_to_vtigercrm-4=2E2=2Ex?= In-Reply-To: <076.1443774be51c11a69826f1418e20e4c8@vtiger.fosslabs.com> References: <076.1443774be51c11a69826f1418e20e4c8@vtiger.fosslabs.com> Message-ID: <085.ad5dd926f0e46061982739a01a825acb@vtiger.fosslabs.com> #62: add postgresql support to vtigercrm-4.2.x ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: jeffk Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Resolution: | Keywords: database postgresql adodb ------------------------+--------------------------------------------------- Comment (by jeffk): (In [5306]) refs #62 and #17. merging source:vtigercrm/branches/4.2_postgresql_integration back to source:vtigercrm/branches/4.2. This closes the postgresql_integration branch. Some work will remain to properly support both mysql and postgresql (e.g. in source:vtigercrm/branches/4.2/config.inc.php) What follows is a journal of how this merge was performed: My present working copy is: $ svn info Path: . URL: http://jeffk at vtiger.fosslabs.com/svn/vtiger/vtigercrm/branches/4.2_postgresql_integration Repository Root: http://jeffk at vtiger.fosslabs.com/svn/vtiger Repository UUID: 83ef7b00-670c-0410-b3e3-e45103aa6900 Revision: 5305 Node Kind: directory Schedule: normal Last Changed Author: jeffk Last Changed Rev: 5114 Last Changed Date: 2006-04-13 19:47:22 -0400 (Thu, 13 Apr 2006) Check that there are no changes in my working copy to commit: $ svn diff (there are none) Check for late changes to the original (target) branch that I should merge first: $ svn diff -r 5113:HEAD http://jeffk at vtiger.fosslabs.com/svn/vtiger/vtigercrm/branches/4.2 (there are none) Switch my working copy to the original (target) branch. This is a good preview of files affected by the coming merge of the two branches. $ svn switch http://jeffk at vtiger.fosslabs.com/svn/vtiger/vtigercrm/branches/4.2 U config.inc.php U sendreminder.php U modules/Accounts/ListViewTop.php U modules/Accounts/Account.php U modules/Accounts/Popup_picker.php U modules/Accounts/Popup.php U modules/Accounts/ListView.php U modules/Accounts/AccountFormBase.php U modules/Quotes/Quote.php U modules/Quotes/Delete.php U modules/Quotes/Popup.php U modules/Quotes/ListView.php U modules/Potentials/Popup.php U modules/Potentials/ListView.php U modules/Potentials/Opportunity.php U modules/Leads/Popup.php U modules/Leads/Lead.php U modules/Leads/ListView.php U modules/Leads/LeadConvertToEntities.php U modules/Home/UnifiedSearch.php U modules/Notes/Delete.php U modules/Notes/ListView.php U modules/Invoice/Invoice.php U modules/Invoice/ListView.php U modules/Orders/SalesOrderListView.php U modules/Orders/SalesOrder.php U modules/Orders/Order.php U modules/Orders/DeleteSalesOrder.php U modules/Orders/PopupSalesOrder.php U modules/Orders/ListView.php U modules/Reports/ReportRun.php U modules/Reports/SaveReportFolder.php U modules/Reports/Save.php U modules/Reports/Reports.php U modules/Reports/PopulateReports.php U modules/HelpDesk/HelpDesk.php U modules/HelpDesk/FaqList.php U modules/HelpDesk/ListView.php U modules/Settings/SaveConvertLead.php U modules/Settings/DeleteCustomField.php U modules/Settings/UpdateComboValues.php U modules/Users/User.php U modules/Users/SaveProfile.php U modules/Users/SaveOrgSharing.php U modules/Users/massdelete.php U modules/Users/LoginHistory.php U modules/Users/saveemailtemplate.php U modules/Users/ListView.php U modules/Users/Security.php U modules/Users/updateLeadDBStatus.php U modules/Users/UserInfoUtil.php U modules/Users/SaveRole.php U modules/Products/Popup.php U modules/Products/AddProductsToPriceBook.php U modules/Products/VendorPopup.php U modules/Products/ListView.php U modules/Products/Delete.php U modules/Products/PriceBookListView.php U modules/Products/Product.php U modules/Products/VendorListView.php U modules/Activities/Activity.php U modules/Activities/ListView.php U modules/Activities/RenderRelatedListUI.php U modules/Activities/OpenListView.php U modules/CustomView/Save.php U modules/CustomView/CustomView.php U modules/Faq/ListView.php U modules/uploads/add2db.php U modules/Calendar/appointment.pinc U modules/Import/UsersLastImport.php U modules/Emails/Email.php U modules/Emails/ListView.php U modules/Meetings/ListView.php U modules/Contacts/Contact.php U modules/Contacts/Popup.php U modules/Contacts/SaveBusinessCard.php U modules/Contacts/ListView.php U data/CRMEntity.php U data/SugarBean.php U include/RelatedListView.php U include/database/PearDatabase.php U include/PopulateComboValues.php U include/utils.php U soap.php U contactserialize.php U schema/DatabaseSchema.xml U install/5createTables.inc.php U install/4createConfigFile.php U install/1checkSystem.php U install/2setConfig.php U install/populateSeedData.php U install/3confirmConfig.php U adodb/adodb.inc.php U adodb/adodb-lib.inc.php U adodb/drivers/adodb-mysql.inc.php Updated to revision 5305. Confirm my working copy info: $ svn info Path: . URL: http://jeffk at vtiger.fosslabs.com/svn/vtiger/vtigercrm/branches/4.2 Repository Root: http://jeffk at vtiger.fosslabs.com/svn/vtiger Repository UUID: 83ef7b00-670c-0410-b3e3-e45103aa6900 Revision: 5305 Node Kind: directory Schedule: normal Last Changed Author: allanbush Last Changed Rev: 5113 Last Changed Date: 2006-04-13 17:25:30 -0400 (Thu, 13 Apr 2006) Perform the actual merge. The form is 'svn merge URL1 URL2'. This updates your working copy with the diff between URL1 and URL2. You confirm the correctness of the merge, write an appropriate message referencing trac tickets, and commit. Since we've been keeping the diff minimized with regular update merges, this merge should a) apply cleanly, and b) represent only the required changes to add postgresql support to vtigercrm-4.2.4. This changeset will be a very useful reference for the equivalent effort on the vtigercrm/trunk $ svn merge http://jeffk at vtiger.fosslabs.com/svn/vtiger/vtigercrm/branches/4.2 http://jeffk at vtiger.fosslabs.com/svn/vtiger/vtigercrm/branches/4.2_postgresql_integration U config.inc.php U sendreminder.php U modules/Accounts/ListViewTop.php U modules/Accounts/Account.php U modules/Accounts/Popup_picker.php U modules/Accounts/Popup.php U modules/Accounts/ListView.php U modules/Accounts/AccountFormBase.php U modules/Quotes/Quote.php U modules/Quotes/Delete.php U modules/Quotes/Popup.php U modules/Quotes/ListView.php U modules/Potentials/Popup.php U modules/Potentials/ListView.php U modules/Potentials/Opportunity.php U modules/Leads/Popup.php U modules/Leads/Lead.php U modules/Leads/ListView.php U modules/Leads/LeadConvertToEntities.php U modules/Home/UnifiedSearch.php U modules/Notes/Delete.php U modules/Notes/ListView.php U modules/Invoice/Invoice.php U modules/Invoice/ListView.php U modules/Orders/SalesOrderListView.php U modules/Orders/SalesOrder.php U modules/Orders/Order.php U modules/Orders/DeleteSalesOrder.php U modules/Orders/PopupSalesOrder.php U modules/Orders/ListView.php U modules/Reports/ReportRun.php U modules/Reports/SaveReportFolder.php U modules/Reports/Save.php U modules/Reports/Reports.php U modules/Reports/PopulateReports.php U modules/HelpDesk/HelpDesk.php U modules/HelpDesk/FaqList.php U modules/HelpDesk/ListView.php U modules/Settings/SaveConvertLead.php U modules/Settings/DeleteCustomField.php U modules/Settings/UpdateComboValues.php U modules/Users/User.php U modules/Users/SaveProfile.php U modules/Users/SaveOrgSharing.php U modules/Users/massdelete.php U modules/Users/LoginHistory.php U modules/Users/saveemailtemplate.php U modules/Users/ListView.php U modules/Users/Security.php U modules/Users/updateLeadDBStatus.php U modules/Users/UserInfoUtil.php U modules/Users/SaveRole.php U modules/Products/Popup.php U modules/Products/AddProductsToPriceBook.php U modules/Products/VendorPopup.php U modules/Products/ListView.php U modules/Products/Delete.php U modules/Products/PriceBookListView.php U modules/Products/Product.php U modules/Products/VendorListView.php U modules/Activities/Activity.php U modules/Activities/ListView.php U modules/Activities/RenderRelatedListUI.php U modules/Activities/OpenListView.php U modules/CustomView/Save.php U modules/CustomView/CustomView.php U modules/Faq/ListView.php U modules/uploads/add2db.php U modules/Calendar/appointment.pinc U modules/Import/UsersLastImport.php U modules/Emails/Email.php U modules/Emails/ListView.php U modules/Meetings/ListView.php U modules/Contacts/Contact.php U modules/Contacts/Popup.php U modules/Contacts/SaveBusinessCard.php U modules/Contacts/ListView.php U data/CRMEntity.php U data/SugarBean.php U include/RelatedListView.php U include/database/PearDatabase.php U include/PopulateComboValues.php U include/utils.php U soap.php U contactserialize.php U schema/DatabaseSchema.xml U install/5createTables.inc.php U install/4createConfigFile.php U install/1checkSystem.php U install/2setConfig.php U install/populateSeedData.php U install/3confirmConfig.php U adodb/adodb.inc.php U adodb/adodb-lib.inc.php U adodb/drivers/adodb-mysql.inc.php All files modified by the merge have indicator 'U', meaning clean update. If there had been any 'C' conflicts, you'd need to repair them manually. Please note that this is only a blind merge of the two branches. In addition to testing, there *will* need to be work done on the 4.2 branch to support both mysql and postgresql for the end user. This integration should be done as quickly as possible, and a vtigercrm/tags/vtigercrm-4.2.5 release created. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 24 18:30:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 24 Apr 2006 22:30:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5306 - in /vtigercrm/branches/4.2: ./ adodb/ adodb/drivers/ data/ include/ include/database/ install/ modules/Accounts/ modules/Activities/ modules/Calendar/ modules/Contacts/ modules/CustomView/ modules/Emails/ modules/Faq/ modules/HelpDesk/ modules/Home/ modules/Import/ modules/Invoice/ modules/Leads/ modules/Meetings/ modules/Notes/ modules/Orders/ modules/Potentials/ modules/Products/ modules/Quotes/ modules/Reports/ modules/Settings/ modules/Users/ modules/uploads/ schema/ Message-ID: <20060424223025.DCCF740E7C8@vtiger.fosslabs.com> Author: jeffk Date: Mon Apr 24 16:29:46 2006 New Revision: 5306 Log: refs #62 and #17. merging source:vtigercrm/branches/4.2_postgresql_integration back to source:vtigercrm/branches/4.2. This closes the postgresql_integration branch. Some work will remain to properly support both mysql and postgresql (e.g. in source:vtigercrm/branches/4.2/config.inc.php) What follows is a journal of how this merge was performed: My present working copy is: $ svn info Path: . URL: http://jeffk at vtiger.fosslabs.com/svn/vtiger/vtigercrm/branches/4.2_postgresql_integration Repository Root: http://jeffk at vtiger.fosslabs.com/svn/vtiger Repository UUID: 83ef7b00-670c-0410-b3e3-e45103aa6900 Revision: 5305 Node Kind: directory Schedule: normal Last Changed Author: jeffk Last Changed Rev: 5114 Last Changed Date: 2006-04-13 19:47:22 -0400 (Thu, 13 Apr 2006) Check that there are no changes in my working copy to commit: $ svn diff (there are none) Check for late changes to the original (target) branch that I should merge first: $ svn diff -r 5113:HEAD http://jeffk at vtiger.fosslabs.com/svn/vtiger/vtigercrm/branches/4.2 (there are none) Switch my working copy to the original (target) branch. This is a good preview of files affected by the coming merge of the two branches. $ svn switch http://jeffk at vtiger.fosslabs.com/svn/vtiger/vtigercrm/branches/4.2 U config.inc.php U sendreminder.php U modules/Accounts/ListViewTop.php U modules/Accounts/Account.php U modules/Accounts/Popup_picker.php U modules/Accounts/Popup.php U modules/Accounts/ListView.php U modules/Accounts/AccountFormBase.php U modules/Quotes/Quote.php U modules/Quotes/Delete.php U modules/Quotes/Popup.php U modules/Quotes/ListView.php U modules/Potentials/Popup.php U modules/Potentials/ListView.php U modules/Potentials/Opportunity.php U modules/Leads/Popup.php U modules/Leads/Lead.php U modules/Leads/ListView.php U modules/Leads/LeadConvertToEntities.php U modules/Home/UnifiedSearch.php U modules/Notes/Delete.php U modules/Notes/ListView.php U modules/Invoice/Invoice.php U modules/Invoice/ListView.php U modules/Orders/SalesOrderListView.php U modules/Orders/SalesOrder.php U modules/Orders/Order.php U modules/Orders/DeleteSalesOrder.php U modules/Orders/PopupSalesOrder.php U modules/Orders/ListView.php U modules/Reports/ReportRun.php U modules/Reports/SaveReportFolder.php U modules/Reports/Save.php U modules/Reports/Reports.php U modules/Reports/PopulateReports.php U modules/HelpDesk/HelpDesk.php U modules/HelpDesk/FaqList.php U modules/HelpDesk/ListView.php U modules/Settings/SaveConvertLead.php U modules/Settings/DeleteCustomField.php U modules/Settings/UpdateComboValues.php U modules/Users/User.php U modules/Users/SaveProfile.php U modules/Users/SaveOrgSharing.php U modules/Users/massdelete.php U modules/Users/LoginHistory.php U modules/Users/saveemailtemplate.php U modules/Users/ListView.php U modules/Users/Security.php U modules/Users/updateLeadDBStatus.php U modules/Users/UserInfoUtil.php U modules/Users/SaveRole.php U modules/Products/Popup.php U modules/Products/AddProductsToPriceBook.php U modules/Products/VendorPopup.php U modules/Products/ListView.php U modules/Products/Delete.php U modules/Products/PriceBookListView.php U modules/Products/Product.php U modules/Products/VendorListView.php U modules/Activities/Activity.php U modules/Activities/ListView.php U modules/Activities/RenderRelatedListUI.php U modules/Activities/OpenListView.php U modules/CustomView/Save.php U modules/CustomView/CustomView.php U modules/Faq/ListView.php U modules/uploads/add2db.php U modules/Calendar/appointment.pinc U modules/Import/UsersLastImport.php U modules/Emails/Email.php U modules/Emails/ListView.php U modules/Meetings/ListView.php U modules/Contacts/Contact.php U modules/Contacts/Popup.php U modules/Contacts/SaveBusinessCard.php U modules/Contacts/ListView.php U data/CRMEntity.php U data/SugarBean.php U include/RelatedListView.php U include/database/PearDatabase.php U include/PopulateComboValues.php U include/utils.php U soap.php U contactserialize.php U schema/DatabaseSchema.xml U install/5createTables.inc.php U install/4createConfigFile.php U install/1checkSystem.php U install/2setConfig.php U install/populateSeedData.php U install/3confirmConfig.php U adodb/adodb.inc.php U adodb/adodb-lib.inc.php U adodb/drivers/adodb-mysql.inc.php Updated to revision 5305. Confirm my working copy info: $ svn info Path: . URL: http://jeffk at vtiger.fosslabs.com/svn/vtiger/vtigercrm/branches/4.2 Repository Root: http://jeffk at vtiger.fosslabs.com/svn/vtiger Repository UUID: 83ef7b00-670c-0410-b3e3-e45103aa6900 Revision: 5305 Node Kind: directory Schedule: normal Last Changed Author: allanbush Last Changed Rev: 5113 Last Changed Date: 2006-04-13 17:25:30 -0400 (Thu, 13 Apr 2006) Perform the actual merge. The form is 'svn merge URL1 URL2'. This updates your working copy with the diff between URL1 and URL2. You confirm the correctness of the merge, write an appropriate message referencing trac tickets, and commit. Since we've been keeping the diff minimized with regular update merges, this merge should a) apply cleanly, and b) represent only the required changes to add postgresql support to vtigercrm-4.2.4. This changeset will be a very useful reference for the equivalent effort on the vtigercrm/trunk $ svn merge http://jeffk at vtiger.fosslabs.com/svn/vtiger/vtigercrm/branches/4.2 http://jeffk at vtiger.fosslabs.com/svn/vtiger/vtigercrm/branches/4.2_postgresql_integration U config.inc.php U sendreminder.php U modules/Accounts/ListViewTop.php U modules/Accounts/Account.php U modules/Accounts/Popup_picker.php U modules/Accounts/Popup.php U modules/Accounts/ListView.php U modules/Accounts/AccountFormBase.php U modules/Quotes/Quote.php U modules/Quotes/Delete.php U modules/Quotes/Popup.php U modules/Quotes/ListView.php U modules/Potentials/Popup.php U modules/Potentials/ListView.php U modules/Potentials/Opportunity.php U modules/Leads/Popup.php U modules/Leads/Lead.php U modules/Leads/ListView.php U modules/Leads/LeadConvertToEntities.php U modules/Home/UnifiedSearch.php U modules/Notes/Delete.php U modules/Notes/ListView.php U modules/Invoice/Invoice.php U modules/Invoice/ListView.php U modules/Orders/SalesOrderListView.php U modules/Orders/SalesOrder.php U modules/Orders/Order.php U modules/Orders/DeleteSalesOrder.php U modules/Orders/PopupSalesOrder.php U modules/Orders/ListView.php U modules/Reports/ReportRun.php U modules/Reports/SaveReportFolder.php U modules/Reports/Save.php U modules/Reports/Reports.php U modules/Reports/PopulateReports.php U modules/HelpDesk/HelpDesk.php U modules/HelpDesk/FaqList.php U modules/HelpDesk/ListView.php U modules/Settings/SaveConvertLead.php U modules/Settings/DeleteCustomField.php U modules/Settings/UpdateComboValues.php U modules/Users/User.php U modules/Users/SaveProfile.php U modules/Users/SaveOrgSharing.php U modules/Users/massdelete.php U modules/Users/LoginHistory.php U modules/Users/saveemailtemplate.php U modules/Users/ListView.php U modules/Users/Security.php U modules/Users/updateLeadDBStatus.php U modules/Users/UserInfoUtil.php U modules/Users/SaveRole.php U modules/Products/Popup.php U modules/Products/AddProductsToPriceBook.php U modules/Products/VendorPopup.php U modules/Products/ListView.php U modules/Products/Delete.php U modules/Products/PriceBookListView.php U modules/Products/Product.php U modules/Products/VendorListView.php U modules/Activities/Activity.php U modules/Activities/ListView.php U modules/Activities/RenderRelatedListUI.php U modules/Activities/OpenListView.php U modules/CustomView/Save.php U modules/CustomView/CustomView.php U modules/Faq/ListView.php U modules/uploads/add2db.php U modules/Calendar/appointment.pinc U modules/Import/UsersLastImport.php U modules/Emails/Email.php U modules/Emails/ListView.php U modules/Meetings/ListView.php U modules/Contacts/Contact.php U modules/Contacts/Popup.php U modules/Contacts/SaveBusinessCard.php U modules/Contacts/ListView.php U data/CRMEntity.php U data/SugarBean.php U include/RelatedListView.php U include/database/PearDatabase.php U include/PopulateComboValues.php U include/utils.php U soap.php U contactserialize.php U schema/DatabaseSchema.xml U install/5createTables.inc.php U install/4createConfigFile.php U install/1checkSystem.php U install/2setConfig.php U install/populateSeedData.php U install/3confirmConfig.php U adodb/adodb.inc.php U adodb/adodb-lib.inc.php U adodb/drivers/adodb-mysql.inc.php All files modified by the merge have indicator 'U', meaning clean update. If there had been any 'C' conflicts, you'd need to repair them manually. Please note that this is only a blind merge of the two branches. In addition to testing, there *will* need to be work done on the 4.2 branch to support both mysql and postgresql for the end user. This integration should be done as quickly as possible, and a vtigercrm/tags/vtigercrm-4.2.5 release created. Modified: vtigercrm/branches/4.2/adodb/adodb-lib.inc.php vtigercrm/branches/4.2/adodb/adodb.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-mysql.inc.php vtigercrm/branches/4.2/config.inc.php vtigercrm/branches/4.2/contactserialize.php vtigercrm/branches/4.2/data/CRMEntity.php vtigercrm/branches/4.2/data/SugarBean.php vtigercrm/branches/4.2/include/PopulateComboValues.php vtigercrm/branches/4.2/include/RelatedListView.php vtigercrm/branches/4.2/include/database/PearDatabase.php vtigercrm/branches/4.2/include/utils.php vtigercrm/branches/4.2/install/1checkSystem.php vtigercrm/branches/4.2/install/2setConfig.php vtigercrm/branches/4.2/install/3confirmConfig.php vtigercrm/branches/4.2/install/4createConfigFile.php vtigercrm/branches/4.2/install/5createTables.inc.php vtigercrm/branches/4.2/install/populateSeedData.php vtigercrm/branches/4.2/modules/Accounts/Account.php vtigercrm/branches/4.2/modules/Accounts/AccountFormBase.php vtigercrm/branches/4.2/modules/Accounts/ListView.php vtigercrm/branches/4.2/modules/Accounts/ListViewTop.php vtigercrm/branches/4.2/modules/Accounts/Popup.php vtigercrm/branches/4.2/modules/Accounts/Popup_picker.php vtigercrm/branches/4.2/modules/Activities/Activity.php vtigercrm/branches/4.2/modules/Activities/ListView.php vtigercrm/branches/4.2/modules/Activities/OpenListView.php vtigercrm/branches/4.2/modules/Activities/RenderRelatedListUI.php vtigercrm/branches/4.2/modules/Calendar/appointment.pinc vtigercrm/branches/4.2/modules/Contacts/Contact.php vtigercrm/branches/4.2/modules/Contacts/ListView.php vtigercrm/branches/4.2/modules/Contacts/Popup.php vtigercrm/branches/4.2/modules/Contacts/SaveBusinessCard.php vtigercrm/branches/4.2/modules/CustomView/CustomView.php vtigercrm/branches/4.2/modules/CustomView/Save.php vtigercrm/branches/4.2/modules/Emails/Email.php vtigercrm/branches/4.2/modules/Emails/ListView.php vtigercrm/branches/4.2/modules/Faq/ListView.php vtigercrm/branches/4.2/modules/HelpDesk/FaqList.php vtigercrm/branches/4.2/modules/HelpDesk/HelpDesk.php vtigercrm/branches/4.2/modules/HelpDesk/ListView.php vtigercrm/branches/4.2/modules/Home/UnifiedSearch.php vtigercrm/branches/4.2/modules/Import/UsersLastImport.php vtigercrm/branches/4.2/modules/Invoice/Invoice.php vtigercrm/branches/4.2/modules/Invoice/ListView.php vtigercrm/branches/4.2/modules/Leads/Lead.php vtigercrm/branches/4.2/modules/Leads/LeadConvertToEntities.php vtigercrm/branches/4.2/modules/Leads/ListView.php vtigercrm/branches/4.2/modules/Leads/Popup.php vtigercrm/branches/4.2/modules/Meetings/ListView.php vtigercrm/branches/4.2/modules/Notes/Delete.php vtigercrm/branches/4.2/modules/Notes/ListView.php vtigercrm/branches/4.2/modules/Orders/DeleteSalesOrder.php vtigercrm/branches/4.2/modules/Orders/ListView.php vtigercrm/branches/4.2/modules/Orders/Order.php vtigercrm/branches/4.2/modules/Orders/PopupSalesOrder.php vtigercrm/branches/4.2/modules/Orders/SalesOrder.php vtigercrm/branches/4.2/modules/Orders/SalesOrderListView.php vtigercrm/branches/4.2/modules/Potentials/ListView.php vtigercrm/branches/4.2/modules/Potentials/Opportunity.php vtigercrm/branches/4.2/modules/Potentials/Popup.php vtigercrm/branches/4.2/modules/Products/AddProductsToPriceBook.php vtigercrm/branches/4.2/modules/Products/Delete.php vtigercrm/branches/4.2/modules/Products/ListView.php vtigercrm/branches/4.2/modules/Products/Popup.php vtigercrm/branches/4.2/modules/Products/PriceBookListView.php vtigercrm/branches/4.2/modules/Products/Product.php vtigercrm/branches/4.2/modules/Products/VendorListView.php vtigercrm/branches/4.2/modules/Products/VendorPopup.php vtigercrm/branches/4.2/modules/Quotes/Delete.php vtigercrm/branches/4.2/modules/Quotes/ListView.php vtigercrm/branches/4.2/modules/Quotes/Popup.php vtigercrm/branches/4.2/modules/Quotes/Quote.php vtigercrm/branches/4.2/modules/Reports/PopulateReports.php vtigercrm/branches/4.2/modules/Reports/ReportRun.php vtigercrm/branches/4.2/modules/Reports/Reports.php vtigercrm/branches/4.2/modules/Reports/Save.php vtigercrm/branches/4.2/modules/Reports/SaveReportFolder.php vtigercrm/branches/4.2/modules/Settings/DeleteCustomField.php vtigercrm/branches/4.2/modules/Settings/SaveConvertLead.php vtigercrm/branches/4.2/modules/Settings/UpdateComboValues.php vtigercrm/branches/4.2/modules/Users/ListView.php vtigercrm/branches/4.2/modules/Users/LoginHistory.php vtigercrm/branches/4.2/modules/Users/SaveOrgSharing.php vtigercrm/branches/4.2/modules/Users/SaveProfile.php vtigercrm/branches/4.2/modules/Users/SaveRole.php vtigercrm/branches/4.2/modules/Users/Security.php vtigercrm/branches/4.2/modules/Users/User.php vtigercrm/branches/4.2/modules/Users/UserInfoUtil.php vtigercrm/branches/4.2/modules/Users/massdelete.php vtigercrm/branches/4.2/modules/Users/saveemailtemplate.php vtigercrm/branches/4.2/modules/Users/updateLeadDBStatus.php vtigercrm/branches/4.2/modules/uploads/add2db.php vtigercrm/branches/4.2/schema/DatabaseSchema.xml vtigercrm/branches/4.2/sendreminder.php vtigercrm/branches/4.2/soap.php Modified: vtigercrm/branches/4.2/adodb/adodb-lib.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/adodb-lib.inc.php (original) +++ vtigercrm/branches/4.2/adodb/adodb-lib.inc.php Mon Apr 24 16:29:46 2006 @@ -933,18 +933,19 @@ $dbt = $zthis->databaseType; if (isset($zthis->dsnType)) $dbt .= '-'.$zthis->dsnType; - if ($inBrowser) { - if ($ss) { - $ss = ''.htmlspecialchars($ss).''; - } - if ($zthis->debug === -1) - ADOConnection::outp( "
    \n($dbt): ".htmlspecialchars($sqlTxt)."   $ss\n
    \n",false); - else - ADOConnection::outp( "
    \n($dbt): ".htmlspecialchars($sqlTxt)."   $ss\n
    \n",false); - } else { - ADOConnection::outp("-----\n($dbt): ".$sqlTxt."\n-----\n",false); - } - +/* + if ($inBrowser) { + if ($ss) { + $ss = ''.htmlspecialchars($ss).''; + } + if ($zthis->debug === -1) + ADOConnection::outp( "
    \n($dbt): ".htmlspecialchars($sqlTxt)."   $ss\n
    \n",false); + else + ADOConnection::outp( "
    \n($dbt): ".htmlspecialchars($sqlTxt)."   $ss\n
    \n",false); + } else { + ADOConnection::outp("-----\n($dbt): ".$sqlTxt."\n-----\n",false); + } +// */ $qID = $zthis->_query($sql,$inputarr); /* @@ -957,6 +958,17 @@ if ($err = $zthis->ErrorNo()) ADOConnection::outp($err.': '.$emsg); } } else if (!$qID) { + if ($inBrowser) { + if ($ss) { + $ss = ''.htmlspecialchars($ss).''; + } + if ($zthis->debug === -1) + ADOConnection::outp( "
    \n($dbt): ".htmlspecialchars($sqlTxt)."   $ss\n
    \n",false); + else + ADOConnection::outp( "
    \n($dbt): ".htmlspecialchars($sqlTxt)."   $ss\n
    \n",false); + } else { + ADOConnection::outp("-----\n($dbt): ".$sqlTxt."\n-----\n",false); + } ADOConnection::outp($zthis->ErrorNo() .': '. $zthis->ErrorMsg()); } @@ -1018,4 +1030,4 @@ return $s; } -?> +?> Modified: vtigercrm/branches/4.2/adodb/adodb.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/adodb.inc.php (original) +++ vtigercrm/branches/4.2/adodb/adodb.inc.php Mon Apr 24 16:29:46 2006 @@ -747,7 +747,7 @@ $this->_transOK = false; if ($this->debug) ADOConnection::outp("Smart Commit failed"); } else - if ($this->debug) ADOConnection::outp("Smart Commit occurred"); + if (false) ADOConnection::outp("Smart Commit occurred"); } else { $this->_transOK = false; $this->RollbackTrans(); Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-mysql.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/drivers/adodb-mysql.inc.php (original) +++ vtigercrm/branches/4.2/adodb/drivers/adodb-mysql.inc.php Mon Apr 24 16:29:46 2006 @@ -171,7 +171,7 @@ function BeginTrans() { - if ($this->debug) ADOConnection::outp("Transactions not supported in 'mysql' driver. Use 'mysqlt' or 'mysqli' driver"); + //if ($this->debug) ADOConnection::outp("Transactions not supported in 'mysql' driver. Use 'mysqlt' or 'mysqli' driver"); } function _affectedrows() @@ -772,4 +772,4 @@ } -?> +?> Modified: vtigercrm/branches/4.2/config.inc.php ============================================================================== --- vtigercrm/branches/4.2/config.inc.php (original) +++ vtigercrm/branches/4.2/config.inc.php Mon Apr 24 16:29:46 2006 @@ -1,7 +1,7 @@ 'en', 'ja'=>'jp', 'sp_ve'=>'sp', 'it_it'=>'it', 'tw_zh'=>'zh', 'pt_br'=>'pt', 'se'=>'sv', 'cn_zh'=>'zh', 'ge_ge'=>'de', 'ge_ch'=>'de', 'fr'=>'fr'); + +// default_module default value = Home $default_module = 'Home'; + +// default_action default value = index $default_action = 'index'; // set default theme +// default_theme default value = blue $default_theme = 'blue'; -$databasetype = 'mysql'; // show or hide time to compose each page +// calculate_response_time default value = true $calculate_response_time = true; // default text that is placed initially in the login form for user name +// no default_user_name default value $default_user_name = ''; // default text that is placed initially in the login form for password +// no default_password default value $default_password = ''; // create user with default username and password +// create_default_user default value = false $create_default_user = false; +// default_user_is_admin default value = false +$default_user_is_admin = false; -// login message -// if a message is provided, it will be placed on the login screen -// this is for site specific special instructions -$login_message = 'Please login to the application.'; +// if your MySQL/PHP configuration does not support persistent connections set this to true to avoid a large performance slowdown +// disable_persistent_connections default value = false +$disable_persistent_connections = false; + +// defined languages available. the key must be the language file prefix. (Example 'en_us' is the prefix for every 'en_us.lang.php' file) +// languages default value = en_us=>US English +$languages = Array('en_us'=>'US English',); + +// default charset +// default charset default value = ISO-8859-1 +$default_charset = 'ISO-8859-1'; + +// default language +// default_language default value = en_us +$default_language = 'en_us'; + +// add the language pack name to every translation string in the display. +// translation_string_prefix default value = false +$translation_string_prefix = false; ?> Modified: vtigercrm/branches/4.2/contactserialize.php ============================================================================== --- vtigercrm/branches/4.2/contactserialize.php (original) +++ vtigercrm/branches/4.2/contactserialize.php Mon Apr 24 16:29:46 2006 @@ -1189,9 +1189,10 @@ function add_contacts_matching_email_address(&$output_list, $email_address, &$seed_contact) { //global $log; + global $adb; $safe_email_address = addslashes($email_address); - $where = "email1 like '$safe_email_address' OR email2 like '$safe_email_address'"; + $where = "email1 ".$adb->getLike()." '$safe_email_address' OR email2 ".$adb->getLike()." '$safe_email_address'"; $response = $seed_contact->get_list("first_name,last_name,primary_address_city", $where, 0); $contactList = $response['list']; @@ -1306,8 +1307,9 @@ function contact_by_search($name) { // global $log; + global $adb; $seed_contact = new Contact(); - $where = "first_name like '$name%' OR last_name like '$name%' OR email1 like '$name%' OR email2 like '$name%'"; + $where = "first_name ".$adb->getLike()." '$name%' OR last_name ".$adb->getLike()." '$name%' OR email1 ".$adb->getLike()." '$name%' OR email2 ".$adb->getLike()." '$name%'"; $response = $seed_contact->get_list("first_name, last_name", $where, 0); $contactList = $response['list']; //$row_count = $response['row_count']; @@ -1661,6 +1663,7 @@ function retrievereportsto($reports_to,$user_id,$account_id) { + global $adb; if($reports_to=="") { return null; @@ -1695,7 +1698,7 @@ // to do handle smartly handle the manager name - $query = "select contactdetails.contactid as contactid from contactdetails inner join crmentity on crmentity.crmid=contactdetails.contactid where crmentity.deleted=0 and contactdetails.firstname like '".$first_name ."' and contactdetails.lastname like '" .$last_name ."'"; + $query = "select contactdetails.contactid as contactid from contactdetails inner join crmentity on crmentity.crmid=contactdetails.contactid where crmentity.deleted=0 and contactdetails.firstname ".$adb->getLike()." '".$first_name ."' and contactdetails.lastname ".$adb->getLike()." '" .$last_name ."'"; @@ -1972,8 +1975,9 @@ function retrieve_task($name) { // global $log; + global $adb; $task = new Task(); - $where = "name like '$name%'"; + $where = "name ".$adb->getLike()." '$name%'"; $response = $task->get_list("name", $where, 0); $taskList = $response['list']; $output_list = Array(); @@ -2218,8 +2222,9 @@ function retrieve_calendar($name) { + global $adb; $task = new Task(); - $where = "name like '$name%'"; + $where = "name ".$adb->getLike()." '$name%'"; $response = $task->get_list("name", $where, 0); $taskList = $response['list']; $output_list = Array(); Modified: vtigercrm/branches/4.2/data/CRMEntity.php ============================================================================== --- vtigercrm/branches/4.2/data/CRMEntity.php (original) +++ vtigercrm/branches/4.2/data/CRMEntity.php Mon Apr 24 16:29:46 2006 @@ -130,11 +130,11 @@ function insertIntoAttachment1($id,$module,$filedata,$filename,$filesize,$filetype,$user_id) { - $date_var = date('YmdHis'); // global $current_user; global $adb; //global $root_directory; global $vtlog; + $date_var = $adb->database->DBTimeStamp(date('YmdHis')); $ownerid = $user_id; @@ -156,7 +156,7 @@ $sql="update ".$tablename." set filename='".$filename."' where ".$idname."=".$id; $adb->query($sql); - $sql1 = "insert into crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values(".$current_id.",".$current_user->id.",".$ownerid.",'".$module." Attachment','"."',".$adb->formatString("crmentity","createdtime",$date_var).",".$adb->formatString("crmentity","modifiedtime",$date_var).")"; + $sql1 = "insert into crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values(".$current_id.",".$current_user->id.",".$ownerid.",'".$module." Attachment','"."',".$date_var.",".$date_var.")"; $adb->query($sql1); //$this->id = $current_id; @@ -176,12 +176,12 @@ function insertIntoAttachment($id,$module) { - $date_var = date('YmdHis'); global $current_user; global $adb; global $root_directory; global $upload_badext; + $date_var = $adb->database->DBTimeStamp(date('YmdHis')); $ownerid = $this->column_fields['assigned_user_id']; $adb->println("insertattach ownerid=".$ownerid." mod=".$module); $adb->println($this->column_fields); @@ -226,7 +226,7 @@ $sql="update ".$tablename." set filename='".$filename."' where ".$idname."=".$id; $adb->query($sql); - $sql1 = "insert into crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values(".$current_id.",".$current_user->id.",".$ownerid.",'".$module." Attachment','".$this->column_fields['description']."',".$adb->formatString("crmentity","createdtime",$date_var).",".$adb->formatString("crmentity","modifiedtime",$date_var).")"; + $sql1 = "insert into crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values(".$current_id.",".$current_user->id.",".$ownerid.",'".$module." Attachment','".$this->column_fields['description']."',".$date_var.",".$date_var.")"; $adb->query($sql1); //$this->id = $current_id; @@ -261,7 +261,7 @@ global $current_user; global $vtlog; - $date_var = date('YmdHis'); + $date_var = $adb->database->DBTimeStamp(date('YmdHis')); if($_REQUEST['assigntype'] == 'T') { $ownerid= 0; @@ -284,7 +284,7 @@ if($this->mode == 'edit') { $description_val = from_html($adb->formatString("crmentity","description",$this->column_fields['description']),($insertion_mode == 'edit')?true:false); - $sql = "update crmentity set smownerid=".$ownerid.",modifiedby=".$current_user->id.",description=".$description_val.", modifiedtime=".$adb->formatString("crmentity","modifiedtime",$date_var)." where crmid=".$this->id; + $sql = "update crmentity set smownerid=".$ownerid.",modifiedby=".$current_user->id.",description=".$description_val.", modifiedtime=".$date_var." where crmid=".$this->id; $adb->query($sql); } @@ -325,7 +325,7 @@ else { $description_val = from_html($adb->formatString("crmentity","description",$this->column_fields['description']),($insertion_mode == 'edit')?true:false); - $sql = "insert into crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values('".$current_id."','".$current_user->id."','".$ownerid."','".$module."',".$description_val.",'".$date_var."','".$date_var."')"; + $sql = "insert into crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values('".$current_id."','".$current_user->id."','".$ownerid."','".$module."',".$description_val.",".$date_var.",".$date_var.")"; $adb->query($sql); $this->id = $current_id; } @@ -611,9 +611,10 @@ $sales_stage = $adb->query_result($adb->query($dbquery),0,'sales_stage'); if($sales_stage != $_REQUEST['sales_stage']) { - $date_var = date('YmdHis'); + $date_var = $adb->database->DBTimeStamp(date('YmdHis')); //$sql = "insert into potstagehistory values('',".$this->id.",".$_REQUEST['amount'].",'".$_REQUEST['sales_stage']."',".$_REQUEST['probability'].",".$_REQUEST['expectedrevenue'].",".$adb->formatString("potstagehistory","closedate",$_REQUEST['closingdate']).",".$adb->formatString("potstagehistory","lastmodified",$date_var).")"; - $sql = "insert into potstagehistory values('',".$this->id.",'".$_REQUEST['amount']."','".$sales_stage."','".$_REQUEST['probability']."',0,".$adb->formatString("potstagehistory","closedate",$_REQUEST['closingdate']).",".$adb->formatString("potstagehistory","lastmodified",$date_var).")"; + $id = $adb->getUniqueID('potstagehistory'); + $sql = "insert into potstagehistory values($id,".$this->id.",'".$_REQUEST['amount']."','".$sales_stage."','".$_REQUEST['probability']."',0,".$adb->formatString("potstagehistory","closedate",$_REQUEST['closingdate']).",".$date_var.")"; $adb->query($sql); } } @@ -742,8 +743,9 @@ else $ownertype = 'customer'; - $comment = addslashes($_REQUEST['comments']); - $sql = "insert into ticketcomments values('',".$this->id.",'".$comment."','".$current_user->id."','".$ownertype."','".$current_time."')"; + $comment = $adb->quote($_REQUEST['comments']); + $id = $adb->getUniqueID("ticketcomments_commentid"); + $sql = "insert into ticketcomments values(".$id.",".$this->id.",".$comment.",'".$current_user->id."','".$ownertype."','".$current_time."')"; $adb->query($sql); } function insertIntoFAQCommentTable($table_name, $module) @@ -754,8 +756,9 @@ $current_time = date('Y-m-d H:i:s'); - $comment = addslashes($_REQUEST['comments']); - $sql = "insert into faqcomments values('',".$this->id.",'".$comment."','".$current_time."')"; + $comment = $adb->quote($_REQUEST['comments']); + $id = $adb->getUniqueID("faqcomments_commentid"); + $sql = "insert into faqcomments values(".$id.",".$this->id.",".$comment.",'".$current_time."')"; $adb->query($sql); } function insertIntoReminderTable($table_name,$module,$recurid) @@ -817,7 +820,7 @@ { $activity_id=$this->id; - $sql='select min(recurringdate) min_date,max(recurringdate) max_date,recurringtype from recurringevents where activityid='. $activity_id.' group by activityid'; + $sql='select min(recurringdate) AS min_date, max(recurringdate) AS max_date, recurringtype from recurringevents where activityid='. $activity_id.' group by activityid, recurringtype'; $result = $adb->query($sql); $noofrows = $adb->num_rows($result); @@ -886,7 +889,7 @@ $tdate=$date_array[$k]; if($tdate <= $end_date) { - $max_recurid_qry = 'select max(recurringid) recurid from recurringevents;'; + $max_recurid_qry = 'select max(recurringid) AS recurid from recurringevents;'; $result = $adb->query($max_recurid_qry); $noofrows = $adb->num_rows($result); for($i=0; $i<$noofrows; $i++) @@ -894,7 +897,7 @@ $recur_id = $adb->query_result($result,$i,"recurid"); } $current_id =$recur_id+1; - $recurring_insert = 'insert into recurringevents values ("'.$current_id.'","'.$this->id.'","'.$tdate.'","'.$type.'")'; + $recurring_insert = "insert into recurringevents values (".$adb->quote($current_id).','.$adb->quote($this->id).','.$adb->quote($tdate).','.$adb->quote($type).')'; $adb->query($recurring_insert); if($_REQUEST['set_reminder'] == 'Yes') { Modified: vtigercrm/branches/4.2/data/SugarBean.php ============================================================================== --- vtigercrm/branches/4.2/data/SugarBean.php (original) +++ vtigercrm/branches/4.2/data/SugarBean.php Mon Apr 24 16:29:46 2006 @@ -185,6 +185,7 @@ if ($id == -1) { $id = $this->id; } + if('' == $id) return null; // GS porting crmentity $query = "SELECT * FROM $this->table_name WHERE $this->module_id = '$id'"; // $query = "SELECT * FROM $this->table_name WHERE ID = '$id'"; Modified: vtigercrm/branches/4.2/include/PopulateComboValues.php ============================================================================== --- vtigercrm/branches/4.2/include/PopulateComboValues.php (original) +++ vtigercrm/branches/4.2/include/PopulateComboValues.php Mon Apr 24 16:29:46 2006 @@ -28,13 +28,14 @@ $i=0; foreach ($values as $val => $cal) { + $id = $adb->getUniqueID($tableName); // horrible assumption on the name of the sequence for this table if($val != '') { - $adb->query("insert into ".$tableName. " values('','".$val."',".$i.",1)"); + $adb->query("insert into ".$tableName. " values($id,'".$val."',".$i.",1)"); } else { - $adb->query("insert into ".$tableName. " values('','--None--',".$i.",1)"); + $adb->query("insert into ".$tableName. " values($id,'--None--',".$i.",1)"); } $i++; } Modified: vtigercrm/branches/4.2/include/RelatedListView.php ============================================================================== --- vtigercrm/branches/4.2/include/RelatedListView.php (original) +++ vtigercrm/branches/4.2/include/RelatedListView.php Mon Apr 24 16:29:46 2006 @@ -78,7 +78,8 @@ } //Appending the group by for Jaguar/Don -if($relatedmodule == 'Activities') +// group by won't work this way in postgres +if($relatedmodule == 'Activities' && !$adb->isPostgres()) { $query .= ' group by crmentity.crmid'; } Modified: vtigercrm/branches/4.2/include/database/PearDatabase.php ============================================================================== --- vtigercrm/branches/4.2/include/database/PearDatabase.php (original) +++ vtigercrm/branches/4.2/include/database/PearDatabase.php Mon Apr 24 16:29:46 2006 @@ -35,8 +35,9 @@ var $lastmysqlrow = -1; var $enableSQLlog = false; - function isMySQL() { return dbType=='mysql'; } - function isOracle() { return dbType=='oci8'; } + function isMySQL() { return $this->dbType=='mysql'; } + function isOracle() { return $this->dbType=='oci8'; } + function isPostgres() { return $this->dbType=='pgsql'; } function println($msg) { @@ -59,8 +60,9 @@ function setDatabaseType($type){ $this->dbType = $type; - } - + $this->like = $this->isPostgres() ? 'ilike' : 'like'; + } + function setUserName($name){ $this->userName = $name; } @@ -86,6 +88,10 @@ function getDataSourceName(){ return $this->dbType. "://".$this->userName.":".$this->userPassword."@". $this->dbHostName . "/". $this->dbName; + } + + function getLike(){ + return $this->like; } function startTransaction() @@ -258,7 +264,14 @@ { $this->println("updateBlobFile t=".$tablename." c=".$colname." id=".$id." f=".$filename); $this->checkConnection(); - $result = $this->database->UpdateBlobFile($tablename, $colname, $filename, $id); + if($this->isPostgres()) { + $fp = fopen($filename, "r"); + $filecontent = fread($fp, filesize($filename)); + $result = $this->database->UpdateBlob($tablename, $colname, $filecontent, $id); + fclose($fp); + } else { + $result = $this->database->UpdateBlobFile($tablename, $colname, $filename, $id); + } $this->println("updateBlobFile t=".$tablename." c=".$colname." id=".$id." f=".$filename." status=".$result); return $result; } @@ -663,9 +676,9 @@ } $this->database = ADONewConnection($this->dbType); - //$this->database->debug = true; - - $this->database->PConnect($this->dbHostName, $this->userName, $this->userPassword, $this->dbName); + $this->database->debug = true; + + $this->database->Connect($this->dbHostName, $this->userName, $this->userPassword, $this->dbName); $this->database->LogSQL($this->enableSQLlog); //$this->database->SetFetchMode(ADODB_FETCH_ASSOC); //$this->println("ADODB type=".$this->dbType." host=".$this->dbHostName." dbname=".$this->dbName." user=".$this->userName." password=".$this->userPassword); @@ -924,11 +937,11 @@ return $date; } -function getDBDateString($datecolname) +function getDBDateString($datecolname, $format='Y-m-d, H:i:s') { $this->checkConnection(); $db = &$this->database; - $datestr = $db->SQLDate("Y-m-d, H:i:s" ,$datecolname); + $datestr = $db->SQLDate($format ,$datecolname); return $datestr; } Modified: vtigercrm/branches/4.2/include/utils.php ============================================================================== --- vtigercrm/branches/4.2/include/utils.php (original) +++ vtigercrm/branches/4.2/include/utils.php Mon Apr 24 16:29:46 2006 @@ -397,6 +397,8 @@ */ function append_where_clause(&$where_clauses, $variable_name, $SQL_name = null) { + global $adb; + if($SQL_name == null) { $SQL_name = $variable_name; @@ -404,7 +406,7 @@ if(isset($_REQUEST[$variable_name]) && $_REQUEST[$variable_name] != "") { - array_push($where_clauses, "$SQL_name like '$_REQUEST[$variable_name]%'"); + array_push($where_clauses, "$SQL_name ".$adb->getLike()." '$_REQUEST[$variable_name]%'"); } } @@ -2412,13 +2414,15 @@ global $adb; $column_fld = Array(); $tabid = getTabid($module); - $sql = "select * from field where tabid=".$tabid; - $result = $adb->query($sql); - $noofrows = $adb->num_rows($result); - for($i=0; $i<$noofrows; $i++) - { - $fieldname = $adb->query_result($result,$i,"fieldname"); - $column_fld[$fieldname] = ''; + if($tabid) { + $sql = "select * from field where tabid=".$tabid; + $result = $adb->query($sql); + $noofrows = $adb->num_rows($result); + for($i=0; $i<$noofrows; $i++) + { + $fieldname = $adb->query_result($result,$i,"fieldname"); + $column_fld[$fieldname] = ''; + } } return $column_fld; } @@ -3146,8 +3150,10 @@ elseif($module == 'Quotes' && $name == 'Potential Name') { $potential_id = $adb->query_result($list_result,$i-1,"potentialid"); - $potential_name = getPotentialName($potential_id); - $value = ''.$potential_name.''; + if('' != $potential_id) { + $potential_name = getPotentialName($potential_id); + $value = ''.$potential_name.''; + } } elseif($owner_id == 0 && $name == 'Assigned To') { @@ -3748,8 +3754,12 @@ } -function getListQuery($module,$where='') -{ +function getListQuery($module,$where='',$distincton='') +{ + if($distincton) { + $distincton = "DISTINCT ON ($distincton)"; + } + if($module == "HelpDesk") { $query = "select crmentity.crmid,troubletickets.title,troubletickets.status,troubletickets.priority,crmentity.smownerid, contactdetails.contactid, troubletickets.parent_id, contactdetails.firstname, contactdetails.lastname, account.accountid, account.accountname, ticketcf.* from troubletickets inner join ticketcf on ticketcf.ticketid = troubletickets.ticketid inner join crmentity on crmentity.crmid=troubletickets.ticketid left join contactdetails on troubletickets.parent_id=contactdetails.contactid left join account on account.accountid=troubletickets.parent_id left join users on crmentity.smownerid=users.id and troubletickets.ticketid = ticketcf.ticketid where crmentity.deleted=0"; @@ -3777,7 +3787,7 @@ } if($module == "Notes") { - $query="select crmentity.crmid, notes.title, notes.contact_id, notes.filename, crmentity.modifiedtime,senotesrel.crmid as relatedto, contactdetails.firstname, contactdetails.lastname, notes.* from notes inner join crmentity on crmentity.crmid=notes.notesid left join senotesrel on senotesrel.notesid=notes.notesid left join contactdetails on contactdetails.contactid = notes.contact_id where crmentity.deleted=0"; + $query="select $distincton crmentity.crmid, notes.title, notes.contact_id, notes.filename, crmentity.modifiedtime,senotesrel.crmid as relatedto, contactdetails.firstname, contactdetails.lastname, notes.* from notes inner join crmentity on crmentity.crmid=notes.notesid left join senotesrel on senotesrel.notesid=notes.notesid left join contactdetails on contactdetails.contactid = notes.contact_id where crmentity.deleted=0"; } if($module == "Calls") { @@ -3785,7 +3795,22 @@ } if($module == "Contacts") { - $query = "select crmentity.crmid, crmentity.smownerid, contactdetails.*, contactaddress.*, contactsubdetails.*, contactscf.*, account.accountname from contactdetails, contactaddress, contactsubdetails, contactscf inner join crmentity on crmentity.crmid=contactdetails.contactid and contactdetails.contactid=contactaddress.contactaddressid and contactdetails.contactid = contactscf.contactid and contactaddress.contactaddressid=contactsubdetails.contactsubscriptionid left join account on account.accountid = contactdetails.accountid where crmentity.deleted=0"; + $query = "SELECT crmentity.crmid, crmentity.smownerid, + contactdetails.*, contactaddress.*, + contactsubdetails.*, contactscf.*, + account.accountname + from contactdetails + INNER JOIN contactaddress + ON contactdetails.contactid=contactaddress.contactaddressid + INNER JOIN contactsubdetails + ON contactaddress.contactaddressid=contactsubdetails.contactsubscriptionid + INNER JOIN contactscf + ON contactdetails.contactid = contactscf.contactid + INNER JOIN crmentity + ON crmentity.crmid=contactdetails.contactid + LEFT JOIN account + ON account.accountid = contactdetails.accountid + WHERE crmentity.deleted=0"; //$query = "select crmentity.crmid, crmentity.smownerid, contactdetails.*, contactaddress.*, contactsubdetails.*, contactscf.*, account.accountname from contactdetails, contactaddress, contactsubdetails, contactscf,crmentity,account where crmentity.crmid=contactdetails.contactid and contactdetails.contactid=contactaddress.contactaddressid and contactdetails.contactid = contactscf.contactid and contactaddress.contactaddressid=contactsubdetails.contactsubscriptionid and account.accountid = contactdetails.accountid and crmentity.deleted=0"; } if($module == "Meetings") @@ -3794,7 +3819,7 @@ } if($module == "Activities") { - $query = " select crmentity.crmid,crmentity.smownerid,crmentity.setype, activity.*, contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, account.accountid, account.accountname, recurringevents.recurringtype from activity inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid= cntactivityrel.contactid left join seactivityrel on seactivityrel.activityid = activity.activityid left outer join account on account.accountid = contactdetails.accountid left outer join recurringevents on recurringevents.activityid=activity.activityid WHERE crmentity.deleted=0 and (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task') ".$where ; + $query = " select $distincton crmentity.crmid,crmentity.smownerid,crmentity.setype, activity.*, contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, account.accountid, account.accountname, recurringevents.recurringtype from activity inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid= cntactivityrel.contactid left join seactivityrel on seactivityrel.activityid = activity.activityid left outer join account on account.accountid = contactdetails.accountid left outer join recurringevents on recurringevents.activityid=activity.activityid WHERE crmentity.deleted=0 and (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task') ".$where ; //included by Jaguar } if($module == "Emails") @@ -4209,7 +4234,11 @@ } //echo $display_date; - $insert_date=$y.'-'.$m.'-'.$d; + if(!$y && !$m && !$d) { + $insert_date = ''; + } else { + $insert_date=$y.'-'.$m.'-'.$d; + } return $insert_date; } Modified: vtigercrm/branches/4.2/install/1checkSystem.php ============================================================================== --- vtigercrm/branches/4.2/install/1checkSystem.php (original) +++ vtigercrm/branches/4.2/install/1checkSystem.php Mon Apr 24 16:29:46 2006 @@ -174,7 +174,7 @@ Database - Available":"Not Available";?> + Available":"Not Available";?> Modified: vtigercrm/branches/4.2/install/2setConfig.php ============================================================================== --- vtigercrm/branches/4.2/install/2setConfig.php (original) +++ vtigercrm/branches/4.2/install/2setConfig.php Mon Apr 24 16:29:46 2006 @@ -340,14 +340,27 @@ Database Name * " /> - - + + + + Database Type * + + + + + + + + + + + Database Type * + ERROR: none detected + + intime=".$intime); - $query = "Insert into loginhistory values ('','$usname','$usip','',".$this->db->formatDate($intime).",'Signedin')"; + $query = "Insert into loginhistory (user_name, user_ip, logout_time, login_time, status) values ('$usname','$usip',null,".$this->db->formatDate($intime).",'Signedin')"; $result = $this->db->query($query) - or die("MySQL error: ".mysql_error()); + or die("SQL error: ".$this->db->database->ErrorMsg()); return $result; } function user_logout(&$usname,&$usip,&$outtime) { - $logid_qry = "SELECT max(login_id) login_id from loginhistory where user_name='$usname' and user_ip='$usip'"; + $logid_qry = "SELECT max(login_id) as login_id from loginhistory where user_name='$usname' and user_ip='$usip'"; $result = $this->db->query($logid_qry); //if($this->db->num_rows($result) !=1 ) return; $loginid = $this->db->query_result($result,0,"login_id"); @@ -126,7 +126,7 @@ // Determine if the account name is present in the where clause. // $query = "SELECT * from loginhistory order by login_time"; global $current_user; - $query = "SELECT user_name,user_ip,".$this->db->getDBDateString("login_time")." login_time,".$this->db->getDBDateString("logout_time")." logout_time,status FROM $this->table_name "; + $query = "SELECT user_name,user_ip,".$this->db->getDBDateString("login_time")." AS login_time,".$this->db->getDBDateString("logout_time")." AS logout_time,status FROM $this->table_name "; if($where != "") { if(!is_admin($current_user)) Modified: vtigercrm/branches/4.2/modules/Users/SaveOrgSharing.php ============================================================================== --- vtigercrm/branches/4.2/modules/Users/SaveOrgSharing.php (original) +++ vtigercrm/branches/4.2/modules/Users/SaveOrgSharing.php Mon Apr 24 16:29:46 2006 @@ -23,7 +23,7 @@ if($tabid != 8 && $tab_id != 14 && $tab_id != 15 && $tab_id != 18 && $tab_id != 19 && $tab_id != 16 & $tab_id != 22) { $reqval = $tabid.'_per'; - $permission=$_REQUEST[$reqval]; + $permission = (int) $_REQUEST[$reqval]; $sql7="update def_org_share set permission=".$permission." where tabid=".$tabid." and ruleid=".$ruleid; //echo $sql7; //echo '
    '; Modified: vtigercrm/branches/4.2/modules/Users/SaveProfile.php ============================================================================== --- vtigercrm/branches/4.2/modules/Users/SaveProfile.php (original) +++ vtigercrm/branches/4.2/modules/Users/SaveProfile.php Mon Apr 24 16:29:46 2006 @@ -15,7 +15,8 @@ $profilename = $_REQUEST['profileName']; $parentProfileId= $_REQUEST['parentProfileId']; //Inserting values into Profile Table -$sql1 = "insert into profile values('','".$profilename."')"; +$id = $adb->getUniqueID('profile'); +$sql1 = "insert into profile (profileid, profilename) values($id,'".$profilename."')"; $adb->query($sql1); //Retreiving the profileid Modified: vtigercrm/branches/4.2/modules/Users/SaveRole.php ============================================================================== --- vtigercrm/branches/4.2/modules/Users/SaveRole.php (original) +++ vtigercrm/branches/4.2/modules/Users/SaveRole.php Mon Apr 24 16:29:46 2006 @@ -25,7 +25,7 @@ } else { - $sql1 = "insert into role values('','".$rolename."','')"; + $sql1 = "insert into role (name) values('".$rolename."')"; $adb->query($sql1); //Retreiving the profileid Modified: vtigercrm/branches/4.2/modules/Users/Security.php ============================================================================== --- vtigercrm/branches/4.2/modules/Users/Security.php (original) +++ vtigercrm/branches/4.2/modules/Users/Security.php Mon Apr 24 16:29:46 2006 @@ -43,28 +43,28 @@ $table_name="user2role"; $table_name="role2tab"; - $this->db->query("INSERT INTO tab VALUES (3,'Home',0,1,'Home','','',1)"); - $this->db->query("INSERT INTO tab VALUES (7,'Leads',0,4,'Leads','','',1)"); - $this->db->query("INSERT INTO tab VALUES (6,'Accounts',0,5,'Accounts','','',1)"); - $this->db->query("INSERT INTO tab VALUES (4,'Contacts',0,6,'Contacts','','',1)"); - $this->db->query("INSERT INTO tab VALUES (2,'Potentials',0,7,'Potentials','','',1)"); - $this->db->query("INSERT INTO tab VALUES (8,'Notes',0,9,'Notes','','',1)"); - $this->db->query("INSERT INTO tab VALUES (9,'Activities',0,3,'Activities','','',1)"); - $this->db->query("INSERT INTO tab VALUES (10,'Emails',0,10,'Emails','','',1)"); - $this->db->query("INSERT INTO tab VALUES (13,'HelpDesk',0,11,'HelpDesk','','',1)"); - $this->db->query("INSERT INTO tab VALUES (14,'Products',0,8,'Products','','',1)"); - $this->db->query("INSERT INTO tab VALUES (1,'Dashboard',0,12,'Dashboards','','',1)"); - $this->db->query("INSERT INTO tab VALUES (15,'Faq',2,14,'Faq','','',1)"); - $this->db->query("INSERT INTO tab VALUES (16,'Events',2,13,'Events','','',1)"); - $this->db->query("INSERT INTO tab VALUES (17,'Calendar',0,2,'Calendar','','',1)"); - $this->db->query("INSERT INTO tab VALUES (18,'Vendor',2,15,'Vendor','','',1)"); - $this->db->query("INSERT INTO tab VALUES (19,'PriceBook',2,16,'PriceBook','','',1)"); - $this->db->query("INSERT INTO tab VALUES (20,'Quotes',0,17,'Quotes','','',1)"); - $this->db->query("INSERT INTO tab VALUES (21,'Orders',0,18,'Orders','','',1)"); - $this->db->query("INSERT INTO tab VALUES (22,'SalesOrder',2,19,'SalesOrder','','',1)"); - $this->db->query("INSERT INTO tab VALUES (23,'Invoice',0,20,'Invoice','','',1)"); - $this->db->query("INSERT INTO tab VALUES (24,'Rss',0,21,'Rss','','',1)"); - $this->db->query("INSERT INTO tab VALUES (25,'Reports',0,22,'Reports','','',1)"); + $this->db->query("INSERT INTO tab VALUES (3,'Home',0,1,'Home',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (7,'Leads',0,4,'Leads',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (6,'Accounts',0,5,'Accounts',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (4,'Contacts',0,6,'Contacts',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (2,'Potentials',0,7,'Potentials',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (8,'Notes',0,9,'Notes',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (9,'Activities',0,3,'Activities',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (10,'Emails',0,10,'Emails',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (13,'HelpDesk',0,11,'HelpDesk',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (14,'Products',0,8,'Products',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (1,'Dashboard',0,12,'Dashboards',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (15,'Faq',2,14,'Faq',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (16,'Events',2,13,'Events',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (17,'Calendar',0,2,'Calendar',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (18,'Vendor',2,15,'Vendor',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (19,'PriceBook',2,16,'PriceBook',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (20,'Quotes',0,17,'Quotes',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (21,'Orders',0,18,'Orders',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (22,'SalesOrder',2,19,'SalesOrder',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (23,'Invoice',0,20,'Invoice',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (24,'Rss',0,21,'Rss',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (25,'Reports',0,22,'Reports',null,null,1)"); //Account Details -- START //Block1 $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'accountname','account',1,'2','accountname','Account Name',1,0,0,100,1,1,1,'V~M')"); Modified: vtigercrm/branches/4.2/modules/Users/User.php ============================================================================== --- vtigercrm/branches/4.2/modules/Users/User.php (original) +++ vtigercrm/branches/4.2/modules/Users/User.php Mon Apr 24 16:29:46 2006 @@ -478,7 +478,11 @@ { global $mod_strings; - $query = "SELECT user_name from users where user_name='$this->user_name' AND id<>'$this->id' AND deleted=0"; + if('' == $this->id) { + $query = "SELECT user_name from users where user_name='$this->user_name' AND deleted=0"; + } else { + $query = "SELECT user_name from users where user_name='$this->user_name' AND id<>'$this->id' AND deleted=0"; + } $result =$this->db->query($query, true, "Error selecting possible duplicate users: "); $dup_users = $this->db->fetchByAssoc($result); Modified: vtigercrm/branches/4.2/modules/Users/UserInfoUtil.php ============================================================================== --- vtigercrm/branches/4.2/modules/Users/UserInfoUtil.php (original) +++ vtigercrm/branches/4.2/modules/Users/UserInfoUtil.php Mon Apr 24 16:29:46 2006 @@ -425,6 +425,7 @@ global $adb; $sqldelete = "delete from users2group where userid = '" .$userid ."'"; $result_delete = $adb->query($sqldelete); + if($groupname == '') return; $sql = "insert into users2group(groupname,userid) values('" .$groupname ."','" .$userid ."')"; $result = $adb->query($sql); } @@ -442,6 +443,7 @@ function insertUsers2GroupMapping($groupname,$userid) { global $adb; + if($groupname == '') return; $sql = "insert into users2group(groupname,userid) values('" .$groupname ."','" .$userid ."')"; $adb->query($sql); } @@ -527,6 +529,7 @@ function insert2LeadGroupRelation($leadid,$groupname) { global $adb; + if($groupname == '') return; $sql = "insert into leadgrouprelation values (" .$leadid .",'".$groupname."')"; $adb->query($sql); @@ -536,6 +539,7 @@ global $adb; $sqldelete = "delete from leadgrouprelation where leadid=".$leadid; $adb->query($sqldelete); + if($groupname == '') return; $sql = "insert into leadgrouprelation values (".$leadid .",'" .$groupname ."')"; $adb->query($sql); @@ -545,6 +549,7 @@ global $adb; $sqldelete = "delete from ticketgrouprelation where ticketid=".$ticketid; $adb->query($sqldelete); + if($groupname == '') return; $sql = "insert into ticketgrouprelation values (".$ticketid .",'" .$groupname ."')"; $adb->query($sql); @@ -553,6 +558,7 @@ function insert2ActivityGroupRelation($activityid,$groupname) { global $adb; + if($groupname == '') return; $sql = "insert into activitygrouprelation values (" .$activityid .",'".$groupname."')"; $adb->query($sql); @@ -561,6 +567,7 @@ function insert2TicketGroupRelation($ticketid,$groupname) { global $adb; + if($groupname == '') return; $sql = "insert into ticketgrouprelation values (" .$ticketid .",'".$groupname."')"; $adb->query($sql); Modified: vtigercrm/branches/4.2/modules/Users/massdelete.php ============================================================================== --- vtigercrm/branches/4.2/modules/Users/massdelete.php (original) +++ vtigercrm/branches/4.2/modules/Users/massdelete.php Mon Apr 24 16:29:46 2006 @@ -25,7 +25,8 @@ $storearray = explode(";",$idlist); foreach($storearray as $id) { - $sql="update crmentity set crmentity.deleted=1 where crmentity.crmid='" .$id ."'"; + if('' == $id) continue; + $sql="update crmentity set deleted=1 where crmid='" .$id ."'"; $result = $adb->query($sql); } if(isset($_REQUEST['smodule']) && ($_REQUEST['smodule']!='')) Modified: vtigercrm/branches/4.2/modules/Users/saveemailtemplate.php ============================================================================== --- vtigercrm/branches/4.2/modules/Users/saveemailtemplate.php (original) +++ vtigercrm/branches/4.2/modules/Users/saveemailtemplate.php Mon Apr 24 16:29:46 2006 @@ -27,13 +27,14 @@ $vtlog->logthis("the body is ".$body,'debug'); if ($body !='') { - $body = to_html($body); + $body = $adb->database->qstr(to_html($body)); + $description = $adb->database->qstr($description); $vtlog->logthis("the body value is set ",'info'); } if(isset($templateid) && $templateid !='') { $vtlog->logthis("the templateid is set",'info'); - $sql = "update emailtemplates set foldername = '".$folderName."', templatename ='".$templateName."', subject ='".$subject."', description ='".$description."', body ='".$body."' where templateid =".$templateid; + $sql = "update emailtemplates set foldername = '".$folderName."', templatename ='".$templateName."', subject ='".$subject."', description =".$description.", body =".$body." where templateid =".$templateid; $adb->query($sql); $vtlog->logthis("about to invoke the detailviewemailtemplate file",'info'); @@ -41,7 +42,7 @@ } else { - $sql = "insert into emailtemplates values ('". $folderName. "','".$templateName."','".$subject."','".$description."','".$body."',0,".$db->getUniqueID('emailtemplates').")"; + $sql = "insert into emailtemplates values ('". $folderName. "','".$templateName."','".$subject."',".$description.",".$body.",0,".$db->getUniqueID('emailtemplates').")"; $adb->query($sql); $vtlog->logthis("added to the db the emailtemplate",'info'); Modified: vtigercrm/branches/4.2/modules/Users/updateLeadDBStatus.php ============================================================================== --- vtigercrm/branches/4.2/modules/Users/updateLeadDBStatus.php (original) +++ vtigercrm/branches/4.2/modules/Users/updateLeadDBStatus.php Mon Apr 24 16:29:46 2006 @@ -21,6 +21,7 @@ global $adb; $storearray = explode(";",$idlist); +$storearray = array_filter($storearray); $date_var = date('YmdHis'); if(isset($_REQUEST['user_id']) && $_REQUEST['user_id']!='') 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 Mon Apr 24 16:29:46 2006 @@ -40,7 +40,7 @@ $current_id = $adb->getUniqueID("crmentity"); $desc = $_REQUEST['txtDescription']; $description = addslashes($desc); - $date_var = date('YmdHis'); + $date_var = $adb->database->DBTimeStamp(date('YmdHis')); //$data = addslashes(fread(fopen($uploaddir.$binFile, "r"), $filesize)); $filenameBase64 = $filename.".base64"; @@ -50,8 +50,8 @@ fwrite($wfh,base64_encode(fread($rfh, $filesize))); deleteFile($uploaddir,$filename); - $query = "insert into 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 = "insert into crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values('"; + $query .= $current_id."','".$current_user->id."','".$current_user->id."','".$_REQUEST['return_module'].' Attachment'."','".$description."',".$date_var.",".$date_var.")"; $result = $adb->query($query); $sql = "insert into attachments values("; Modified: vtigercrm/branches/4.2/schema/DatabaseSchema.xml ============================================================================== --- vtigercrm/branches/4.2/schema/DatabaseSchema.xml (original) +++ vtigercrm/branches/4.2/schema/DatabaseSchema.xml Mon Apr 24 16:29:46 2006 @@ -915,7 +915,6 @@ - @@ -2034,18 +2033,6 @@ - - - - ADD CONSTRAINT fk_SeTicketsRel1 FOREIGN KEY (crmid) REFERENCES crmentity(crmid) ON DELETE CASCADE - - Type=InnoDB - - - -
    - - ADD CONSTRAINT fk_SeTicketsRel2 FOREIGN KEY (ticketid) REFERENCES troubletickets(ticketid) ON DELETE CASCADE @@ -4077,13 +4064,6 @@
    ADD CONSTRAINT fk_Quotes2 FOREIGN KEY (potentialid) REFERENCES potential(potentialid) ON DELETE CASCADE - Type=InnoDB - - -
    - - - ADD CONSTRAINT fk_Quotes3 FOREIGN KEY (contactid) REFERENCES contactdetails(contactid) ON DELETE CASCADEType=InnoDB Modified: vtigercrm/branches/4.2/sendreminder.php ============================================================================== --- vtigercrm/branches/4.2/sendreminder.php (original) +++ vtigercrm/branches/4.2/sendreminder.php Mon Apr 24 16:29:46 2006 @@ -33,7 +33,7 @@ $vtlog->logthis(" invoked sendreminder ",'debug'); //modified query for recurring events -Jag - $query="select crmentity.crmid,activity.*,activity_reminder.reminder_time,activity_reminder.reminder_sent,activity_reminder.recurringid,recurringevents.recurringdate from activity inner join crmentity on crmentity.crmid=activity.activityid inner join activity_reminder on activity.activityid=activity_reminder.activity_id left outer join recurringevents on activity.activityid=recurringevents.activityid where DATE_FORMAT(activity.date_start,'%Y-%m-%d, %H:%i:%s') >= '".date('Y-m-d')."' and crmentity.crmid != 0 and activity.eventstatus = 'Planned' and activity_reminder.reminder_sent = 0 group by activity.activityid,recurringevents.recurringid ;"; +$query="select crmentity.crmid,activity.*,activity_reminder.reminder_time,activity_reminder.reminder_sent,activity_reminder.recurringid,recurringevents.recurringdate from activity inner join crmentity on crmentity.crmid=activity.activityid inner join activity_reminder on activity.activityid=activity_reminder.activity_id left outer join recurringevents on activity.activityid=recurringevents.activityid where ".$adb->getDBDateString('activity.date_start', 'Y-m-d, H:i:s')." >= '".date('Y-m-d')."' and crmentity.crmid != 0 and activity.eventstatus = 'Planned' and activity_reminder.reminder_sent = 0 group by activity.activityid,recurringevents.recurringid ;"; $result = $adb->query($query); Modified: vtigercrm/branches/4.2/soap.php ============================================================================== --- vtigercrm/branches/4.2/soap.php (original) +++ vtigercrm/branches/4.2/soap.php Mon Apr 24 16:29:46 2006 @@ -153,10 +153,10 @@ } function add_contacts_matching_email_address(&$output_list, $email_address, &$seed_contact, &$msi_id) { - global $log; + global $adb, $log; $safe_email_address = addslashes($email_address); - $where = "email1 like '$safe_email_address' OR email2 like '$safe_email_address'"; + $where = "email1 ".$adb->getLike()." '$safe_email_address' OR email2 ".$adb->getLike()." '$safe_email_address'"; $response = $seed_contact->get_list("first_name, last_name", $where, 0); $contactList = $response['list']; From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 23:15:21 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 03:15:21 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23737=3A_?= =?utf-8?q?kjhkkh?= Message-ID: <076.43fc6e336c84d81eac940a54ae49d43d@vtiger.fosslabs.com> #737: kjhkkh -----------------------------+---------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: new Priority: critical | Milestone: 4.2.5 Component: thunderbirdextn | Version: 5.0.0 Keywords: | -----------------------------+---------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 23:17:36 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 03:17:36 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23738=3A_?= =?utf-8?q?custom_date_field_does_not_work?= Message-ID: <076.a77c78c65d038159208fb0ccaed11ec1@vtiger.fosslabs.com> #738: custom date field does not work ---------------------------+------------------------------------------------ Reporter: anonymous | Owner: developer Type: defect | Status: new Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: custom, field | ---------------------------+------------------------------------------------ creating new date field does not populate the database field correctly -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 23:18:21 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 03:18:21 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23739=3A_?= =?utf-8?q?cannot_add_custom_number_field?= Message-ID: <076.dd0ac47d6c95fa39e3c1ceac2f415609@vtiger.fosslabs.com> #739: cannot add custom number field -----------------------+---------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- adding custom number field shows a blank page -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 23:19:24 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 03:19:24 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23740=3A_?= =?utf-8?q?date_field_does_not_show_correctly_in_list_view?= Message-ID: <076.ad87948531c823c55f0f8a3ed7250a14@vtiger.fosslabs.com> #740: date field does not show correctly in list view -----------------------+---------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- dates appear as 00/00/00 in the list view -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Apr 24 23:32:31 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 03:32:31 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23737=3A_?= =?utf-8?q?kjhkkh?= In-Reply-To: <076.43fc6e336c84d81eac940a54ae49d43d@vtiger.fosslabs.com> References: <076.43fc6e336c84d81eac940a54ae49d43d@vtiger.fosslabs.com> Message-ID: <085.8653d1236e8b71fc71b840ebacf84028@vtiger.fosslabs.com> #737: kjhkkh ------------------------------+--------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: 4.2.5 Component: thunderbirdextn | Version: 5.0.0 Resolution: invalid | Keywords: ------------------------------+--------------------------------------------- Changes (by anonymous): * resolution: => invalid * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 00:32:05 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 04:32:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5307 - in /vtigercrm/branches/4.2: include/ modules/Invoice/ modules/Invoice/pdf_templates/ modules/Invoice/pdf_templates/lastpage/ modules/Orders/ modules/Orders/pdf_templates/ modules/Orders/pdf_templates/lastpage/ modules/Quotes/ modules/Quotes/pdf_templates/ modules/Quotes/pdf_templates/lastpage/ Message-ID: <20060425043206.E29C06D8FD4@vtiger.fosslabs.com> Author: mmbrich Date: Mon Apr 24 22:31:58 2006 New Revision: 5307 Log: initial check-in of new PDF code. Fixed errors resulting in the entityid's not being quoted in utils.php Added: vtigercrm/branches/4.2/include/VtigerPDF.php vtigercrm/branches/4.2/modules/Invoice/pdf_data.php vtigercrm/branches/4.2/modules/Invoice/pdf_templates/ vtigercrm/branches/4.2/modules/Invoice/pdf_templates/body.php vtigercrm/branches/4.2/modules/Invoice/pdf_templates/footer.php vtigercrm/branches/4.2/modules/Invoice/pdf_templates/header.php vtigercrm/branches/4.2/modules/Invoice/pdf_templates/lastpage/ vtigercrm/branches/4.2/modules/Invoice/pdf_templates/lastpage/body.php vtigercrm/branches/4.2/modules/Invoice/pdf_templates/lastpage/footer.php vtigercrm/branches/4.2/modules/Invoice/pdf_templates/license.txt vtigercrm/branches/4.2/modules/Orders/pdf_data.php vtigercrm/branches/4.2/modules/Orders/pdf_dataso.php vtigercrm/branches/4.2/modules/Orders/pdf_templates/ vtigercrm/branches/4.2/modules/Orders/pdf_templates/body.php vtigercrm/branches/4.2/modules/Orders/pdf_templates/lastpage/ vtigercrm/branches/4.2/modules/Orders/pdf_templates/lastpage/body.php vtigercrm/branches/4.2/modules/Orders/pdf_templates/lastpage/po_footer.php vtigercrm/branches/4.2/modules/Orders/pdf_templates/lastpage/so_footer.php vtigercrm/branches/4.2/modules/Orders/pdf_templates/license.txt vtigercrm/branches/4.2/modules/Orders/pdf_templates/po_footer.php vtigercrm/branches/4.2/modules/Orders/pdf_templates/po_header.php vtigercrm/branches/4.2/modules/Orders/pdf_templates/so_footer.php vtigercrm/branches/4.2/modules/Orders/pdf_templates/so_header.php vtigercrm/branches/4.2/modules/Quotes/pdf_data.php vtigercrm/branches/4.2/modules/Quotes/pdf_templates/ vtigercrm/branches/4.2/modules/Quotes/pdf_templates/body.php vtigercrm/branches/4.2/modules/Quotes/pdf_templates/footer.php vtigercrm/branches/4.2/modules/Quotes/pdf_templates/header.php vtigercrm/branches/4.2/modules/Quotes/pdf_templates/lastpage/ vtigercrm/branches/4.2/modules/Quotes/pdf_templates/lastpage/body.php vtigercrm/branches/4.2/modules/Quotes/pdf_templates/lastpage/footer.php vtigercrm/branches/4.2/modules/Quotes/pdf_templates/license.txt Modified: vtigercrm/branches/4.2/include/utils.php vtigercrm/branches/4.2/modules/Invoice/CreatePDF.php vtigercrm/branches/4.2/modules/Orders/CreatePDF.php vtigercrm/branches/4.2/modules/Orders/CreateSOPDF.php vtigercrm/branches/4.2/modules/Quotes/CreatePDF.php Modified: vtigercrm/branches/4.2/include/utils.php ============================================================================== --- vtigercrm/branches/4.2/include/utils.php (original) +++ vtigercrm/branches/4.2/include/utils.php Mon Apr 24 22:31:58 2006 @@ -2342,7 +2342,7 @@ global $vtlog; $vtlog->logthis("in getQuoteName ".$quote_id,'info'); global $adb; - $sql = "select * from quotes where quoteid=".$quote_id; + $sql = "select * from quotes where quoteid='".$quote_id."'"; $result = $adb->query($sql); $quote_name = $adb->query_result($result,0,"subject"); return $quote_name; @@ -2375,7 +2375,7 @@ global $vtlog; $vtlog->logthis("in getSoName ".$so_id,'info'); global $adb; - $sql = "select * from salesorder where salesorderid=".$so_id; + $sql = "select * from salesorder where salesorderid='".$so_id."'"; $result = $adb->query($sql); $so_name = $adb->query_result($result,0,"subject"); return $so_name; Modified: vtigercrm/branches/4.2/modules/Invoice/CreatePDF.php ============================================================================== --- vtigercrm/branches/4.2/modules/Invoice/CreatePDF.php (original) +++ vtigercrm/branches/4.2/modules/Invoice/CreatePDF.php Mon Apr 24 22:31:58 2006 @@ -1,433 +1,86 @@ + * + * Changes/Additions: + * + * (c) 2005 OpenCRM + * - Improved currency support + * - Fixed IE download bug + */ + +require_once('include/database/PearDatabase.php'); + +global $adb; +global $app_strings; +global $max_desc_size; +global $max_prod_desc_size; +global $products_per_page; $id = $_REQUEST['record']; -global $adb; -//retreiving the invoice info -$focus = new Invoice(); -$focus->retrieve_entity_info($_REQUEST['record'],"Invoice"); -$account_name = getAccountName($focus->column_fields[account_id]); -$iData[] = $account_name; -$iData[] = $id; -$iData[] = date('Y-m-d'); -//newly added for Sales Order No. -if($focus->column_fields["salesorder_id"] != '') + +$sql="select currency_symbol from currency_info"; +$result = $adb->query($sql); +$currency_symbol = $adb->query_result($result,0,'currency_symbol'); + +/* ************ BEGIN USER CONFIG **************** */ +$endpage="0"; +$products_per_page="9"; +$max_prod_desc_size="75"; +$max_desc_size="175"; +/* *********** END USER CONFIG ****************** */ + +require_once('include/VtigerPDF.php'); +require_once('pdf_data.php'); +$page_num='1'; +$pdf = new PDF( 'P', 'mm', 'A4' ); +$pdf->Open(); + +$num_pages=ceil(($num_products/$products_per_page)); +$current_product=0; + +for($l=0;$l<$num_pages;$l++) { - $so_name = getSoName($focus->column_fields["salesorder_id"]); -} -else -{ - $so_name = ' '; -} + $line=array(); + if($num_pages == $page_num) + $lastpage=1; + + while($current_product != $page_num*$products_per_page) + { + $line[]=$product_line[$current_product]; + $current_product++; + } -$iData[] = $so_name; + $pdf->AddPage(); + include("pdf_templates/header.php"); + include("pdf_templates/body.php"); + include("pdf_templates/footer.php"); -//setting the Customer Data -$iCustData[] = $account_name; + $page_num++; -if($focus->column_fields["purchaseorder"] != '') -{ - $po_name = $focus->column_fields["purchaseorder"]; -} -else -{ - $po_name = ' '; -} -$iCustData[] = $po_name; - -if($focus->column_fields["duedate"] != '') -{ - $due_date = $focus->column_fields["duedate"]; -} -else -{ - $due_date = ' '; -} -$iCustData[] = $due_date; - -//setting the billing address -$bdata[] = $account_name; -if($focus->column_fields["bill_street"] != '') -{ - $bill_street = $focus->column_fields["bill_street"]; - $bdata[] = $bill_street; - -} - -if($focus->column_fields["bill_city"] != '') -{ - $bill_city = $focus->column_fields["bill_city"]; - $bdata[] = $bill_city; -} - - -if($focus->column_fields["bill_state"] != '') -{ - $bill_state = $focus->column_fields["bill_state"]; - $bdata[] = $bill_state; -} - - -if($focus->column_fields["bill_code"] != '') -{ - $bill_code = $focus->column_fields["bill_code"]; - $bdata[] = $bill_code; -} - - -if($focus->column_fields["bill_country"] != '') -{ - $bill_country = $focus->column_fields["bill_country"]; - $bdata[] = $bill_country; -} - -for($i =0; $i <5; $i++) -{ - if(sizeof($bdata) < 6) + if (($endpage) && ($lastpage)) { - $bdata[] = ' '; + $pdf->AddPage(); + include("pdf_templates/header.php"); + include("pdf_templates/lastpage/body.php"); + include("pdf_templates/lastpage/footer.php"); } } -//setting the shipping address -$sdata[] = $account_name; -if($focus->column_fields["ship_street"] != '') -{ - $ship_street = $focus->column_fields["ship_street"]; - $sdata[] = $ship_street; -} - -if($focus->column_fields["ship_city"] != '') -{ - $ship_city = $focus->column_fields["ship_city"]; - $sdata[] = $ship_city; -} - - -if($focus->column_fields["ship_state"] != '') -{ - $ship_state = $focus->column_fields["ship_state"]; - $sdata[] = $ship_state; -} - - -if($focus->column_fields["ship_code"] != '') -{ - $ship_code = $focus->column_fields["ship_code"]; - $sdata[] = $ship_code; -} - - -if($focus->column_fields["ship_country"] != '') -{ - $ship_country = $focus->column_fields["ship_country"]; - $sdata[] = $ship_country; -} - -for($i =0; $i <5; $i++) -{ - if(sizeof($sdata) < 6) - { - $sdata[] = ' '; - } -} - -//Getting the terms_conditions - -if($focus->column_fields["terms_conditions"] != '') -{ - $conditions = $focus->column_fields["terms_conditions"]; -} -else -{ - $conditions = ' '; -} - -//Getting the Company Address -$add_query = "select * from organizationdetails"; -$result = $adb->query($add_query); -$num_rows = $adb->num_rows($result); -$org_field_array = Array('organizationame','address','city','state','country','code','phone','fax','website'); - -$companyaddress = Array(); -$logo_name = ''; - -if($num_rows == 1) -{ - $org_name = $adb->query_result($result,0,"organizationame"); - $org_address = $adb->query_result($result,0,"address"); - $org_city = $adb->query_result($result,0,"city"); - $org_state = $adb->query_result($result,0,"state"); - $org_country = $adb->query_result($result,0,"country"); - $org_code = $adb->query_result($result,0,"code"); - $org_phone = $adb->query_result($result,0,"phone"); - $org_fax = $adb->query_result($result,0,"fax"); - $org_website = $adb->query_result($result,0,"website"); - - if($org_name != '') - { - $companyaddress[] = $org_name; - } - if($org_address != '' || $org_city != '' || $org_state != '') - { - $companyaddress[] = $org_address.' '.$org_city.' '.$org_state; - } - if($org_country != '' || $org_code!= '') - { - $companyaddress[] = $org_country.' '.$org_code; - } - if($org_phone != '' || $org_fax != '') - { - $companyaddress[] = $org_phone.' '.$org_fax; - } - if($org_website != '') - { - $companyaddress[] = $org_website; - } - - for($i =0; $i < 4; $i++) - { - if(sizeof($companyaddress) < 5) - { - $companyaddress[] = ' '; - } - } - - $logo_name = $adb->query_result($result,0,"logoname"); -} -//Getting the logo - - -//getting the Product Data -$query="select products.productname,products.unit_price,invoiceproductrel.* from invoiceproductrel inner join products on products.productid=invoiceproductrel.productid where invoiceid=".$id; - -$result = $adb->query($query); -$num_rows=$adb->num_rows($result); -for($i=1;$i<=$num_rows;$i++) -{ - $temp_data = Array(); - $productname=$adb->query_result($result,$i-1,'productname'); - $unitprice=$adb->query_result($result,$i-1,'unit_price'); - $productid=$adb->query_result($result,$i-1,'productid'); - $qty=$adb->query_result($result,$i-1,'quantity'); - $listprice=$adb->query_result($result,$i-1,'listprice'); - $total = $qty*$listprice; - - $temp_data['productname'] = $productname; - $temp_data['qty'] = $qty; - $temp_data['unitprice'] = $unitprice; - $temp_data['listprice'] = $listprice; - $temp_data['total'] = $total; - $iDataDtls[] = $temp_data; - -} -//getting the Total Array -$price_total[] = $focus->column_fields["hdnSubTotal"]; -$price_total[] = $focus->column_fields["txtTax"]; -$price_total[] = $focus->column_fields["txtAdjustment"]; -$price_total[] = $focus->column_fields["hdnGrandTotal"]; - -class PDF extends FPDF -{ - -// Invoice Title -function setInvoiceTitle($title,$logo_name,$caddress) -{ - if($title != "") - { - if(isset($logo_name) && $logo_name != '') - { - $this->Image('test/logo/'.$logo_name,10,10,0,0); - } - else - { - //$this->Image('themes/Aqua/images/blank.jpg',10,10,0,0); - } - for($i=0;$iLn(); - $this->Cell(40); - $this->SetFont('','',10); - $this->Cell(0,5,$caddress[$i],0,0,'L',0); - } - $this->Ln(); - $this->SetFillColor(224,235,255); - $this->SetTextColor(0); - $this->SetFont('','B',18); - $this->Cell(0,10,$title,0,0,'C',0); - - } -} -//Invoice Address -function setAddress($billing="",$shipping="") -{ - - $this->Ln(); - $this->SetFillColor(224,235,255); - $this->SetTextColor(0); - $this->SetFont('','B',10); - $this->Cell(130,10,"Bill To:",0,0,'L',0); - $this->Cell(0,10,"Ship To:",0,0,'L',0); - for($i=0;$iCell(17); - $this->SetFont('','',10); - $this->Cell(130,5,$billing[$i],0,0,'L',0); - $this->Cell(0,5,$shipping[$i],0,0,'L',0); - $this->Ln(); - } - -} -//Invoice from -function setInvoiceDetails($iHeader,$iData) -{ - $this->Ln(); - $this->SetFillColor(162,200,243); - $this->SetTextColor(0); - $this->SetDrawColor(61,121,206); - //$this->SetLineWidth(.3); - $this->SetFont('Arial','B',10); - //Header - $this->Cell(15); - foreach($iHeader as $value) - { - $this->Cell(40,7,$value,1,0,'L',1); - } - $this->Ln(); - $this->SetFillColor(233,241,253); - $this->SetTextColor(0); - $this->SetFont(''); - //Data - $this->Cell(15); - $fill=0; - foreach($iData as $value) - { - $this->Cell(40,6,$value,1,0,'L',0); - } - $this->Ln(); -} - -//customer Details -function setCustomerDetails($iCHeader,$iCData) -{ - $this->Ln(); - //$this->Cell(0); - $this->SetFillColor(162,200,243); - $this->SetTextColor(0); - $this->SetDrawColor(61,121,206); - //$this->SetLineWidth(.3); - $this->SetFont('Arial','B',10); - //Header - //$this->Cell(15); - foreach($iCHeader as $value) - { - $this->Cell(63,7,$value,1,0,'L',1); - } - $this->Ln(); - $this->SetFillColor(233,241,253); - $this->SetTextColor(0); - $this->SetFont(''); - //Data - //$this->Cell(15); - $fill=0; - foreach($iCData as $value) - { - $this->Cell(63,6,$value,1,0,'L',0); - } - $this->Ln(); -} - -//Product Details -function setProductDetails($ivHeader,$ivData) -{ - $this->Ln(); - $this->Ln(); - $this->SetFillColor(162,200,243); - $this->SetTextColor(0); - $this->SetDrawColor(61,121,206); - $this->SetLineWidth(.3); - $this->SetFont('Arial','B',10); - //Header - foreach($ivHeader as $value) - { - $this->Cell(38,7,$value,0,0,'L',0); - } - $this->Ln(); - $this->SetDrawColor(0,0,0); - $this->SetLineWidth(.5); - $this->line(10,140,200,140); - $this->SetFillColor(233,241,253); - $this->SetTextColor(0); - $this->SetFont(''); - //Data - $fill=0; - if($ivData) foreach($ivData as $key=>$value) - { - $this->Cell(38,6,$value['productname'],0,0,'L',0); - $this->Cell(38,6,$value['qty'],0,0,'L',0); - $this->Cell(38,6,$value['unitprice'],0,0,'L',0); - $this->Cell(38,6,$value['listprice'],0,0,'L',0); - $this->Cell(38,6,$value['total'],0,0,'R',0); - $this->Ln(); - } - $this->Ln(); -} - -function setTotal($price_total="",$conditions="") -{ - $this->Ln(); - $this->SetDrawColor(0,0,0); - $this->SetLineWidth(.3); -// $this->line(10,200,200,200); - $this->SetFillColor(224,235,255); - $this->SetTextColor(0); - $this->SetFont('','B',10); - $this->Cell(140,6,"Sub Total: ",0,0,'R',0); - $this->Cell(0,6,$price_total[0],1,0,'R',0); - $this->Ln(4); - $this->Ln(4); - $this->Cell(140,6,"Tax: ",0,0,'R',0); - $this->Cell(0,6,$price_total[1],1,0,'R',0); - $this->Ln(4); - $this->Ln(4); - $this->Cell(140,6,"Adjustment: ",0,0,'R',0); - $this->Cell(0,6,$price_total[2],1,0,'R',0); - $this->Ln(4); - $this->Ln(4); - $this->Cell(140,6,"Grand total: ",0,0,'R',0); - $this->Cell(0,6,$price_total[3],1,0,'R',0); - $this->Ln(); - $this->Ln(); - $this->Cell(0,8,"Terms & Conditions: ",0,0,'L',0); - $this->Ln(); - $this->Cell(0,8,$conditions,0,0,'L',0); -} -} -$iHead = array("Company","Invoice No.","Date","Sales Order No."); -$iCustHeadDtls = array("Customer Name","Purchase Order","Due Date"); -$iHeadDtls = array("Product Name","Quantity","List Price","Unit Price","Total"); - -$pdf = new PDF('P','mm','A4'); -$pdf->SetFont('Arial','',10); -$pdf->AddPage(); -$pdf->setInvoiceTitle("Invoice",$logo_name,$companyaddress); -$pdf->Ln(); -$pdf->setInvoiceDetails($iHead,$iData); -$pdf->setAddress($bdata,$sdata); -$pdf->setCustomerDetails($iCustHeadDtls,$iCustData); -$pdf->setProductDetails($iHeadDtls,$iDataDtls); -$pdf->setTotal($price_total,$conditions); -$pdf->Output('Invoice.pdf','D'); +$pdf->Output('Invoice.pdf','D'); //added file name to make it work in IE, also forces the download giving the user the option to save exit; ?> Modified: vtigercrm/branches/4.2/modules/Orders/CreatePDF.php ============================================================================== --- vtigercrm/branches/4.2/modules/Orders/CreatePDF.php (original) +++ vtigercrm/branches/4.2/modules/Orders/CreatePDF.php Mon Apr 24 22:31:58 2006 @@ -1,434 +1,87 @@ + * + * Changes/Additions: + * + * (c) 2005 OpenCRM + * - Improved currency support + * - Fixed IE download bug + */ + +require_once('include/database/PearDatabase.php'); + +global $adb; +global $app_strings; +global $max_desc_size; +global $products_per_page; +global $max_prod_desc_size; $id = $_REQUEST['record']; -global $adb; -//retreiving the invoice info -$focus = new Order(); -$focus->retrieve_entity_info($_REQUEST['record'],"Orders"); -$vendor_name = getVendorName($focus->column_fields[vendor_id]); -$iData[] = $vendor_name; -$iData[] = $id; -$iData[] = date('Y-m-d'); -//newly added for Sales Order No. -if($focus->column_fields["requisition_no"] != '') +$sql="select currency_symbol from currency_info"; +$result = $adb->query($sql); +$currency_symbol = $adb->query_result($result,0,'currency_symbol'); + +/* ************ BEGIN USER CONFIG *************** */ +$endpage="0"; +$products_per_page="9"; +$max_desc_size="175"; +$max_prod_desc_size="75"; +/* ************ END USER CONFIG ***************** */ + +require_once('include/VtigerPDF.php'); +require_once('pdf_data.php'); + +$page_num='1'; +$pdf = new PDF( 'P', 'mm', 'A4' ); +$pdf->Open(); + +$num_pages=ceil(($num_products/$products_per_page)); +$current_product=0; + +for($l=0;$l<$num_pages;$l++) { - $reqno = $focus->column_fields["requisition_no"]; -} -else -{ - $reqno = ' '; -} + $line=array(); + if($num_pages == $page_num) + $lastpage=1; + + while($current_product != $page_num*$products_per_page) + { + $line[]=$product_line[$current_product]; + $current_product++; + } -$iData[] = $reqno; + $pdf->AddPage(); + include("pdf_templates/po_header.php"); + include("pdf_templates/body.php"); + include("pdf_templates/po_footer.php"); -//setting the Customer Data -$iCustData[] = $vendor_name; + $page_num++; -if($focus->column_fields["tracking_no"] != '') -{ - $trno = $focus->column_fields["tracking_no"]; -} -else -{ - $trno = ' '; -} -$iCustData[] = $trno; - -if($focus->column_fields["duedate"] != '') -{ - $due_date = $focus->column_fields["duedate"]; -} -else -{ - $due_date = ' '; -} -$iCustData[] = $due_date; - -//setting the billing address -$bdata[] = $vendor_name; -if($focus->column_fields["bill_street"] != '') -{ - $bill_street = $focus->column_fields["bill_street"]; - $bdata[] = $bill_street; - -} - -if($focus->column_fields["bill_city"] != '') -{ - $bill_city = $focus->column_fields["bill_city"]; - $bdata[] = $bill_city; + if (($endpage) && ($lastpage)) + { + $pdf->AddPage(); + include("pdf_templates/po_header.php"); + include("pdf_templates/lastpage/body.php"); + include("pdf_templates/lastpage/po_footer.php"); + } } -if($focus->column_fields["bill_state"] != '') -{ - $bill_state = $focus->column_fields["bill_state"]; - $bdata[] = $bill_state; -} - - -if($focus->column_fields["bill_code"] != '') -{ - $bill_code = $focus->column_fields["bill_code"]; - $bdata[] = $bill_code; -} - - -if($focus->column_fields["bill_country"] != '') -{ - $bill_country = $focus->column_fields["bill_country"]; - $bdata[] = $bill_country; -} - -for($i =0; $i <5; $i++) -{ - if(sizeof($bdata) < 6) - { - $bdata[] = ' '; - } -} - -//setting the shipping address -$sdata[] = $vendor_name; -if($focus->column_fields["ship_street"] != '') -{ - $ship_street = $focus->column_fields["ship_street"]; - $sdata[] = $ship_street; -} - -if($focus->column_fields["ship_city"] != '') -{ - $ship_city = $focus->column_fields["ship_city"]; - $sdata[] = $ship_city; -} - - -if($focus->column_fields["ship_state"] != '') -{ - $ship_state = $focus->column_fields["ship_state"]; - $sdata[] = $ship_state; -} - - -if($focus->column_fields["ship_code"] != '') -{ - $ship_code = $focus->column_fields["ship_code"]; - $sdata[] = $ship_code; -} - - -if($focus->column_fields["ship_country"] != '') -{ - $ship_country = $focus->column_fields["ship_country"]; - $sdata[] = $ship_country; -} - -for($i =0; $i <5; $i++) -{ - if(sizeof($sdata) < 6) - { - $sdata[] = ' '; - } -} - -//Getting the terms_conditions - -if($focus->column_fields["terms_conditions"] != '') -{ - $conditions = $focus->column_fields["terms_conditions"]; -} -else -{ - $conditions = ' '; -} - -//Getting the Company Address -$add_query = "select * from organizationdetails"; -$result = $adb->query($add_query); -$num_rows = $adb->num_rows($result); -$org_field_array = Array('organizationame','address','city','state','country','code','phone','fax','website'); - -$companyaddress = Array(); -$logo_name = ''; - -if($num_rows == 1) -{ - $org_name = $adb->query_result($result,0,"organizationame"); - $org_address = $adb->query_result($result,0,"address"); - $org_city = $adb->query_result($result,0,"city"); - $org_state = $adb->query_result($result,0,"state"); - $org_country = $adb->query_result($result,0,"country"); - $org_code = $adb->query_result($result,0,"code"); - $org_phone = $adb->query_result($result,0,"phone"); - $org_fax = $adb->query_result($result,0,"fax"); - $org_website = $adb->query_result($result,0,"website"); - - if($org_name != '') - { - $companyaddress[] = $org_name; - } - if($org_address != '' || $org_city != '' || $org_state != '') - { - $companyaddress[] = $org_address.' '.$org_city.' '.$org_state; - } - if($org_country != '' || $org_code!= '') - { - $companyaddress[] = $org_country.' '.$org_code; - } - if($org_phone != '' || $org_fax != '') - { - $companyaddress[] = $org_phone.' '.$org_fax; - } - if($org_website != '') - { - $companyaddress[] = $org_website; - } - - for($i =0; $i < 4; $i++) - { - if(sizeof($companyaddress) < 5) - { - $companyaddress[] = ' '; - } - } - - $logo_name = $adb->query_result($result,0,"logoname"); -} -//Getting the logo - - - -//getting the Product Data -$query="select products.productname,products.unit_price,poproductrel.* from poproductrel inner join products on products.productid=poproductrel.productid where purchaseorderid=".$id; - -$result = $adb->query($query); -$num_rows=$adb->num_rows($result); -for($i=1;$i<=$num_rows;$i++) -{ - $temp_data = Array(); - $productname=$adb->query_result($result,$i-1,'productname'); - $unitprice=$adb->query_result($result,$i-1,'unit_price'); - $productid=$adb->query_result($result,$i-1,'productid'); - $qty=$adb->query_result($result,$i-1,'quantity'); - $listprice=$adb->query_result($result,$i-1,'listprice'); - $total = $qty*$listprice; - - $temp_data['productname'] = $productname; - $temp_data['qty'] = $qty; - $temp_data['unitprice'] = $unitprice; - $temp_data['listprice'] = $listprice; - $temp_data['total'] = $total; - $iDataDtls[] = $temp_data; - -} -//getting the Total Array -$price_total[] = $focus->column_fields["hdnSubTotal"]; -$price_total[] = $focus->column_fields["txtTax"]; -$price_total[] = $focus->column_fields["txtAdjustment"]; -$price_total[] = $focus->column_fields["hdnGrandTotal"]; - -class PDF extends FPDF -{ - -// Invoice Title -function setInvoiceTitle($title,$logo_name,$caddress) -{ - if($title != "") - { - if(isset($logo_name) && $logo_name != '') - { - $this->Image('test/logo/'.$logo_name,10,10,0,0); - } - else - { - //$this->Image('themes/Aqua/images/blank.jpg',10,10,0,0); - } - for($i=0;$iLn(); - $this->Cell(40); - $this->SetFont('','',10); - $this->Cell(0,5,$caddress[$i],0,0,'L',0); - } - $this->Ln(); - $this->SetFillColor(224,235,255); - $this->SetTextColor(0); - $this->SetFont('','B',18); - $this->Cell(0,10,$title,0,0,'C',0); - - } -} -//Invoice Address -function setAddress($billing="",$shipping="") -{ - - $this->Ln(); - $this->SetFillColor(224,235,255); - $this->SetTextColor(0); - $this->SetFont('','B',10); - $this->Cell(130,10,"Bill To:",0,0,'L',0); - $this->Cell(0,10,"Ship To:",0,0,'L',0); - for($i=0;$iCell(17); - $this->SetFont('','',10); - $this->Cell(130,5,$billing[$i],0,0,'L',0); - $this->Cell(0,5,$shipping[$i],0,0,'L',0); - $this->Ln(); - } - -} -//Invoice from -function setInvoiceDetails($iHeader,$iData) -{ - $this->Ln(); - $this->SetFillColor(162,200,243); - $this->SetTextColor(0); - $this->SetDrawColor(61,121,206); - //$this->SetLineWidth(.3); - $this->SetFont('Arial','B',10); - //Header - $this->Cell(15); - foreach($iHeader as $value) - { - $this->Cell(40,7,$value,1,0,'L',1); - } - $this->Ln(); - $this->SetFillColor(233,241,253); - $this->SetTextColor(0); - $this->SetFont(''); - //Data - $this->Cell(15); - $fill=0; - foreach($iData as $value) - { - $this->Cell(40,6,$value,1,0,'L',0); - } - $this->Ln(); -} - -//customer Details -function setCustomerDetails($iCHeader,$iCData) -{ - $this->Ln(); - //$this->Cell(0); - $this->SetFillColor(162,200,243); - $this->SetTextColor(0); - $this->SetDrawColor(61,121,206); - //$this->SetLineWidth(.3); - $this->SetFont('Arial','B',10); - //Header - //$this->Cell(15); - foreach($iCHeader as $value) - { - $this->Cell(63,7,$value,1,0,'L',1); - } - $this->Ln(); - $this->SetFillColor(233,241,253); - $this->SetTextColor(0); - $this->SetFont(''); - //Data - //$this->Cell(15); - $fill=0; - foreach($iCData as $value) - { - $this->Cell(63,6,$value,1,0,'L',0); - } - $this->Ln(); -} - -//Product Details -function setProductDetails($ivHeader,$ivData) -{ - $this->Ln(); - $this->Ln(); - $this->SetFillColor(162,200,243); - $this->SetTextColor(0); - $this->SetDrawColor(61,121,206); - $this->SetLineWidth(.3); - $this->SetFont('Arial','B',10); - //Header - foreach($ivHeader as $value) - { - $this->Cell(38,7,$value,0,0,'L',0); - } - $this->Ln(); - $this->SetDrawColor(0,0,0); - $this->SetLineWidth(.5); - $this->line(10,140,200,140); - $this->SetFillColor(233,241,253); - $this->SetTextColor(0); - $this->SetFont(''); - //Data - $fill=0; - if($ivData) foreach($ivData as $key=>$value) - { - $this->Cell(38,6,$value['productname'],0,0,'L',0); - $this->Cell(38,6,$value['qty'],0,0,'L',0); - $this->Cell(38,6,$value['unitprice'],0,0,'L',0); - $this->Cell(38,6,$value['listprice'],0,0,'L',0); - $this->Cell(38,6,$value['total'],0,0,'R',0); - $this->Ln(); - } - $this->Ln(); -} - -function setTotal($price_total="",$conditions="") -{ - $this->Ln(); - $this->SetDrawColor(0,0,0); - $this->SetLineWidth(.3); -// $this->line(10,200,200,200); - $this->SetFillColor(224,235,255); - $this->SetTextColor(0); - $this->SetFont('','B',10); - $this->Cell(140,6,"Sub Total: ",0,0,'R',0); - $this->Cell(0,6,$price_total[0],1,0,'R',0); - $this->Ln(4); - $this->Ln(4); - $this->Cell(140,6,"Tax: ",0,0,'R',0); - $this->Cell(0,6,$price_total[1],1,0,'R',0); - $this->Ln(4); - $this->Ln(4); - $this->Cell(140,6,"Adjustment: ",0,0,'R',0); - $this->Cell(0,6,$price_total[2],1,0,'R',0); - $this->Ln(4); - $this->Ln(4); - $this->Cell(140,6,"Grand total: ",0,0,'R',0); - $this->Cell(0,6,$price_total[3],1,0,'R',0); - $this->Ln(); - $this->Ln(); - $this->Cell(0,8,"Terms & Conditions: ",0,0,'L',0); - $this->Ln(); - $this->Cell(0,8,$conditions,0,0,'L',0); -} -} -$iHead = array("Company","Purchase Order No.","Date","Requisition No."); -$iCustHeadDtls = array("Customer Name","Tracking No","Due Date"); -$iHeadDtls = array("Product Name","Quantity","List Price","Unit Price","Total"); - -$pdf = new PDF('P','mm','A4'); -$pdf->SetFont('Arial','',10); -$pdf->AddPage(); -$pdf->setInvoiceTitle("Purchase Order",$logo_name,$companyaddress); -$pdf->Ln(); -$pdf->setInvoiceDetails($iHead,$iData); -$pdf->setAddress($bdata,$sdata); -$pdf->setCustomerDetails($iCustHeadDtls,$iCustData); -$pdf->setProductDetails($iHeadDtls,$iDataDtls); -$pdf->setTotal($price_total,$conditions); -$pdf->Output('POOrder.pdf','D'); +$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; ?> Modified: vtigercrm/branches/4.2/modules/Orders/CreateSOPDF.php ============================================================================== --- vtigercrm/branches/4.2/modules/Orders/CreateSOPDF.php (original) +++ vtigercrm/branches/4.2/modules/Orders/CreateSOPDF.php Mon Apr 24 22:31:58 2006 @@ -1,435 +1,88 @@ + * + * Changes/Additions: + * + * (c) 2005 OpenCRM + * - Improved currency support + * - Fixed IE download bug + */ + +require_once('include/database/PearDatabase.php'); + +global $adb; +global $app_strings; +global $products_per_page; +global $max_desc_size; +global $max_prod_desc_size; $id = $_REQUEST['record']; -global $adb; -//retreiving the invoice info -$focus = new SalesOrder(); -$focus->retrieve_entity_info($_REQUEST['record'],"SalesOrder"); -$account_name = getAccountName($focus->column_fields[account_id]); -$iData[] = $account_name; -$iData[] = $id; -$iData[] = date('Y-m-d'); -//newly added for Sales Order No. -if($focus->column_fields["quote_id"] != '') + +$sql="select currency_symbol from currency_info"; +$result = $adb->query($sql); +$currency_symbol = $adb->query_result($result,0,'currency_symbol'); + +/* ************* BEGIN USER CONFIG *************** */ +$endpage="0"; +$products_per_page="9"; +$max_desc_size="75"; +$max_prod_desc_size="175"; +/* ************* END USER CONFIG ***************** */ + +require_once('include/VtigerPDF.php'); +require_once('pdf_dataso.php'); + +$page_num='1'; +$pdf = new PDF( 'P', 'mm', 'A4' ); +$pdf->Open(); + +$num_pages=ceil(($num_products/$products_per_page)); +$current_product=0; + +for($l=0;$l<$num_pages;$l++) { - $qt_name = getQuoteName($focus->column_fields["quote_id"]); -} -else -{ - $qt_name = ' '; -} + $line=array(); + if($num_pages == $page_num) + $lastpage=1; + + while($current_product != $page_num*$products_per_page) + { + $line[]=$product_line[$current_product]; + $current_product++; + } -$iData[] = $qt_name; + $pdf->AddPage(); + include("pdf_templates/so_header.php"); + include("pdf_templates/body.php"); + include("pdf_templates/so_footer.php"); -//$iData[] = $qtname; + $page_num++; -//setting the Customer Data -$iCustData[] = $account_name; - -if($focus->column_fields["purchaseorder"] != '') -{ - $po_name = $focus->column_fields["purchaseorder"]; -} -else -{ - $po_name = ' '; -} - -$iCustData[] = $po_name; - -if($focus->column_fields["duedate"] != '') -{ - $due_date = $focus->column_fields["duedate"]; -} -else -{ - $due_date = ' '; -} -$iCustData[] = $due_date; - -//setting the billing address -$bdata[] = $account_name; -if($focus->column_fields["bill_street"] != '') -{ - $bill_street = $focus->column_fields["bill_street"]; - $bdata[] = $bill_street; - -} - -if($focus->column_fields["bill_city"] != '') -{ - $bill_city = $focus->column_fields["bill_city"]; - $bdata[] = $bill_city; + if (($endpage) && ($lastpage)) + { + $pdf->AddPage(); + include("pdf_templates/so_header.php"); + include("pdf_templates/lastpage/body.php"); + include("pdf_templates/lastpage/so_footer.php"); + } } -if($focus->column_fields["bill_state"] != '') -{ - $bill_state = $focus->column_fields["bill_state"]; - $bdata[] = $bill_state; -} - - -if($focus->column_fields["bill_code"] != '') -{ - $bill_code = $focus->column_fields["bill_code"]; - $bdata[] = $bill_code; -} - - -if($focus->column_fields["bill_country"] != '') -{ - $bill_country = $focus->column_fields["bill_country"]; - $bdata[] = $bill_country; -} - -for($i =0; $i <5; $i++) -{ - if(sizeof($bdata) < 6) - { - $bdata[] = ' '; - } -} - -//setting the shipping address -$sdata[] = $account_name; -if($focus->column_fields["ship_street"] != '') -{ - $ship_street = $focus->column_fields["ship_street"]; - $sdata[] = $ship_street; -} - -if($focus->column_fields["ship_city"] != '') -{ - $ship_city = $focus->column_fields["ship_city"]; - $sdata[] = $ship_city; -} - - -if($focus->column_fields["ship_state"] != '') -{ - $ship_state = $focus->column_fields["ship_state"]; - $sdata[] = $ship_state; -} - - -if($focus->column_fields["ship_code"] != '') -{ - $ship_code = $focus->column_fields["ship_code"]; - $sdata[] = $ship_code; -} - - -if($focus->column_fields["ship_country"] != '') -{ - $ship_country = $focus->column_fields["ship_country"]; - $sdata[] = $ship_country; -} - -for($i =0; $i <5; $i++) -{ - if(sizeof($sdata) < 6) - { - $sdata[] = ' '; - } -} - -//Getting the terms_conditions - -if($focus->column_fields["terms_conditions"] != '') -{ - $conditions = $focus->column_fields["terms_conditions"]; -} -else -{ - $conditions = ' '; -} - -//Getting the Company Address -$add_query = "select * from organizationdetails"; -$result = $adb->query($add_query); -$num_rows = $adb->num_rows($result); -$org_field_array = Array('organizationame','address','city','state','country','code','phone','fax','website'); - -$companyaddress = Array(); -$logo_name = ''; - -if($num_rows == 1) -{ - $org_name = $adb->query_result($result,0,"organizationame"); - $org_address = $adb->query_result($result,0,"address"); - $org_city = $adb->query_result($result,0,"city"); - $org_state = $adb->query_result($result,0,"state"); - $org_country = $adb->query_result($result,0,"country"); - $org_code = $adb->query_result($result,0,"code"); - $org_phone = $adb->query_result($result,0,"phone"); - $org_fax = $adb->query_result($result,0,"fax"); - $org_website = $adb->query_result($result,0,"website"); - - if($org_name != '') - { - $companyaddress[] = $org_name; - } - if($org_address != '' || $org_city != '' || $org_state != '') - { - $companyaddress[] = $org_address.' '.$org_city.' '.$org_state; - } - if($org_country != '' || $org_code!= '') - { - $companyaddress[] = $org_country.' '.$org_code; - } - if($org_phone != '' || $org_fax != '') - { - $companyaddress[] = $org_phone.' '.$org_fax; - } - if($org_website != '') - { - $companyaddress[] = $org_website; - } - - for($i =0; $i < 4; $i++) - { - if(sizeof($companyaddress) < 5) - { - $companyaddress[] = ' '; - } - } - - $logo_name = $adb->query_result($result,0,"logoname"); -} -//Getting the logo - -//getting the Product Data -$query="select products.productname,products.unit_price,soproductrel.* from soproductrel inner join products on products.productid=soproductrel.productid where salesorderid=".$id; - -$result = $adb->query($query); -$num_rows=$adb->num_rows($result); -for($i=1;$i<=$num_rows;$i++) -{ - $temp_data = Array(); - $productname=$adb->query_result($result,$i-1,'productname'); - $unitprice=$adb->query_result($result,$i-1,'unit_price'); - $productid=$adb->query_result($result,$i-1,'productid'); - $qty=$adb->query_result($result,$i-1,'quantity'); - $listprice=$adb->query_result($result,$i-1,'listprice'); - $total = $qty*$listprice; - - $temp_data['productname'] = $productname; - $temp_data['qty'] = $qty; - $temp_data['unitprice'] = $unitprice; - $temp_data['listprice'] = $listprice; - $temp_data['total'] = $total; - $iDataDtls[] = $temp_data; - -} -//getting the Total Array -$price_total[] = $focus->column_fields["hdnSubTotal"]; -$price_total[] = $focus->column_fields["txtTax"]; -$price_total[] = $focus->column_fields["txtAdjustment"]; -$price_total[] = $focus->column_fields["hdnGrandTotal"]; - -class PDF extends FPDF -{ - -// Invoice Title -function setInvoiceTitle($title,$logo_name,$caddress) -{ - if($title != "") - { - if(isset($logo_name) && $logo_name != '') - { - $this->Image('test/logo/'.$logo_name,10,10,0,0); - } - else - { - //$this->Image('themes/Aqua/images/blank.jpg',10,10,0,0); - } - for($i=0;$iLn(); - $this->Cell(40); - $this->SetFont('','',10); - $this->Cell(0,5,$caddress[$i],0,0,'L',0); - } - $this->Ln(); - $this->SetFillColor(224,235,255); - $this->SetTextColor(0); - $this->SetFont('','B',18); - $this->Cell(0,10,$title,0,0,'C',0); - - } -} -//Invoice Address -function setAddress($billing="",$shipping="") -{ - - $this->Ln(); - $this->SetFillColor(224,235,255); - $this->SetTextColor(0); - $this->SetFont('','B',10); - $this->Cell(130,10,"Bill To:",0,0,'L',0); - $this->Cell(0,10,"Ship To:",0,0,'L',0); - for($i=0;$iCell(17); - $this->SetFont('','',10); - $this->Cell(130,5,$billing[$i],0,0,'L',0); - $this->Cell(0,5,$shipping[$i],0,0,'L',0); - $this->Ln(); - } - -} -//Invoice from -function setInvoiceDetails($iHeader,$iData) -{ - $this->Ln(); - $this->SetFillColor(162,200,243); - $this->SetTextColor(0); - $this->SetDrawColor(61,121,206); - //$this->SetLineWidth(.3); - $this->SetFont('Arial','B',10); - //Header - $this->Cell(15); - foreach($iHeader as $value) - { - $this->Cell(40,7,$value,1,0,'L',1); - } - $this->Ln(); - $this->SetFillColor(233,241,253); - $this->SetTextColor(0); - $this->SetFont(''); - //Data - $this->Cell(15); - $fill=0; - foreach($iData as $value) - { - $this->Cell(40,6,$value,1,0,'L',0); - } - $this->Ln(); -} - -//customer Details -function setCustomerDetails($iCHeader,$iCData) -{ - $this->Ln(); - //$this->Cell(0); - $this->SetFillColor(162,200,243); - $this->SetTextColor(0); - $this->SetDrawColor(61,121,206); - //$this->SetLineWidth(.3); - $this->SetFont('Arial','B',10); - //Header - //$this->Cell(15); - foreach($iCHeader as $value) - { - $this->Cell(63,7,$value,1,0,'L',1); - } - $this->Ln(); - $this->SetFillColor(233,241,253); - $this->SetTextColor(0); - $this->SetFont(''); - //Data - //$this->Cell(15); - $fill=0; - foreach($iCData as $value) - { - $this->Cell(63,6,$value,1,0,'L',0); - } - $this->Ln(); -} - -//Product Details -function setProductDetails($ivHeader,$ivData) -{ - $this->Ln(); - $this->Ln(); - $this->SetFillColor(162,200,243); - $this->SetTextColor(0); - $this->SetDrawColor(61,121,206); - $this->SetLineWidth(.3); - $this->SetFont('Arial','B',10); - //Header - foreach($ivHeader as $value) - { - $this->Cell(38,7,$value,0,0,'L',0); - } - $this->Ln(); - $this->SetDrawColor(0,0,0); - $this->SetLineWidth(.5); - $this->line(10,140,200,140); - $this->SetFillColor(233,241,253); - $this->SetTextColor(0); - $this->SetFont(''); - //Data - $fill=0; - if($ivData) foreach($ivData as $key=>$value) - { - $this->Cell(38,6,$value['productname'],0,0,'L',0); - $this->Cell(38,6,$value['qty'],0,0,'L',0); - $this->Cell(38,6,$value['unitprice'],0,0,'L',0); - $this->Cell(38,6,$value['listprice'],0,0,'L',0); - $this->Cell(38,6,$value['total'],0,0,'R',0); - $this->Ln(); - } - $this->Ln(); -} - -function setTotal($price_total="",$conditions="") -{ - $this->Ln(); - $this->SetDrawColor(0,0,0); - $this->SetLineWidth(.3); -// $this->line(10,200,200,200); - $this->SetFillColor(224,235,255); - $this->SetTextColor(0); - $this->SetFont('','B',10); - $this->Cell(140,6,"Sub Total: ",0,0,'R',0); - $this->Cell(0,6,$price_total[0],1,0,'R',0); - $this->Ln(4); - $this->Ln(4); - $this->Cell(140,6,"Tax: ",0,0,'R',0); - $this->Cell(0,6,$price_total[1],1,0,'R',0); - $this->Ln(4); - $this->Ln(4); - $this->Cell(140,6,"Adjustment: ",0,0,'R',0); - $this->Cell(0,6,$price_total[2],1,0,'R',0); - $this->Ln(4); - $this->Ln(4); - $this->Cell(140,6,"Grand total: ",0,0,'R',0); - $this->Cell(0,6,$price_total[3],1,0,'R',0); - $this->Ln(); - $this->Ln(); - $this->Cell(0,8,"Terms & Conditions: ",0,0,'L',0); - $this->Ln(); - $this->Cell(0,8,$conditions,0,0,'L',0); -} -} -$iHead = array("Company","Sales Order No.","Date","Quote Name."); -$iCustHeadDtls = array("Customer Name","Purchase Order","Due Date"); -$iHeadDtls = array("Product Name","Quantity","List Price","Unit Price","Total"); - -$pdf = new PDF('P','mm','A4'); -$pdf->SetFont('Arial','',10); -$pdf->AddPage(); -$pdf->setInvoiceTitle("Sales Order",$logo_name,$companyaddress); -$pdf->Ln(); -$pdf->setInvoiceDetails($iHead,$iData); -$pdf->setAddress($bdata,$sdata); -$pdf->setCustomerDetails($iCustHeadDtls,$iCustData); -$pdf->setProductDetails($iHeadDtls,$iDataDtls); -$pdf->setTotal($price_total,$conditions); -$pdf->Output('SOOrder.pdf','D'); +$pdf->Output('SalesOrder.pdf','D'); //added file name to make it work in IE, also forces the download giving the user the option to save exit; ?> Modified: vtigercrm/branches/4.2/modules/Quotes/CreatePDF.php ============================================================================== --- vtigercrm/branches/4.2/modules/Quotes/CreatePDF.php (original) +++ vtigercrm/branches/4.2/modules/Quotes/CreatePDF.php Mon Apr 24 22:31:58 2006 @@ -1,411 +1,88 @@ + * + * + * Changes/Additions: + * + * (c) 2005 OpenCRM + * - Improved currency support + * - Fixed IE download bug + */ + +require_once('include/database/PearDatabase.php'); + +global $adb; +global $app_strings; +global $max_desc_size; +global $max_prod_desc_size; +global $products_per_page; $id = $_REQUEST['record']; -global $adb; -//retreiving the invoice info -$focus = new Quote(); -$focus->retrieve_entity_info($_REQUEST['record'],"Quotes"); -$account_name = getAccountName($focus->column_fields[account_id]); -$iData[] = $account_name; -$iData[] = $id; -$iData[] = date('Y-m-d'); +$sql="select currency_symbol from currency_info"; +$result = $adb->query($sql); +$currency_symbol = $adb->query_result($result,0,'currency_symbol'); -//setting the Customer Data -$iCustData[] = $account_name; +/* ************* BEGIN USER CONFIG **************** */ +$endpage="0"; +$products_per_page="9"; +$max_prod_desc_size="75"; +$max_desc_size="175"; +/* ************ END USER CONFIG ******************* */ -if($focus->column_fields["validtill"] != '') +require_once('include/VtigerPDF.php'); +require_once('pdf_data.php'); + +$page_num='1'; +$pdf = new PDF( 'P', 'mm', 'A4' ); +$pdf->Open(); + +$num_pages=ceil(($num_products/$products_per_page)); +$current_product=0; + +for($l=0;$l<$num_pages;$l++) { - $due_date = $focus->column_fields["validtill"]; -} -else -{ - $due_date = ' '; -} -$iCustData[] = $due_date; + $line=array(); + if($num_pages == $page_num) + $lastpage=1; + + while($current_product != $page_num*$products_per_page) + { + $line[]=$product_line[$current_product]; + $current_product++; + } -//setting the billing address -$bdata[] = $account_name; -if($focus->column_fields["bill_street"] != '') -{ - $bill_street = $focus->column_fields["bill_street"]; - $bdata[] = $bill_street; - -} + $pdf->AddPage(); + include("pdf_templates/header.php"); + include("pdf_templates/body.php"); + include("pdf_templates/footer.php"); -if($focus->column_fields["bill_city"] != '') -{ - $bill_city = $focus->column_fields["bill_city"]; - $bdata[] = $bill_city; + $page_num++; + + if (($endpage) && ($lastpage)) + { + $pdf->AddPage(); + include("pdf_templates/header.php"); + include("pdf_templates/lastpage/body.php"); + include("pdf_templates/lastpage/footer.php"); + } } -if($focus->column_fields["bill_state"] != '') -{ - $bill_state = $focus->column_fields["bill_state"]; - $bdata[] = $bill_state; -} - - -if($focus->column_fields["bill_code"] != '') -{ - $bill_code = $focus->column_fields["bill_code"]; - $bdata[] = $bill_code; -} - - -if($focus->column_fields["bill_country"] != '') -{ - $bill_country = $focus->column_fields["bill_country"]; - $bdata[] = $bill_country; -} - -for($i =0; $i <5; $i++) -{ - if(sizeof($bdata) < 6) - { - $bdata[] = ' '; - } -} - -//setting the shipping address -$sdata[] = $account_name; -if($focus->column_fields["ship_street"] != '') -{ - $ship_street = $focus->column_fields["ship_street"]; - $sdata[] = $ship_street; -} - -if($focus->column_fields["ship_city"] != '') -{ - $ship_city = $focus->column_fields["ship_city"]; - $sdata[] = $ship_city; -} - - -if($focus->column_fields["ship_state"] != '') -{ - $ship_state = $focus->column_fields["ship_state"]; - $sdata[] = $ship_state; -} - - -if($focus->column_fields["ship_code"] != '') -{ - $ship_code = $focus->column_fields["ship_code"]; - $sdata[] = $ship_code; -} - - -if($focus->column_fields["ship_country"] != '') -{ - $ship_country = $focus->column_fields["ship_country"]; - $sdata[] = $ship_country; -} - -for($i =0; $i <5; $i++) -{ - if(sizeof($sdata) < 6) - { - $sdata[] = ' '; - } -} - -//Getting the terms_conditions - -if($focus->column_fields["terms_conditions"] != '') -{ - $conditions = $focus->column_fields["terms_conditions"]; -} -else -{ - $conditions = ' '; -} - -//Getting the Company Address -$add_query = "select * from organizationdetails"; -$result = $adb->query($add_query); -$num_rows = $adb->num_rows($result); -$org_field_array = Array('organizationame','address','city','state','country','code','phone','fax','website'); - -$companyaddress = Array(); -$logo_name = ''; - -if($num_rows == 1) -{ - $org_name = $adb->query_result($result,0,"organizationame"); - $org_address = $adb->query_result($result,0,"address"); - $org_city = $adb->query_result($result,0,"city"); - $org_state = $adb->query_result($result,0,"state"); - $org_country = $adb->query_result($result,0,"country"); - $org_code = $adb->query_result($result,0,"code"); - $org_phone = $adb->query_result($result,0,"phone"); - $org_fax = $adb->query_result($result,0,"fax"); - $org_website = $adb->query_result($result,0,"website"); - - if($org_name != '') - { - $companyaddress[] = $org_name; - } - if($org_address != '' || $org_city != '' || $org_state != '') - { - $companyaddress[] = $org_address.' '.$org_city.' '.$org_state; - } - if($org_country != '' || $org_code!= '') - { - $companyaddress[] = $org_country.' '.$org_code; - } - if($org_phone != '' || $org_fax != '') - { - $companyaddress[] = $org_phone.' '.$org_fax; - } - if($org_website != '') - { - $companyaddress[] = $org_website; - } - - for($i =0; $i < 4; $i++) - { - if(sizeof($companyaddress) < 5) - { - $companyaddress[] = ' '; - } - } - - $logo_name = $adb->query_result($result,0,"logoname"); -} -//Getting the logo - -//getting the Product Data -$query="select products.productname,products.unit_price,quotesproductrel.* from quotesproductrel inner join products on products.productid=quotesproductrel.productid where quoteid=".$id; - -$result = $adb->query($query); -$num_rows=$adb->num_rows($result); -for($i=1;$i<=$num_rows;$i++) -{ - $temp_data = Array(); - $productname=$adb->query_result($result,$i-1,'productname'); - $unitprice=$adb->query_result($result,$i-1,'unit_price'); - $productid=$adb->query_result($result,$i-1,'productid'); - $qty=$adb->query_result($result,$i-1,'quantity'); - $listprice=$adb->query_result($result,$i-1,'listprice'); - $total = $qty*$listprice; - - $temp_data['productname'] = $productname; - $temp_data['qty'] = $qty; - $temp_data['unitprice'] = $unitprice; - $temp_data['listprice'] = $listprice; - $temp_data['total'] = $total; - $iDataDtls[] = $temp_data; - -} -//getting the Total Array -$price_total[] = $focus->column_fields["hdnSubTotal"]; -$price_total[] = $focus->column_fields["txtTax"]; -$price_total[] = $focus->column_fields["txtAdjustment"]; -$price_total[] = $focus->column_fields["hdnGrandTotal"]; - -class PDF extends FPDF -{ - -// Invoice Title -function setInvoiceTitle($title,$logo_name,$caddress) -{ - if($title != "") - { - if(isset($logo_name) && $logo_name != '') - { - $this->Image('test/logo/'.$logo_name,10,10,0,0); - } - else - { - //$this->Image('themes/Aqua/images/blank.jpg',10,10,0,0); - } - for($i=0;$iLn(); - $this->Cell(40); - $this->SetFont('','',10); - $this->Cell(0,5,$caddress[$i],0,0,'L',0); - } - $this->Ln(); - $this->SetFillColor(224,235,255); - $this->SetTextColor(0); - $this->SetFont('','B',18); - $this->Cell(0,10,$title,0,0,'C',0); - - } -} -//Invoice Address -function setAddress($billing="",$shipping="") -{ - - $this->Ln(); - $this->SetFillColor(224,235,255); - $this->SetTextColor(0); - $this->SetFont('','B',10); - $this->Cell(130,10,"Bill To:",0,0,'L',0); - $this->Cell(0,10,"Ship To:",0,0,'L',0); - for($i=0;$iCell(17); - $this->SetFont('','',10); - $this->Cell(130,5,$billing[$i],0,0,'L',0); - $this->Cell(0,5,$shipping[$i],0,0,'L',0); - $this->Ln(); - } - -} -//Invoice from -function setInvoiceDetails($iHeader,$iData) -{ - $this->Ln(); - $this->SetFillColor(162,200,243); - $this->SetTextColor(0); - $this->SetDrawColor(61,121,206); - //$this->SetLineWidth(.3); - $this->SetFont('Arial','B',10); - //Header - $this->Cell(15); - foreach($iHeader as $value) - { - $this->Cell(40,7,$value,1,0,'L',1); - } - $this->Ln(); - $this->SetFillColor(233,241,253); - $this->SetTextColor(0); - $this->SetFont(''); - //Data - $this->Cell(15); - $fill=0; - foreach($iData as $value) - { - $this->Cell(40,6,$value,1,0,'L',0); - } - $this->Ln(); -} - -//customer Details -function setCustomerDetails($iCHeader,$iCData) -{ - $this->Ln(); - //$this->Cell(0); - $this->SetFillColor(162,200,243); - $this->SetTextColor(0); - $this->SetDrawColor(61,121,206); - //$this->SetLineWidth(.3); - $this->SetFont('Arial','B',10); - //Header - //$this->Cell(15); - foreach($iCHeader as $value) - { - $this->Cell(63,7,$value,1,0,'L',1); - } - $this->Ln(); - $this->SetFillColor(233,241,253); - $this->SetTextColor(0); - $this->SetFont(''); - //Data - //$this->Cell(15); - $fill=0; - foreach($iCData as $value) - { - $this->Cell(63,6,$value,1,0,'L',0); - } - $this->Ln(); -} - -//Product Details -function setProductDetails($ivHeader,$ivData) -{ - $this->Ln(); - $this->Ln(); - $this->SetFillColor(162,200,243); - $this->SetTextColor(0); - $this->SetDrawColor(61,121,206); - $this->SetLineWidth(.3); - $this->SetFont('Arial','B',10); - //Header - foreach($ivHeader as $value) - { - $this->Cell(38,7,$value,0,0,'L',0); - } - $this->Ln(); - $this->SetDrawColor(0,0,0); - $this->SetLineWidth(.5); - $this->line(10,140,200,140); - $this->SetFillColor(233,241,253); - $this->SetTextColor(0); - $this->SetFont(''); - //Data - $fill=0; - if($ivData) foreach($ivData as $key=>$value) - { - $this->Cell(38,6,$value['productname'],0,0,'L',0); - $this->Cell(38,6,$value['qty'],0,0,'L',0); - $this->Cell(38,6,$value['unitprice'],0,0,'L',0); - $this->Cell(38,6,$value['listprice'],0,0,'L',0); - $this->Cell(38,6,$value['total'],0,0,'R',0); - $this->Ln(); - } - $this->Ln(); -} - -function setTotal($price_total="",$conditions="") -{ - $this->Ln(); - $this->SetDrawColor(0,0,0); - $this->SetLineWidth(.3); -// $this->line(10,200,200,200); - $this->SetFillColor(224,235,255); - $this->SetTextColor(0); - $this->SetFont('','B',10); - $this->Cell(140,6,"Sub Total: ",0,0,'R',0); - $this->Cell(0,6,$price_total[0],1,0,'R',0); - $this->Ln(4); - $this->Ln(4); - $this->Cell(140,6,"Tax: ",0,0,'R',0); - $this->Cell(0,6,$price_total[1],1,0,'R',0); - $this->Ln(4); - $this->Ln(4); - $this->Cell(140,6,"Adjustment: ",0,0,'R',0); - $this->Cell(0,6,$price_total[2],1,0,'R',0); - $this->Ln(4); - $this->Ln(4); - $this->Cell(140,6,"Grand total: ",0,0,'R',0); - $this->Cell(0,6,$price_total[3],1,0,'R',0); - $this->Ln(); - $this->Ln(); - $this->Cell(0,8,"Terms & Conditions: ",0,0,'L',0); - $this->Ln(); - $this->Cell(0,8,$conditions,0,0,'L',0); -} -} -$iHead = array("Company","Quote No.","Date"); -$iCustHeadDtls = array("Customer Name","Valid Till"); -$iHeadDtls = array("Product Name","Quantity","List Price","Unit Price","Total"); - -$pdf = new PDF('P','mm','A4'); -$pdf->SetFont('Arial','',10); -$pdf->AddPage(); -$pdf->setInvoiceTitle("Quotes",$logo_name,$companyaddress); -$pdf->Ln(); -$pdf->setInvoiceDetails($iHead,$iData); -$pdf->setAddress($bdata,$sdata); -$pdf->setCustomerDetails($iCustHeadDtls,$iCustData); -$pdf->setProductDetails($iHeadDtls,$iDataDtls); -$pdf->setTotal($price_total,$conditions); -$pdf->Output('Quotes.pdf','D'); +$pdf->Output('Quote.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 Tue Apr 25 00:38:05 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 04:38:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5308 - /vtigercrm/branches/4.2/include/VtigerPDF.php Message-ID: <20060425043805.B73276D8FC6@vtiger.fosslabs.com> Author: mmbrich Date: Mon Apr 24 22:38:04 2006 New Revision: 5308 Log: stretchx typo in VtigerPDF.php Modified: vtigercrm/branches/4.2/include/VtigerPDF.php Modified: vtigercrm/branches/4.2/include/VtigerPDF.php ============================================================================== --- vtigercrm/branches/4.2/include/VtigerPDF.php (original) +++ vtigercrm/branches/4.2/include/VtigerPDF.php Mon Apr 24 22:38:04 2006 @@ -444,7 +444,7 @@ $x1 = $location[0]; $y1 = $location[1]; $stretchx = $location[2]; - $stretchx = $location[3]; + $stretchy = $location[3]; $this->Image('test/logo/'.$logo_name,$x1,$y1,$stretchx,$stretchy); } From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 01:34:35 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 05:34:35 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5309 - /vtigercrm/trunk/modules/Users/SaveGroup.php Message-ID: <20060425053435.F30D86D9011@vtiger.fosslabs.com> Author: don Date: Mon Apr 24 23:34:30 2006 New Revision: 5309 Log: parentab added for Save Group Modified: vtigercrm/trunk/modules/Users/SaveGroup.php Modified: vtigercrm/trunk/modules/Users/SaveGroup.php ============================================================================== --- vtigercrm/trunk/modules/Users/SaveGroup.php (original) +++ vtigercrm/trunk/modules/Users/SaveGroup.php Mon Apr 24 23:34:30 2006 @@ -87,7 +87,7 @@ $groupMemberArray=constructGroupMemberArray($member_array); updateGroup($groupId,$groupName,$groupMemberArray,$description); - $loc = "Location: index.php?action=".$returnaction."&module=Users&groupId=".$groupId; + $loc = "Location: index.php?action=".$returnaction."&module=Users&parenttab=Settings&groupId=".$groupId; } elseif(isset($_REQUEST['mode']) && $_REQUEST['mode'] == 'create') { From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 01:36:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 05:36:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5310 - /vtigercrm/trunk/modules/Users/DeleteGroup.php Message-ID: <20060425053648.BA7C66D9011@vtiger.fosslabs.com> Author: don Date: Mon Apr 24 23:36:44 2006 New Revision: 5310 Log: parenttab added for delete Group Modified: vtigercrm/trunk/modules/Users/DeleteGroup.php Modified: vtigercrm/trunk/modules/Users/DeleteGroup.php ============================================================================== --- vtigercrm/trunk/modules/Users/DeleteGroup.php (original) +++ vtigercrm/trunk/modules/Users/DeleteGroup.php Mon Apr 24 23:36:44 2006 @@ -16,5 +16,5 @@ //Updating the user2 role table deleteGroup($del_id); -header("Location: index.php?action=listgroups&module=Users"); +header("Location: index.php?action=listgroups&module=Users&parenttab=Settings"); ?> From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 01:39:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 05:39:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5311 - /vtigercrm/trunk/Smarty/templates/UserProfile.tpl Message-ID: <20060425053950.801EC40E7CF@vtiger.fosslabs.com> Author: don Date: Mon Apr 24 23:39:46 2006 New Revision: 5311 Log: parenttab issue in Profiles has been fixed Modified: vtigercrm/trunk/Smarty/templates/UserProfile.tpl Modified: vtigercrm/trunk/Smarty/templates/UserProfile.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserProfile.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserProfile.tpl Mon Apr 24 23:39:46 2006 @@ -43,9 +43,9 @@       {/if} - Edit + Edit   - + {/section} From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 02:13:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 06:13:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5312 - /vtigercrm/trunk/include/utils/ListViewUtils.php Message-ID: <20060425061343.951B36D9001@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 25 00:13:38 2006 New Revision: 5312 Log: where condition added for contact list query 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 Apr 25 00:13:38 2006 @@ -1409,7 +1409,7 @@ if($module == "Contacts") { //Query modified to sort by assigned to - $query = "select contactdetails.firstname,contactdetails.lastname,contactdetails.title,contactdetails.accountid,contactdetails.email,contactdetails.phone,crmentity.smownerid ,crmentity.crmid from contactdetails inner join crmentity on crmentity.crmid=contactdetails.contactid inner join contactaddress on contactdetails.contactid=contactaddress.contactaddressid inner join contactsubdetails on contactaddress.contactaddressid=contactsubdetails.contactsubscriptionid inner join contactscf on contactdetails.contactid = contactscf.contactid left join account on account.accountid = contactdetails.accountid left join contactgrouprelation on contactscf.contactid=contactgrouprelation.contactid left join groups on groups.groupname=contactgrouprelation.groupname inner join users on users.id=crmentity.smownerid where crmentity.deleted=0 "; + $query = "select contactdetails.firstname,contactdetails.lastname,contactdetails.title,contactdetails.accountid,contactdetails.email,contactdetails.phone,crmentity.smownerid ,crmentity.crmid from contactdetails inner join crmentity on crmentity.crmid=contactdetails.contactid inner join contactaddress on contactdetails.contactid=contactaddress.contactaddressid inner join contactsubdetails on contactaddress.contactaddressid=contactsubdetails.contactsubscriptionid inner join contactscf on contactdetails.contactid = contactscf.contactid left join account on account.accountid = contactdetails.accountid left join contactgrouprelation on contactscf.contactid=contactgrouprelation.contactid left join groups on groups.groupname=contactgrouprelation.groupname inner join users on users.id=crmentity.smownerid where crmentity.deleted=0 ".$where; if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3) { From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 02:25:42 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 06:25:42 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2386=3A_H?= =?utf-8?q?elpDesk_Assigned_To_field_pulls_only_user_data_in_Custom_Views?= In-Reply-To: <076.f9eb297f705149b7cfa25e948aa290f1@vtiger.fosslabs.com> References: <076.f9eb297f705149b7cfa25e948aa290f1@vtiger.fosslabs.com> Message-ID: <085.84ae93bb1a34d30ed07ed453abec2dc7@vtiger.fosslabs.com> #86: HelpDesk Assigned To field pulls only user data in Custom Views ------------------------------------+--------------------------------------- Reporter: james at jenxnetwork.com | Owner: allanbush Type: defect | Status: assigned Priority: critical | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.3 Resolution: | Keywords: helpdesk, custom views ------------------------------------+--------------------------------------- Changes (by allanbush): * milestone: 4.2.4 => 4.2.5 Comment: Moving to 4.2.5, and merging patch. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 02:29:47 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 06:29:47 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2386=3A_H?= =?utf-8?q?elpDesk_Assigned_To_field_pulls_only_user_data_in_Custom_Views?= In-Reply-To: <076.f9eb297f705149b7cfa25e948aa290f1@vtiger.fosslabs.com> References: <076.f9eb297f705149b7cfa25e948aa290f1@vtiger.fosslabs.com> Message-ID: <085.db13d629872a34391c2c29ccc80cef20@vtiger.fosslabs.com> #86: HelpDesk Assigned To field pulls only user data in Custom Views ------------------------------------+--------------------------------------- Reporter: james at jenxnetwork.com | Owner: allanbush Type: defect | Status: closed Priority: critical | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.3 Resolution: fixed | Keywords: helpdesk, custom views ------------------------------------+--------------------------------------- Changes (by allanbush): * resolution: => fixed * status: assigned => closed Comment: (In [5313]) Merged patch attached to ticket #86, to allow custom filters to match the groupname as well as the user name for Assigned To fields. Closes #86. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 02:29:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 06:29:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5313 - in /vtigercrm/branches/4.2: include/utils.php modules/CustomView/CustomView.php Message-ID: <20060425062949.9C0EB6D9026@vtiger.fosslabs.com> Author: allanbush Date: Tue Apr 25 00:29:29 2006 New Revision: 5313 Log: Merged patch attached to ticket #86, to allow custom filters to match the groupname as well as the user name for Assigned To fields. Closes #86. Modified: vtigercrm/branches/4.2/include/utils.php vtigercrm/branches/4.2/modules/CustomView/CustomView.php Modified: vtigercrm/branches/4.2/include/utils.php ============================================================================== --- vtigercrm/branches/4.2/include/utils.php (original) +++ vtigercrm/branches/4.2/include/utils.php Tue Apr 25 00:29:29 2006 @@ -3762,7 +3762,7 @@ if($module == "HelpDesk") { - $query = "select crmentity.crmid,troubletickets.title,troubletickets.status,troubletickets.priority,crmentity.smownerid, contactdetails.contactid, troubletickets.parent_id, contactdetails.firstname, contactdetails.lastname, account.accountid, account.accountname, ticketcf.* from troubletickets inner join ticketcf on ticketcf.ticketid = troubletickets.ticketid inner join crmentity on crmentity.crmid=troubletickets.ticketid left join contactdetails on troubletickets.parent_id=contactdetails.contactid left join account on account.accountid=troubletickets.parent_id left join users on crmentity.smownerid=users.id and troubletickets.ticketid = ticketcf.ticketid where crmentity.deleted=0"; + $query = "select crmentity.crmid,troubletickets.title,troubletickets.status,troubletickets.priority,crmentity.smownerid, contactdetails.contactid, troubletickets.parent_id, contactdetails.firstname, contactdetails.lastname, account.accountid, account.accountname, ticketcf.* from troubletickets inner join ticketcf on ticketcf.ticketid = troubletickets.ticketid inner join crmentity on crmentity.crmid=troubletickets.ticketid left join contactdetails on troubletickets.parent_id=contactdetails.contactid left join account on account.accountid=troubletickets.parent_id left join users on crmentity.smownerid=users.id and troubletickets.ticketid = ticketcf.ticketid LEFT OUTER JOIN ticketgrouprelation ON ticketgrouprelation.ticketid = troubletickets.ticketid where crmentity.deleted=0"; //$query = "select crmentity.crmid,troubletickets.title,troubletickets.status,troubletickets.priority,crmentity.smownerid, contactdetails.firstname, contactdetails.lastname, ticketcf.* from troubletickets inner join crmentity on crmentity.crmid=troubletickets.ticketid inner join ticketcf on ticketcf.ticketid = troubletickets.ticketid left join contactdetails on troubletickets.contact_id=contactdetails.contactid left join users on crmentity.smownerid=users.id where crmentity.deleted=0"; } if($module == "Accounts") @@ -3779,7 +3779,7 @@ if($module == "Leads") { //$query = "select crmentity.crmid, leaddetails.firstname, leaddetails.lastname, leaddetails.company, leadaddress.phone, leadsubdetails.website, leaddetails.email, crmentity.smownerid, leadscf.* from leaddetails, leadaddress, leadsubdetails, leadscf inner join crmentity on crmentity.crmid=leaddetails.leadid and leaddetails.leadid=leadaddressid and leaddetails.leadid = leadscf.leadid and leadaddress.leadaddressid=leadsubdetails.leadsubscriptionid where crmentity.deleted=0 and leaddetails.converted=0"; - $query = "select crmentity.crmid, leaddetails.firstname, leaddetails.lastname, leaddetails.company, leadaddress.phone, leadsubdetails.website, leaddetails.email, crmentity.smownerid, leadscf.* from leaddetails inner join crmentity on crmentity.crmid=leaddetails.leadid inner join leadsubdetails on leadsubdetails.leadsubscriptionid=leaddetails.leadid inner join leadaddress on leadaddress.leadaddressid=leadsubdetails.leadsubscriptionid inner join leadscf on leaddetails.leadid = leadscf.leadid where crmentity.deleted=0 and leaddetails.converted=0"; + $query = "select crmentity.crmid, leaddetails.firstname, leaddetails.lastname, leaddetails.company, leadaddress.phone, leadsubdetails.website, leaddetails.email, crmentity.smownerid, leadscf.* from leaddetails inner join crmentity on crmentity.crmid=leaddetails.leadid inner join leadsubdetails on leadsubdetails.leadsubscriptionid=leaddetails.leadid inner join leadaddress on leadaddress.leadaddressid=leadsubdetails.leadsubscriptionid inner join leadscf on leaddetails.leadid = leadscf.leadid LEFT OUTER JOIN leadgrouprelation ON leadgrouprelation.leadid = leaddetails.leadid where crmentity.deleted=0 and leaddetails.converted=0"; } if($module == "Products") { @@ -3819,13 +3819,13 @@ } if($module == "Activities") { - $query = " select $distincton crmentity.crmid,crmentity.smownerid,crmentity.setype, activity.*, contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, account.accountid, account.accountname, recurringevents.recurringtype from activity inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid= cntactivityrel.contactid left join seactivityrel on seactivityrel.activityid = activity.activityid left outer join account on account.accountid = contactdetails.accountid left outer join recurringevents on recurringevents.activityid=activity.activityid WHERE crmentity.deleted=0 and (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task') ".$where ; + $query = " select $distincton crmentity.crmid,crmentity.smownerid,crmentity.setype, activity.*, contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, account.accountid, account.accountname, recurringevents.recurringtype from activity inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid= cntactivityrel.contactid left join seactivityrel on seactivityrel.activityid = activity.activityid left outer join account on account.accountid = contactdetails.accountid left outer join recurringevents on recurringevents.activityid=activity.activityid LEFT OUTER JOIN activitygrouprelation ON activitygrouprelation.activityid = activity.activityid WHERE crmentity.deleted=0 and (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task') ".$where ; //included by Jaguar } if($module == "Emails") { //$query = "select crmentity.crmid,crmentity.smownerid, emails.emailid, emails.filename, activity.subject, activity.activityid, contactdetails.lastname, contactdetails.firstname, contactdetails.contactid , activity.date_start from emails inner join crmentity on crmentity.crmid=emails.emailid inner join activity on activity.activityid = crmentity.crmid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid= cntactivityrel.contactid WHERE crmentity.deleted=0"; - $query = "select crmentity.crmid,crmentity.smownerid, emails.emailid, emails.filename, activity.subject, activity.activityid, contactdetails.lastname, contactdetails.firstname, contactdetails.contactid , activity.date_start from emails inner join crmentity on crmentity.crmid=emails.emailid inner join activity on activity.activityid = crmentity.crmid left join seactivityrel on seactivityrel.activityid = activity.activityid left join contactdetails on contactdetails.contactid=seactivityrel.crmid left join cntactivityrel on cntactivityrel.activityid= activity.activityid and cntactivityrel.contactid=cntactivityrel.contactid WHERE crmentity.deleted=0"; + $query = "select crmentity.crmid,crmentity.smownerid, emails.emailid, emails.filename, activity.subject, activity.activityid, contactdetails.lastname, contactdetails.firstname, contactdetails.contactid , activity.date_start from emails inner join crmentity on crmentity.crmid=emails.emailid inner join activity on activity.activityid = crmentity.crmid left join seactivityrel on seactivityrel.activityid = activity.activityid left join contactdetails on contactdetails.contactid=seactivityrel.crmid left join cntactivityrel on cntactivityrel.activityid= activity.activityid and cntactivityrel.contactid=cntactivityrel.contactid LEFT OUTER JOIN activitygrouprelation ON activitygrouprelation.activityid = activity.activityid WHERE crmentity.deleted=0"; } if($module == "Faq") { Modified: vtigercrm/branches/4.2/modules/CustomView/CustomView.php ============================================================================== --- vtigercrm/branches/4.2/modules/CustomView/CustomView.php (original) +++ vtigercrm/branches/4.2/modules/CustomView/CustomView.php Tue Apr 25 00:29:29 2006 @@ -634,7 +634,17 @@ { if($fieldname == "smownerid" || $fieldname == "inventorymanager") { + // BUG this doesn't work with non equilvalent comparisons + $org_value = $value; $value = $tablename.".".$fieldname.$this->getAdvComparator($comparator,getUserId_Ol($value)); + // hack to get "assigned to" to check group name as well + if($_REQUEST['module'] == 'Activities' || $_REQUEST['module'] == 'Emails') { + $value = '(('.$value.' AND NOT '.$tablename.".".$fieldname.$this->getAdvComparator($comparator, 0).') OR activitygrouprelation.groupname'.$this->getAdvComparator($comparator, $org_value).')'; + } else if($_REQUEST['module'] == 'HelpDesk') { + $value = '(('.$value.' AND NOT '.$tablename.".".$fieldname.$this->getAdvComparator($comparator, 0).') OR ticketgrouprelation.groupname'.$this->getAdvComparator($comparator, $org_value).')'; + } else if($_REQUEST['module'] == 'Leads') { + $value = '(('.$value.' AND NOT '.$tablename.".".$fieldname.$this->getAdvComparator($comparator, 0).') OR leadgrouprelation.groupname'.$this->getAdvComparator($comparator, $org_value).')'; + } }else if($fieldname == "parentid") { $value = $tablename.".".$fieldname.$this->getAdvComparator($comparator,$this->getAccountId($value)); From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 02:38:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 06:38:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5314 - /vtigercrm/trunk/modules/Users/User.php Message-ID: <20060425063849.E09566D902E@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 25 00:38:44 2006 New Revision: 5314 Log: Made requisite changes to user list view (Proper Redirection for all links)- Ahmed 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 Apr 25 00:38:44 2006 @@ -512,20 +512,25 @@ $entries_list = array(); $roleinfo = getAllRoleDetails(); - //echo '
    '; print_r($roleinfo['H1']); '
    '; for($i = $navigation_array['start'];$i <= $navigation_array['end_val']; $i++) { $entries=array(); $id=$this->db->query_result($result,$i-1,'id'); $entries[]='Edit  Delete'; - $entries[]=$this->db->query_result($result,$i-1,'first_name').' '.$this->db->query_result($result,$i-1,'last_name'); $entries[]=''.$this->db->query_result($result,$i-1,'user_name').''; -// $entries[]=$this->db->query_result($result,$i-1,'department'); - $entries[]=$this->db->query_result($result,$i-1,'email1'); - $rolecode= fetchUserRole($this->db->query_result($result,$i-1,'id')); - $entries[]=''.$roleinfo[$rolecode][0]; + + $rolecode= fetchUserRole($this->db->query_result($result,$i-1,'id')); + $entries[]=''.$roleinfo[ +$rolecode][0]; + + $entries[]=''.$this->db->query_result($result,$i-1,'email1').' '; + + $entries[]=''. $this->db->query_result($result,$i-1,'first_name').' '.$this->db->query_result($result,$i-1,'last_name').''; + $entries[]=$this->db->query_result($result,$i-1,'is_admin'); + $entries_list[]=$entries; + } return $entries_list; } From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 02:55:06 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 06:55:06 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23697=3A_?= =?utf-8?q?Convert_Lead_Don=27t_Have_Security_checks?= In-Reply-To: <076.27f8cf078d0768eb2c2965a3503ace97@vtiger.fosslabs.com> References: <076.27f8cf078d0768eb2c2965a3503ace97@vtiger.fosslabs.com> Message-ID: <085.4e02d1eee074a035e4b6fc0cef7f1fc4@vtiger.fosslabs.com> #697: Convert Lead Don't Have Security checks ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: Don Type: defect | Status: closed Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Security ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 03:01:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 07:01:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5315 - /vtigercrm/trunk/modules/Emails/mail.php Message-ID: <20060425070159.391E96D903A@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 01:01:53 2006 New Revision: 5315 Log: Changed PearDatabase::qstr to $adb->qstr. Fixes #206. Modified: vtigercrm/trunk/modules/Emails/mail.php Modified: vtigercrm/trunk/modules/Emails/mail.php ============================================================================== --- vtigercrm/trunk/modules/Emails/mail.php (original) +++ vtigercrm/trunk/modules/Emails/mail.php Tue Apr 25 01:01:53 2006 @@ -88,7 +88,8 @@ if($val != '') { //$sql = "select email1, email2, yahoo_id from users where ".$name." = '".$val."'"; - $sql = "select email1, email2, yahoo_id from users where ".$name." = ".PearDatabase::quote($val); + //done to resolve the PHP5 specific behaviour + $sql = "select email1, email2, yahoo_id from users where ".$name." = ".$adb->quote($val); $res = $adb->query($sql); $email = $adb->query_result($res,0,'email1'); if($email == '') From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 03:01:58 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 07:01:58 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23206=3A_?= =?utf-8?q?unable_to_save_outgoing_mail_server_info?= In-Reply-To: <076.8e9907477ed00259bc1939ad6c9185b6@vtiger.fosslabs.com> References: <076.8e9907477ed00259bc1939ad6c9185b6@vtiger.fosslabs.com> Message-ID: <085.92013f0d62f07fedaf2f30775cfd4f6b@vtiger.fosslabs.com> #206: unable to save outgoing mail server info ------------------------+--------------------------------------------------- Reporter: richie | Owner: richie Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: outgoing mailserver info ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed Comment: (In [5315]) Changed PearDatabase::qstr to $adb->qstr. Fixes #206. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 03:21:46 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 07:21:46 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23290=3A_?= =?utf-8?q?Dashboard_amounts_not_proper?= In-Reply-To: <076.d32dd9695eb9aeb5d9c1a0d15e10d75a@vtiger.fosslabs.com> References: <076.d32dd9695eb9aeb5d9c1a0d15e10d75a@vtiger.fosslabs.com> Message-ID: <085.52efa8af6e705d31ed9fe2a221148156@vtiger.fosslabs.com> #290: Dashboard amounts not proper ------------------------+--------------------------------------------------- Reporter: richie | Owner: richie Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: dashboard ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed Comment: (In [5316]) Removed the K symbol so that the amounts are shown properly. Fixes #290 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 03:21:46 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 07:21:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5316 - /vtigercrm/trunk/modules/Potentials/Charts.php Message-ID: <20060425072147.104706D903D@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 01:21:41 2006 New Revision: 5316 Log: Removed the K symbol so that the amounts are shown properly. Fixes #290 Modified: vtigercrm/trunk/modules/Potentials/Charts.php Modified: vtigercrm/trunk/modules/Potentials/Charts.php ============================================================================== Binary files - no diff available. From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 03:34:21 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 07:34:21 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23503=3A_?= =?utf-8?q?Profile_Delete_Issue=28UI=29?= In-Reply-To: <076.2d750bd33c88cc25739f0c0a339fa6f0@vtiger.fosslabs.com> References: <076.2d750bd33c88cc25739f0c0a339fa6f0@vtiger.fosslabs.com> Message-ID: <085.087581536268e55aaaed141ca0fbe588@vtiger.fosslabs.com> #503: Profile Delete Issue(UI) ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed Comment: (In [5317]) Delete Option provided. Fixes #503 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 03:34:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 07:34:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5317 - /vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl Message-ID: <20060425073422.5F15B6D9048@vtiger.fosslabs.com> Author: don Date: Tue Apr 25 01:34:13 2006 New Revision: 5317 Log: Delete Option provided. Fixes #503 Modified: vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl Modified: vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl Tue Apr 25 01:34:13 2006 @@ -407,6 +407,10 @@     @@ -425,7 +429,25 @@
    {$LIST_ENTRIES[entries].profilename}{$LIST_ENTRIES[entries].profilename} {$LIST_ENTRIES[entries].description} 
       + { if $PROFILEID != 1 && $PROFILEID != 2 && $PROFILEID != 3 && $PROFILEID != 4 } + +    + {/if}
    +
    + {include file='SettingsSubMenu.tpl'} + + {/literal} -{/if} {if $MODULE eq 'Contacts'} {literal} @@ -504,14 +481,4 @@ {/literal} {/if} - + Modified: vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl Tue Apr 25 03:00:12 2006 @@ -16,13 +16,12 @@ {elseif $button_check eq 's_cmail'} - {elseif $button_check eq 'c_owner'} - {elseif $button_check eq 'c_status'} - + {/if} {/foreach} + {$RECORD_COUNTS} @@ -86,13 +85,12 @@ {elseif $button_check eq 's_cmail'} - {elseif $button_check eq 'c_owner'} - {elseif $button_check eq 'c_status'} - + {/if} {/foreach} + {$RECORD_COUNTS} From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 05:00:39 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 09:00:39 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23411=3A_?= =?utf-8?q?Issue_in_OrgSharing_Privileges?= In-Reply-To: <076.ed0dea6bdbb20e17a0f1cd92b8c0d970@vtiger.fosslabs.com> References: <076.ed0dea6bdbb20e17a0f1cd92b8c0d970@vtiger.fosslabs.com> Message-ID: <085.d409e7c6c7307e6a5d1ded12add6f7fa@vtiger.fosslabs.com> #411: Issue in OrgSharing Privileges ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: don Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Security ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 05:01:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 09:01:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5324 - /vtigercrm/trunk/modules/Users/updateLeadDBStatus.php Message-ID: <20060425090128.9661A6D904B@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 03:01:24 2006 New Revision: 5324 Log: redirect changed Modified: vtigercrm/trunk/modules/Users/updateLeadDBStatus.php Modified: vtigercrm/trunk/modules/Users/updateLeadDBStatus.php ============================================================================== --- vtigercrm/trunk/modules/Users/updateLeadDBStatus.php (original) +++ vtigercrm/trunk/modules/Users/updateLeadDBStatus.php Tue Apr 25 03:01:24 2006 @@ -17,6 +17,7 @@ $leadstatusval = $_REQUEST['leadval']; $idval=$_REQUEST['user_id']; $viewid = $_REQUEST['viewname']; +$return_module = $_REQUEST['return_module']; global $current_user; global $adb; $storearray = explode(";",$idlist); @@ -40,6 +41,6 @@ $result1 = $adb->query($query); } } -header("Location: index.php?module=Leads&action=LeadsAjax&file=ListView&ajax=changestate&viewname=".$viewid); +header("Location: index.php?module=$return_module&action=".$return_module."Ajax&file=ListView&ajax=changestate&viewname=".$viewid); ?> From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 05:02:29 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 09:02:29 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5325 - /vtigercrm/trunk/modules/Contacts/ListView.php Message-ID: <20060425090229.CD1196D904B@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 03:02:25 2006 New Revision: 5325 Log: function added to support mass change owner in listviews Modified: vtigercrm/trunk/modules/Contacts/ListView.php Modified: vtigercrm/trunk/modules/Contacts/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/ListView.php (original) +++ vtigercrm/trunk/modules/Contacts/ListView.php Tue Apr 25 03:02:25 2006 @@ -91,7 +91,7 @@ $customviewcombo_html = $oCustomView->getCustomViewCombo($viewid); $viewnamedesc = $oCustomView->getCustomViewByCvid($viewid); //<<<<>>>> - +$smarty->assign("CHANGE_OWNER",getUserslist()); // Buttons and View options if($viewid != 0) { From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 05:03:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 09:03:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5326 - /vtigercrm/trunk/modules/Accounts/ListView.php Message-ID: <20060425090317.1484B6D904B@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 03:03:13 2006 New Revision: 5326 Log: function added to support mass change owner in listviews Modified: vtigercrm/trunk/modules/Accounts/ListView.php Modified: vtigercrm/trunk/modules/Accounts/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/ListView.php (original) +++ vtigercrm/trunk/modules/Accounts/ListView.php Tue Apr 25 03:03:13 2006 @@ -60,7 +60,7 @@ $viewnamedesc = $oCustomView->getCustomViewByCvid($viewid); $groupid = $oCustomView->getGroupId($currentModule); //<<<<>>>> - +$smarty->assign("CHANGE_OWNER",getUserslist()); if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { $where = getWhereCondition($currentModule); From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 05:03:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 09:03:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5327 - /vtigercrm/trunk/modules/Activities/ListView.php Message-ID: <20060425090343.310546D905C@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 03:03:39 2006 New Revision: 5327 Log: function added to support mass change owner in listviews Modified: vtigercrm/trunk/modules/Activities/ListView.php Modified: vtigercrm/trunk/modules/Activities/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Activities/ListView.php (original) +++ vtigercrm/trunk/modules/Activities/ListView.php Tue Apr 25 03:03:39 2006 @@ -57,7 +57,7 @@ $customviewcombo_html = $oCustomView->getCustomViewCombo($viewid); $viewnamedesc = $oCustomView->getCustomViewByCvid($viewid); //<<<<>>>> - +$smarty->assign("CHANGE_OWNER",getUserslist()); $where = ""; $url_string = ''; // assigning http url string From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 05:04:08 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 09:04:08 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5328 - /vtigercrm/trunk/modules/Campaigns/ListView.php Message-ID: <20060425090408.537666D9053@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 03:04:04 2006 New Revision: 5328 Log: function added to support mass change owner in listviews Modified: vtigercrm/trunk/modules/Campaigns/ListView.php Modified: vtigercrm/trunk/modules/Campaigns/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/ListView.php (original) +++ vtigercrm/trunk/modules/Campaigns/ListView.php Tue Apr 25 03:04:04 2006 @@ -66,7 +66,7 @@ $viewid = $oCustomView->getViewId($currentModule); $customviewcombo_html = $oCustomView->getCustomViewCombo($viewid); $viewnamedesc = $oCustomView->getCustomViewByCvid($viewid); - +$smarty->assign("CHANGE_OWNER",getUserslist()); //<<<<>>>> $smarty = new vtigerCRM_Smarty; From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 05:04:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 09:04:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5329 - /vtigercrm/trunk/modules/HelpDesk/ListView.php Message-ID: <20060425090441.8284D6D9053@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 03:04:37 2006 New Revision: 5329 Log: function added to support mass change owner in listviews Modified: vtigercrm/trunk/modules/HelpDesk/ListView.php Modified: vtigercrm/trunk/modules/HelpDesk/ListView.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/ListView.php (original) +++ vtigercrm/trunk/modules/HelpDesk/ListView.php Tue Apr 25 03:04:37 2006 @@ -73,7 +73,7 @@ $customviewcombo_html = $oCustomView->getCustomViewCombo($viewid); $viewnamedesc = $oCustomView->getCustomViewByCvid($viewid); //<<<<>>>> - +$smarty->assign("CHANGE_OWNER",getUserslist()); if($viewid != 0) { $CActionDtls = $oCustomView->getCustomActionDetails($viewid); From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 05:05:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 09:05:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5330 - /vtigercrm/trunk/modules/Potentials/ListView.php Message-ID: <20060425090516.077D56D9053@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 03:05:11 2006 New Revision: 5330 Log: function added to support mass change owner in listviews Modified: vtigercrm/trunk/modules/Potentials/ListView.php Modified: vtigercrm/trunk/modules/Potentials/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/ListView.php (original) +++ vtigercrm/trunk/modules/Potentials/ListView.php Tue Apr 25 03:05:11 2006 @@ -96,7 +96,7 @@ $customviewcombo_html = $oCustomView->getCustomViewCombo($viewid); $viewnamedesc = $oCustomView->getCustomViewByCvid($viewid); //<<<<>>>> - +$smarty->assign("CHANGE_OWNER",getUserslist()); if(isPermitted('Potentials',2,'') == 'yes') { From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 05:05:46 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 09:05:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5331 - /vtigercrm/trunk/modules/Products/ListView.php Message-ID: <20060425090546.29DF46D9053@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 03:05:41 2006 New Revision: 5331 Log: function added to support mass change owner in listviews Modified: vtigercrm/trunk/modules/Products/ListView.php Modified: vtigercrm/trunk/modules/Products/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Products/ListView.php (original) +++ vtigercrm/trunk/modules/Products/ListView.php Tue Apr 25 03:05:41 2006 @@ -82,6 +82,8 @@ $customviewcombo_html = $oCustomView->getCustomViewCombo($viewid); $viewnamedesc = $oCustomView->getCustomViewByCvid($viewid); //<<<<>>>> + +$smarty->assign("CHANGE_OWNER",getUserslist()); if($viewnamedesc['viewname'] == 'All') { $smarty->assign("ALL", 'All'); From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 05:06:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 09:06:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5332 - /vtigercrm/trunk/modules/PurchaseOrder/ListView.php Message-ID: <20060425090607.3831D6D9053@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 03:06:02 2006 New Revision: 5332 Log: function added to support mass change owner in listviews Modified: vtigercrm/trunk/modules/PurchaseOrder/ListView.php Modified: vtigercrm/trunk/modules/PurchaseOrder/ListView.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/ListView.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/ListView.php Tue Apr 25 03:06:02 2006 @@ -68,7 +68,7 @@ $customviewcombo_html = $oCustomView->getCustomViewCombo($viewid); $viewnamedesc = $oCustomView->getCustomViewByCvid($viewid); //<<<<>>>> - +$smarty->assign("CHANGE_OWNER",getUserslist()); if(isPermitted('PurchaseOrder',2,'') == 'yes') { From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 05:06:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 09:06:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5333 - /vtigercrm/trunk/modules/Quotes/ListView.php Message-ID: <20060425090624.8F02C6D9053@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 03:06:20 2006 New Revision: 5333 Log: function added to support mass change owner in listviews Modified: vtigercrm/trunk/modules/Quotes/ListView.php Modified: vtigercrm/trunk/modules/Quotes/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/ListView.php (original) +++ vtigercrm/trunk/modules/Quotes/ListView.php Tue Apr 25 03:06:20 2006 @@ -74,7 +74,7 @@ $customviewcombo_html = $oCustomView->getCustomViewCombo($viewid); $viewnamedesc = $oCustomView->getCustomViewByCvid($viewid); //<<<<>>>> - +$smarty->assign("CHANGE_OWNER",getUserslist()); if(isPermitted('Quotes',2,'') == 'yes') { From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 05:07:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 09:07:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5334 - /vtigercrm/trunk/modules/SalesOrder/ListView.php Message-ID: <20060425090706.ADAC26D906F@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 03:07:02 2006 New Revision: 5334 Log: function added to support mass change owner in listviews Modified: vtigercrm/trunk/modules/SalesOrder/ListView.php Modified: vtigercrm/trunk/modules/SalesOrder/ListView.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/ListView.php (original) +++ vtigercrm/trunk/modules/SalesOrder/ListView.php Tue Apr 25 03:07:02 2006 @@ -102,7 +102,7 @@ $customviewcombo_html = $oCustomView->getCustomViewCombo($viewid); $viewnamedesc = $oCustomView->getCustomViewByCvid($viewid); //<<<<>>>> - +$smarty->assign("CHANGE_OWNER",getUserslist()); // Buttons and View options if(isPermitted('SalesOrder',2,'') == 'yes') { From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 05:07:47 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 09:07:47 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23436=3A_?= =?utf-8?q?Mass_Change_Owner_option_is_missing_in_contacts?= In-Reply-To: <076.2a85e9ca07304adbf6788d457c3f9084@vtiger.fosslabs.com> References: <076.2a85e9ca07304adbf6788d457c3f9084@vtiger.fosslabs.com> Message-ID: <085.f47ebdb64e4a2a35ae14a1904e8fe53b@vtiger.fosslabs.com> #436: Mass Change Owner option is missing in contacts ------------------------+--------------------------------------------------- Reporter: don | Owner: richie Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed Comment: Integrated -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 05:26:00 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 09:26:00 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23741=3A_?= =?utf-8?q?Create_Group_-_Default_filter_selection?= Message-ID: <076.2a6d5517e6c3b15c30ace383f35ae26b@vtiger.fosslabs.com> #741: Create Group - Default filter selection --------------------------+------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: Create group | --------------------------+------------------------------------------------- In Settings > Users & Access Management > Create New Group, in 'Filters' Select option box make the 'Users' as default selected, with the list of members available, in the 'Member Available' text area. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 05:41:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 09:41:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5335 - /vtigercrm/trunk/Smarty/templates/Settings/BackupServer.tpl Message-ID: <20060425094122.5D5916D9073@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 03:41:17 2006 New Revision: 5335 Log: server password field data check implemented. Fixes #219 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 Tue Apr 25 03:41:17 2006 @@ -117,6 +117,7 @@ function validate() { if (!emptyCheck("server","ftp Server Name","text")) return false if (!emptyCheck("server_username","ftp User Name","text")) return false + if (!emptyCheck("server_password","ftp Password","text")) return false return true; } From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 05:41:21 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 09:41:21 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23219=3A_?= =?utf-8?q?blank_ftp_password_but_accepts?= In-Reply-To: <076.6488771d9fd470785bb174b2504cccec@vtiger.fosslabs.com> References: <076.6488771d9fd470785bb174b2504cccec@vtiger.fosslabs.com> Message-ID: <085.f4e585369a0eb1797ec212dc69acb662@vtiger.fosslabs.com> #219: blank ftp password but accepts ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed Comment: (In [5335]) server password field data check implemented. Fixes #219 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 05:48:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 09:48:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5336 - in /vtigercrm/trunk: Smarty/templates/CreateView.tpl Smarty/templates/QuickCreate.tpl Smarty/templates/salesEditView.tpl include/utils/EditViewUtils.php Message-ID: <20060425094820.BDA1D6D9071@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 25 03:48:11 2006 New Revision: 5336 Log: Team changed to group Modified: vtigercrm/trunk/Smarty/templates/CreateView.tpl vtigercrm/trunk/Smarty/templates/QuickCreate.tpl vtigercrm/trunk/Smarty/templates/salesEditView.tpl vtigercrm/trunk/include/utils/EditViewUtils.php Modified: vtigercrm/trunk/Smarty/templates/CreateView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateView.tpl Tue Apr 25 03:48:11 2006 @@ -254,6 +254,411 @@ {/if} + + {if $uitype eq 2} + *{$fldlabel} + + {elseif $uitype eq 11 || $uitype eq 1 || $uitype eq 13 || $uitype eq 7 || $uitype eq 9} + {$fldlabel} + {if $fldname eq 'tickersymbol' && $MODULE eq 'Accounts'} + + {else} + + {/if} + {elseif $uitype eq 19 || $uitype eq 20} + + {if $uitype eq 20}*{/if} + {$fldlabel} + + + {elseif $uitype eq 21 || $uitype eq 24} + + {if $uitype eq 24} + * + {/if} + {$fldlabel} + + + {elseif $uitype eq 15 || $uitype eq 16} + + {if $uitype eq 16} + * + {/if} + {$fldlabel} + + + + + {elseif $uitype eq 33} + + {$fldlabel} + + + + + + {elseif $uitype eq 53} + + {$fldlabel} + + + {assign var=check value=1} + {foreach key=key_one item=arr from=$fldvalue} + {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} +  User + {if $secondvalue neq ''} +  Group + {/if} + + + {if $secondvalue neq ''} + + + {/if} + + {elseif $uitype eq 52 || $uitype eq 77} + + {$fldlabel} + + + {if $uitype eq 52} + + {else} + + + {elseif $uitype eq 51} + {if $MODULE eq 'Accounts'} + {assign var='popuptype' value = 'specific_account_address'} + {else} + {assign var='popuptype' value = 'specific_contact_account_address'} + {/if} + {$fldlabel} +  Select  + + {elseif $uitype eq 50} + *{$fldlabel} +  Select + {elseif $uitype eq 73} + *{$fldlabel} +  Select + + {elseif $uitype eq 75 || $uitype eq 81} + + {if $uitype eq 81} + * + {assign var="pop_type" value="specific_vendor_address"} + {else}{assign var="pop_type" value="specific"} + {/if} + {$fldlabel} + +  Select + {if $uitype eq 75} +   + {/if} + {elseif $uitype eq 57} + {$fldlabel} +  Select  + + {elseif $uitype eq 80} + {$fldlabel} +  Select  + + {elseif $uitype eq 78} + {$fldlabel} +  Select  + + {elseif $uitype eq 76} + {$fldlabel} +  Select  + + {elseif $uitype eq 17} + {$fldlabel} +   http://  + + {elseif $uitype eq 71 || $uitype eq 72} + + {if $uitype eq 72} + * + {/if} + {$fldlabel} + + + {elseif $uitype eq 56} + {$fldlabel} + {if $fldname eq 'notime' && $ACTIVITY_MODE eq 'Events'} + {if $fldvalue eq 1} + + {else} + + {/if} + {else} + {if $fldvalue eq 1} + + {else} + + {/if} + {/if} + {elseif $uitype eq 23 || $uitype eq 5 || $uitype eq 6} + {$fldlabel} + + {foreach key=date_value item=time_value from=$fldvalue} + {assign var=date_val value="$date_value"} + {assign var=time_val value="$time_value"} + {/foreach} + + + {if $uitype eq 6} + + {/if} + {foreach key=date_format item=date_str from=$secondvalue} + {assign var=dateFormat value="$date_format"} + {assign var=dateStr value="$date_str"} + {/foreach} + {if $uitype eq 5 || $uitype eq 23} +
    ({$dateStr}) + {else} +
    ({$dateStr}) + {/if} + + + + + + {elseif $uitype eq 63} + + {$fldlabel} + + +   + + + {elseif $uitype eq 68 || $uitype eq 66 || $uitype eq 62} + + + + + +  Select  + + {elseif $uitype eq 357} + To:  + + +   + +  Select  + + CC:  + + + BCC:  + + + + + {elseif $uitype eq 59} + + {$fldlabel} + +  Select  + + {elseif $uitype eq 55} + {$fldlabel} + + + + + {elseif $uitype eq 22} + *{$fldlabel} + + + + + {elseif $uitype eq 69} + {$fldlabel} + + {if $MODULE eq 'Products'} + +
    Files Maximum 6 + +
    + + + {else} + {$fldvalue} + {/if} + + {elseif $uitype eq 61} + {$fldlabel} + {$fldvalue} + {elseif $uitype eq 30} + {$fldlabel} + + {assign var=check value=$secondvalue[0]} + {assign var=yes_val value=$secondvalue[1]} + {assign var=no_val value=$secondvalue[2]} +  {$yes_val}  {$no_val}  + {foreach item=val_arr from=$fldvalue} + {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]"} + +  {$disp_text} + {/foreach} + + + {/if} + {/foreach} + + {/foreach} +   + {/foreach} + + + + +
    + {if $MODULE eq 'Emails'} + + + {/if} + + +
    + + + + + + + + +
    + + + +
    + {**} + + + + +
    + + + + + + {foreach key=header item=data from=$ADVBLOCKS} + + + + {foreach key=label item=subdata from=$data} + + {foreach key=mainlabel item=maindata from=$subdata} + {assign var="uitype" value="$maindata[0][0]"} + {assign var="fldlabel" value="$maindata[1][0]"} + {assign var="fldlabel_sel" value="$maindata[1][1]"} + {assign var="fldlabel_combo" value="$maindata[1][2]"} + {assign var="fldname" value="$maindata[2][0]"} + {assign var="fldvalue" value="$maindata[3][0]"} + {assign var="secondvalue" value="$maindata[3][1]"} + {if $uitype eq 2} @@ -566,10 +971,10 @@ {else} {$fldvalue} {/if} - {elseif $uitype eq 61} + {elseif $uitype eq 30} {/foreach} - - - - -
    +
    + + +
    +
    + {$header} +
    *{$fldlabel}{$fldlabel} {$fldvalue}{$fldlabel} @@ -601,411 +1006,6 @@ {/foreach}
     
    - -
    - {if $MODULE eq 'Emails'} - - - {/if} - - -
    -
    -
    -
    - -
    - -
    - - - -
    - {**} - - - - - From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 09:07:36 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 13:07:36 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23220=3A_?= =?utf-8?q?Events_Scheduled_after_more_than_1_hour_gets_displayed_only_at_?= =?utf-8?q?the_start_of_the_Hour_-_Calendar?= In-Reply-To: <076.106fba7ba90fc32941161e0f200a0e12@vtiger.fosslabs.com> References: <076.106fba7ba90fc32941161e0f200a0e12@vtiger.fosslabs.com> Message-ID: <085.8c150e7b7a228c7115171b0e4148fcb7@vtiger.fosslabs.com> #220: Events Scheduled after more than 1 hour gets displayed only at the start of the Hour - Calendar ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 09:07:57 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 13:07:57 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23271=3A_?= =?utf-8?q?Calendar_Day_View_-_Too_much_scrolling?= In-Reply-To: <076.3ecd9b4390d05ad93ba958d69bc9eb11@vtiger.fosslabs.com> References: <076.3ecd9b4390d05ad93ba958d69bc9eb11@vtiger.fosslabs.com> Message-ID: <085.ae79626b7b4df70589077290265a0e80@vtiger.fosslabs.com> #271: Calendar Day View - Too much scrolling ------------------------+--------------------------------------------------- Reporter: gopal | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 09:08:21 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 13:08:21 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23276=3A_?= =?utf-8?q?Calendar_Day_View_-_AM/PM_font_can_be_made_superscript?= In-Reply-To: <076.a606dddc26c965eb7959805dc46ce62b@vtiger.fosslabs.com> References: <076.a606dddc26c965eb7959805dc46ce62b@vtiger.fosslabs.com> Message-ID: <085.1b905f8997df4a6741c918473de62769@vtiger.fosslabs.com> #276: Calendar Day View - AM/PM font can be made superscript ------------------------+--------------------------------------------------- Reporter: gopal | Owner: mangai Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 09:08:55 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 13:08:55 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23280=3A_?= =?utf-8?q?Calendar_Day_View_-_Better_to_have_Month_Day=2C_Week_format?= In-Reply-To: <076.6291568ebf441727bcf8ab703b0d8ac6@vtiger.fosslabs.com> References: <076.6291568ebf441727bcf8ab703b0d8ac6@vtiger.fosslabs.com> Message-ID: <085.a5030e468d42ea056846e279ef01e994@vtiger.fosslabs.com> #280: Calendar Day View - Better to have Month Day, Week format ------------------------+--------------------------------------------------- Reporter: gopal | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 09:09:28 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 13:09:28 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23302=3A_?= =?utf-8?q?Day_View_-_Calendar_-_Better_to_avoid_Horizontal_scrolling?= In-Reply-To: <076.87a166e9322ff09c6faad1f0430280db@vtiger.fosslabs.com> References: <076.87a166e9322ff09c6faad1f0430280db@vtiger.fosslabs.com> Message-ID: <085.fe20b2fab76738365506c6c221b0751d@vtiger.fosslabs.com> #302: Day View - Calendar - Better to avoid Horizontal scrolling ------------------------+--------------------------------------------------- Reporter: gopal | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 09:09:48 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 13:09:48 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23337=3A_?= =?utf-8?q?Calendar_-_Week_View_-_Better_to_have_links_on_date?= In-Reply-To: <076.e086d49dbbce1782e4640ba674d7de03@vtiger.fosslabs.com> References: <076.e086d49dbbce1782e4640ba674d7de03@vtiger.fosslabs.com> Message-ID: <085.091f52d596f791ffd2791dcf4fa0cf33@vtiger.fosslabs.com> #337: Calendar - Week View - Better to have links on date ------------------------+--------------------------------------------------- Reporter: gopal | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 09:10:09 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 13:10:09 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23161=3A_?= =?utf-8?q?Next/Prev_Button_Click_in_Calendar_-_Week/Month_Tab_Having_Issu?= =?utf-8?q?es?= In-Reply-To: <076.09810a84fe8b30486fcb66ce567736a9@vtiger.fosslabs.com> References: <076.09810a84fe8b30486fcb66ce567736a9@vtiger.fosslabs.com> Message-ID: <085.ac52d84f9a5a16ae392f82cb1f952c20@vtiger.fosslabs.com> #161: Next/Prev Button Click in Calendar - Week/Month Tab Having Issues ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: mangai Type: defect | Status: new Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 09:15:17 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 13:15:17 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23466=3A_?= =?utf-8?q?def_org_field_access_screen_issue?= In-Reply-To: <076.7489aba2a3b2c94787d97f4e59654634@vtiger.fosslabs.com> References: <076.7489aba2a3b2c94787d97f4e59654634@vtiger.fosslabs.com> Message-ID: <085.27ac9277404c78f5a5c868e797a4b3f0@vtiger.fosslabs.com> #466: def org field access screen issue ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: def org ------------------------+--------------------------------------------------- Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 09:29:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 13:29:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5351 - /vtigercrm/trunk/modules/Migration/updateCurrency.php Message-ID: <20060425132917.B2A4A6D9405@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 25 07:29:10 2006 New Revision: 5351 Log: * Added file to do the currency updation for all records which have the amount values Added: vtigercrm/trunk/modules/Migration/updateCurrency.php From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 09:30:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 13:30:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5352 - /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Message-ID: <20060425133027.B9B0A6D9A73@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 25 07:30:23 2006 New Revision: 5352 Log: * Added code to get the conversion rate to convert the currency values and some issues fixed Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php ============================================================================== --- vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php (original) +++ vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Tue Apr 25 07:30:23 2006 @@ -1761,7 +1761,7 @@ $query_array = Array( "ALTER TABLE `accountgrouprelation` DROP INDEX `fk_accountgrouprelation2`", -"ALTER TABLE `accountscf` DROP COLUMN `cf_356`", +//"ALTER TABLE `accountscf` DROP COLUMN `cf_356`", "ALTER TABLE `activity` DROP INDEX `status`", "ALTER TABLE `attachments` DROP INDEX `attachmentsid`", "ALTER TABLE `carrier` DROP INDEX `carrier_UK0`", @@ -1781,9 +1781,9 @@ "ALTER TABLE `freetagged_objects` DROP INDEX `object_id_index`", "ALTER TABLE `groups` DROP INDEX `groupname`", "ALTER TABLE `invoicegrouprelation` DROP INDEX `fk_invoicegrouprelation2`", -"ALTER TABLE `leadscf` DROP COLUMN `cf_354`", -"ALTER TABLE `leadscf` DROP COLUMN `cf_358`", -"ALTER TABLE `leadscf` DROP COLUMN `cf_360`", +//"ALTER TABLE `leadscf` DROP COLUMN `cf_354`", +//"ALTER TABLE `leadscf` DROP COLUMN `cf_358`", +//"ALTER TABLE `leadscf` DROP COLUMN `cf_360`", "ALTER TABLE `pogrouprelation` DROP INDEX `fk_productgrouprelation2`", "ALTER TABLE `potential` DROP INDEX `potentialid`", "ALTER TABLE `potentialgrouprelation` DROP INDEX `fk_potentialgrouprelation2`", @@ -2616,7 +2616,42 @@ } - +$update_query3 = "update currency_info set conversion_rate=1, currency_status='Active', defaultid='-11' where id=1"; +Execute($update_query3); + +//Added to get the conversion rate and update for all records +//include("modules/Migration/ModifyDatabase/updateCurrency.php"); +?> + + References: <076.0987feb4ecde6ea77150c2c0ffdb501f@vtiger.fosslabs.com> Message-ID: <085.3f4535596a37d4ac3c05587fc10ebaf6@vtiger.fosslabs.com> #648: Migration Issues - Leads Module ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Migration ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * status: assigned => closed Comment: This issue has been fixed and has been checkedin in the svn. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 09:33:04 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 13:33:04 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23652=3A_?= =?utf-8?q?Migration_Issues_-_Exceptions_Thrown_in_Accounts_Module?= In-Reply-To: <076.4ac89b7447d55a55667ee546e6247d5e@vtiger.fosslabs.com> References: <076.4ac89b7447d55a55667ee546e6247d5e@vtiger.fosslabs.com> Message-ID: <085.08767d880b1be65473a46b1a6096eb37@vtiger.fosslabs.com> #652: Migration Issues - Exceptions Thrown in Accounts Module ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * status: assigned => closed Comment: This issue has been fixed and has been checkedin in the svn. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 09:37:18 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 13:37:18 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23676=3A_?= =?utf-8?q?Migration_Issues_-_Quick_Create_Potentials_Non_Functional?= In-Reply-To: <076.396c5f0dc651a29c5494394f2a4bac76@vtiger.fosslabs.com> References: <076.396c5f0dc651a29c5494394f2a4bac76@vtiger.fosslabs.com> Message-ID: <085.71c4c005a60e70b93dd3a3c744fe03f7@vtiger.fosslabs.com> #676: Migration Issues - Quick Create Potentials Non Functional ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * status: assigned => closed Comment: This issue has been fixed and has been checkedin in the svn. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 09:42:39 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 13:42:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5353 - /vtigercrm/trunk/Smarty/templates/UserListView.tpl Message-ID: <20060425134239.905186D9A73@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 25 07:42:34 2006 New Revision: 5353 Log: Navigation Buttons Organised in List view. ref #144. Modified: vtigercrm/trunk/Smarty/templates/UserListView.tpl Modified: vtigercrm/trunk/Smarty/templates/UserListView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserListView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserListView.tpl Tue Apr 25 07:42:34 2006 @@ -27,7 +27,11 @@ {/if} - +'; } $list_header .= ''; - foreach($focus->list_fields as $name=>$tableinfo) - { - $fieldname = $focus->list_fields_name[$name]; + $names = get_field_list($focus, $oCv, $tabid); - //added for customview 27/5 - if($oCv) - { - if(isset($oCv->list_fields_name)) - { - $fieldname = $oCv->list_fields_name[$name]; - } - } - - global $profile_id; - $query = "select profile2field.* from field inner join profile2field on field.fieldid=profile2field.fieldid where profile2field.tabid=".$tabid." and profile2field.profileid=".$profile_id." and field.fieldname='".$fieldname."'"; - $result = $adb->query($query); - - - //Getting the Entries from def_org_field table - $query1 = "select def_org_field.* from field inner join def_org_field on field.fieldid=def_org_field.fieldid where def_org_field.tabid=".$tabid." and field.fieldname='".$fieldname."'"; - $result_def = $adb->query($query1); - - if($adb->query_result($result,0,"visible") == 0 && $adb->query_result($result_def,0,"visible") == 0) - { - if($fieldname == '') - { - $table_name = ''; - $column_name = ''; - foreach($tableinfo as $tablename=>$colname) + + foreach($names as $fieldname=>$data) { + list($name, $is_column) = $data; + + if($is_column) { - $table_name=$tablename; - $column_name = $colname; - } - $value = $adb->query_result($list_result,$i-1,$colname); + $value = $adb->query_result($list_result,$i-1,$fieldname); } else { - if(($module == 'Activities' || $module == 'Tasks' || $module == 'Meetings' || $module == 'Emails' || $module == 'HelpDesk' || $module == 'Invoice') && (($name=='Related to') || ($name=='Contact Name') || ($name=='Close'))) { $status = $adb->query_result($list_result,$i-1,"status"); @@ -3071,6 +3072,7 @@ if ($name=='Related to') $value=getRelatedTo($module,$list_result,$i-1); if($name=='Contact Name') + { $first_name = $adb->query_result($list_result,$i-1,"firstname"); $last_name = $adb->query_result($list_result,$i-1,"lastname"); @@ -3091,6 +3093,7 @@ $value = "".$contact_name.""; } if ($name == 'Close') + { if($status =='Deferred' || $status == 'Completed' || $status == 'Held' || $status == '') { @@ -3105,6 +3108,7 @@ else $evt_status='&eventstatus=Held'; if(isPermitted("Activities",1,$activityid) == 'yes') + { $value = "X"; } @@ -3112,7 +3116,6 @@ { $value = ""; } - } } } @@ -3165,15 +3168,13 @@ { $value = getGroupName($entity_id, $module); } - else - { - - $query = "select * from field where tabid=".$tabid." and fieldname='".$fieldname."'"; - $field_result = $adb->query($query); - $list_result_count = $i-1; - - $value = getValue($field_result,$list_result,$fieldname,$focus,$module,$entity_id,$list_result_count,"list","",$returnset); - } + else + { + list($uitype, $colname) = get_uitype_colname($tabid, $fieldname); + $list_result_count = $i-1; + + $value = getValue($uitype, $colname,$list_result,$fieldname,$focus,$module,$entity_id,$list_result_count,"list","",$returnset); + } } //Added condition to hide the close symbol in Related Lists // if($relatedlist != '' && $value == "X") @@ -3192,8 +3193,6 @@ } } - } - if($returnset=='') $returnset = '&return_module='.$module.'&return_action=index'; @@ -3226,6 +3225,31 @@ return $list_header; } +function get_uitype_colname($tabid, $fieldname) +{ + static $last_tabid, $res = null; + + if(!is_null($res) && $last_tabid == $tabid) { + return $res[$fieldname]; + } + + global $adb; + $last_tabid = $tabid; + $res = null; + + $query = "select uitype, columnname, fieldname from field where tabid=".$tabid; + $result = $adb->query($query); + $num_rows=$adb->num_rows($result); + for($i=0;$i<$num_rows;$i++) { + $uitype = $adb->query_result($result,$i,"uitype"); + + $colname = $adb->query_result($result,$i,"columnname"); + $thisfieldname = $adb->query_result($result,$i,"fieldname"); + $res[$thisfieldname] = array($uitype, $colname); + } + + return $res[$fieldname]; +} function getSearchListViewEntries($focus, $module,$list_result,$navigation_array) { @@ -3316,11 +3340,10 @@ } else { - $query = "select * from field where tabid=".$tabid." and fieldname='".$fieldname."'"; - $field_result = $adb->query($query); + list($uitype, $colname) = get_uitype_colname($tabid, $fieldname); $list_result_count = $i-1; - $value = getValue($field_result,$list_result,$fieldname,$focus,$module,$entity_id,$list_result_count,"search",$focus->popup_type); + $value = getValue($uitype, $colname,$list_result,$fieldname,$focus,$module,$entity_id,$list_result_count,"search",$focus->popup_type); } } @@ -3334,12 +3357,9 @@ return $list_header; } -function getValue($field_result, $list_result,$fieldname,$focus,$module,$entity_id,$list_result_count,$mode,$popuptype,$returnset='') +function getValue($uitype, $colname, $list_result,$fieldname,$focus,$module,$entity_id,$list_result_count,$mode,$popuptype,$returnset='') { global $adb; - $uitype = $adb->query_result($field_result,0,"uitype"); - - $colname = $adb->query_result($field_result,0,"columnname"); $temp_val = $adb->query_result($list_result,$list_result_count,$colname); if(strlen($temp_val) > 40) From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 17:10:46 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 21:10:46 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23744=3A_?= =?utf-8?q?Remove_Duplicate_Queries?= In-Reply-To: <076.e0aa545b1227d61b497ea30577e03c97@vtiger.fosslabs.com> References: <076.e0aa545b1227d61b497ea30577e03c97@vtiger.fosslabs.com> Message-ID: <085.37df1e42b6a9dcf7babbacd44e06e8af@vtiger.fosslabs.com> #744: Remove Duplicate Queries ------------------------+--------------------------------------------------- Reporter: allanbush | Owner: allanbush Type: task | Status: new Priority: minor | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc3 Resolution: | Keywords: optimization database ------------------------+--------------------------------------------------- Comment (by allanbush): (In [5366]) Cached requests for user id. Refs #744. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 17:10:47 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 21:10:47 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5366 - /vtigercrm/branches/4.2/include/utils.php Message-ID: <20060425211047.CDFAF3FC421@vtiger.fosslabs.com> Author: allanbush Date: Tue Apr 25 15:10:44 2006 New Revision: 5366 Log: Cached requests for user id. Refs #744. Modified: vtigercrm/branches/4.2/include/utils.php Modified: vtigercrm/branches/4.2/include/utils.php ============================================================================== --- vtigercrm/branches/4.2/include/utils.php (original) +++ vtigercrm/branches/4.2/include/utils.php Tue Apr 25 15:10:44 2006 @@ -4034,11 +4034,15 @@ function getUserId($record) { + static $cache = array(); + if(isset($cache[$record])) return $cache[$record]; + global $vtlog; $vtlog->logthis("in getUserId ".$record,'info'); global $adb; - $user_id=$adb->query_result($adb->query("select * from crmentity where crmid = ".$record),0,'smownerid'); + $user_id=$adb->query_result($adb->query("select smownerid from crmentity where crmid = ".$record),0,'smownerid'); + $cache[$record] = $user_id; return $user_id; } From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 18:05:39 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 22:05:39 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23744=3A_?= =?utf-8?q?Remove_Duplicate_Queries?= In-Reply-To: <076.e0aa545b1227d61b497ea30577e03c97@vtiger.fosslabs.com> References: <076.e0aa545b1227d61b497ea30577e03c97@vtiger.fosslabs.com> Message-ID: <085.f822b282dd4e46d0e0c2a57d9384a63c@vtiger.fosslabs.com> #744: Remove Duplicate Queries ------------------------+--------------------------------------------------- Reporter: allanbush | Owner: allanbush Type: task | Status: new Priority: minor | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc3 Resolution: | Keywords: optimization database ------------------------+--------------------------------------------------- Comment (by allanbush): (In [5367]) Added a seperate query set for the mini calendar, reducing it to 3 queries (from 3 per day). Refs #744. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 18:05:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 22:05:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5367 - in /vtigercrm/branches/4.2/modules/Calendar: appointment.pinc minical.php Message-ID: <20060425220541.5918F6E4A9C@vtiger.fosslabs.com> Author: allanbush Date: Tue Apr 25 16:05:36 2006 New Revision: 5367 Log: Added a seperate query set for the mini calendar, reducing it to 3 queries (from 3 per day). Refs #744. Modified: vtigercrm/branches/4.2/modules/Calendar/appointment.pinc vtigercrm/branches/4.2/modules/Calendar/minical.php Modified: vtigercrm/branches/4.2/modules/Calendar/appointment.pinc ============================================================================== --- vtigercrm/branches/4.2/modules/Calendar/appointment.pinc (original) +++ vtigercrm/branches/4.2/modules/Calendar/appointment.pinc Tue Apr 25 16:05:36 2006 @@ -2048,57 +2048,7 @@ } unset($o); } - //} - // - - /* # - # First query ( non repeating appointments ) - # - $q = "SELECT * FROM ". $this->tablename." WHERE "; - $q .= " ("; - if(!is_admin($current_user)) - { - $q .= " ( "; - } - $q .= " (a_start < ". $x2 ." AND a_start >= ". $x1 .")"; - $q .= " OR (a_end < ". $x2 ." AND a_end >= ". $x1 .")"; - $q .= " OR (a_start < ". $x1 ." AND a_end >= ". $x2 .")"; - if(!is_admin($current_user)) - { - $q .= " ) AND ( creator = '".$current_user->id."' ) "; - } - $q .= " )"; - $q .= " ORDER by a_start"; - - //print("GS --> allowed ".is_admin($current_user)." q=".$q); - # always at the end of query - # check_dbacl( $q, $current_user->id); - - // srini cal appoint - $r = $this->db->query($q); - $n = $this->db->getRowCount($r); - $a = 0; - //print("GS --> ".$n." q=".$q); - while ( $a < $n ) - { - - $o = &new appointment(); - $result = mysql_fetch_assoc($r); - //$o->read_result($r,$a); - $o->read_result($result); - $a++; - if ( $o->see_ok() ) - { */ - /* Get all participants */ - /* //$o->read_participants(); - //print("GS --> see"); - $obj->callist[$o->id] = &$o; - } - unset($o); - } - //$r->free(); - - */ + $x = new DateTime(); $x->setDateTimeTS($from->ts); @@ -2114,72 +2064,100 @@ $ymd .= $pre ."'". Date("j/n",$x->getTimeStamp()) ."'"; $x->addDays(1); } - # - # Second query ( repeating appointments w/o end ) - # - /* $q = "SELECT c.* FROM ". $obj->dbconn->prefix .$table['appointment1'][name]." c WHERE "; - $q .= " r_ignore = 1 AND ("; - $q .= " ( repeat = 1 AND r_arg in (". $wd .") )"; - $q .= " OR ( repeat = 2 AND r_arg in (". $md .") )"; - $q .= " OR ( repeat = 3 AND r_arg in (". $ymd .") )"; - $q .= " OR ( repeat = 4 )"; - $q .= " ) AND ( a_start <= ". $x2 ." )"; - $q .= ""; - $q .= " ORDER by a_start"; - - */ - # always at the end of query - # check_dbacl( $q, $current_user->id); - - # $r = $obj->dbconn->Exec($q); - # $n = $r->numrows(); - # $a = 0; - # while ( $a < $n ) { - # $o = &new appointment($obj->dbconn); - # $o->read_result($r,$a); - # $a++; - # if ( $o->see_ok() ) { - /* Get all participants */ - # $o->read_participants(); - # $obj->callist[$o->id] = &$o; - # } - # unset($o); - # } - # $r->free(); - - # - # Third query ( repeating appointments with end ) - # - /* $q = "SELECT c.* FROM ". $obj->dbconn->prefix .$table['appointment1'][name]." c WHERE "; - $q .= " r_ignore = 0 AND ("; - $q .= " ( repeat = 1 AND r_arg in (". $wd .") )"; - $q .= " OR ( repeat = 2 AND r_arg in (". $md .") )"; - $q .= " OR ( repeat = 3 AND r_arg in (". $ymd .") )"; - $q .= " OR ( repeat = 4 )"; - $q .= ") AND ( (a_start < ". $x2 ." AND a_start >= ". $x1 .")"; - $q .= " OR (a_end < ". $x2 ." AND a_end >= ". $x1 .")"; - $q .= " OR (a_start < ". $x1 ." AND a_end >= ". $x2 .")"; - $q .= ")"; - $q .= " ORDER by a_start"; - */ - # $r = $obj->dbconn->Exec($q); - # $n = $r->numrows(); - # $a = 0; - # while ( $a < $n ) { - # $o = &new appointment($obj->dbconn); - # $o->read_result($r,$a); - # $a++; - # if ( $o->see_ok() ) { - /* Get all participants */ - # $o->read_participants(); - # $obj->callist[$o->id] = &$o; - # } - # unset($o); - # } - # $r->free(); return; } + + /** faster version of readCal which caches it's results and only returns the + * number of events on a given day + */ + function scanCal($from, $to) { + static $res = null; + global $msg, $current_user; + + $from = date("Y-m-d", $from); + $to = date("Y-m-d", $to); + + if(!is_null($res)) return $res[$from]; + + $res = array(); + + $q = "SELECT activity.date_start, count(*) AS count + FROM activity + INNER JOIN crmentity + ON activity.activityid = crmentity.crmid + INNER JOIN salesmanactivityrel + ON salesmanactivityrel.activityid=activity.activityid + WHERE activity.activitytype in ('Call','Meeting') + AND activity.date_start < '". $to ."' + AND activity.date_start >= '". $from."' + AND (activity.date_start like (activity.due_date) + OR (activity.date_start != null )) + AND crmentity.smownerid ='".$current_user->id."' + AND salesmanactivityrel.smid = '".$current_user->id."' + AND crmentity.deleted = 0 + GROUP BY activity.date_start"; + $r = $this->db->query($q); + $n = $this->db->getRowCount($r); + for($i=0; $i<$n; $i++) { + $date = $this->db->query_result($r, $i, 'date_start'); + $count = $this->db->query_result($r, $i, 'count'); + $res[$date] = $count; + } + + $q = "SELECT activity.date_start, count(*) AS count + FROM activity + INNER JOIN crmentity + ON activity.activityid = crmentity.crmid + INNER JOIN recurringevents + ON activity.activityid = recurringevents.activityid + INNER JOIN salesmanactivityrel + ON salesmanactivityrel.activityid = activity.activityid + WHERE activity.activitytype in ('Call','Meeting') + AND recurringdate < '". $to ."' + AND recurringdate >= '". $from."' + AND crmentity.smownerid ='".$current_user->id."' + AND salesmanactivityrel.smid = '".$current_user->id."' + AND crmentity.deleted = 0 + AND crmentity.deleted = 0 + GROUP BY activity.date_start"; + $r = $this->db->query($q); + $n = $this->db->getRowCount($r); + for($i=0; $i<$n; $i++) { + $date = $this->db->query_result($r, $i, 'date_start'); + $count = $this->db->query_result($r, $i, 'count'); + $res[$date] += $count; + } + + $q = "SELECT activity.date_start, count(*) AS count + FROM activity + INNER JOIN crmentity + ON activity.activityid = crmentity.crmid + INNER JOIN salesmanactivityrel + ON salesmanactivityrel.activityid=activity.activityid + INNER JOIN activitygrouprelation + ON activitygrouprelation.activityid=activity.activityid + INNER JOIN users2group + ON users2group.groupname=activitygrouprelation.groupname + WHERE activity.activitytype in ('Call','Meeting') + AND activity.date_start < '". $to ."' + AND activity.date_start >= '". $from."' + AND (activity.date_start like (activity.due_date) + OR (activity.date_start != null )) + AND crmentity.smownerid=0 + AND users2group.userid=".$current_user->id." + AND crmentity.deleted = 0 + GROUP BY activity.date_start"; + $r = $this->db->query($q); + $n = $this->db->getRowCount($r); + for($i=0; $i<$n; $i++) { + $date = $this->db->query_result($r, $i, 'date_start'); + $count = $this->db->query_result($r, $i, 'count'); + $res[$date] += $count; + } + return $res[$from]; + } + /** * get the help index */ Modified: vtigercrm/branches/4.2/modules/Calendar/minical.php ============================================================================== --- vtigercrm/branches/4.2/modules/Calendar/minical.php (original) +++ vtigercrm/branches/4.2/modules/Calendar/minical.php Tue Apr 25 16:05:36 2006 @@ -139,6 +139,9 @@ $today=Date("Ymd",time()); /* Back to last weekstart before ts */ +$te = $ts + 86400*31; +$app = new appointment(); +$app->scanCal($ts, $te); while ( Date("w",$ts) != $current_user->weekstart ) { $ts -= 86400; } @@ -203,10 +206,7 @@ $to->setDateTimeTS($ts - 12 * 3600); #$to->addDays(7); - $pref->callist = array(); - $app = new appointment(); - $app->readCal($pref,$from,$to); - // appointment::readCal($pref,$from,$to); + $app_count = $app->scanCal($ts, $te); $dd = new DateTime(); # $d = strftime($lang['DateFormatStr'],$ts); @@ -214,7 +214,7 @@ $d = $dd->getDate(); $tref = Date("Ymd",$ts); $eventclass=$col; - if(count($pref->callist)!=0) + if($app_count > 0) { //Classes are provided when events are created - Jaguar if($col == "today") From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 18:17:51 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 22:17:51 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23744=3A_?= =?utf-8?q?Remove_Duplicate_Queries?= In-Reply-To: <076.e0aa545b1227d61b497ea30577e03c97@vtiger.fosslabs.com> References: <076.e0aa545b1227d61b497ea30577e03c97@vtiger.fosslabs.com> Message-ID: <085.35f64f58a872a36ee59234617baab9b6@vtiger.fosslabs.com> #744: Remove Duplicate Queries ------------------------+--------------------------------------------------- Reporter: allanbush | Owner: allanbush Type: task | Status: new Priority: minor | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc3 Resolution: | Keywords: optimization database ------------------------+--------------------------------------------------- Comment (by allanbush): (In [5368]) Caching of ticket's related to information. Refs #744. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 18:17:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 22:17:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5368 - /vtigercrm/branches/4.2/modules/HelpDesk/ListTickets.php Message-ID: <20060425221752.9AC5D6E50D3@vtiger.fosslabs.com> Author: allanbush Date: Tue Apr 25 16:17:49 2006 New Revision: 5368 Log: Caching of ticket's related to information. Refs #744. Modified: vtigercrm/branches/4.2/modules/HelpDesk/ListTickets.php Modified: vtigercrm/branches/4.2/modules/HelpDesk/ListTickets.php ============================================================================== --- vtigercrm/branches/4.2/modules/HelpDesk/ListTickets.php (original) +++ vtigercrm/branches/4.2/modules/HelpDesk/ListTickets.php Tue Apr 25 16:17:49 2006 @@ -148,6 +148,9 @@ function getParentLink($parent_id) { + static $res = array(); + if(isset($res[$parent_id])) return $res[$parent_id]; + global $adb; $sql = "select setype from crmentity where crmid=".$parent_id; @@ -156,8 +159,9 @@ if($parent_module == 'Contacts') { $sql = "select firstname,lastname from contactdetails where contactid=".$parent_id; - $parentname = $adb->query_result($adb->query($sql),0,'firstname'); - $parentname .= ' '.$adb->query_result($adb->query($sql),0,'lastname'); + $result = $adb->query($sql); + $parentname = $adb->query_result($result,0,'firstname'); + $parentname .= ' '.$adb->query_result($result,0,'lastname'); $parent_name = ''.$parentname.''; } if($parent_module == 'Accounts') @@ -167,6 +171,7 @@ $parent_name = ''.$parentname.''; } + $res[$parent_id] = $parent_name; return $parent_name; } From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 18:24:44 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 22:24:44 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23744=3A_?= =?utf-8?q?Remove_Duplicate_Queries?= In-Reply-To: <076.e0aa545b1227d61b497ea30577e03c97@vtiger.fosslabs.com> References: <076.e0aa545b1227d61b497ea30577e03c97@vtiger.fosslabs.com> Message-ID: <085.0dd1a53777425ec923c4ff69bf748fd8@vtiger.fosslabs.com> #744: Remove Duplicate Queries ------------------------+--------------------------------------------------- Reporter: allanbush | Owner: allanbush Type: task | Status: new Priority: minor | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc3 Resolution: | Keywords: optimization database ------------------------+--------------------------------------------------- Comment (by allanbush): (In [5369]) Caching currency information. Refs #744. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 18:24:45 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 22:24:45 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5369 - /vtigercrm/branches/4.2/include/utils.php Message-ID: <20060425222445.BC4FC3FC42A@vtiger.fosslabs.com> Author: allanbush Date: Tue Apr 25 16:24:41 2006 New Revision: 5369 Log: Caching currency information. Refs #744. Modified: vtigercrm/branches/4.2/include/utils.php Modified: vtigercrm/branches/4.2/include/utils.php ============================================================================== --- vtigercrm/branches/4.2/include/utils.php (original) +++ vtigercrm/branches/4.2/include/utils.php Tue Apr 25 16:24:41 2006 @@ -4274,6 +4274,9 @@ function getDisplayCurrency() { + static $disp_curr = ''; + if($disp_curr) return $disp_curr; + global $adb; $sql1 = "select * from currency_info"; $result = $adb->query($sql1); @@ -4285,6 +4288,9 @@ function getCurrencySymbol() { + static $curr_symbol = ''; + if($curr_symbol) return $curr_symbol; + global $adb; $sql1 = "select * from currency_info"; $result = $adb->query($sql1); From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 18:42:06 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 22:42:06 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23744=3A_?= =?utf-8?q?Remove_Duplicate_Queries?= In-Reply-To: <076.e0aa545b1227d61b497ea30577e03c97@vtiger.fosslabs.com> References: <076.e0aa545b1227d61b497ea30577e03c97@vtiger.fosslabs.com> Message-ID: <085.9f576f5b00892a0de5ce66832b522d42@vtiger.fosslabs.com> #744: Remove Duplicate Queries ------------------------+--------------------------------------------------- Reporter: allanbush | Owner: allanbush Type: task | Status: new Priority: minor | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc3 Resolution: | Keywords: optimization database ------------------------+--------------------------------------------------- Comment (by allanbush): That's all I've found that looks worth fixing. I'll leave this open for a while to see if anyone else identifies some more redundant queries. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 02:44:07 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 06:44:07 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23745=3A_?= =?utf-8?q?New_=3CRecord=3E_Dorp-down_list_Change_Plural_to_Singular_form?= Message-ID: <076.c63c672b5c93dac045b955a9741b350d@vtiger.fosslabs.com> #745: New Dorp-down list Change Plural to Singular form -----------------------+---------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- In New Drop downlist, we have New Leads, New Contacts, New ... etc. All in plural form. It is better to change them to singular form i.e. '''New Lead''', '''New Contact''', etc. because only one record can be create at in single click. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 02:47:14 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 06:47:14 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23746=3A_?= =?utf-8?q?New_=3CRecord=3E_-_Handling_Tickets_and_FAQ?= Message-ID: <076.8a974f855c1ae2b8ba9418701ef5c2f7@vtiger.fosslabs.com> #746: New - Handling Tickets and FAQ -----------------------+---------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- We have Tickets and FAQ as a separate modules, but these two are put under "New HelpDesk". It is better to have New Ticket and New FAQ separately rather "New HelpDesk" Please get back to me if you need any clarifications. Thanks, Gopal -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 02:50:46 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 06:50:46 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23747=3A_?= =?utf-8?q?Handling_=3CNew=3ERecord=3A_Tasks_and_Events?= Message-ID: <076.2ad5054a596cd3d9eadad40186d30945@vtiger.fosslabs.com> #747: Handling Record: Tasks and Events -----------------------+---------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- We have Tasks and Events as a separate modules, but these two are put under "New Activities". It is better to have New Task and New Event separately rather "New Activities" Please get back to me if you need any clarifications. Thanks, Gopal -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 05:57:21 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 09:57:21 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23180=3A_?= =?utf-8?q?Basic_Search_fields_are_not_displayed_properly?= In-Reply-To: <076.5723a65820487e4af009b16310c3bc3d@vtiger.fosslabs.com> References: <076.5723a65820487e4af009b16310c3bc3d@vtiger.fosslabs.com> Message-ID: <085.9b48c419e131c20c4081cbd99b75c6a0@vtiger.fosslabs.com> #180: Basic Search fields are not displayed properly ------------------------+--------------------------------------------------- Reporter: don | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by saraj): * resolution: => fixed * status: new => closed Comment: (In [5370]) Search criteria and customview are retained after sorting in listview. Fixes #160and #180, and refs #160 -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 05:57:20 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 09:57:20 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23160=3A_?= =?utf-8?q?Sorting_not_working_in_search_List_view?= In-Reply-To: <076.dedd4d04a6dca9a90288861822f7ca9a@vtiger.fosslabs.com> References: <076.dedd4d04a6dca9a90288861822f7ca9a@vtiger.fosslabs.com> Message-ID: <085.4d28cb2c47421e6e6cadf780b4b42d47@vtiger.fosslabs.com> #160: Sorting not working in search List view ------------------------+--------------------------------------------------- Reporter: don | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by saraj): * resolution: => fixed * status: new => closed Comment: (In [5370]) Search criteria and customview are retained after sorting in listview. Fixes #160and #180, and refs #160 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 26 05:57:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 26 Apr 2006 09:57:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5370 - in /vtigercrm/trunk: include/utils/SearchUtils.php modules/Leads/ListView.php Message-ID: <20060426095721.C7F076E6494@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 26 03:57:11 2006 New Revision: 5370 Log: Search criteria and customview are retained after sorting in listview. Fixes #160and #180, and refs #160 Modified: vtigercrm/trunk/include/utils/SearchUtils.php vtigercrm/trunk/modules/Leads/ListView.php Modified: vtigercrm/trunk/include/utils/SearchUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/SearchUtils.php (original) +++ vtigercrm/trunk/include/utils/SearchUtils.php Wed Apr 26 03:57:11 2006 @@ -182,7 +182,7 @@ function Search($module) { - + $url_string=''; if(isset($_REQUEST['search_field']) && $_REQUEST['search_field'] !="") { $search_column=$_REQUEST['search_field']; @@ -207,8 +207,8 @@ else //Global Search { } - - return $where; + $url_string = "&search_field=".$search_column."&search_text=".$search_string."&searchtype=BasicSearch"; + return $where."#@@#".$url_string; } } @@ -410,14 +410,14 @@ if($_REQUEST['searchtype']=='advance') { $adv_string=''; + $url_string=''; if(isset($_REQUEST['search_cnt'])) $tot_no_criteria = $_REQUEST['search_cnt']; if($_REQUEST['matchtype'] == 'all') $matchtype = "and"; else $matchtype = "or"; - - for($i=0; $i<=$tot_no_criteria; $i++) + for($i=0; $i<$tot_no_criteria; $i++) { if($i == $tot_no_criteria-1) $matchtype= ""; @@ -429,6 +429,7 @@ $tab_col = str_replace('\'','',stripslashes($_REQUEST[$table_colname])); $srch_cond = str_replace('\'','',stripslashes($_REQUEST[$search_condition])); $srch_val = $_REQUEST[$search_value]; + $url_string .="&Fields".$i."=".$tab_col."&Condition".$i."=".$srch_cond."&Srch_value".$i."=".$srch_val; if($tab_col == "crmentity.smownerid") { $adv_string .= " (".getSearch_criteria($srch_cond,$srch_val,'users.user_name')." or"; @@ -439,7 +440,7 @@ $adv_string .= " ".getSearch_criteria($srch_cond,$srch_val,$tab_col)." ".$matchtype; } } - $where=$adv_string; + $where=$adv_string."#@@#".$url_string."&searchtype=advance&search_cnt=".$tot_no_criteria."&matchtype=".$_REQUEST['matchtype']; } else { Modified: vtigercrm/trunk/modules/Leads/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Leads/ListView.php (original) +++ vtigercrm/trunk/modules/Leads/ListView.php Wed Apr 26 03:57:11 2006 @@ -67,9 +67,9 @@ if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { - $where = getWhereCondition($currentModule); + list($where, $ustring) = split("#@@#",getWhereCondition($currentModule)); // we have a query - $url_string .="&query=true"; + $url_string .="&query=true".$ustring; $log->info("Here is the where clause for the list view: $where"); } From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 06:01:37 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 10:01:37 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23633=3A_?= =?utf-8?q?unInstallation_issue?= In-Reply-To: <076.51f5249c35374c687a3ee4d97ec59ede@vtiger.fosslabs.com> References: <076.51f5249c35374c687a3ee4d97ec59ede@vtiger.fosslabs.com> Message-ID: <085.7fba6f2cb6362a9d10f4692efcf20de6@vtiger.fosslabs.com> #633: unInstallation issue ------------------------+--------------------------------------------------- Reporter: mickie | Owner: richie Type: defect | Status: new Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.1 Resolution: | Keywords: install ------------------------+--------------------------------------------------- Changes (by richie): * priority: critical => minor * version: 5.0.0 => 5.0.1 * owner: developer => richie Comment: will not be handled for v5. Richie -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 26 06:18:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 26 Apr 2006 10:18:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5371 - /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Message-ID: <20060426101848.5093B6AB388@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 26 04:18:44 2006 New Revision: 5371 Log: * Modified the purchase order relatedlist label for vendors which do not show the Products in vendor relatedlist Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php ============================================================================== --- vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php (original) +++ vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Wed Apr 26 04:18:44 2006 @@ -2619,6 +2619,10 @@ $update_query3 = "update currency_info set conversion_rate=1, currency_status='Active', defaultid='-11' where id=1"; Execute($update_query3); +$update_query4 = "update relatedlists set label='Purchase Order' where tabid=18 and name='get_purchase_orders'"; +Execute($update_query4); + + //Added to get the conversion rate and update for all records //include("modules/Migration/ModifyDatabase/updateCurrency.php"); ?> From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 06:20:37 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 10:20:37 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23679=3A_?= =?utf-8?q?Migration_Issues_-_Exceptions_Thrown_in_Vendors?= In-Reply-To: <076.2af5095a13ae186cfdfff0e886a79dc2@vtiger.fosslabs.com> References: <076.2af5095a13ae186cfdfff0e886a79dc2@vtiger.fosslabs.com> Message-ID: <085.35aeb2b19436caa8763a19f88d16d1fa@vtiger.fosslabs.com> #679: Migration Issues - Exceptions Thrown in Vendors ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * status: assigned => closed Comment: This issue has been fixed and has been checkedin in the svn -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 06:31:46 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 10:31:46 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23160=3A_?= =?utf-8?q?Sorting_not_working_in_search_List_view?= In-Reply-To: <076.dedd4d04a6dca9a90288861822f7ca9a@vtiger.fosslabs.com> References: <076.dedd4d04a6dca9a90288861822f7ca9a@vtiger.fosslabs.com> Message-ID: <085.017a669caca209983ee36aad04c6e003@vtiger.fosslabs.com> #160: Sorting not working in search List view ------------------------+--------------------------------------------------- Reporter: don | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Comment (by saraj): (In [5372]) Search criteria and customview are retained after sorting in listview for all modules. Fixes #160and #180, and refs #160 -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 06:31:47 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 10:31:47 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23180=3A_?= =?utf-8?q?Basic_Search_fields_are_not_displayed_properly?= In-Reply-To: <076.5723a65820487e4af009b16310c3bc3d@vtiger.fosslabs.com> References: <076.5723a65820487e4af009b16310c3bc3d@vtiger.fosslabs.com> Message-ID: <085.6946104fbe956a68a7d33f01586379f1@vtiger.fosslabs.com> #180: Basic Search fields are not displayed properly ------------------------+--------------------------------------------------- Reporter: don | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Comment (by saraj): (In [5372]) Search criteria and customview are retained after sorting in listview for all modules. Fixes #160and #180, and refs #160 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 26 06:31:47 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 26 Apr 2006 10:31:47 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5372 - in /vtigercrm/trunk/modules: Accounts/ Activities/ Campaigns/ Contacts/ Faq/ HelpDesk/ Invoice/ Notes/ Potentials/ PriceBooks/ Products/ PurchaseOrder/ Quotes/ SalesOrder/ Vendors/ Message-ID: <20060426103147.B5CEB6E67EA@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 26 04:31:23 2006 New Revision: 5372 Log: Search criteria and customview are retained after sorting in listview for all modules. Fixes #160and #180, and refs #160 Modified: vtigercrm/trunk/modules/Accounts/ListView.php vtigercrm/trunk/modules/Activities/ListView.php vtigercrm/trunk/modules/Campaigns/ListView.php vtigercrm/trunk/modules/Contacts/ListView.php vtigercrm/trunk/modules/Faq/ListView.php vtigercrm/trunk/modules/HelpDesk/ListView.php vtigercrm/trunk/modules/Invoice/ListView.php vtigercrm/trunk/modules/Notes/ListView.php vtigercrm/trunk/modules/Potentials/ListView.php vtigercrm/trunk/modules/PriceBooks/ListView.php vtigercrm/trunk/modules/Products/ListView.php vtigercrm/trunk/modules/PurchaseOrder/ListView.php vtigercrm/trunk/modules/Quotes/ListView.php vtigercrm/trunk/modules/SalesOrder/ListView.php vtigercrm/trunk/modules/Vendors/ListView.php Modified: vtigercrm/trunk/modules/Accounts/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/ListView.php (original) +++ vtigercrm/trunk/modules/Accounts/ListView.php Wed Apr 26 04:31:23 2006 @@ -63,10 +63,11 @@ $smarty->assign("CHANGE_OWNER",getUserslist()); if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { - $where = getWhereCondition($currentModule); + list($where, $ustring) = split("#@@#",getWhereCondition($currentModule)); // we have a query - $url_string .="&query=true"; + $url_string .="&query=true".$ustring; $log->info("Here is the where clause for the list view: $where"); + } if($viewid != 0) { Modified: vtigercrm/trunk/modules/Activities/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Activities/ListView.php (original) +++ vtigercrm/trunk/modules/Activities/ListView.php Wed Apr 26 04:31:23 2006 @@ -64,12 +64,11 @@ if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { - $where=getWhereCondition($currentModule); + + list($where, $ustring) = split("#@@#",getWhereCondition($currentModule)); // we have a query - $url_string .="&query=true"; - + $url_string .="&query=true".$ustring; $log->info("Here is the where clause for the list view: $where"); - } Modified: vtigercrm/trunk/modules/Campaigns/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/ListView.php (original) +++ vtigercrm/trunk/modules/Campaigns/ListView.php Wed Apr 26 04:31:23 2006 @@ -49,16 +49,10 @@ if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { - $where=getWhereCondition($currentModule); - - $url_string .="&query=true"; - -/* if (isset($_REQUEST['campaignid'])) $campaignid = $_REQUEST['campaignid']; - if (isset($_REQUEST['campaignname'])) $campaignname = $_REQUEST['campaignname']; - if (isset($_REQUEST['campaigntype'])) $campaigntype = $_REQUEST['campaigntype']; - if (isset($_REQUEST['campaignstatus'])) $campaignstatus = $_REQUEST['campaignstatus']; - if (isset($_REQUEST['current_user_only'])) $current_user_only = $_REQUEST['current_user_only']; -*/ + list($where, $ustring) = split("#@@#",getWhereCondition($currentModule)); + // we have a query + $url_string .="&query=true".$ustring; + $log->info("Here is the where clause for the list view: $where"); } //<<<>>>>>> Modified: vtigercrm/trunk/modules/Contacts/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/ListView.php (original) +++ vtigercrm/trunk/modules/Contacts/ListView.php Wed Apr 26 04:31:23 2006 @@ -54,11 +54,13 @@ if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { + list($where, $ustring) = split("#@@#",getWhereCondition($currentModule)); // we have a query - $url_string .="&query=true"; - $where=getWhereCondition($currentModule); + $url_string .="&query=true".$ustring; + $log->info("Here is the where clause for the list view: $where"); + //Added for Custom Field Search -$sql="select * from field where tablename='contactscf' order by fieldlabel"; +/*$sql="select * from field where tablename='contactscf' order by fieldlabel"; $result=$adb->query($sql); for($i=0;$i<$adb->num_rows($result);$i++) { @@ -81,8 +83,7 @@ } //upto this added for Custom Field - $log->info("Here is the where clause for the list view: $where"); - +*/ } //<<<>>>>>> Modified: vtigercrm/trunk/modules/Faq/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Faq/ListView.php (original) +++ vtigercrm/trunk/modules/Faq/ListView.php Wed Apr 26 04:31:23 2006 @@ -71,7 +71,10 @@ $list_query = getListQuery("Faq"); if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { - $where=Search($currentModule); + list($where, $ustring) = split("#@@#",getWhereCondition($currentModule)); + // we have a query + $url_string .="&query=true".$ustring; + $log->info("Here is the where clause for the list view: $where"); } if(isset($where) && $where != '') { Modified: vtigercrm/trunk/modules/HelpDesk/ListView.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/ListView.php (original) +++ vtigercrm/trunk/modules/HelpDesk/ListView.php Wed Apr 26 04:31:23 2006 @@ -53,18 +53,11 @@ if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { - $where=Search($currentModule); - $url_string .="&query=true"; - - if (isset($_REQUEST['ticket_title'])) $name = $_REQUEST['ticket_title']; - if (isset($_REQUEST['ticket_id'])) $ticket_id_val = $_REQUEST['ticket_id']; - if (isset($_REQUEST['contact_name'])) $contact_name = $_REQUEST['contact_name']; - if (isset($_REQUEST['priority'])) $priority = $_REQUEST['priority']; - if (isset($_REQUEST['status'])) $status = $_REQUEST['status']; - if (isset($_REQUEST['category'])) $category = $_REQUEST['category']; - if (isset($_REQUEST['date'])) $date = $_REQUEST['date']; - if (isset($_REQUEST['current_user_only'])) $current_user_only = $_REQUEST['current_user_only']; - + list($where, $ustring) = split("#@@#",getWhereCondition($currentModule)); + // we have a query + $url_string .="&query=true".$ustring; + $log->info("Here is the where clause for the list view: $where"); + } //<<<>>>>>> Modified: vtigercrm/trunk/modules/Invoice/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/ListView.php (original) +++ vtigercrm/trunk/modules/Invoice/ListView.php Wed Apr 26 04:31:23 2006 @@ -54,11 +54,11 @@ if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { - $where=Search($currentModule); + list($where, $ustring) = split("#@@#",getWhereCondition($currentModule)); // we have a query - $url_string .="&query=true"; - + $url_string .="&query=true".$ustring; $log->info("Here is the where clause for the list view: $where"); + } //<<<>>>>>> Modified: vtigercrm/trunk/modules/Notes/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Notes/ListView.php (original) +++ vtigercrm/trunk/modules/Notes/ListView.php Wed Apr 26 04:31:23 2006 @@ -77,10 +77,9 @@ if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { - $where=Search($currentModule); + list($where, $ustring) = split("#@@#",getWhereCondition($currentModule)); // we have a query - $url_string .="&query=true"; - + $url_string .="&query=true".$ustring; $log->info("Here is the where clause for the list view: $where"); } Modified: vtigercrm/trunk/modules/Potentials/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/ListView.php (original) +++ vtigercrm/trunk/modules/Potentials/ListView.php Wed Apr 26 04:31:23 2006 @@ -56,15 +56,13 @@ if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { + list($where, $ustring) = split("#@@#",getWhereCondition($currentModule)); // we have a query - $url_string .="&query=true"; - - //Call for search function - Jaguar - $where=Search($currentModule); - - + $url_string .="&query=true".$ustring; + $log->info("Here is the where clause for the list view: $where"); + //Added for Custom Field Search - $sql="select * from field where tablename='potentialscf' order by fieldlabel"; +/* $sql="select * from field where tablename='potentialscf' order by fieldlabel"; $result=$adb->query($sql); for($i=0;$i<$adb->num_rows($result);$i++) { @@ -86,8 +84,7 @@ } } - $log->info("Here is the where clause for the list view: $where"); - +*/ } //<<<>>>>>> Modified: vtigercrm/trunk/modules/PriceBooks/ListView.php ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/ListView.php (original) +++ vtigercrm/trunk/modules/PriceBooks/ListView.php Wed Apr 26 04:31:23 2006 @@ -52,14 +52,11 @@ if(isset($_REQUEST['query']) && $_REQUEST['query'] != '' && $_REQUEST['query'] == 'true') { - $where=Search($currentModule); - - $url_string .="&query=true"; - if (isset($_REQUEST['bookname'])) $bookname = $_REQUEST['bookname']; - if (isset($_REQUEST['active'])) $active = $_REQUEST['active']; - + list($where, $ustring) = split("#@@#",getWhereCondition($currentModule)); + // we have a query + $url_string .="&query=true".$ustring; $log->info("Here is the where clause for the list view: $where"); - + } //<<<>>>>>> Modified: vtigercrm/trunk/modules/Products/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Products/ListView.php (original) +++ vtigercrm/trunk/modules/Products/ListView.php Wed Apr 26 04:31:23 2006 @@ -58,22 +58,10 @@ if(isset($_REQUEST['query']) && $_REQUEST['query'] != '' && $_REQUEST['query'] == 'true') { - $where=Search($currentModule); - - $url_string .="&query=true"; - - if (isset($_REQUEST['productname'])) $productname = $_REQUEST['productname']; - if (isset($_REQUEST['productcode'])) $productcode = $_REQUEST['productcode']; - if (isset($_REQUEST['commissionrate'])) $commissionrate = $_REQUEST['commissionrate']; - if (isset($_REQUEST['qtyperunit'])) $qtyperunit = $_REQUEST['qtyperunit']; - if (isset($_REQUEST['unitprice'])) $unitprice = $_REQUEST['unitprice']; - if (isset($_REQUEST['manufacturer'])) $manufacturer = $_REQUEST['manufacturer']; - if (isset($_REQUEST['productcategory'])) $productcategory = $_REQUEST['productcategory']; - if (isset($_REQUEST['start_date'])) $start_date = $_REQUEST['start_date']; - if (isset($_REQUEST['expiry_date'])) $expiry_date = $_REQUEST['expiry_date']; - if (isset($_REQUEST['purchase_date'])) $purchase_date = $_REQUEST['purchase_date']; - - $log->info("Here is the where clause for the list view: $where"); + list($where, $ustring) = split("#@@#",getWhereCondition($currentModule)); + // we have a query + $url_string .="&query=true".$ustring; + $log->info("Here is the where clause for the list view: $where"); } //<<<>>>>>> Modified: vtigercrm/trunk/modules/PurchaseOrder/ListView.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/ListView.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/ListView.php Wed Apr 26 04:31:23 2006 @@ -54,11 +54,9 @@ if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { - $where=Search($currentModule); - + list($where, $ustring) = split("#@@#",getWhereCondition($currentModule)); // we have a query - $url_string .="&query=true"; - + $url_string .="&query=true".$ustring; $log->info("Here is the where clause for the list view: $where"); } Modified: vtigercrm/trunk/modules/Quotes/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/ListView.php (original) +++ vtigercrm/trunk/modules/Quotes/ListView.php Wed Apr 26 04:31:23 2006 @@ -54,16 +54,9 @@ if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { - $where=Search($currentModule); - + list($where, $ustring) = split("#@@#",getWhereCondition($currentModule)); // we have a query - $url_string .="&query=true"; - - if (isset($_REQUEST['subject'])) $subject = $_REQUEST['subject']; - if (isset($_REQUEST['potentialname'])) $potentialname = $_REQUEST['potentialname']; - if (isset($_REQUEST['quotestage'])) $quotestage = $_REQUEST['quotestage']; - if (isset($_REQUEST['accountname'])) $accountname = $_REQUEST['accountname']; - + $url_string .="&query=true".$ustring; $log->info("Here is the where clause for the list view: $where"); } Modified: vtigercrm/trunk/modules/SalesOrder/ListView.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/ListView.php (original) +++ vtigercrm/trunk/modules/SalesOrder/ListView.php Wed Apr 26 04:31:23 2006 @@ -52,10 +52,13 @@ if(isset($_REQUEST['query']) && $_REQUEST['query'] != '' && $_REQUEST['query'] == 'true') { - $where=Search($currentModule); + + list($where, $ustring) = split("#@@#",getWhereCondition($currentModule)); + // we have a query + $url_string .="&query=true".$ustring; + $log->info("Here is the where clause for the list view: $where"); - $url_string .="&query=true"; - if (isset($_REQUEST['subject'])) $subject = $_REQUEST['subject']; +/* if (isset($_REQUEST['subject'])) $subject = $_REQUEST['subject']; if (isset($_REQUEST['accountname'])) $accountname = $_REQUEST['accountname']; if (isset($_REQUEST['quotename'])) $quotename = $_REQUEST['quotename']; @@ -90,7 +93,7 @@ $where .= " and "; $where .= $clause; } - +*/ $log->info("Here is the where clause for the list view: $where"); Modified: vtigercrm/trunk/modules/Vendors/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Vendors/ListView.php (original) +++ vtigercrm/trunk/modules/Vendors/ListView.php Wed Apr 26 04:31:23 2006 @@ -51,14 +51,9 @@ if(isset($_REQUEST['query']) && $_REQUEST['query'] != '' && $_REQUEST['query'] == 'true') { - $where=Search($currentModule); - - $url_string .="&query=true"; - - if (isset($_REQUEST['vendorname'])) $vendorname = $_REQUEST['vendorname']; - if (isset($_REQUEST['email'])) $email = $_REQUEST['email']; - if (isset($_REQUEST['category'])) $category = $_REQUEST['category']; - + list($where, $ustring) = split("#@@#",getWhereCondition($currentModule)); + // we have a query + $url_string .="&query=true".$ustring; $log->info("Here is the where clause for the list view: $where"); } From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 06:56:27 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 10:56:27 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23427=3A_?= =?utf-8?q?mailserver_details_fails?= In-Reply-To: <076.9e7e654229d664e748d9809d31b4de35@vtiger.fosslabs.com> References: <076.9e7e654229d664e748d9809d31b4de35@vtiger.fosslabs.com> Message-ID: <085.b6caaee3f4d7705a1447b100ec687f12@vtiger.fosslabs.com> #427: mailserver details fails ------------------------+--------------------------------------------------- Reporter: richie | Owner: richie Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: mailserver ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => duplicate * status: new => closed Comment: Duplicate 507 Richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 06:56:57 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 10:56:57 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23163=3A_?= =?utf-8?q?mailserver_details_throws_exception?= In-Reply-To: <076.e8c6a6b2b25f7031e102264397786cd6@vtiger.fosslabs.com> References: <076.e8c6a6b2b25f7031e102264397786cd6@vtiger.fosslabs.com> Message-ID: <085.b33a950deaef2ba4a01e5688bcdf131c@vtiger.fosslabs.com> #163: mailserver details throws exception ------------------------+--------------------------------------------------- Reporter: richie | Owner: ahmed Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: mailserver details ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => duplicate * status: new => closed Comment: Duplicate 507 Richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 06:57:08 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 10:57:08 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23507=3A_?= =?utf-8?q?My_Preference_Page_Error?= In-Reply-To: <076.369b9e9cf241d21998da449131304b7a@vtiger.fosslabs.com> References: <076.369b9e9cf241d21998da449131304b7a@vtiger.fosslabs.com> Message-ID: <085.508b355f12b6981729f4ed7fe804e657@vtiger.fosslabs.com> #507: My Preference Page Error ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by richie): * resolution: => fixed * status: new => closed Comment: (In [5373]) ID is properly passed. Fixes #507 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 26 06:57:08 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 26 Apr 2006 10:57:08 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5373 - /vtigercrm/trunk/Smarty/templates/MailAccountDetailView.tpl Message-ID: <20060426105708.E623C6E69A8@vtiger.fosslabs.com> Author: richie Date: Wed Apr 26 04:57:03 2006 New Revision: 5373 Log: ID is properly passed. Fixes #507 Modified: vtigercrm/trunk/Smarty/templates/MailAccountDetailView.tpl Modified: vtigercrm/trunk/Smarty/templates/MailAccountDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/MailAccountDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/MailAccountDetailView.tpl Wed Apr 26 04:57:03 2006 @@ -26,7 +26,7 @@ - + {* *} @@ -39,7 +39,7 @@
    - - - - - - {foreach key=header item=data from=$ADVBLOCKS} - - - - {foreach key=label item=subdata from=$data} - - {foreach key=mainlabel item=maindata from=$subdata} - {assign var="uitype" value="$maindata[0][0]"} - {assign var="fldlabel" value="$maindata[1][0]"} - {assign var="fldlabel_sel" value="$maindata[1][1]"} - {assign var="fldlabel_combo" value="$maindata[1][2]"} - {assign var="fldname" value="$maindata[2][0]"} - {assign var="fldvalue" value="$maindata[3][0]"} - {assign var="secondvalue" value="$maindata[3][1]"} - - - {if $uitype eq 2} - - - {elseif $uitype eq 11 || $uitype eq 1 || $uitype eq 13 || $uitype eq 7 || $uitype eq 9} - - {if $fldname eq 'tickersymbol' && $MODULE eq 'Accounts'} - - {else} - - {/if} - {elseif $uitype eq 19 || $uitype eq 20} - - - {elseif $uitype eq 21 || $uitype eq 24} - - - {elseif $uitype eq 15 || $uitype eq 16} - - - {elseif $uitype eq 33} - - - - {elseif $uitype eq 53} - - - {elseif $uitype eq 52 || $uitype eq 77} - - - {elseif $uitype eq 51} - {if $MODULE eq 'Accounts'} - {assign var='popuptype' value = 'specific_account_address'} - {else} - {assign var='popuptype' value = 'specific_contact_account_address'} - {/if} - - - - {elseif $uitype eq 50} - - - {elseif $uitype eq 73} - - - - {elseif $uitype eq 75 || $uitype eq 81} - - - {/if} - {elseif $uitype eq 57} - - - - {elseif $uitype eq 80} - - - - {elseif $uitype eq 78} - - - - {elseif $uitype eq 76} - - - - {elseif $uitype eq 17} - - - - {elseif $uitype eq 71 || $uitype eq 72} - - - - {elseif $uitype eq 56} - - {if $fldname eq 'notime' && $ACTIVITY_MODE eq 'Events'} - {if $fldvalue eq 1} - - {else} - - {/if} - {else} - {if $fldvalue eq 1} - - {else} - - {/if} - {/if} - {elseif $uitype eq 23 || $uitype eq 5 || $uitype eq 6} - - - - {elseif $uitype eq 63} - - - - - {elseif $uitype eq 357} - - - - - - - - - - {elseif $uitype eq 59} - - - - {elseif $uitype eq 55} - - - - {elseif $uitype eq 22} - - - - {elseif $uitype eq 69} - - - {else} - {$fldvalue} - {/if} - {elseif $uitype eq 61} - - - - {elseif $uitype eq 30} - - - - {/if} - {/foreach} - - {/foreach} - - {/foreach} From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 05:54:33 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 09:54:33 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23742=3A_?= =?utf-8?q?New_Ticket_screen?= Message-ID: <076.94e6b59f3e5bca0bd95e96ed6e6c80e3@vtiger.fosslabs.com> #742: New Ticket screen -----------------------+---------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: new Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- see screenshot attached -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 05:58:11 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 09:58:11 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23237=3A_?= =?utf-8?q?no_cancel_in_Notification_Scheduler?= In-Reply-To: <076.3524642d79ee15805889640bfe2f7854@vtiger.fosslabs.com> References: <076.3524642d79ee15805889640bfe2f7854@vtiger.fosslabs.com> Message-ID: <085.0ac0a0a6ff9b03a858a795a163212579@vtiger.fosslabs.com> #237: no cancel in Notification Scheduler ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.1 Resolution: fixed | Keywords: notification scheduler ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed Comment: (In [5338]) Cancel button added. Fixes #237 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 05:58:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 09:58:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5338 - /vtigercrm/trunk/Smarty/templates/Settings/EditEmailNotification.tpl Message-ID: <20060425095811.9CDC16D906D@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 03:58:06 2006 New Revision: 5338 Log: Cancel button added. Fixes #237 Modified: vtigercrm/trunk/Smarty/templates/Settings/EditEmailNotification.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings/EditEmailNotification.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/EditEmailNotification.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/EditEmailNotification.tpl Tue Apr 25 03:58:06 2006 @@ -40,6 +40,7 @@ From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 06:02:32 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 10:02:32 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23435=3A_?= =?utf-8?q?able_to_create_a_group_of_users_which_have_roles_too?= In-Reply-To: <076.3a388c4f43cdf08640bcff90db19520c@vtiger.fosslabs.com> References: <076.3a388c4f43cdf08640bcff90db19520c@vtiger.fosslabs.com> Message-ID: <085.e73fcfff1064c06daf395fb1b9105902@vtiger.fosslabs.com> #435: able to create a group of users which have roles too ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: group ------------------------+--------------------------------------------------- Changes (by don): * resolution: => invalid * status: new => closed Comment: This is not an issue. It is how groups work -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 06:07:05 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 10:07:05 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23643=3A_?= =?utf-8?q?DashBoard_not_working?= In-Reply-To: <076.5a765c13a09d13707d5ba6fefc0b886f@vtiger.fosslabs.com> References: <076.5a765c13a09d13707d5ba6fefc0b886f@vtiger.fosslabs.com> Message-ID: <085.55ec231beb663c6b6a265ecc8c2b2123@vtiger.fosslabs.com> #643: DashBoard not working ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: richie Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Dashboard ---------------------------+------------------------------------------------ -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 06:16:33 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 10:16:33 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23643=3A_?= =?utf-8?q?DashBoard_not_working?= In-Reply-To: <076.5a765c13a09d13707d5ba6fefc0b886f@vtiger.fosslabs.com> References: <076.5a765c13a09d13707d5ba6fefc0b886f@vtiger.fosslabs.com> Message-ID: <085.35f4d2be58f052d9430d491d10e0cd35@vtiger.fosslabs.com> #643: DashBoard not working ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: richie Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Dashboard ---------------------------+------------------------------------------------ -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 06:22:43 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 10:22:43 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23684=3A_?= =?utf-8?q?Security_Issue_in_Settings?= In-Reply-To: <076.102ee7f846edab9a85696e865ee56779@vtiger.fosslabs.com> References: <076.102ee7f846edab9a85696e865ee56779@vtiger.fosslabs.com> Message-ID: <085.5994511a75fd80b3b5d9f88fd6188737@vtiger.fosslabs.com> #684: Security Issue in Settings ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: Don Type: defect | Status: closed Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Security ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 06:25:45 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 10:25:45 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23674=3A_?= =?utf-8?q?Security_issue?= In-Reply-To: <076.69b68bee679ae1d33832d7dee1ea1f6f@vtiger.fosslabs.com> References: <076.69b68bee679ae1d33832d7dee1ea1f6f@vtiger.fosslabs.com> Message-ID: <085.9cee6b4eb1fd232d4ad81210c353f96d@vtiger.fosslabs.com> #674: Security issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: Don Type: defect | Status: closed Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Security ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 06:27:31 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 10:27:31 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23672=3A_?= =?utf-8?q?No_Security_for_Merge?= In-Reply-To: <076.7e14cd7ef58df8565de99d9517ad90d6@vtiger.fosslabs.com> References: <076.7e14cd7ef58df8565de99d9517ad90d6@vtiger.fosslabs.com> Message-ID: <085.4157e2aca25649d2179f09efc7e37228@vtiger.fosslabs.com> #672: No Security for Merge ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Security ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 06:31:44 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 10:31:44 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23640=3A_?= =?utf-8?q?Security_not_available_for_QuickCreate?= In-Reply-To: <076.cff216f20ffae325751ccb838d55bb16@vtiger.fosslabs.com> References: <076.cff216f20ffae325751ccb838d55bb16@vtiger.fosslabs.com> Message-ID: <085.d1599ecb928bc2d258790040b6821670@vtiger.fosslabs.com> #640: Security not available for QuickCreate ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: Don Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Security ---------------------------+------------------------------------------------ Changes (by saraj): * resolution: => fixed * status: new => closed Comment: (In [5340]) Added Security Check to Quick Create Module. Fixes #640. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 06:31:45 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 10:31:45 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5340 - /vtigercrm/trunk/include/utils/CommonUtils.php Message-ID: <20060425103145.4B0096D9082@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 25 04:31:40 2006 New Revision: 5340 Log: Added Security Check to Quick Create Module. Fixes #640. 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 Apr 25 04:31:40 2006 @@ -1532,11 +1532,24 @@ function QuickCreate($module) { global $adb; + global $current_user; global $mod_strings; $tabid = getTabid($module); + +//Adding Security Check +require('user_privileges/user_privileges_'.$current_user->id.'.php'); + if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0) + { + $quickcreate_query = "select * from field where quickcreate=0 and tabid = ".$tabid." order by quickcreatesequence"; + } + else + { + $profileList = getCurrentUserProfileList(); + $quickcreate_query = "select field.* from field inner join profile2field on profile2field.fieldid=field.fieldid inner join def_org_field on def_org_field.fieldid=field.fieldid where field.tabid=".$tabid." and quickcreate=0 and profile2field.visible=0 and def_org_field.visible=0 and profile2field.profileid in ".$profileList." order by quickcreatesequence"; + } + $category = getParentTab(); -$quickcreate_query = "select * from field where quickcreate=0 and tabid = ".$tabid." order by quickcreatesequence"; $result = $adb->query($quickcreate_query); $noofrows = $adb->num_rows($result); $fieldName_array = Array(); From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 06:34:17 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 10:34:17 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23671=3A_?= =?utf-8?q?Add_Bussiness_is_removed_so_we_have_to_remove_in_Security_too?= In-Reply-To: <076.9fd8391133d582286939a90b06fb8ffa@vtiger.fosslabs.com> References: <076.9fd8391133d582286939a90b06fb8ffa@vtiger.fosslabs.com> Message-ID: <085.c641b2dcf350839dac1b780f77a3be09@vtiger.fosslabs.com> #671: Add Bussiness is removed so we have to remove in Security too ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: don Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Security ---------------------------+------------------------------------------------ Changes (by don): * owner: developer => don -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 06:36:01 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 10:36:01 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23671=3A_?= =?utf-8?q?Add_Bussiness_is_removed_so_we_have_to_remove_in_Security_too?= In-Reply-To: <076.9fd8391133d582286939a90b06fb8ffa@vtiger.fosslabs.com> References: <076.9fd8391133d582286939a90b06fb8ffa@vtiger.fosslabs.com> Message-ID: <085.d8c48a11f9139775acc26a9029c0e3cb@vtiger.fosslabs.com> #671: Add Bussiness is removed so we have to remove in Security too ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: don Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Security ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 06:39:38 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 10:39:38 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23601=3A_?= =?utf-8?q?No_Security_Support_Faq=2CDashBoard=2CReports=2CRss=2CPortal?= In-Reply-To: <076.eec1eb209bc7f2f2f2e8cec1fd90cbdd@vtiger.fosslabs.com> References: <076.eec1eb209bc7f2f2f2e8cec1fd90cbdd@vtiger.fosslabs.com> Message-ID: <085.1f43fd1be3d4a0b1d6229d9976c6dcd2@vtiger.fosslabs.com> #601: No Security Support Faq,DashBoard,Reports,Rss,Portal ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: don Type: defect | Status: new Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Security ---------------------------+------------------------------------------------ Changes (by don): * owner: developer => don -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 06:39:53 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 10:39:53 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23601=3A_?= =?utf-8?q?No_Security_Support_Faq=2CDashBoard=2CReports=2CRss=2CPortal?= In-Reply-To: <076.eec1eb209bc7f2f2f2e8cec1fd90cbdd@vtiger.fosslabs.com> References: <076.eec1eb209bc7f2f2f2e8cec1fd90cbdd@vtiger.fosslabs.com> Message-ID: <085.3ab5009f08fc8458f33247a1382e154d@vtiger.fosslabs.com> #601: No Security Support Faq,DashBoard,Reports,Rss,Portal ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: don Type: defect | Status: closed Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Security ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 06:47:30 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 10:47:30 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23144=3A_?= =?utf-8?q?Statistics_not_in_the_same_plane_as_List_View_Users?= In-Reply-To: <076.6ff95a784ff00fd4b095cf6a1e5450fa@vtiger.fosslabs.com> References: <076.6ff95a784ff00fd4b095cf6a1e5450fa@vtiger.fosslabs.com> Message-ID: <085.a2aab1be2df1e95e4f514462bcedba00@vtiger.fosslabs.com> #144: Statistics not in the same plane as List View Users ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Statistics ------------------------+--------------------------------------------------- Comment (by saraj): (In [5341]) Made the User List View Proper with Proper Links including putting a check that the default admin and standarduser cannot be deleted. refs #144. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 06:47:31 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 10:47:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5341 - /vtigercrm/trunk/modules/Users/User.php Message-ID: <20060425104731.8BEF96D9084@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 25 04:47:26 2006 New Revision: 5341 Log: Made the User List View Proper with Proper Links including putting a check that the default admin and standarduser cannot be deleted. refs #144. 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 Apr 25 04:47:26 2006 @@ -505,8 +505,8 @@ function getUserListViewEntries($navigation_array) { global $theme; - $theme_path="themes/".$theme."/"; - $image_path=$theme_path."images/"; + $theme_path="themes/".$theme."/"; + $image_path=$theme_path."images/"; $query = "SELECT * from users where deleted=0"; $result =$this->db->query($query); $entries_list = array(); @@ -516,12 +516,19 @@ { $entries=array(); $id=$this->db->query_result($result,$i-1,'id'); - $entries[]='Edit  Delete'; + + if($this->db->query_result($result,$i-1,'user_name') == 'admin' || $this->db->query_result($result,$i-1,'user_name') == 'standarduser' ) + { + $entries[]='Edit  '; + } + else + + $entries[]='Edit  Delete'; + $entries[]=''.$this->db->query_result($result,$i-1,'user_name').''; $rolecode= fetchUserRole($this->db->query_result($result,$i-1,'id')); - $entries[]=''.$roleinfo[ -$rolecode][0]; + $entries[]=''.$roleinfo[$rolecode][0]; $entries[]=''.$this->db->query_result($result,$i-1,'email1').' '; From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 06:49:06 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 10:49:06 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23743=3A_?= =?utf-8?q?Unable_to_set_Password_for_Duplicate_User?= Message-ID: <076.ce9a4546c95b27a7ab5c308222e723b4@vtiger.fosslabs.com> #743: Unable to set Password for Duplicate User -----------------------+---------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- The password Fields are missing when clicking on Duplicate and creating Duplicate User -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 07:07:18 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 11:07:18 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23595=3A_?= =?utf-8?q?Profile_security_issue?= In-Reply-To: <076.c3cab07876ed32071c0d9389e5b0181e@vtiger.fosslabs.com> References: <076.c3cab07876ed32071c0d9389e5b0181e@vtiger.fosslabs.com> Message-ID: <085.a3c018c10a089d32f219d17f60b9d79c@vtiger.fosslabs.com> #595: Profile security issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: don Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Security ---------------------------+------------------------------------------------ Changes (by don): * owner: developer => don -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 07:13:29 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 11:13:29 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23743=3A_?= =?utf-8?q?Unable_to_set_Password_for_Duplicate_User?= In-Reply-To: <076.ce9a4546c95b27a7ab5c308222e723b4@vtiger.fosslabs.com> References: <076.ce9a4546c95b27a7ab5c308222e723b4@vtiger.fosslabs.com> Message-ID: <085.ce35d3977be74207e4d9d560a2996572@vtiger.fosslabs.com> #743: Unable to set Password for Duplicate User ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by saraj): * resolution: => fixed * status: new => closed Comment: (In [5342]) Added the password & confirm password field for Duplicate Users - Ahmed. Fixes #743. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 07:13:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 11:13:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5342 - /vtigercrm/trunk/modules/Users/EditView.php Message-ID: <20060425111330.7EDB76D908D@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 25 05:13:25 2006 New Revision: 5342 Log: Added the password & confirm password field for Duplicate Users - Ahmed. Fixes #743. Modified: vtigercrm/trunk/modules/Users/EditView.php Modified: vtigercrm/trunk/modules/Users/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Users/EditView.php (original) +++ vtigercrm/trunk/modules/Users/EditView.php Tue Apr 25 05:13:25 2006 @@ -54,6 +54,13 @@ if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') { $focus->id = ""; $focus->user_name = ""; + $mode='create'; + $password=' + + + + + '; } global $theme; @@ -151,7 +158,6 @@ $smarty->assign("DATE_FORMAT", $DATE_FORMAT_SELECT_OPTION); if (is_admin($current_user)) { - //$status = "\n"; $status = " {if $ALL eq 'All'} - {else} - + {$APP.LNK_CV_DELETE} {/if}
    -
    - - -
    -
    - {$header} -
    *{$fldlabel}{$fldlabel} - {if $uitype eq 20}*{/if} - {$fldlabel} - - {if $uitype eq 24} - * - {/if} - {$fldlabel} - - {if $uitype eq 16} - * - {/if} - {$fldlabel} - - - - {$fldlabel} - - - - {$fldlabel} - - {assign var=check value=1} - {foreach key=key_one item=arr from=$fldvalue} - {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} -  User - {if $secondvalue neq ''} -  Team - {/if} - - - {if $secondvalue neq ''} - - - {/if} - - {$fldlabel} - - {if $uitype eq 52} - - {else} - - {$fldlabel} Select *{$fldlabel} Select*{$fldlabel} Select - {if $uitype eq 81} - * - {assign var="pop_type" value="specific_vendor_address"} - {else}{assign var="pop_type" value="specific"} - {/if} - {$fldlabel} -  Select - {if $uitype eq 75} -  {$fldlabel} Select {$fldlabel} Select {$fldlabel} Select {$fldlabel} Select {$fldlabel}  http://  - {if $uitype eq 72} - * - {/if} - {$fldlabel}{$fldlabel}{$fldlabel} - {foreach key=date_value item=time_value from=$fldvalue} - {assign var=date_val value="$date_value"} - {assign var=time_val value="$time_value"} - {/foreach} - - - {if $uitype eq 6} - - {/if} - {foreach key=date_format item=date_str from=$secondvalue} - {assign var=dateFormat value="$date_format"} - {assign var=dateStr value="$date_str"} - {/foreach} - {if $uitype eq 5 || $uitype eq 23} -
    ({$dateStr}) - {else} -
    ({$dateStr}) - {/if} - - - -     		- {$fldlabel} - -   - - - {elseif $uitype eq 68 || $uitype eq 66 || $uitype eq 62} - - - - -  Select To:  - -   - -  Select 
    CC:  - BCC:  -
    - {$fldlabel} -  Select {$fldlabel} - - *{$fldlabel} - - {$fldlabel} - {if $MODULE eq 'Products'} - -
    Files Maximum 6 - -
    - -     		{$fldlabel}{$fldvalue}{$fldlabel} - {assign var=check value=$secondvalue[0]} - {assign var=yes_val value=$secondvalue[1]} - {assign var=no_val value=$secondvalue[2]} -  {$yes_val}  {$no_val}  - {foreach item=val_arr from=$fldvalue} - {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]"} - -  {$disp_text} - {/foreach} -
     
    Modified: vtigercrm/trunk/Smarty/templates/QuickCreate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/QuickCreate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/QuickCreate.tpl Tue Apr 25 03:48:11 2006 @@ -100,7 +100,7 @@ {/if}  User {if $secondvalue neq ''} -  Team +  Group {/if}  User {if $secondvalue neq ''} -  Team +  Group {/if} '.$app_strings['LBL_TEAM']; + onclick="toggleAssignType(this.value)">'.$app_strings['LBL_GROUP']; } $GROUP_SELECT_OPTION .='
    References: <076.5a765c13a09d13707d5ba6fefc0b886f@vtiger.fosslabs.com> Message-ID: <085.1fd4223727a5b1ccff1a3021bbc1d1e6@vtiger.fosslabs.com> #643: DashBoard not working ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: richie Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Dashboard ---------------------------+------------------------------------------------ Changes (by richie): * priority: blocker => major * owner: developer => richie Comment: Fixed. The issue has been fixed by compiling php with --with-ttf and --with-freetype-dir parameters -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 05:49:27 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 09:49:27 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23192=3A_?= =?utf-8?q?picklist_settings_great!?= In-Reply-To: <076.c5ae652b83bc6b62d10710cb09cab462@vtiger.fosslabs.com> References: <076.c5ae652b83bc6b62d10710cb09cab462@vtiger.fosslabs.com> Message-ID: <085.a4022bccaa85de13cabf45c2526ae7aa@vtiger.fosslabs.com> #192: picklist settings great! ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 05:52:31 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 09:52:31 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23235=3A_?= =?utf-8?q?no_cancel_button_in_edit_inventory_notifications?= In-Reply-To: <076.9acf1b6002f4a08921da403ba2e0b02a@vtiger.fosslabs.com> References: <076.9acf1b6002f4a08921da403ba2e0b02a@vtiger.fosslabs.com> Message-ID: <085.589e826203c9216a57c7b831144dea78@vtiger.fosslabs.com> #235: no cancel button in edit inventory notifications ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: inventory ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed Comment: (In [5337]) Cancel button added. Fixes #235 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 05:52:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 09:52:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5337 - /vtigercrm/trunk/Smarty/templates/Settings/EditInventoryNotify.tpl Message-ID: <20060425095232.301FA6D9033@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 03:52:27 2006 New Revision: 5337 Log: Cancel button added. Fixes #235 Modified: vtigercrm/trunk/Smarty/templates/Settings/EditInventoryNotify.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings/EditInventoryNotify.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/EditInventoryNotify.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/EditInventoryNotify.tpl Tue Apr 25 03:52:27 2006 @@ -27,6 +27,7 @@
    +
     
    +
     
    *Password*Confirm Password
    ".$app_strings['LBL_REQUIRED_SYMBOL']."".$mod_strings['LBL_STATUS']."  \n"; -echo " \n"; -echo " \n"; -echo " \n"; -echo "
    \n"; -echo " "; -echo " "; -echo " \n"; -echo " \n"; -echo "
    \n"; -echo "
    \n"; - -echo ""; -echo get_set_focus_js(); -echo get_validate_record_js(); -*/ ?> From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 07:16:20 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 11:16:20 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23595=3A_?= =?utf-8?q?Profile_security_issue?= In-Reply-To: <076.c3cab07876ed32071c0d9389e5b0181e@vtiger.fosslabs.com> References: <076.c3cab07876ed32071c0d9389e5b0181e@vtiger.fosslabs.com> Message-ID: <085.42f18e29b2eded2ba3ec7eae4e94b2e0@vtiger.fosslabs.com> #595: Profile security issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: don Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Security ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 07:19:02 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 11:19:02 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23568=3A_?= =?utf-8?q?unable_to_login_as_standard_user?= In-Reply-To: <076.a1184dedb1f8d5b602466923e6d467e3@vtiger.fosslabs.com> References: <076.a1184dedb1f8d5b602466923e6d467e3@vtiger.fosslabs.com> Message-ID: <085.7cfcd283161b5abb0c1c7d8b3b92310e@vtiger.fosslabs.com> #568: unable to login as standard user ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: don Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: security ---------------------------+------------------------------------------------ Changes (by don): * owner: developer => don -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 07:22:18 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 11:22:18 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23568=3A_?= =?utf-8?q?unable_to_login_as_standard_user?= In-Reply-To: <076.a1184dedb1f8d5b602466923e6d467e3@vtiger.fosslabs.com> References: <076.a1184dedb1f8d5b602466923e6d467e3@vtiger.fosslabs.com> Message-ID: <085.b4d13cec01e8edb12e064ce053946e0c@vtiger.fosslabs.com> #568: unable to login as standard user ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: don Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: security ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 07:24:21 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 11:24:21 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23551=3A_?= =?utf-8?q?Security_Issue?= In-Reply-To: <076.e7f9ecf93c9d82d4473e75022f2e9c49@vtiger.fosslabs.com> References: <076.e7f9ecf93c9d82d4473e75022f2e9c49@vtiger.fosslabs.com> Message-ID: <085.63ef571fe94324fcb4b4bb563282def6@vtiger.fosslabs.com> #551: Security Issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: don Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: security ---------------------------+------------------------------------------------ Changes (by don): * owner: developer => don -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 07:24:48 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 11:24:48 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23551=3A_?= =?utf-8?q?Security_Issue?= In-Reply-To: <076.e7f9ecf93c9d82d4473e75022f2e9c49@vtiger.fosslabs.com> References: <076.e7f9ecf93c9d82d4473e75022f2e9c49@vtiger.fosslabs.com> Message-ID: <085.ea79fb6b38c67598472da93cb66326bc@vtiger.fosslabs.com> #551: Security Issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: don Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: security ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 07:26:32 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 11:26:32 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23518=3A_?= =?utf-8?q?Title_should_be_changed_for_Field_access?= In-Reply-To: <076.f4c821006fca097924c1376dd04dc95b@vtiger.fosslabs.com> References: <076.f4c821006fca097924c1376dd04dc95b@vtiger.fosslabs.com> Message-ID: <085.da9b0d827eb9e740b7df117c5fca4343@vtiger.fosslabs.com> #518: Title should be changed for Field access ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: ela Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: assigned => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 07:27:46 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 11:27:46 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23514=3A_?= =?utf-8?q?Issue_in_Organisation_Sharing_Privileges?= In-Reply-To: <076.ee8bbe6e04ff829ca526590a1f507db7@vtiger.fosslabs.com> References: <076.ee8bbe6e04ff829ca526590a1f507db7@vtiger.fosslabs.com> Message-ID: <085.5bdc8990837ba34794dbfd472520e2b4@vtiger.fosslabs.com> #514: Issue in Organisation Sharing Privileges ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: don Type: defect | Status: new Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Security ---------------------------+------------------------------------------------ Changes (by don): * owner: developer => don -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 07:28:37 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 11:28:37 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23514=3A_?= =?utf-8?q?Issue_in_Organisation_Sharing_Privileges?= In-Reply-To: <076.ee8bbe6e04ff829ca526590a1f507db7@vtiger.fosslabs.com> References: <076.ee8bbe6e04ff829ca526590a1f507db7@vtiger.fosslabs.com> Message-ID: <085.d3113cdda796cc5664790c6f00a9ae4d@vtiger.fosslabs.com> #514: Issue in Organisation Sharing Privileges ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: don Type: defect | Status: closed Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: Security ---------------------------+------------------------------------------------ Changes (by don): * resolution: => invalid * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 07:29:41 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 11:29:41 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23509=3A_?= =?utf-8?q?Delete_not_available_for_Role_Detail_View?= In-Reply-To: <076.53e50073e405d488131b91c93a0e58ee@vtiger.fosslabs.com> References: <076.53e50073e405d488131b91c93a0e58ee@vtiger.fosslabs.com> Message-ID: <085.b71ad1501e5b91c21ad9f8842a4dda99@vtiger.fosslabs.com> #509: Delete not available for Role Detail View ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: don Type: defect | Status: new Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: UI ---------------------------+------------------------------------------------ Changes (by don): * owner: developer => don -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 07:30:27 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 11:30:27 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23509=3A_?= =?utf-8?q?Delete_not_available_for_Role_Detail_View?= In-Reply-To: <076.53e50073e405d488131b91c93a0e58ee@vtiger.fosslabs.com> References: <076.53e50073e405d488131b91c93a0e58ee@vtiger.fosslabs.com> Message-ID: <085.bf3e10b27e71943b24073ed6dd16fc3e@vtiger.fosslabs.com> #509: Delete not available for Role Detail View ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: don Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 07:33:33 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 11:33:33 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23402=3A_?= =?utf-8?q?delete_role_issue?= In-Reply-To: <076.a7a921d097b274cd819a3013954d7537@vtiger.fosslabs.com> References: <076.a7a921d097b274cd819a3013954d7537@vtiger.fosslabs.com> Message-ID: <085.55662e37c165da8739bcd10a3831479f@vtiger.fosslabs.com> #402: delete role issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: don Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Security ---------------------------+------------------------------------------------ Changes (by don): * owner: developer => don -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 07:51:55 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 11:51:55 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23266=3A_?= =?utf-8?q?editing_dashboard_throws_exceptions?= In-Reply-To: <076.04d3c577084250d38f421f8c39b6c528@vtiger.fosslabs.com> References: <076.04d3c577084250d38f421f8c39b6c528@vtiger.fosslabs.com> Message-ID: <085.b36d26ef7732082c15e9da710349e536@vtiger.fosslabs.com> #266: editing dashboard throws exceptions ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: dashboard ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed Comment: (In [5343]) Zero check added. Fixes #266 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 07:51:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 11:51:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5343 - /vtigercrm/trunk/include/utils/GraphUtils.php Message-ID: <20060425115155.D96786D9093@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 05:51:50 2006 New Revision: 5343 Log: Zero check added. Fixes #266 Modified: vtigercrm/trunk/include/utils/GraphUtils.php Modified: vtigercrm/trunk/include/utils/GraphUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/GraphUtils.php (original) +++ vtigercrm/trunk/include/utils/GraphUtils.php Tue Apr 25 05:51:50 2006 @@ -92,6 +92,12 @@ // normalize $max to get value between 1 and 10 $coef = pow(10,floor(log10($max))); + if($coef == 0) + { + $data=0; + echo "

    No data available with the specified time period

    "; + return $data; + } $normalized = $max / $coef; if($normalized < 1.5){ From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 08:02:22 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 12:02:22 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23587=3A_?= =?utf-8?q?redirection_of_website_adding?= In-Reply-To: <076.099e4c4e6754da2a40058cd1471b7ea5@vtiger.fosslabs.com> References: <076.099e4c4e6754da2a40058cd1471b7ea5@vtiger.fosslabs.com> Message-ID: <085.c18ae5e4b53a3f9b739ee28de34bec71@vtiger.fosslabs.com> #587: redirection of website adding --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: jeri Type: defect | Status: new Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: --------------------------------+------------------------------------------- Changes (by richie): * owner: developer => jeri -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 08:06:39 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 12:06:39 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23567=3A_?= =?utf-8?q?required_field_not_specified?= In-Reply-To: <076.9ce280e54e44bf68ffb1beabe00c03e2@vtiger.fosslabs.com> References: <076.9ce280e54e44bf68ffb1beabe00c03e2@vtiger.fosslabs.com> Message-ID: <085.1313b1f547f5de9d69150e60c716b51f@vtiger.fosslabs.com> #567: required field not specified --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: ahmed Type: defect | Status: new Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: --------------------------------+------------------------------------------- Changes (by richie): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 08:07:48 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 12:07:48 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23371=3A_?= =?utf-8?q?Cloud_Tag_under_the_Header_-Select_template_to_Mail_Merge_=28He?= =?utf-8?q?lpDesk=29?= In-Reply-To: <076.599a44b8a7a1b8ea9621b16f65b1d071@vtiger.fosslabs.com> References: <076.599a44b8a7a1b8ea9621b16f65b1d071@vtiger.fosslabs.com> Message-ID: <085.d73b210083ff0be8e91f13f7b7991e84@vtiger.fosslabs.com> #371: Cloud Tag under the Header -Select template to Mail Merge (HelpDesk) ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: ahmed Type: defect | Status: new Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 08:08:26 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 12:08:26 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23368=3A_?= =?utf-8?q?clearer_message_while_using_existing_mysql?= In-Reply-To: <076.5f20b029663faeb28a418bc08bd641ff@vtiger.fosslabs.com> References: <076.5f20b029663faeb28a418bc08bd641ff@vtiger.fosslabs.com> Message-ID: <085.737477950cb411948b217ebfd0aef1ab@vtiger.fosslabs.com> #368: clearer message while using existing mysql ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: installation ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed Comment: Fixed in the exe installation -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 08:10:30 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 12:10:30 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23352=3A_?= =?utf-8?q?unwanted_Emails_and_WebMails_link_in_top_of_emails_Create/EditV?= =?utf-8?q?iew?= In-Reply-To: <076.3cdb8f28ca7207c8b42fd535ef869264@vtiger.fosslabs.com> References: <076.3cdb8f28ca7207c8b42fd535ef869264@vtiger.fosslabs.com> Message-ID: <085.16eee4c662b8cf629bf4751b6b4f5db4@vtiger.fosslabs.com> #352: unwanted Emails and WebMails link in top of emails Create/EditView --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: jeri Type: defect | Status: new Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: --------------------------------+------------------------------------------- Changes (by richie): * owner: developer => jeri Comment: Fixed by the integration of the newer UI for Emails/Webmails Richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 08:10:55 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 12:10:55 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23349=3A_?= =?utf-8?q?getting_scroll_bar_in_email_edit/create_view?= In-Reply-To: <076.35e4502eeac2f7711edcaab632e8b357@vtiger.fosslabs.com> References: <076.35e4502eeac2f7711edcaab632e8b357@vtiger.fosslabs.com> Message-ID: <085.3143a40ee8038f6925fd85ae38a06409@vtiger.fosslabs.com> #349: getting scroll bar in email edit/create view --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: jeri Type: defect | Status: new Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: --------------------------------+------------------------------------------- Changes (by richie): * owner: developer => jeri Comment: Fixed by adding the new UI for Webmails/Emails. Richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 08:12:44 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 12:12:44 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23352=3A_?= =?utf-8?q?unwanted_Emails_and_WebMails_link_in_top_of_emails_Create/EditV?= =?utf-8?q?iew?= In-Reply-To: <076.3cdb8f28ca7207c8b42fd535ef869264@vtiger.fosslabs.com> References: <076.3cdb8f28ca7207c8b42fd535ef869264@vtiger.fosslabs.com> Message-ID: <085.f5b28b7b39f67b762f6bb92b63e03d3d@vtiger.fosslabs.com> #352: unwanted Emails and WebMails link in top of emails Create/EditView --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: jeri Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 08:12:54 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 12:12:54 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23349=3A_?= =?utf-8?q?getting_scroll_bar_in_email_edit/create_view?= In-Reply-To: <076.35e4502eeac2f7711edcaab632e8b357@vtiger.fosslabs.com> References: <076.35e4502eeac2f7711edcaab632e8b357@vtiger.fosslabs.com> Message-ID: <085.bb3d04fccf37a96cc6d21b8bba9b98d1@vtiger.fosslabs.com> #349: getting scroll bar in email edit/create view --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: jeri Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 08:20:16 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 12:20:16 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23732=3A_?= =?utf-8?q?Webmail_not_working?= In-Reply-To: <076.ed6c8148f21744174fe5c3975735bf62@vtiger.fosslabs.com> References: <076.ed6c8148f21744174fe5c3975735bf62@vtiger.fosslabs.com> Message-ID: <085.9262ba0409a9e165a42aa8df03e2b79e@vtiger.fosslabs.com> #732: Webmail not working -----------------------------+---------------------------------------------- Reporter: Pooh the tiger | Owner: richie Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.1 Resolution: | Keywords: -----------------------------+---------------------------------------------- Changes (by richie): * owner: developer => richie Comment: Hello! This is an issue in the demo as of now. This has been fixed and you will find the updated demo with this issue fixed soon. Kindly bear with us in the meanwhile. Richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 08:20:42 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 12:20:42 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23643=3A_?= =?utf-8?q?DashBoard_not_working?= In-Reply-To: <076.5a765c13a09d13707d5ba6fefc0b886f@vtiger.fosslabs.com> References: <076.5a765c13a09d13707d5ba6fefc0b886f@vtiger.fosslabs.com> Message-ID: <085.3d97ad6f92da629a39f1988b0028a14e@vtiger.fosslabs.com> #643: DashBoard not working ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: richie Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Dashboard ---------------------------+------------------------------------------------ Changes (by richie): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 08:36:11 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 12:36:11 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23190=3A_?= =?utf-8?q?Sharing_Issued_in_Calendar_Module?= In-Reply-To: <076.3c257ada412a9b3531914a206a12e87a@vtiger.fosslabs.com> References: <076.3c257ada412a9b3531914a206a12e87a@vtiger.fosslabs.com> Message-ID: <085.eddba28b48d10dba157cbaeaa59f2abb@vtiger.fosslabs.com> #190: Sharing Issued in Calendar Module ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 08:48:32 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 12:48:32 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23574=3A_?= =?utf-8?q?parenttab_is_not_parsed_in_Notes_CustomView?= In-Reply-To: <076.b31e86eae65dd3bc908e3030de9d3029@vtiger.fosslabs.com> References: <076.b31e86eae65dd3bc908e3030de9d3029@vtiger.fosslabs.com> Message-ID: <085.b5e81259bfe8ef05e8b47eb5d1226162@vtiger.fosslabs.com> #574: parenttab is not parsed in Notes CustomView --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed Comment: (In [5344]) passed parenttab and fixes #574 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 08:48:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 12:48:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5344 - /vtigercrm/trunk/Smarty/templates/ListView.tpl Message-ID: <20060425124834.0F6086D92E0@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 06:48:27 2006 New Revision: 5344 Log: passed parenttab and fixes #574 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 Apr 25 06:48:27 2006 @@ -298,17 +298,17 @@     		{$APP.LNK_CV_CREATEVIEW} + {$APP.LNK_CV_CREATEVIEW} | {$APP.LNK_CV_EDIT} | {$APP.LNK_CV_DELETE}{$APP.LNK_CV_CREATEVIEW} + {$APP.LNK_CV_CREATEVIEW} | - {$APP.LNK_CV_EDIT} + {$APP.LNK_CV_EDIT} | - {$APP.LNK_CV_DELETE}
    From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 08:49:28 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 12:49:28 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23574=3A_?= =?utf-8?q?parenttab_is_not_parsed_in_Notes_CustomView?= In-Reply-To: <076.b31e86eae65dd3bc908e3030de9d3029@vtiger.fosslabs.com> References: <076.b31e86eae65dd3bc908e3030de9d3029@vtiger.fosslabs.com> Message-ID: <085.1b18af63138028870c40c4cbc2a281e5@vtiger.fosslabs.com> #574: parenttab is not parsed in Notes CustomView --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Comment (by richie): (In [5345]) passed parenttab and fixes #574 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 08:49:29 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 12:49:29 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5345 - /vtigercrm/trunk/modules/CustomView/Delete.php Message-ID: <20060425124929.36F306D931C@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 06:49:24 2006 New Revision: 5345 Log: passed parenttab and fixes #574 Modified: vtigercrm/trunk/modules/CustomView/Delete.php Modified: vtigercrm/trunk/modules/CustomView/Delete.php ============================================================================== --- vtigercrm/trunk/modules/CustomView/Delete.php (original) +++ vtigercrm/trunk/modules/CustomView/Delete.php Tue Apr 25 06:49:24 2006 @@ -15,6 +15,7 @@ $cvid = $_REQUEST["record"]; $module = $_REQUEST["dmodule"]; $smodule = $REQUEST["smodule"]; +$parenttab = $_REQUEST["parenttab"]; if(isset($cvid) && $cvid != '') { @@ -27,5 +28,5 @@ $smodule_url = "&smodule=".$smodule; } -header("Location: index.php?action=index&module=$module".$smodule_url); +header("Location: index.php?action=index&parenttab=$parenttab&module=$module".$smodule_url); ?> From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 08:50:21 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 12:50:21 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23574=3A_?= =?utf-8?q?parenttab_is_not_parsed_in_Notes_CustomView?= In-Reply-To: <076.b31e86eae65dd3bc908e3030de9d3029@vtiger.fosslabs.com> References: <076.b31e86eae65dd3bc908e3030de9d3029@vtiger.fosslabs.com> Message-ID: <085.e237853fb0c6e527ad2f3a85b61070cb@vtiger.fosslabs.com> #574: parenttab is not parsed in Notes CustomView --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Comment (by richie): (In [5346]) passed parenttab and fixes #574 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 08:50:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 12:50:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5346 - /vtigercrm/trunk/modules/CustomView/EditView.php Message-ID: <20060425125021.9A8D06D9330@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 06:50:17 2006 New Revision: 5346 Log: passed parenttab and fixes #574 Modified: vtigercrm/trunk/modules/CustomView/EditView.php Modified: vtigercrm/trunk/modules/CustomView/EditView.php ============================================================================== --- vtigercrm/trunk/modules/CustomView/EditView.php (original) +++ vtigercrm/trunk/modules/CustomView/EditView.php Tue Apr 25 06:50:17 2006 @@ -33,6 +33,7 @@ $recordid = $_REQUEST['record']; $smarty->assign("MOD", $mod_strings); +$smarty->assign("CATEGORY", $_REQUEST['parenttab']); $smarty->assign("APP", $app_strings); $smarty->assign("IMAGE_PATH", $image_path); $smarty->assign("MODULE",$cv_module); From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 08:51:06 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 12:51:06 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23574=3A_?= =?utf-8?q?parenttab_is_not_parsed_in_Notes_CustomView?= In-Reply-To: <076.b31e86eae65dd3bc908e3030de9d3029@vtiger.fosslabs.com> References: <076.b31e86eae65dd3bc908e3030de9d3029@vtiger.fosslabs.com> Message-ID: <085.5cda1c641a46c70a818fe685babeed9e@vtiger.fosslabs.com> #574: parenttab is not parsed in Notes CustomView --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Comment (by richie): (In [5347]) passed parenttab and fixes #574 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 08:51:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 12:51:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5347 - /vtigercrm/trunk/Smarty/templates/CustomView.tpl Message-ID: <20060425125107.516326D90A1@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 06:51:02 2006 New Revision: 5347 Log: passed parenttab and fixes #574 Modified: vtigercrm/trunk/Smarty/templates/CustomView.tpl Modified: vtigercrm/trunk/Smarty/templates/CustomView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CustomView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CustomView.tpl Tue Apr 25 06:51:02 2006 @@ -17,6 +17,7 @@
    + From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 08:51:49 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 12:51:49 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23574=3A_?= =?utf-8?q?parenttab_is_not_parsed_in_Notes_CustomView?= In-Reply-To: <076.b31e86eae65dd3bc908e3030de9d3029@vtiger.fosslabs.com> References: <076.b31e86eae65dd3bc908e3030de9d3029@vtiger.fosslabs.com> Message-ID: <085.b41bcf3c4ab3217cbcfe7e4f5a7d2678@vtiger.fosslabs.com> #574: parenttab is not parsed in Notes CustomView --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Comment (by richie): (In [5348]) passed parenttab and fixes #574 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 08:51:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 12:51:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5348 - /vtigercrm/trunk/modules/CustomView/Save.php Message-ID: <20060425125150.0FFD96D9544@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 06:51:45 2006 New Revision: 5348 Log: passed parenttab and fixes #574 Modified: vtigercrm/trunk/modules/CustomView/Save.php Modified: vtigercrm/trunk/modules/CustomView/Save.php ============================================================================== --- vtigercrm/trunk/modules/CustomView/Save.php (original) +++ vtigercrm/trunk/modules/CustomView/Save.php Tue Apr 25 06:51:45 2006 @@ -15,7 +15,7 @@ $cvid = $_REQUEST["record"]; $cvmodule = $_REQUEST["cvmodule"]; - +$parenttab = $_REQUEST["parenttab"]; if($cvmodule != "") { $viewname = addslashes($_REQUEST["viewName"]); @@ -191,5 +191,5 @@ } } -header("Location: index.php?action=index&module=$cvmodule&viewname=$cvid"); +header("Location: index.php?action=index&parenttab=$parenttab&module=$cvmodule&viewname=$cvid"); ?> From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 08:53:01 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 12:53:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5349 - /vtigercrm/trunk/modules/Notes/ListView.php Message-ID: <20060425125301.5FF026D9544@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 06:52:56 2006 New Revision: 5349 Log: if check added for getting the parenttab first from the request else the db Modified: vtigercrm/trunk/modules/Notes/ListView.php Modified: vtigercrm/trunk/modules/Notes/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Notes/ListView.php (original) +++ vtigercrm/trunk/modules/Notes/ListView.php Tue Apr 25 06:52:56 2006 @@ -35,8 +35,14 @@ $log = LoggerManager::getLogger('note_list'); global $currentModule,$image_path,$theme; - -$category = getParentTab(); +if($_REQUEST['parenttab'] != '') +{ + $category = $_REQUEST['parenttab']; +} +else +{ + $category = getParentTab(); +} //<<<>>>>>> $oCustomView = new CustomView("Notes"); From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 08:55:15 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 12:55:15 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23312=3A_?= =?utf-8?q?Calendar_-_Week_View_-_No_Validation?= In-Reply-To: <076.f319964df0f32a86e0f9859bd56d3e0d@vtiger.fosslabs.com> References: <076.f319964df0f32a86e0f9859bd56d3e0d@vtiger.fosslabs.com> Message-ID: <085.b6a5114dd5a072ea09c6c03db41e126c@vtiger.fosslabs.com> #312: Calendar - Week View - No Validation ------------------------+--------------------------------------------------- Reporter: gopal | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 08:55:33 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 12:55:33 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23318=3A_?= =?utf-8?q?Calendar_UI_flow_is_not_clear?= In-Reply-To: <076.93149cf7bd184403a7279f250ea58607@vtiger.fosslabs.com> References: <076.93149cf7bd184403a7279f250ea58607@vtiger.fosslabs.com> Message-ID: <085.43b96ea51fa72048368d12805163cd63@vtiger.fosslabs.com> #318: Calendar UI flow is not clear ------------------------+--------------------------------------------------- Reporter: gopal | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 08:55:56 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 12:55:56 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23334=3A_?= =?utf-8?q?Calendar_-_Improper_Start/End_Dates?= In-Reply-To: <076.f812a2d1d9c939a7bfe098a25d7302e1@vtiger.fosslabs.com> References: <076.f812a2d1d9c939a7bfe098a25d7302e1@vtiger.fosslabs.com> Message-ID: <085.0b9ef77b4edee4e080737762660d387b@vtiger.fosslabs.com> #334: Calendar - Improper Start/End Dates ------------------------+--------------------------------------------------- Reporter: gopal | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 08:56:26 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 12:56:26 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23335=3A_?= =?utf-8?q?Calendar_Week_View_-_Time_filter_not_working?= In-Reply-To: <076.df63abff42de689ab316c61e005cbb56@vtiger.fosslabs.com> References: <076.df63abff42de689ab316c61e005cbb56@vtiger.fosslabs.com> Message-ID: <085.5f010fbe784683a514de0c3f0715c05f@vtiger.fosslabs.com> #335: Calendar Week View - Time filter not working ------------------------+--------------------------------------------------- Reporter: gopal | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 08:56:42 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 12:56:42 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23616=3A_?= =?utf-8?q?User_EditView_issue?= In-Reply-To: <076.37000080ebffa19975b7e7a8740a3420@vtiger.fosslabs.com> References: <076.37000080ebffa19975b7e7a8740a3420@vtiger.fosslabs.com> Message-ID: <085.c8e5f8b91329324070b0f0c7d14142d5@vtiger.fosslabs.com> #616: User EditView issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: richie Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Security ---------------------------+------------------------------------------------ Changes (by richie): * owner: developer => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 08:57:20 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 12:57:20 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23616=3A_?= =?utf-8?q?User_EditView_issue?= In-Reply-To: <076.37000080ebffa19975b7e7a8740a3420@vtiger.fosslabs.com> References: <076.37000080ebffa19975b7e7a8740a3420@vtiger.fosslabs.com> Message-ID: <085.2178605e75647ded0f90a91487f61330@vtiger.fosslabs.com> #616: User EditView issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: richie Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: wontfix | Keywords: Security ---------------------------+------------------------------------------------ Changes (by richie): * resolution: => wontfix * priority: major => minor * status: new => closed Comment: Unable to replicate. Downgrading to minor. Putting in abeyance. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 08:57:52 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 12:57:52 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23358=3A_?= =?utf-8?q?Calendar_Sharing_-_Available/Selected_Users_not_updated_properl?= =?utf-8?q?y?= In-Reply-To: <076.1198098523ca5d817d42dcb064b3d678@vtiger.fosslabs.com> References: <076.1198098523ca5d817d42dcb064b3d678@vtiger.fosslabs.com> Message-ID: <085.2fdaee4a27c67adcf64954caac63d8c0@vtiger.fosslabs.com> #358: Calendar Sharing - Available/Selected Users not updated properly ------------------------+--------------------------------------------------- Reporter: gopal | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 08:58:43 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 12:58:43 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23361=3A_?= =?utf-8?q?Calendar__Sharing_-_Save_double_click_not_working_properly?= In-Reply-To: <076.f277be639d017333d268dc12f69d4801@vtiger.fosslabs.com> References: <076.f277be639d017333d268dc12f69d4801@vtiger.fosslabs.com> Message-ID: <085.4d454705d265920610093448f7ef40db@vtiger.fosslabs.com> #361: Calendar Sharing - Save double click not working properly ------------------------+--------------------------------------------------- Reporter: gopal | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 09:01:43 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 13:01:43 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23148=3A_?= =?utf-8?q?Improper_Values_after_Saving_Events_thru_Calendar?= In-Reply-To: <076.fece241f99eca80394e606738c23177f@vtiger.fosslabs.com> References: <076.fece241f99eca80394e606738c23177f@vtiger.fosslabs.com> Message-ID: <085.b92361d1924940f984439836b99fc19b@vtiger.fosslabs.com> #148: Improper Values after Saving Events thru Calendar ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 09:02:33 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 13:02:33 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23149=3A_?= =?utf-8?q?Able_to_add_events_for_days_gone_by_without_any_check_in_Calend?= =?utf-8?q?ar?= In-Reply-To: <076.cf1907ebb39ce87940079993e8ae3424@vtiger.fosslabs.com> References: <076.cf1907ebb39ce87940079993e8ae3424@vtiger.fosslabs.com> Message-ID: <085.f7866301cb1c97783e9a17781122367d@vtiger.fosslabs.com> #149: Able to add events for days gone by without any check in Calendar ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 09:03:06 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 13:03:06 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23152=3A_?= =?utf-8?q?Time_Filter_Combo_Box_non_functional_in_Calendar_-_Week_Tab?= In-Reply-To: <076.f746c9f29152fef0cd48e6c12a634dac@vtiger.fosslabs.com> References: <076.f746c9f29152fef0cd48e6c12a634dac@vtiger.fosslabs.com> Message-ID: <085.d4be6332e3f16066fd0a2e2fc9d44672@vtiger.fosslabs.com> #152: Time Filter Combo Box non functional in Calendar - Week Tab ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Time Filter - Week Tab ------------------------+--------------------------------------------------- Changes (by mangai): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 09:03:31 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 13:03:31 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23154=3A_?= =?utf-8?q?Cannot_Create_Task_from_Calendar_Module?= In-Reply-To: <076.ea1c68f9f29d7dafb9a1eec31db3fabc@vtiger.fosslabs.com> References: <076.ea1c68f9f29d7dafb9a1eec31db3fabc@vtiger.fosslabs.com> Message-ID: <085.6b54c0ac2cc8abcd5b29817f25715d20@vtiger.fosslabs.com> #154: Cannot Create Task from Calendar Module ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 09:04:02 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 13:04:02 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23168=3A_?= =?utf-8?q?Multiple_Events_Not_Displayed_for_Particular_Day_in_Calendar_-_?= =?utf-8?q?Month_Tab?= In-Reply-To: <076.e1ee923196db4883b67e00116c5e092c@vtiger.fosslabs.com> References: <076.e1ee923196db4883b67e00116c5e092c@vtiger.fosslabs.com> Message-ID: <085.f80cb5571cfe6b0d91a9ab5e50c24315@vtiger.fosslabs.com> #168: Multiple Events Not Displayed for Particular Day in Calendar - Month Tab ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 09:04:44 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 13:04:44 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23187=3A_?= =?utf-8?q?Cannot_Disable_Share_Calendar_Feature_for_Single_User?= In-Reply-To: <076.4a8338ece8b8361dd08d6153e6e829c1@vtiger.fosslabs.com> References: <076.4a8338ece8b8361dd08d6153e6e829c1@vtiger.fosslabs.com> Message-ID: <085.12a8fe21d1ac331992f917c3e452ef8a@vtiger.fosslabs.com> #187: Cannot Disable Share Calendar Feature for Single User ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * milestone: => 5.0.0 * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 09:05:14 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 13:05:14 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23204=3A_?= =?utf-8?q?Inviting_Users=2C_Recurring_Events_=26_Reminder_Non_Functional_?= =?utf-8?q?-__Calendar?= In-Reply-To: <076.59442eec4e6153f731214192b8585aa8@vtiger.fosslabs.com> References: <076.59442eec4e6153f731214192b8585aa8@vtiger.fosslabs.com> Message-ID: <085.303b943c8868fbe6b0eb3607d2c95ee6@vtiger.fosslabs.com> #204: Inviting Users, Recurring Events & Reminder Non Functional - Calendar ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 09:05:44 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 13:05:44 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23209=3A_?= =?utf-8?q?Date_and_Time_Buttons_in_Add_Event_Non_Functional_-_Calendar?= In-Reply-To: <076.f869a371012c25e18f2dca1fd3fae5ec@vtiger.fosslabs.com> References: <076.f869a371012c25e18f2dca1fd3fae5ec@vtiger.fosslabs.com> Message-ID: <085.17e5f8433b840300063f681ba6335ade@vtiger.fosslabs.com> #209: Date and Time Buttons in Add Event Non Functional - Calendar ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 09:06:54 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 13:06:54 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23721=3A_?= =?utf-8?q?Parent_tab_shift?= In-Reply-To: <076.526e32eb34e2787149e3f31ae9ad3378@vtiger.fosslabs.com> References: <076.526e32eb34e2787149e3f31ae9ad3378@vtiger.fosslabs.com> Message-ID: <085.9e725cf3a927cf86df68cec86ac6d158@vtiger.fosslabs.com> #721: Parent tab shift ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Parent tab ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed Comment: (In [5350]) passed parenttab as parameter. Fixes #721 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 09:06:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 13:06:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5350 - /vtigercrm/trunk/Smarty/templates/ListView.tpl Message-ID: <20060425130655.E57486D9A33@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 07:06:50 2006 New Revision: 5350 Log: passed parenttab as parameter. Fixes #721 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 Apr 25 07:06:50 2006 @@ -90,7 +90,7 @@
    		{if $MODULE ne 'Notes' && $MODULE ne 'Emails'} - Import {$MODULE} | + Import {$MODULE} | {/if} Export {$MODULE} {$RECORD_COUNTS}{$NAVIGATION} + + {$NAVIGATION} +
    +
     
    From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 09:44:39 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 13:44:39 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23695=3A_?= =?utf-8?q?Migration_Issues_-_My_Preferences_throws_exception?= In-Reply-To: <076.d5c2f446b43753dbeb39d9660fb3e039@vtiger.fosslabs.com> References: <076.d5c2f446b43753dbeb39d9660fb3e039@vtiger.fosslabs.com> Message-ID: <085.edc9e0ecb545fd9ac19079878fd411ba@vtiger.fosslabs.com> #695: Migration Issues - My Preferences throws exception ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * status: assigned => closed Comment: This issue has been fixed and has been checkedin in the svn. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 09:47:01 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 13:47:01 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23687=3A_?= =?utf-8?q?Migration_Issues_-_Users_Link_in_Settings?= In-Reply-To: <076.fe8007d1417bdc1609b69fd5446e55e4@vtiger.fosslabs.com> References: <076.fe8007d1417bdc1609b69fd5446e55e4@vtiger.fosslabs.com> Message-ID: <085.ff17b59b3a3ea9d387b966987dfcb5a4@vtiger.fosslabs.com> #687: Migration Issues - Users Link in Settings ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * status: assigned => closed Comment: This issue has been fixed and has been checkedin in the svn. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 10:18:47 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 14:18:47 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5354 - in /vtigercrm/trunk: Smarty/templates/Portal.tpl modules/Portal/ListView.php modules/Portal/Popup.php Message-ID: <20060425141847.9E1EC6DA389@vtiger.fosslabs.com> Author: don Date: Tue Apr 25 08:18:40 2006 New Revision: 5354 Log: issue in adding portal has been fixed Modified: vtigercrm/trunk/Smarty/templates/Portal.tpl vtigercrm/trunk/modules/Portal/ListView.php vtigercrm/trunk/modules/Portal/Popup.php Modified: vtigercrm/trunk/Smarty/templates/Portal.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Portal.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Portal.tpl Tue Apr 25 08:18:40 2006 @@ -20,14 +20,14 @@ - + {$MOD.LBL_OPEN_IN_BROWSER}

    Modified: vtigercrm/trunk/modules/Portal/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Portal/ListView.php (original) +++ vtigercrm/trunk/modules/Portal/ListView.php Tue Apr 25 08:18:40 2006 @@ -19,7 +19,7 @@ global $current_language; $current_module_strings = return_module_language($current_language, 'Portal'); global $adb; - + $query="select * from portal"; $result=$adb->query($query); $no_of_portals=$adb->num_rows($result); @@ -34,6 +34,18 @@ $portal_info[]=$portal_array; } $smarty = new vtigerCRM_Smarty; +$portal_def = Array(); +if($_REQUEST['portalid'] != '') +{ + $query="select * from portal where portalid =".$_REQUEST['portalid']; +}else +{ + $query="select * from portal"; +} + $result=$adb->query($query); + $portal_def [] = $adb->query_result($result,0,'portalurl'); + $portal_def [] = $adb->query_result($result,0,'portalid'); + $smarty->assign("DEFPORTAL_DETAILS", $portal_def); $smarty->assign("IMAGEPATH", $image_path); $smarty->assign("MOD", $mod_strings); Modified: vtigercrm/trunk/modules/Portal/Popup.php ============================================================================== --- vtigercrm/trunk/modules/Portal/Popup.php (original) +++ vtigercrm/trunk/modules/Portal/Popup.php Tue Apr 25 08:18:40 2006 @@ -17,8 +17,15 @@ if(isset($_REQUEST['portalurl']) && $_REQUEST['portalurl']!='') { $result=SavePortal($_REQUEST['portalname'],$_REQUEST['portalurl']); - if($result == 'true') - $portal_inputs.=""; + if($result != '') + { + $portal_inputs.=""; + } } @@ -41,6 +48,6 @@ $portal_url=$_REQUEST['portalurl']; $query="insert into portal values(".$portalid.",'".$portal_name."','".$portal_url."',0)"; $result=$adb->query($query); -return true; +return $portalid; } ?> From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 10:19:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 14:19:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5355 - /vtigercrm/trunk/include/utils/ListViewUtils.php Message-ID: <20060425141928.7B3036DA529@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 25 08:19:24 2006 New Revision: 5355 Log: contact assigned to group is missing in listview - fixed 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 Apr 25 08:19:24 2006 @@ -1409,7 +1409,7 @@ if($module == "Contacts") { //Query modified to sort by assigned to - $query = "select contactdetails.firstname,contactdetails.lastname,contactdetails.title,contactdetails.accountid,contactdetails.email,contactdetails.phone,crmentity.smownerid ,crmentity.crmid from contactdetails inner join crmentity on crmentity.crmid=contactdetails.contactid inner join contactaddress on contactdetails.contactid=contactaddress.contactaddressid inner join contactsubdetails on contactaddress.contactaddressid=contactsubdetails.contactsubscriptionid inner join contactscf on contactdetails.contactid = contactscf.contactid left join account on account.accountid = contactdetails.accountid left join contactgrouprelation on contactscf.contactid=contactgrouprelation.contactid left join groups on groups.groupname=contactgrouprelation.groupname inner join users on users.id=crmentity.smownerid where crmentity.deleted=0 ".$where; + $query = "select contactdetails.firstname,contactdetails.lastname,contactdetails.title,contactdetails.accountid,contactdetails.email,contactdetails.phone,crmentity.smownerid ,crmentity.crmid from contactdetails inner join crmentity on crmentity.crmid=contactdetails.contactid inner join contactaddress on contactdetails.contactid=contactaddress.contactaddressid inner join contactsubdetails on contactaddress.contactaddressid=contactsubdetails.contactsubscriptionid inner join contactscf on contactdetails.contactid = contactscf.contactid left join account on account.accountid = contactdetails.accountid left join contactgrouprelation on contactscf.contactid=contactgrouprelation.contactid left join groups on groups.groupname=contactgrouprelation.groupname left join users on users.id=crmentity.smownerid where crmentity.deleted=0 ".$where; if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3) { From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 10:26:35 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 14:26:35 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23164=3A_?= =?utf-8?q?Search_Not_working_properly_in_leads?= In-Reply-To: <076.299d780297924bc255766ca33205d3ab@vtiger.fosslabs.com> References: <076.299d780297924bc255766ca33205d3ab@vtiger.fosslabs.com> Message-ID: <085.eddf3c33fc85a05f419e9f9ebad86d0e@vtiger.fosslabs.com> #164: Search Not working properly in leads ------------------------+--------------------------------------------------- Reporter: don | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by saraj): * resolution: => fixed * status: new => closed Comment: (In [5356]) Basic search - assigned to in lead. Fixes #164, and refs #164 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 10:26:35 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 14:26:35 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5356 - /vtigercrm/trunk/include/utils/SearchUtils.php Message-ID: <20060425142635.B84CF6DA65C@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 25 08:26:31 2006 New Revision: 5356 Log: Basic search - assigned to in lead. Fixes #164, and refs #164 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 Apr 25 08:26:31 2006 @@ -233,11 +233,12 @@ $where .= " or "; } } - $where.=")"; + $where.=" or groups.groupname like '%".$search_string."%')"; } else { - $where="$table_name.$column_name =''"; + //$where="$table_name.$column_name =''"; + $where="groups.groupname like '%".$search_string."%' "; } return $where; } @@ -428,7 +429,15 @@ $tab_col = str_replace('\'','',stripslashes($_REQUEST[$table_colname])); $srch_cond = str_replace('\'','',stripslashes($_REQUEST[$search_condition])); $srch_val = $_REQUEST[$search_value]; - $adv_string .= " ".getSearch_criteria($srch_cond,$srch_val,$tab_col)." ".$matchtype; + if($tab_col == "crmentity.smownerid") + { + $adv_string .= " (".getSearch_criteria($srch_cond,$srch_val,'users.user_name')." or"; + $adv_string .= " ".getSearch_criteria($srch_cond,$srch_val,'groups.groupname')." )".$matchtype; + } + else + { + $adv_string .= " ".getSearch_criteria($srch_cond,$srch_val,$tab_col)." ".$matchtype; + } } $where=$adv_string; } From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 10:27:56 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 14:27:56 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23164=3A_?= =?utf-8?q?Search_Not_working_properly_in_leads?= In-Reply-To: <076.299d780297924bc255766ca33205d3ab@vtiger.fosslabs.com> References: <076.299d780297924bc255766ca33205d3ab@vtiger.fosslabs.com> Message-ID: <085.ca7a0685ed27a0c15331479b38095faa@vtiger.fosslabs.com> #164: Search Not working properly in leads ------------------------+--------------------------------------------------- Reporter: don | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 10:29:52 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 14:29:52 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23295=3A_?= =?utf-8?q?Search_icon_in_emails_detail_view_is_not_working?= In-Reply-To: <076.6bb16a56ff3a92de013d911c98a43d27@vtiger.fosslabs.com> References: <076.6bb16a56ff3a92de013d911c98a43d27@vtiger.fosslabs.com> Message-ID: <085.ef0adb7f98993a17fb34d1c51d0ca247@vtiger.fosslabs.com> #295: Search icon in emails detail view is not working --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: search icon in email detailview --------------------------------+------------------------------------------- Changes (by saraj): * resolution: => invalid * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 10:32:17 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 14:32:17 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23189=3A_?= =?utf-8?q?recursive_search_not_working_in_basic_search?= In-Reply-To: <076.2705722651b5d2819f862de2836d4151@vtiger.fosslabs.com> References: <076.2705722651b5d2819f862de2836d4151@vtiger.fosslabs.com> Message-ID: <085.de6f599511cbb52df4e188eb1e61f236@vtiger.fosslabs.com> #189: recursive search not working in basic search ------------------------+--------------------------------------------------- Reporter: don | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: wontfix | Keywords: ------------------------+--------------------------------------------------- Changes (by saraj): * resolution: => wontfix * status: new => closed Comment: The current basic search design does not support this feature. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 10:32:31 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 14:32:31 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23689=3A_?= =?utf-8?q?Migration_Issues_-_Global_Access_Privileges_-_settings?= In-Reply-To: <076.3145637101ebdf830949cfecd724434c@vtiger.fosslabs.com> References: <076.3145637101ebdf830949cfecd724434c@vtiger.fosslabs.com> Message-ID: <085.60ddc126e354439133dced23d0e26fdf@vtiger.fosslabs.com> #689: Migration Issues - Global Access Privileges - settings ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * status: assigned => closed Comment: This issue has been fixed and has been checkedin in the svn. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 10:46:49 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 14:46:49 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23261=3A_?= =?utf-8?q?Delete_User__Pop-up_-_Typo?= In-Reply-To: <076.08912867dcb0f1ce45081a7806548cbf@vtiger.fosslabs.com> References: <076.08912867dcb0f1ce45081a7806548cbf@vtiger.fosslabs.com> Message-ID: <085.354f6edc89ba947449344cb19eafcc7e@vtiger.fosslabs.com> #261: Delete User Pop-up - Typo ------------------------+--------------------------------------------------- Reporter: gopal | Owner: richie Type: defect | Status: closed Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed Comment: (In [5357]) Changed spelling for delete. Fixes #261 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 10:46:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 14:46:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5357 - /vtigercrm/trunk/modules/Users/UserDeleteStep1.php Message-ID: <20060425144650.367866DA757@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 08:46:45 2006 New Revision: 5357 Log: Changed spelling for delete. Fixes #261 Modified: vtigercrm/trunk/modules/Users/UserDeleteStep1.php Modified: vtigercrm/trunk/modules/Users/UserDeleteStep1.php ============================================================================== Binary files - no diff available. From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 10:49:53 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 14:49:53 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23222=3A_?= =?utf-8?q?The_=22Create_Leads=2E=2E=22_button_caption_is_wrong=2E?= In-Reply-To: <076.7d40353e97e728747d657dc167467150@vtiger.fosslabs.com> References: <076.7d40353e97e728747d657dc167467150@vtiger.fosslabs.com> Message-ID: <085.54fb877bbea446fd5c761121da614dfe@vtiger.fosslabs.com> #222: The "Create Leads.." button caption is wrong. ------------------------+--------------------------------------------------- Reporter: don | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.1 Resolution: wontfix | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => wontfix * version: 5.0.0 => 5.0.1 * status: new => closed Comment: Impact for this fix is high as it involves changing the labels in the database. Will be handled in the next release. Richie -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 11:03:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 15:03:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5358 - /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Message-ID: <20060425150341.35A466DA759@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 25 09:03:37 2006 New Revision: 5358 Log: * Commented the queries which has modified the quoteid, vendorid, contactid as unique as they are wrong queries Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php ============================================================================== --- vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php (original) +++ vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Tue Apr 25 09:03:37 2006 @@ -2349,9 +2349,9 @@ "ALTER TABLE `profile2utility` MODIFY COLUMN `tabid` INTEGER(11) NOT NULL PRIMARY KEY", "ALTER TABLE `profile2utility` MODIFY COLUMN `activityid` INTEGER(11) NOT NULL PRIMARY KEY", "ALTER TABLE `profile_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL", -"ALTER TABLE `purchaseorder` MODIFY COLUMN `quoteid` INTEGER(19) DEFAULT NULL UNIQUE", -"ALTER TABLE `purchaseorder` MODIFY COLUMN `vendorid` INTEGER(19) DEFAULT NULL UNIQUE", -"ALTER TABLE `purchaseorder` MODIFY COLUMN `contactid` INTEGER(19) DEFAULT NULL UNIQUE", +//"ALTER TABLE `purchaseorder` MODIFY COLUMN `quoteid` INTEGER(19) DEFAULT NULL UNIQUE", +//"ALTER TABLE `purchaseorder` MODIFY COLUMN `vendorid` INTEGER(19) DEFAULT NULL UNIQUE", +//"ALTER TABLE `purchaseorder` MODIFY COLUMN `contactid` INTEGER(19) DEFAULT NULL UNIQUE", "ALTER TABLE `purchaseorder` MODIFY COLUMN `terms_conditions` TEXT COLLATE latin1_swedish_ci", "ALTER TABLE `quotegrouprelation` MODIFY COLUMN `quoteid` INTEGER(19) NOT NULL PRIMARY KEY", "ALTER TABLE `quotes` MODIFY COLUMN `potentialid` INTEGER(19) DEFAULT NULL UNIQUE", From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 11:06:12 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 15:06:12 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23682=3A_?= =?utf-8?q?Migration_Issues_-_Duplication_of_Purchase_Order_Returns_No_Val?= =?utf-8?q?ues?= In-Reply-To: <076.260f3255a06e7eaa5036495341824543@vtiger.fosslabs.com> References: <076.260f3255a06e7eaa5036495341824543@vtiger.fosslabs.com> Message-ID: <085.98f43f0202fa95855d6238d7c2125582@vtiger.fosslabs.com> #682: Migration Issues - Duplication of Purchase Order Returns No Values ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * status: assigned => closed Comment: This issue has been fixed and has been checkedin in the svn. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 11:13:20 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 15:13:20 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23346=3A_?= =?utf-8?q?parenttab_error?= In-Reply-To: <076.114b8f31260f9ed39d7e15498b1461d0@vtiger.fosslabs.com> References: <076.114b8f31260f9ed39d7e15498b1461d0@vtiger.fosslabs.com> Message-ID: <085.ea971a7bf694d67076b0abf63a1bc1ff@vtiger.fosslabs.com> #346: parenttab error ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: parenttab ---------------------------+------------------------------------------------ Changes (by richie): * resolution: => fixed * status: new => closed Comment: (In [5359]) passed parenttab parameter. Fixes #346 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 11:13:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 15:13:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5359 - /vtigercrm/trunk/include/utils/ListViewUtils.php Message-ID: <20060425151320.C4E5E6DA898@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 09:13:16 2006 New Revision: 5359 Log: passed parenttab parameter. Fixes #346 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 Apr 25 09:13:16 2006 @@ -401,6 +401,7 @@ //parameter added for customview $oCv 27/5 function getListViewEntries($focus, $module,$list_result,$navigation_array,$relatedlist='',$returnset='',$edit_action='EditView',$del_action='Delete',$oCv='') { + $tabname = getParentTab(); global $adb,$current_user; global $app_strings; $noofrows = $adb->num_rows($list_result); @@ -607,13 +608,13 @@ $account_id = $adb->query_result($list_result,$i-1,"crmid"); $account_name = getAccountName($account_id); // Fredy Klammsteiner, 4.8.2005: changes from 4.0.1 migrated to 4.2 - $value = ''.$account_name.''; // Armando L??scher 05.07.2005 -> ??priority -> Desc: inserted style="$P_FONT_COLOR" + $value = ''.$account_name.''; // Armando L??scher 05.07.2005 -> ??priority -> Desc: inserted style="$P_FONT_COLOR" }else { $account_id = $adb->query_result($list_result,$i-1,"accountid"); $account_name = getAccountName($account_id); // Fredy Klammsteiner, 4.8.2005: changes from 4.0.1 migrated to 4.2 - $value = ''.$account_name.''; // Armando L??scher 05.07.2005 -> ??priority -> Desc: inserted style="$P_FONT_COLOR" + $value = ''.$account_name.''; // Armando L??scher 05.07.2005 -> ??priority -> Desc: inserted style="$P_FONT_COLOR" } } elseif(( $module == 'HelpDesk' || $module == 'PriceBook' || $module == 'Quotes' || $module == 'PurchaseOrder' || $module == 'Faq') && $name == 'Product Name') From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 11:17:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 15:17:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5360 - /vtigercrm/trunk/pkg/bin/startvTiger.bat Message-ID: <20060425151734.9E4BE6DA898@vtiger.fosslabs.com> Author: richie Date: Tue Apr 25 09:17:30 2006 New Revision: 5360 Log: message changed and directions given to handle the apache port change Modified: vtigercrm/trunk/pkg/bin/startvTiger.bat Modified: vtigercrm/trunk/pkg/bin/startvTiger.bat ============================================================================== --- vtigercrm/trunk/pkg/bin/startvTiger.bat (original) +++ vtigercrm/trunk/pkg/bin/startvTiger.bat Tue Apr 25 09:17:30 2006 @@ -150,7 +150,9 @@ echo "" echo "" echo "********* Service not started as port # %apache_port% occupied ******* " -echo "********* Kindly free port %apache_port% and restart again ******* " +echo "********* Kindly free port %apache_port% and restart again or give a different port which is free******* " +echo "********* You need to open the apache/conf/httpd.conf file, search for the word Listen and change the port number given******* " +echo "********* Please make the apache port number change in the startvTiger.bat file and the stopvTiger.bat file too******* " echo "" echo "" echo "" From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 11:29:39 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 15:29:39 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23348=3A_?= =?utf-8?q?Account_always_points_to_Support_primary_tab?= In-Reply-To: <076.4fc89fe2de8cc4c1f965c3b9d4c0cff4@vtiger.fosslabs.com> References: <076.4fc89fe2de8cc4c1f965c3b9d4c0cff4@vtiger.fosslabs.com> Message-ID: <085.44e26b0a8d62586d5d5266612ee4d6f9@vtiger.fosslabs.com> #348: Account always points to Support primary tab ------------------------+--------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => duplicate * status: new => closed Comment: Duplicate issue. Hence closing this. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 14:33:43 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 18:33:43 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23744=3A_?= =?utf-8?q?Remove_Duplicate_Queries?= Message-ID: <076.e0aa545b1227d61b497ea30577e03c97@vtiger.fosslabs.com> #744: Remove Duplicate Queries -----------------------------------+---------------------------------------- Reporter: allanbush | Owner: allanbush Type: task | Status: new Priority: minor | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc3 Keywords: optimization database | -----------------------------------+---------------------------------------- If you look at the queries performed on every page load you'll see that lots of them are duplicates or predictably similar. I propose we eliminate as many of these redundant queries as possible which should offer a significant decrease in page loading times. You can view all the queries used to create a page by turning on adodb's debugging and reloading the page in question. To do this uncomment line 679 of source:/vtigercrm/branches/4.2/include/database/PearDatabase.php ($this->database->debug = true;). If the code from ticket #69 is checked in you'll also have to comment out line 936 of source:/vtigercrm/branches/4.2/adodb/adodb-lib.inc.php (// /*). -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 14:44:30 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 18:44:30 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23744=3A_?= =?utf-8?q?Remove_Duplicate_Queries?= In-Reply-To: <076.e0aa545b1227d61b497ea30577e03c97@vtiger.fosslabs.com> References: <076.e0aa545b1227d61b497ea30577e03c97@vtiger.fosslabs.com> Message-ID: <085.c7605bdeeac5d98bf60eec051b0968d9@vtiger.fosslabs.com> #744: Remove Duplicate Queries ------------------------+--------------------------------------------------- Reporter: allanbush | Owner: allanbush Type: task | Status: new Priority: minor | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc3 Resolution: | Keywords: optimization database ------------------------+--------------------------------------------------- Comment (by allanbush): (In [5361]) Fetch all the tab ids in one query and cache the results for subsequent requests. Refs #744. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 14:44:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 18:44:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5361 - /vtigercrm/branches/4.2/include/utils.php Message-ID: <20060425184432.883EB6DAFFA@vtiger.fosslabs.com> Author: allanbush Date: Tue Apr 25 12:44:28 2006 New Revision: 5361 Log: Fetch all the tab ids in one query and cache the results for subsequent requests. Refs #744. Modified: vtigercrm/branches/4.2/include/utils.php Modified: vtigercrm/branches/4.2/include/utils.php ============================================================================== --- vtigercrm/branches/4.2/include/utils.php (original) +++ vtigercrm/branches/4.2/include/utils.php Tue Apr 25 12:44:28 2006 @@ -866,15 +866,21 @@ function getTabid($module) { - global $vtlog; + global $adb, $vtlog; + static $res = null; $vtlog->logthis("module is ".$module,'info'); - global $adb; - $sql = "select tabid from tab where name='".$module."'"; + if(!is_null($res)) return $res[$module]; + + $sql = "select tabid, name from tab"; $result = $adb->query($sql); - $tabid= $adb->query_result($result,0,"tabid"); - return $tabid; - + $tab_count = $adb->num_rows($result); + for($i=0; $i<$tab_count; $i++) { + $tabid = $adb->query_result($result,$i,"tabid"); + $tabname = $adb->query_result($result, $i, "name"); + $res[$tabname] = $tabid; + } + return $res[$module]; } function getOutputHtml($uitype, $fieldname, $fieldlabel, $maxlength, $col_fields,$generatedtype) From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 15:14:23 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 19:14:23 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23744=3A_?= =?utf-8?q?Remove_Duplicate_Queries?= In-Reply-To: <076.e0aa545b1227d61b497ea30577e03c97@vtiger.fosslabs.com> References: <076.e0aa545b1227d61b497ea30577e03c97@vtiger.fosslabs.com> Message-ID: <085.e50e6c32a5327af53684f75d446f4cae@vtiger.fosslabs.com> #744: Remove Duplicate Queries ------------------------+--------------------------------------------------- Reporter: allanbush | Owner: allanbush Type: task | Status: new Priority: minor | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc3 Resolution: | Keywords: optimization database ------------------------+--------------------------------------------------- Comment (by allanbush): (In [5362]) Cache all the tab permissions for all profiles in one query. Modified from mikecrowe's optimizations (http://forums.vtiger.com/viewtopic.php?t=3804). Refs #744. Also removed the special case for the global MAX_TAB_PER variable as I don't know where this gets set or what it's suppost to do. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 15:14:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 19:14:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5362 - /vtigercrm/branches/4.2/modules/Users/UserInfoUtil.php Message-ID: <20060425191423.C369F6DB6F3@vtiger.fosslabs.com> Author: allanbush Date: Tue Apr 25 13:14:20 2006 New Revision: 5362 Log: Cache all the tab permissions for all profiles in one query. Modified from mikecrowe's optimizations (http://forums.vtiger.com/viewtopic.php?t=3804). Refs #744. Also removed the special case for the global MAX_TAB_PER variable as I don't know where this gets set or what it's suppost to do. Modified: vtigercrm/branches/4.2/modules/Users/UserInfoUtil.php Modified: vtigercrm/branches/4.2/modules/Users/UserInfoUtil.php ============================================================================== --- vtigercrm/branches/4.2/modules/Users/UserInfoUtil.php (original) +++ vtigercrm/branches/4.2/modules/Users/UserInfoUtil.php Tue Apr 25 13:14:20 2006 @@ -79,45 +79,39 @@ return $groupname; } -function getAllTabsPermission($profileid) -{ - global $adb,$MAX_TAB_PER; - $sql = "select * from profile2tab where profileid=" .$profileid ; +function loadAllPerms() +{ + global $adb; + static $persistPermArray = Array(); + + if($persistPermArray) return $persistPermArray; + + $sql = "select tabid, permissions, profileid from profile2tab"; $result = $adb->query($sql); - $tab_perr_array = Array(); - if($MAX_TAB_PER !='') - { - $tab_perr_array = array_fill(0,$MAX_TAB_PER,0); - } $num_rows = $adb->num_rows($result); for($i=0; $i<$num_rows; $i++) { - $tabid= $adb->query_result($result,$i,'tabid'); - $tab_per= $adb->query_result($result,$i,'permissions'); - $tab_perr_array[$tabid] = $tab_per; - } + $tabid = $adb->query_result($result, $i, 'tabid'); + $tab_per = $adb->query_result($result, $i, 'permissions'); + $profileid = $adb->query_result($result, $i, 'profileid'); + $persistPermArray[$profileid][$tabid] = $tab_per; + } + return $persistPermArray; +} + +function getAllTabsPermission($profileid) +{ + $perm = loadAllPerms(); + return $perm[$profileid]; +} + +function getTabsPermission($profileid) +{ + $perm = loadAllPerms(); + $tab_perr_array = $perm[$profileid]; + foreach( array(1,3,16,15,17,18,19,22) as $tabid ) + $tab_perr_array[$tabid] = 0; return $tab_perr_array; - -} - -function getTabsPermission($profileid) -{ - global $adb; - $sql = "select * from profile2tab where profileid=" .$profileid ; - $result = $adb->query($sql); - $tab_perr_array = Array(); - $num_rows = $adb->num_rows($result); - for($i=0; $i<$num_rows; $i++) - { - $tabid= $adb->query_result($result,$i,'tabid'); - $tab_per= $adb->query_result($result,$i,'permissions'); - if($tabid != 1 && $tabid != 3 && $tabid != 16 && $tab_id != 15 && $tab_id != 17 && $tab_id != 18 && $tab_id != 19 && $tab_id != 22) - { - $tab_perr_array[$tabid] = $tab_per; - } - } - return $tab_perr_array; - } function getTabsActionPermission($profileid) From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 15:25:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 19:25:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5363 - /vtigercrm/branches/4.2/vtigerlogger.php Message-ID: <20060425192515.F32686DAB84@vtiger.fosslabs.com> Author: allanbush Date: Tue Apr 25 13:25:13 2006 New Revision: 5363 Log: Only create the logging object once and reuse it everytime as suggested by mikecrowe (http://forums.vtiger.com/viewtopic.php?t=3804). I measured an approximate half second page loading time improvement on my system (3.5 -> 3 seconds to load the home tab) with this change. Modified: vtigercrm/branches/4.2/vtigerlogger.php Modified: vtigercrm/branches/4.2/vtigerlogger.php ============================================================================== --- vtigercrm/branches/4.2/vtigerlogger.php (original) +++ vtigercrm/branches/4.2/vtigerlogger.php Tue Apr 25 13:25:13 2006 @@ -11,17 +11,17 @@ class vtigerLogger { var $debug_status; + var $log1; function logthis($msg,$loglevel) { if($this->debug_status) { require_once('include/logging.php'); - $log1 =& LoggerManager::getLogger('VT'); if(is_array($msg)) - $log1->$loglevel("Message".print_r($msg,true)); + $this->log1->$loglevel("Message".print_r($msg,true)); else - $log1->$loglevel("Message ->".$msg); + $this->log1->$loglevel("Message ->".$msg); return $msg; } @@ -29,6 +29,7 @@ function vtigerLogger() { $this->debug_status= true; + $this->log1 =& LoggerManager::getLogger('VT'); } } From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 15:52:09 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 19:52:09 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2335=3A_C?= =?utf-8?q?alls_to_adoSchema-=3Eprintln=28=29_produce_logging_output_of_?= =?utf-8?q?=22FATAL_VT=22_type_instead_of_=22INFO_VT=22?= In-Reply-To: <076.f178b3fc1e0f0b7c80263af2fdeb0cd0@vtiger.fosslabs.com> References: <076.f178b3fc1e0f0b7c80263af2fdeb0cd0@vtiger.fosslabs.com> Message-ID: <085.0c99e62beadda64d84dc1f9fedc307ed@vtiger.fosslabs.com> #35: Calls to adoSchema->println() produce logging output of "FATAL VT" type instead of "INFO VT" ------------------------+--------------------------------------------------- Reporter: mfedyk | Owner: developer Type: defect | Status: closed Priority: trivial | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.3 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by allanbush): * resolution: => fixed * status: new => closed Comment: (In [5364]) Cleaned up the logging levels. Closes #35. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 15:52:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 19:52:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5364 - /vtigercrm/branches/4.2/include/database/PearDatabase.php Message-ID: <20060425195212.2721E6DBF1B@vtiger.fosslabs.com> Author: allanbush Date: Tue Apr 25 13:52:07 2006 New Revision: 5364 Log: Cleaned up the logging levels. Closes #35. Modified: vtigercrm/branches/4.2/include/database/PearDatabase.php Modified: vtigercrm/branches/4.2/include/database/PearDatabase.php ============================================================================== --- vtigercrm/branches/4.2/include/database/PearDatabase.php (original) +++ vtigercrm/branches/4.2/include/database/PearDatabase.php Tue Apr 25 13:52:07 2006 @@ -41,15 +41,14 @@ function println($msg) { - require_once('include/logging.php'); - $log1 =& LoggerManager::getLogger('VT'); + global $vtlog; if(is_array($msg)) { - $log1->fatal("PearDatabse ->".print_r($msg,true)); + $vtlog->logthis("PearDatabse ->".print_r($msg,true), 'info'); } else { - $log1->fatal("PearDatabase ->".$msg); + $vtlog->logthis("PearDatabase ->".$msg, 'info'); } return $msg; } @@ -149,27 +148,16 @@ function checkError($msg='', $dieOnError=false) { - /*if($this->database->ErrorNo()) - { - if($this->dieOnError || $dieOnError) - { - $this->println("ADODB error ".$this->database->ErrorNo()); - die ($msg."ADODB error ".$this->database->ErrorNo()); - - }else{ - $this->log->error("MySQL error ".mysql_errno().": ".mysql_error()); - } - return true; - }*/ - + global $vtlog; + if($this->dieOnError || $dieOnError) { - $this->println("ADODB error ".$msg."->[".$this->database->ErrorNo()."]".$this->database->ErrorMsg()); + $vtlog->logthis("ADODB error ".$msg."->[".$this->database->ErrorNo()."]".$this->database->ErrorMsg(), 'fatal'); die ($msg."ADODB error ".$msg."->".$this->database->ErrorMsg()); } else { - $this->println("ADODB error ".$msg."->[".$this->database->ErrorNo()."]".$this->database->ErrorMsg()); + $vtlog->logthis("ADODB error ".$msg."->[".$this->database->ErrorNo()."]".$this->database->ErrorMsg(), 'error'); } return false; From vtiger-tickets at vtiger.fosslabs.com Tue Apr 25 17:05:11 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 25 Apr 2006 21:05:11 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23744=3A_?= =?utf-8?q?Remove_Duplicate_Queries?= In-Reply-To: <076.e0aa545b1227d61b497ea30577e03c97@vtiger.fosslabs.com> References: <076.e0aa545b1227d61b497ea30577e03c97@vtiger.fosslabs.com> Message-ID: <085.3b73098a3d3d4fea5660520f961559b9@vtiger.fosslabs.com> #744: Remove Duplicate Queries ------------------------+--------------------------------------------------- Reporter: allanbush | Owner: allanbush Type: task | Status: new Priority: minor | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc3 Resolution: | Keywords: optimization database ------------------------+--------------------------------------------------- Comment (by allanbush): (In [5365]) Caching of field permissions (from http://forums.vtiger.com/viewtopic.php?p=15163#15163). Refs #744. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 25 17:05:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 25 Apr 2006 21:05:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5365 - /vtigercrm/branches/4.2/include/utils.php Message-ID: <20060425210513.90FAA3FC3C3@vtiger.fosslabs.com> Author: allanbush Date: Tue Apr 25 15:05:04 2006 New Revision: 5365 Log: Caching of field permissions (from http://forums.vtiger.com/viewtopic.php?p=15163#15163). Refs #744. Modified: vtigercrm/branches/4.2/include/utils.php Modified: vtigercrm/branches/4.2/include/utils.php ============================================================================== --- vtigercrm/branches/4.2/include/utils.php (original) +++ vtigercrm/branches/4.2/include/utils.php Tue Apr 25 15:05:04 2006 @@ -103,7 +103,7 @@ { require_once('include/database/PearDatabase.php'); $db = new PearDatabase(); - $temp_result = Array(); + $user_array = Array(); // Including deleted users for now. if (empty($status)) { $query = "SELECT id, user_name from users"; @@ -131,16 +131,14 @@ if ($add_blank==true){ // Add in a blank row - $temp_result[''] = ''; + $user_array[''] = ''; } // Get the id and the name. while($row = $db->fetchByAssoc($result)) { - $temp_result[$row['id']] = $row['user_name']; - } - - $user_array = &$temp_result; + $user_array[$row['id']] = $row['user_name']; + } } return $user_array; @@ -2435,15 +2433,20 @@ function getUserName($userid) { -global $vtlog; -$vtlog->logthis("in getUserName ".$userid,'info'); + static $cache = array(); + if(isset($cache[$userid])) return $cache[$userid]; + + global $vtlog; + $vtlog->logthis("in getUserName ".$userid,'info'); global $adb; + $user_name = ''; if($userid != '') { $sql = "select user_name from users where id=".$userid; $result = $adb->query($sql); $user_name = $adb->query_result($result,0,"user_name"); + $cache[$userid] = $user_name; } return $user_name; } @@ -2626,40 +2629,13 @@ } } - //modified for customview 27/5 - $app_strings change to $mod_strings - foreach($focus->list_fields as $name=>$tableinfo) - { - //$fieldname = $focus->list_fields_name[$name]; //commented for customview 27/5 - //added for customview 27/5 - if($oCv) - { - if(isset($oCv->list_fields_name)) - { - $fieldname = $oCv->list_fields_name[$name]; - }else - { - $fieldname = $focus->list_fields_name[$name]; - } - }else - { - $fieldname = $focus->list_fields_name[$name]; - } - - //Getting the Entries from Profile2 field table - $query = "select profile2field.* from field inner join profile2field on field.fieldid=profile2field.fieldid where profile2field.tabid=".$tabid." and profile2field.profileid=".$profile_id." and field.fieldname='".$fieldname."'"; - $result = $adb->query($query); - - //Getting the Entries from def_org_field table - $query1 = "select def_org_field.* from field inner join def_org_field on field.fieldid=def_org_field.fieldid where def_org_field.tabid=".$tabid." and field.fieldname='".$fieldname."'"; - $result_def = $adb->query($query1); - - - if($adb->query_result($result,0,"visible") == 0 && $adb->query_result($result_def,0,"visible") == 0) - { - + $names = get_field_list($focus, $oCv, $tabid); + foreach($names as $fieldname=>$data) { + list($name, $is_column) = $data; if(isset($focus->sortby_fields) && $focus->sortby_fields !='') { - foreach($focus->list_fields[$name] as $tab=>$col) + + if($focus->list_fields[$name]) foreach($focus->list_fields[$name] as $tab=>$col) { if(in_array($col,$focus->sortby_fields)) { @@ -2717,7 +2693,8 @@ $name .=': (in '.$curr_symbol.')'; } else - { if($app_strings[$name]) + { + if($app_strings[$name]) { $name = $app_strings[$name]; } @@ -2726,8 +2703,6 @@ $name = $mod_strings[$name]; } } - - } } //Added condition to hide the close column in Related Lists if($name == $app_strings['Close'] && $relatedlist != '') @@ -2976,6 +2951,58 @@ } +function get_field_list($focus, $oCv, $tabid) +{ + static $names = null, $last_tabid = null; + if(!is_null($names) && $tabid == $last_tabid) return $names; + + $names = null; + $last_tabid = $tabid; + + foreach($focus->list_fields as $name=>$tableinfo) + { + $fieldname = $focus->list_fields_name[$name]; + + //added for customview 27/5 + if($oCv && isset($oCv->list_fields_name)) { + $fieldname = $oCv->list_fields_name[$name]; + } + if($fieldname == '') { + foreach($tableinfo as $tablename=>$colname); + $fieldname = $colname; + $is_column = true; + } else { + $is_column = false; + } + $fieldnames[] = $fieldname; + $namelist[$fieldname] = array($name, $is_column); + } + + $fieldnamelist = implode($fieldnames, '\', \''); + + global $profile_id, $adb; + if($profile_id == '') + { + global $current_user; + $profile_id = fetchUserProfileId($current_user->id); + } + + $query = "select distinct field.fieldname from field inner join profile2field on field.fieldid=profile2field.fieldid inner join def_org_field on field.fieldid=def_org_field.fieldid where profile2field.tabid=".$tabid." and profile2field.profileid=".$profile_id." and field.fieldname in ('".$fieldnamelist."') and profile2field.visible = 0 and def_org_field.visible = 0"; + $result = $adb->query($query); + $noofrows = $adb->num_rows($result); + for($j=0; $j<$noofrows; $j++) { + $visible_fields[] = $adb->query_result($result, $j, 'fieldname'); + } + + foreach($fieldnames as $fieldname) { + if(is_null($visible_fields) || in_array($fieldname, $visible_fields)) { + $names[$fieldname] = $namelist[$fieldname]; + } + } + + return $names; +} + //parameter added for customview $oCv 27/5 function getListViewEntries($focus, $module,$list_result,$navigation_array,$relatedlist='',$returnset='',$edit_action='EditView',$del_action='Delete',$oCv='') { @@ -3025,44 +3052,18 @@ $list_header .= '
    - + From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 06:57:35 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 10:57:35 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23633=3A_?= =?utf-8?q?unInstallation_issue?= In-Reply-To: <076.51f5249c35374c687a3ee4d97ec59ede@vtiger.fosslabs.com> References: <076.51f5249c35374c687a3ee4d97ec59ede@vtiger.fosslabs.com> Message-ID: <085.3ef34ba45b66b99e25a1c20c1819f362@vtiger.fosslabs.com> #633: unInstallation issue ------------------------+--------------------------------------------------- Reporter: mickie | Owner: richie Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.1 Resolution: wontfix | Keywords: install ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => wontfix * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 07:01:50 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 11:01:50 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23194=3A_?= =?utf-8?q?massdelete_in_ListView_shows_hacking_attempt?= In-Reply-To: <076.1ca2595c177e192b1f562a9749f81d8c@vtiger.fosslabs.com> References: <076.1ca2595c177e192b1f562a9749f81d8c@vtiger.fosslabs.com> Message-ID: <085.5a7945a74313bdeda3ff1a2600775d3e@vtiger.fosslabs.com> #194: massdelete in ListView shows hacking attempt ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: philip Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: massdelete ---------------------------+------------------------------------------------ Changes (by anonymous): * owner: developer => philip -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 07:03:01 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 11:03:01 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23507=3A_?= =?utf-8?q?My_Preference_Page_Error?= In-Reply-To: <076.369b9e9cf241d21998da449131304b7a@vtiger.fosslabs.com> References: <076.369b9e9cf241d21998da449131304b7a@vtiger.fosslabs.com> Message-ID: <085.c2396b3b6f4fd3b412f1039952c0498b@vtiger.fosslabs.com> #507: My Preference Page Error ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Comment (by richie): (In [5374]) ID is properly passed. Fixes #507 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 26 07:03:02 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 26 Apr 2006 11:03:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5374 - /vtigercrm/trunk/Smarty/templates/MyPrefDetailView.tpl Message-ID: <20060426110302.2C3D66E6FC6@vtiger.fosslabs.com> Author: richie Date: Wed Apr 26 05:02:56 2006 New Revision: 5374 Log: ID is properly passed. Fixes #507 Modified: vtigercrm/trunk/Smarty/templates/MyPrefDetailView.tpl Modified: vtigercrm/trunk/Smarty/templates/MyPrefDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/MyPrefDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/MyPrefDetailView.tpl Wed Apr 26 05:02:56 2006 @@ -39,7 +39,7 @@ - + From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 07:11:40 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 11:11:40 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23176=3A_?= =?utf-8?q?no_cancel_button_in_announcements?= In-Reply-To: <076.4d8917f257e17267aa179d1e98cf854e@vtiger.fosslabs.com> References: <076.4d8917f257e17267aa179d1e98cf854e@vtiger.fosslabs.com> Message-ID: <085.896cbb129a2c2ecdd84db7252672e651@vtiger.fosslabs.com> #176: no cancel button in announcements ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: cancel ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed Comment: (In [5375]) Cancel button added. Fixes #176 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 26 07:11:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 26 Apr 2006 11:11:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5375 - /vtigercrm/trunk/Smarty/templates/Settings/Announcements.tpl Message-ID: <20060426111140.98DDA6E7318@vtiger.fosslabs.com> Author: richie Date: Wed Apr 26 05:11:35 2006 New Revision: 5375 Log: Cancel button added. Fixes #176 Modified: vtigercrm/trunk/Smarty/templates/Settings/Announcements.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings/Announcements.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/Announcements.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/Announcements.tpl Wed Apr 26 05:11:35 2006 @@ -63,6 +63,7 @@
     My DetailsMy Details My Mail Server Details  
      My Details My Mail Server Details My Mail Server Details  
      +
    From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 07:12:06 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 11:12:06 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23106=3A_?= =?utf-8?q?Delete_not_Working?= In-Reply-To: <076.e43921d946ab38d7ed71adef5e06927b@vtiger.fosslabs.com> References: <076.e43921d946ab38d7ed71adef5e06927b@vtiger.fosslabs.com> Message-ID: <085.61ca533328a90003e921951e0a61308c@vtiger.fosslabs.com> #106: Delete not Working ------------------------+--------------------------------------------------- Reporter: jeri | Owner: philip Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Accounts ------------------------+--------------------------------------------------- Changes (by anonymous): * owner: developer => philip -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 26 07:33:01 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 26 Apr 2006 11:33:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5376 - /vtigercrm/trunk/Smarty/templates/ListView.tpl Message-ID: <20060426113301.BD6006E6FC6@vtiger.fosslabs.com> Author: richie Date: Wed Apr 26 05:32:49 2006 New Revision: 5376 Log: Cancel button added 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 Wed Apr 26 05:32:49 2006 @@ -403,6 +403,7 @@     		   +
    From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 07:40:08 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 11:40:08 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23177=3A_?= =?utf-8?q?assign_module_owner_cancel_takes_me_to_Settings_home_page?= In-Reply-To: <076.5013290f7e31546c744208c1d923ab5e@vtiger.fosslabs.com> References: <076.5013290f7e31546c744208c1d923ab5e@vtiger.fosslabs.com> Message-ID: <085.40e849fd8b71027a6d378c425dacc2c2@vtiger.fosslabs.com> #177: assign module owner cancel takes me to Settings home page ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Cancel ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed Comment: (In [5377]) Made proper redirection on cancel. Fixes #177 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 26 07:40:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 26 Apr 2006 11:40:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5377 - /vtigercrm/trunk/Smarty/templates/Settings/ModuleOwnersContents.tpl Message-ID: <20060426114009.5C9D8638F98@vtiger.fosslabs.com> Author: richie Date: Wed Apr 26 05:40:00 2006 New Revision: 5377 Log: Made proper redirection on cancel. Fixes #177 Modified: vtigercrm/trunk/Smarty/templates/Settings/ModuleOwnersContents.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings/ModuleOwnersContents.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/ModuleOwnersContents.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/ModuleOwnersContents.tpl Wed Apr 26 05:40:00 2006 @@ -12,7 +12,7 @@ {else} - + {/if}
    From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 07:42:48 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 11:42:48 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23356=3A_?= =?utf-8?q?My_Mail_Server_Details_link_is_broken?= In-Reply-To: <076.4278d8a764c99e1c7fce31d0bb54bc43@vtiger.fosslabs.com> References: <076.4278d8a764c99e1c7fce31d0bb54bc43@vtiger.fosslabs.com> Message-ID: <085.11ad7010b7d9e5a158e5b37e77e8b490@vtiger.fosslabs.com> #356: My Mail Server Details link is broken ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: Mail Server ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => duplicate * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 07:43:05 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 11:43:05 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23419=3A_?= =?utf-8?q?Redundant_buttons?= In-Reply-To: <076.6de71d424e67da126d5c147a0d1f2701@vtiger.fosslabs.com> References: <076.6de71d424e67da126d5c147a0d1f2701@vtiger.fosslabs.com> Message-ID: <085.59fb2315e3470c22ed0b89d2c1276142@vtiger.fosslabs.com> #419: Redundant buttons ------------------------+--------------------------------------------------- Reporter: richie | Owner: ela Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: profile ------------------------+--------------------------------------------------- Changes (by anonymous): * owner: developer => ela -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 07:44:55 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 11:44:55 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23728=3A_?= =?utf-8?q?Add_accounts_and_contacts_links_to_Marketing_tab?= In-Reply-To: <076.2b0185f2a18c096fb40efbfe665effd3@vtiger.fosslabs.com> References: <076.2b0185f2a18c096fb40efbfe665effd3@vtiger.fosslabs.com> Message-ID: <085.92622b16db00f9caebc584404c7c2c37@vtiger.fosslabs.com> #728: Add accounts and contacts links to Marketing tab --------------------------+------------------------------------------------- Reporter: OnwealdTim | Owner: developer Type: enhancement | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------+------------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 07:45:27 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 11:45:27 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23121=3A_?= =?utf-8?q?Issue_in_Mass_Delete?= In-Reply-To: <076.534509f43245a3f9190f86720e967f9d@vtiger.fosslabs.com> References: <076.534509f43245a3f9190f86720e967f9d@vtiger.fosslabs.com> Message-ID: <085.8ffb9b7b5ab1860e09f034c658d07c3f@vtiger.fosslabs.com> #121: Issue in Mass Delete ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: philip Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: massdelete ------------------------+--------------------------------------------------- Changes (by anonymous): * owner: developer => philip -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 07:45:44 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 11:45:44 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23122=3A_?= =?utf-8?q?Issue_in_Mass_Delete?= In-Reply-To: <076.89726d02571017484d27333203347a97@vtiger.fosslabs.com> References: <076.89726d02571017484d27333203347a97@vtiger.fosslabs.com> Message-ID: <085.8cf09db11885c4191abca3dfec9c0a6a@vtiger.fosslabs.com> #122: Issue in Mass Delete ------------------------+--------------------------------------------------- Reporter: jeri | Owner: philip Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: massdelete ------------------------+--------------------------------------------------- Changes (by anonymous): * owner: developer => philip -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 26 07:46:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 26 Apr 2006 11:46:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5378 - /vtigercrm/trunk/modules/Users/Security.php Message-ID: <20060426114653.04E2A6E6A58@vtiger.fosslabs.com> Author: don Date: Wed Apr 26 05:46:44 2006 New Revision: 5378 Log: Contacts and Accounts added under Marketing Modified: vtigercrm/trunk/modules/Users/Security.php Modified: vtigercrm/trunk/modules/Users/Security.php ============================================================================== --- vtigercrm/trunk/modules/Users/Security.php (original) +++ vtigercrm/trunk/modules/Users/Security.php Wed Apr 26 05:46:44 2006 @@ -2105,7 +2105,9 @@ (7,24,1), (7,27,2), (7,8,3), - (2,26,1)"); + (2,26,1), + (2,6,2), + (2,4,3)"); } From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 07:49:52 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 11:49:52 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23174=3A_?= =?utf-8?q?Announcements?= In-Reply-To: <076.a87ce118b91cea66bd5f5d6bb21edb63@vtiger.fosslabs.com> References: <076.a87ce118b91cea66bd5f5d6bb21edb63@vtiger.fosslabs.com> Message-ID: <085.a0de234093c9670c6c8c789a6d2d2b85@vtiger.fosslabs.com> #174: Announcements ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Announcement ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed Comment: The default update time period is 300 seconds. The result will be seen after that period alone or upon a page refresh. Jeri -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 07:54:04 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 11:54:04 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23662=3A_?= =?utf-8?q?Calculator_/_world_time_on_every_page_is_bandwidth_intensive?= In-Reply-To: <076.effa1b25ccc4464b7b5f7b7df566c9a0@vtiger.fosslabs.com> References: <076.effa1b25ccc4464b7b5f7b7df566c9a0@vtiger.fosslabs.com> Message-ID: <085.aef079252a7ac7b2a889e47789e883bc@vtiger.fosslabs.com> #662: Calculator / world time on every page is bandwidth intensive --------------------------+------------------------------------------------- Reporter: ncrossland | Owner: ela Type: enhancement | Status: new Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.1 Resolution: | Keywords: --------------------------+------------------------------------------------- Changes (by richie): * version: 5.0.0 => 5.0.1 * owner: developer => ela Comment: Will take up post 5GA. Richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 07:54:31 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 11:54:31 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23410=3A_?= =?utf-8?q?Improper_redirection_on_clicking_cancel?= In-Reply-To: <076.04eee924b1ab2c373eba75721188a75f@vtiger.fosslabs.com> References: <076.04eee924b1ab2c373eba75721188a75f@vtiger.fosslabs.com> Message-ID: <085.c785b35ad47f02e4d8501546364e0374@vtiger.fosslabs.com> #410: Improper redirection on clicking cancel ------------------------+--------------------------------------------------- Reporter: saraj | Owner: richie Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Settings Assign Moudle Owners ------------------------+--------------------------------------------------- Changes (by anonymous): * owner: jerrydgeorge => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 07:55:02 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 11:55:02 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23410=3A_?= =?utf-8?q?Improper_redirection_on_clicking_cancel?= In-Reply-To: <076.04eee924b1ab2c373eba75721188a75f@vtiger.fosslabs.com> References: <076.04eee924b1ab2c373eba75721188a75f@vtiger.fosslabs.com> Message-ID: <085.c440e868a0b96101f88bac65a48b5459@vtiger.fosslabs.com> #410: Improper redirection on clicking cancel ------------------------+--------------------------------------------------- Reporter: saraj | Owner: richie Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: Settings Assign Moudle Owners ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => duplicate * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Apr 26 07:56:29 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 26 Apr 2006 11:56:29 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23185=3A_?= =?utf-8?q?Scroll_Message_in_Home_page_-_displays_SQL_query?= In-Reply-To: <076.847231a7bde0a077c86ff3bbc7b76176@vtiger.fosslabs.com> References: <076.847231a7bde0a077c86ff3bbc7b76176@vtiger.fosslabs.com> Message-ID: <085.6911afdbc5cc0c66a99fd1a79b103a37@vtiger.fosslabs.com> #185: Scroll Message in Home page - displays SQL query ------------------------+--------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => invalid * status: new => closed Comment: It seems there are some other debug tools installed in the system due to which you are getting this exception in the pages. Richie -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 26 08:51:01 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 26 Apr 2006 12:51:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5379 - /vtigercrm/trunk/modules/Invoice/DetailView.php Message-ID: <20060426125101.881C86AB419@vtiger.fosslabs.com> Author: don Date: Wed Apr 26 06:50:55 2006 New Revision: 5379 Log: Removed call to tabPerData Modified: vtigercrm/trunk/modules/Invoice/DetailView.php Modified: vtigercrm/trunk/modules/Invoice/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/DetailView.php (original) +++ vtigercrm/trunk/modules/Invoice/DetailView.php Wed Apr 26 06:50:55 2006 @@ -67,7 +67,6 @@ $category = getParentTab(); $smarty->assign("CATEGORY",$category); -$permissionData = $_SESSION['action_permission_set']; if(isPermitted("Invoice",1,$_REQUEST['record']) == 'yes') $smarty->assign("EDIT_DUPLICATE","permitted"); @@ -76,11 +75,6 @@ if(isPermitted("Invoice",2,$_REQUEST['record']) == 'yes') $smarty->assign("DELETE","permitted"); -//Security check for related list -global $profile_id; -$tab_per_Data = getAllTabsPermission($profile_id); -$permissionData = $_SESSION['action_permission_set']; - //Get the associated Products and then display above Terms and Conditions $smarty->assign("ASSOCIATED_PRODUCTS",getDetailAssociatedProducts('Invoice',$focus)); From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 26 08:53:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 26 Apr 2006 12:53:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5380 - /vtigercrm/trunk/modules/Products/DetailView.php Message-ID: <20060426125328.803996AB419@vtiger.fosslabs.com> Author: don Date: Wed Apr 26 06:53:24 2006 New Revision: 5380 Log: Removed call to tabPerData Modified: vtigercrm/trunk/modules/Products/DetailView.php Modified: vtigercrm/trunk/modules/Products/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Products/DetailView.php (original) +++ vtigercrm/trunk/modules/Products/DetailView.php Wed Apr 26 06:53:24 2006 @@ -50,7 +50,6 @@ $smarty->assign("CUSTOMFIELD", $cust_fld); $smarty->assign("SINGLE_MOD","Product"); -$permissionData = $_SESSION['action_permission_set']; if(isPermitted("Products",1,$_REQUEST['record']) == 'yes') $smarty->assign("EDIT_DUPLICATE","permitted"); @@ -62,9 +61,6 @@ $smarty->assign("ID", $_REQUEST['record']); //Security check for related list -global $profile_id; -$tab_per_Data = getAllTabsPermission($profile_id); -$permissionData = $_SESSION['action_permission_set']; $smarty->assign("MODULE", $module); $smarty->display("DetailView.tpl"); From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 26 08:59:05 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 26 Apr 2006 12:59:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5381 - /vtigercrm/trunk/modules/HelpDesk/DetailView.php Message-ID: <20060426125905.CD22B6AB419@vtiger.fosslabs.com> Author: don Date: Wed Apr 26 06:59:02 2006 New Revision: 5381 Log: Removed call to tabPerData Modified: vtigercrm/trunk/modules/HelpDesk/DetailView.php Modified: vtigercrm/trunk/modules/HelpDesk/DetailView.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 26 09:00:31 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 26 Apr 2006 13:00:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5382 - /vtigercrm/trunk/modules/Emails/DetailView.php Message-ID: <20060426130031.CAB2D6AB419@vtiger.fosslabs.com> Author: don Date: Wed Apr 26 07:00:27 2006 New Revision: 5382 Log: Removed call to tabPerData Modified: vtigercrm/trunk/modules/Emails/DetailView.php Modified: vtigercrm/trunk/modules/Emails/DetailView.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 26 09:02:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 26 Apr 2006 13:02:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5383 - /vtigercrm/trunk/modules/Emails/Save.php Message-ID: <20060426130258.55E426AB419@vtiger.fosslabs.com> Author: richie Date: Wed Apr 26 07:02:53 2006 New Revision: 5383 Log: PearDatabase::quote replaced with $adb->quote Modified: vtigercrm/trunk/modules/Emails/Save.php Modified: vtigercrm/trunk/modules/Emails/Save.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 26 09:04:14 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 26 Apr 2006 13:04:14 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5384 - in /vtigercrm/trunk/modules/Emails: mail.php mailsend.php Message-ID: <20060426130415.25AE36E789B@vtiger.fosslabs.com> Author: richie Date: Wed Apr 26 07:04:09 2006 New Revision: 5384 Log: PearDatabase::quote replaced with $adb->quote Modified: vtigercrm/trunk/modules/Emails/mail.php vtigercrm/trunk/modules/Emails/mailsend.php Modified: vtigercrm/trunk/modules/Emails/mail.php ============================================================================== --- vtigercrm/trunk/modules/Emails/mail.php (original) +++ vtigercrm/trunk/modules/Emails/mail.php Wed Apr 26 07:04:09 2006 @@ -119,7 +119,7 @@ global $adb; $adb->println("Inside the function addSignature"); - $sign = $adb->query_result($adb->query("select signature from users where user_name=".PearDatabase::quote($fromname)),0,"signature"); + $sign = $adb->query_result($adb->query("select signature from users where user_name=".$adb->quote($fromname)),0,"signature"); if($sign != '') { $contents .= '

    '.$sign.''; @@ -339,7 +339,7 @@ if($parentid != '') { //$query = 'select * from '.$tablename.' where '.$idname.' = '.$parentid; - $query = 'select * from '.$tablename.' where '. $idname.' = '.PearDatabase::quote($parentid); + $query = 'select * from '.$tablename.' where '. $idname.' = '.$adb->quote($parentid); $mailid = $adb->query_result($adb->query($query),0,$first_email); $mailid2 = $adb->query_result($adb->query($query),0,$second_email); } Modified: vtigercrm/trunk/modules/Emails/mailsend.php ============================================================================== --- vtigercrm/trunk/modules/Emails/mailsend.php (original) +++ vtigercrm/trunk/modules/Emails/mailsend.php Wed Apr 26 07:04:09 2006 @@ -103,7 +103,7 @@ { $temp=$realid[$j]; //$myquery='Select columnname from field where fieldid='.$temp; - $myquery='Select columnname from field where fieldid='.PearDatabase::quote($temp); + $myquery='Select columnname from field where fieldid='.$adb->quote($temp); $fresult=$adb->query($myquery); if ($pmodule=='Contacts') { From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 26 09:07:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 26 Apr 2006 13:07:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5385 - /vtigercrm/trunk/modules/Quotes/DetailView.php Message-ID: <20060426130749.26B1A6E789B@vtiger.fosslabs.com> Author: don Date: Wed Apr 26 07:07:45 2006 New Revision: 5385 Log: Removed call to tabPerData Modified: vtigercrm/trunk/modules/Quotes/DetailView.php Modified: vtigercrm/trunk/modules/Quotes/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/DetailView.php (original) +++ vtigercrm/trunk/modules/Quotes/DetailView.php Wed Apr 26 07:07:45 2006 @@ -66,7 +66,6 @@ $category = getParentTab(); $smarty->assign("CATEGORY",$category); -$permissionData = $_SESSION['action_permission_set']; if(isPermitted("Quotes",1,$_REQUEST['record']) == 'yes') $smarty->assign("EDIT_DUPLICATE","permitted"); @@ -83,9 +82,6 @@ $smarty->assign("DELETE","permitted"); -//Security check for related list -$tab_per_Data = getAllTabsPermission($profile_id); -$permissionData = $_SESSION['action_permission_set']; $smarty->assign("CONVERTMODE",'quotetoinvoice'); $smarty->assign("MODULE", $currentModule); From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 26 09:25:45 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 26 Apr 2006 13:25:45 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5386 - /vtigercrm/trunk/include/utils/ListViewUtils.php Message-ID: <20060426132545.6A12A5C73EC@vtiger.fosslabs.com> Author: richie Date: Wed Apr 26 07:25:41 2006 New Revision: 5386 Log: subject passed as parameter 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 Wed Apr 26 07:25:41 2006 @@ -1317,7 +1317,7 @@ } elseif($module == 'Emails') { - $value = ''.$temp_val.''; + $value = ''.$temp_val.''; } else { From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 26 09:27:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 26 Apr 2006 13:27:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5387 - /vtigercrm/trunk/Smarty/templates/Emails.tpl Message-ID: <20060426132730.B55B76DA65C@vtiger.fosslabs.com> Author: richie Date: Wed Apr 26 07:27:26 2006 New Revision: 5387 Log: subject passed to the td and shown on top. Hardcoded inbox and sent counts removed Modified: vtigercrm/trunk/Smarty/templates/Emails.tpl Modified: vtigercrm/trunk/Smarty/templates/Emails.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Emails.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Emails.tpl Wed Apr 26 07:27:26 2006 @@ -5,7 +5,10 @@ hide("status"); document.getElementById("EmailDetails").innerHTML=response.responseText; {rdelim} - +function setSubject(subject) +{ldelim} +document.getElementById("subjectsetter").innerHTML=subject +{rdelim} function getEmailContents(id) {ldelim} show("status"); @@ -64,10 +67,10 @@  All Mails
    •    - Inbox (121) + Inbox 
    •    - Sent (21) + Sent 
    •    Trash  @@ -76,10 +79,10 @@  Qualified Mails
      •    - Inbox (221) + Inbox 
      •    - Sent (521) + Sent 
      •    Trash  @@ -129,7 +132,7 @@   - Network world : WiFiTech Introduces new gen WiFi Router +   From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 26 09:34:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 26 Apr 2006 13:34:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5388 - /vtigercrm/trunk/modules/Campaigns/DetailView.php Message-ID: <20060426133428.8E2346E7ABE@vtiger.fosslabs.com> Author: don Date: Wed Apr 26 07:34:24 2006 New Revision: 5388 Log: Removed call to tabPerData Modified: vtigercrm/trunk/modules/Campaigns/DetailView.php Modified: vtigercrm/trunk/modules/Campaigns/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/DetailView.php (original) +++ vtigercrm/trunk/modules/Campaigns/DetailView.php Wed Apr 26 07:34:24 2006 @@ -45,7 +45,6 @@ $category = getParentTab(); $smarty->assign("CATEGORY",$category); -$permissionData = $_SESSION['action_permission_set']; if(isPermitted("Campaigns",1,$_REQUEST['record']) == 'yes') $smarty->assign("EDIT_DUPLICATE","permitted"); @@ -58,9 +57,6 @@ $smarty->assign("MODULE","Campaigns"); $smarty->display("DetailView.tpl"); -//Security check for related list -$tab_per_Data = getAllTabsPermission($profile_id); -$permissionData = $_SESSION['action_permission_set']; $focus->id = $_REQUEST['record']; ?> From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 26 09:37:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 26 Apr 2006 13:37:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5389 - /vtigercrm/trunk/modules/Leads/DetailView.php Message-ID: <20060426133703.6026E6E7ABE@vtiger.fosslabs.com> Author: don Date: Wed Apr 26 07:36:57 2006 New Revision: 5389 Log: Removed call to tabPerData Modified: vtigercrm/trunk/modules/Leads/DetailView.php Modified: vtigercrm/trunk/modules/Leads/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Leads/DetailView.php (original) +++ vtigercrm/trunk/modules/Leads/DetailView.php Wed Apr 26 07:36:57 2006 @@ -68,14 +68,8 @@ $val = isPermitted("Leads",1,$_REQUEST['record']); -$permissionData = $_SESSION['action_permission_set']; if(isPermitted("Leads",1,$_REQUEST['record']) == 'yes') $smarty->assign("EDIT_DUPLICATE","permitted"); - -//Security check for Convert Lead Button -global $profile_id; -$tab_per_Data = getAllTabsPermission($profile_id); -$permissionData = $_SESSION['action_permission_set']; if(isPermitted("Leads","ConvertLead") =='yes' && isPermitted("Accounts","EditView") =='yes' && isPermitted("Contacts","EditView")) From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 26 09:43:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 26 Apr 2006 13:43:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5390 - /vtigercrm/trunk/modules/Contacts/DetailView.php Message-ID: <20060426134332.52C956E7EE9@vtiger.fosslabs.com> Author: don Date: Wed Apr 26 07:43:28 2006 New Revision: 5390 Log: Removed call to tabPerData Modified: vtigercrm/trunk/modules/Contacts/DetailView.php Modified: vtigercrm/trunk/modules/Contacts/DetailView.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 26 09:45:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 26 Apr 2006 13:45:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5391 - /vtigercrm/trunk/modules/PurchaseOrder/DetailView.php Message-ID: <20060426134542.61FAA6E7EE9@vtiger.fosslabs.com> Author: don Date: Wed Apr 26 07:45:38 2006 New Revision: 5391 Log: Removed call to tabPerData Modified: vtigercrm/trunk/modules/PurchaseOrder/DetailView.php Modified: vtigercrm/trunk/modules/PurchaseOrder/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/DetailView.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/DetailView.php Wed Apr 26 07:45:38 2006 @@ -67,7 +67,6 @@ $category = getParentTab(); $smarty->assign("CATEGORY",$category); -$permissionData = $_SESSION['action_permission_set']; if(isPermitted("PurchaseOrder",1,$_REQUEST['record']) == 'yes') $smarty->assign("EDIT_DUPLICATE","permitted"); @@ -76,9 +75,6 @@ if(isPermitted("PurchaseOrder",2,$_REQUEST['record']) == 'yes') $smarty->assign("DELETE","permitted"); -//Security check for related list -$tab_per_Data = getAllTabsPermission($profile_id); -$permissionData = $_SESSION['action_permission_set']; //Get the associated Products and then display above Terms and Conditions $smarty->assign("ASSOCIATED_PRODUCTS",getDetailAssociatedProducts('PurchaseOrder',$focus)); From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 26 09:56:35 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 26 Apr 2006 13:56:35 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5392 - /vtigercrm/trunk/Smarty/templates/Buttons_List.tpl Message-ID: <20060426135635.DA5246E7E0E@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 26 07:56:31 2006 New Revision: 5392 Log: Added new tpl for enabling security for 'Add/Search/Import/Export' Links - Ahmed Added: vtigercrm/trunk/Smarty/templates/Buttons_List.tpl From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 26 10:04:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 26 Apr 2006 14:04:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5393 - in /vtigercrm/trunk/Smarty/templates: CreateView.tpl DetailView.tpl ListView.tpl salesEditView.tpl Message-ID: <20060426140432.88A216E81CD@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 26 08:04:24 2006 New Revision: 5393 Log: Included the file Buttons_List.tpl for security check in List/Detail/Edit/Create View - Ahmed Modified: vtigercrm/trunk/Smarty/templates/CreateView.tpl vtigercrm/trunk/Smarty/templates/DetailView.tpl vtigercrm/trunk/Smarty/templates/ListView.tpl vtigercrm/trunk/Smarty/templates/salesEditView.tpl Modified: vtigercrm/trunk/Smarty/templates/CreateView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateView.tpl Wed Apr 26 08:04:24 2006 @@ -45,50 +45,7 @@ - - - - - - - - - - -
        {$CATEGORY} > {$MODULE} - - - - - - - - -
        - - - - - - -
        Create {$SINGLE_MOD}...Search in {$MODULE}...
        -         		  - - - - - - - -
        Open Calendar...Show World Clock...Open Calculator...
        -         		  - - - - -
        -
        -
        + {include file='Buttons_List.tpl'} {**} Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/DetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/DetailView.tpl Wed Apr 26 08:04:24 2006 @@ -57,66 +57,7 @@ {include file='DetailViewHidden.tpl'}
        - - - - - - - - - - {if $MODULE eq 'Contacts' || $MODULE eq 'Leads' || $MODULE eq 'Accounts' || $MODULE eq 'Potentials' || $MODULE eq 'Products' || $MODULE eq 'Notes' || $MODULE eq 'Emails'} - - - {else} - - {/if} - - - - -
        {$CATEGORY} > {$MODULE} - - - - - - - - -
        - - - {if $MODULE eq 'Activities'} - - {else} - - {/if} - - - -
        Create {$ACTIVITY_MODE}...Create {$SINGLE_MOD}...Search in {$SINGLE_MOD}...
        -         		  - - - - - - -
        Open Calendar...Show World Clock...Open Calculator...
        -         		- - - -
        -
        -         		- {if $MODULE ne 'Notes' && $MODULE ne 'Emails'} - Import {$MODULE} | - {/if} - Export {$MODULE} -  
        + {include file='Buttons_List.tpl'} Modified: vtigercrm/trunk/Smarty/templates/ListView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListView.tpl Wed Apr 26 08:04:24 2006 @@ -38,69 +38,8 @@ - - -
        - - - - - - - {if $MODULE eq 'Contacts' || $MODULE eq 'Leads' || $MODULE eq 'Accounts' || $MODULE eq 'Potentials' || $MODULE eq 'Products' || $MODULE eq 'Notes' || $MODULE eq 'Emails'} - - - {else} - - {/if} - - - -
        {$CATEGORY} > {$MODULE} - - - - - - - - -
        - - - - {if $MODULE eq 'Activities'} - - {else} - - {/if} - - - -
        Create {$MODULE}...Create {$MODULE}...Search in {$MODULE}...Chat... -
        -         		  - - - - - - - -
        Open Calendar...Show World Clock...Open Calculator...
        -         		- - - - -
        -
        -         		- {if $MODULE ne 'Notes' && $MODULE ne 'Emails'} - Import {$MODULE} | - {/if} - Export {$MODULE} -  
        + {include file='Buttons_List.tpl'} + '; } + $log->debug("Exiting getValue method ..."); return $value; } function getListQuery($module,$where='') { + global $log; + $log->debug("Entering getListQuery(".$module.",".$where.") method ..."); global $current_user; require('user_privileges/user_privileges_'.$current_user->id.'.php'); @@ -1513,12 +1535,15 @@ } */ + $log->debug("Exiting getListQuery method ..."); return $query; } function getReadEntityIds($module) { + global $log; + $log->debug("Entering getReadEntityIds(".$module.") method ..."); global $current_user; require('user_privileges/user_privileges_'.$current_user->id.'.php'); require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); @@ -1616,6 +1641,7 @@ } } + $log->debug("Exiting getReadEntityIds method ..."); return $query; } @@ -1624,6 +1650,8 @@ //parameter $viewid added for customview 27/5 function AlphabeticalSearch($module,$action,$fieldname,$query,$type,$popuptype='',$recordid='',$return_module='',$append_url='',$viewid='',$groupid='') { + global $log; + $log->debug("Entering AlphabeticalSearch(".$module.",".$action.",".$fieldname.",".$query.",".$type.",".$popuptype.",".$recordid.",".$return_module.",".$append_url.",".$viewid.",".$groupid.") method ..."); if($type=='advanced') $flag='&advanced=true'; @@ -1639,12 +1667,15 @@ // Mike Crowe Mod --------------------------------------------------------added groupid to url $list .= ''.$var.''; + $log->debug("Exiting AlphabeticalSearch method ..."); return $list; } function getRelatedToEntity($module,$list_result,$rset) { + global $log; + $log->debug("Entering getRelatedToEntity(".$module.",".$list_result.",".$rset.") method ..."); global $adb; $seid = $adb->query_result($list_result,$rset,"relatedto"); @@ -1712,6 +1743,7 @@ { $parent_value = ''; } + $log->debug("Exiting getRelatedToEntity method ..."); return $parent_value; } @@ -1720,6 +1752,8 @@ //used in home page listTop files function getRelatedTo($module,$list_result,$rset) { + global $log; + $log->debug("Entering getRelatedTo(".$module.",".$list_result.",".$rset.") method ..."); global $adb; global $app_strings; @@ -1830,6 +1864,7 @@ $parent_value = $module_icon."".$parent_name.""; } //code added by raju ends + $log->debug("Exiting getRelatedTo method ..."); return $parent_value; @@ -1838,6 +1873,8 @@ function getTableHeaderNavigation($navigation_array, $url_qry,$module='',$action_val='index',$viewid='') { + global $log; + $log->debug("Entering getTableHeaderNavigation(".$navigation_array.",". $url_qry.",".$module.",".$action_val.",".$viewid.") method ..."); global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; @@ -1873,6 +1910,7 @@ $output .= ' '; } $output .= ''; + $log->debug("Exiting getTableHeaderNavigation method ..."); return $output; } @@ -1885,6 +1923,8 @@ function getRelCheckquery($currentmodule,$returnmodule,$recordid) { + global $log; + $log->debug("Entering getRelCheckquery(".$currentmodule.",".$returnmodule.",".$recordid.") method ..."); global $adb; $skip_id = Array(); $where_relquery = ""; @@ -1911,6 +1951,7 @@ $where_relquery = "and contactdetails.contactid not in ".$skipids; } } + $log->debug("Exiting getRelCheckquery method ..."); return $where_relquery; } From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 11:19:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 15:19:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5503 - /vtigercrm/trunk/include/utils/UserInfoUtil.php Message-ID: <20060427151907.62A7040E7BB@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 09:19:01 2006 New Revision: 5503 Log: log entries have been inserted in all functions 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 Thu Apr 27 09:19:01 2006 @@ -23,10 +23,13 @@ */ function getMailServerInfo($user) { + global $log; + $log->debug("Entering getMailServerInfo(".$user.") method ..."); global $adb; //$sql= "select rolename from user2role where userid='" .$userid ."'"; $sql = "select * from mail_accounts where status=1 and user_id=".$user->id; $result = $adb->query($sql); + $log->debug("Exiting getMailServerInfo method ..."); return $result; } @@ -36,11 +39,14 @@ */ function fetchUserRole($userid) { + global $log; + $log->debug("Entering fetchUserRole(".$userid.") method ..."); global $adb; //$sql= "select rolename from user2role where userid='" .$userid ."'"; $sql = "select roleid from user2role where userid='" .$userid ."'"; $result = $adb->query($sql); $roleid= $adb->query_result($result,0,"roleid"); + $log->debug("Exiting fetchUserRole method ..."); return $roleid; } @@ -50,6 +56,8 @@ */ function fetchUserProfileId($userid) { + global $log; + $log->debug("Entering fetchUserProfileId(".$userid.") method ..."); global $adb; $sql = "select roleid from user2role where userid=" .$userid; $result = $adb->query($sql); @@ -59,6 +67,7 @@ $sql1 = "select profileid from role2profile where roleid='" .$roleid."'"; $result1 = $adb->query($sql1); $profileid= $adb->query_result($result1,0,"profileid"); + $log->debug("Exiting fetchUserProfileId method ..."); return $profileid; } @@ -69,10 +78,13 @@ */ function fetchUserGroupids($userid) { + global $log; + $log->debug("Entering fetchUserGroupids(".$userid.") method ..."); global $adb; $focus = new GetUserGroups(); $focus->getAllUserGroups($userid); $groupidlists = implode(",",$focus->user_groups); + $log->debug("Exiting fetchUserGroupids method ..."); return $groupidlists; } @@ -82,6 +94,8 @@ */ function loadAllPerms() { + global $log; + $log->debug("Entering loadAllPerms() method ..."); global $adb,$MAX_TAB_PER; global $persistPermArray; @@ -110,6 +124,7 @@ $persistPermArray[$profileid][$tabid] = $tab_per; } } + $log->debug("Exiting loadAllPerms method ..."); } /** Function to get all the tab permission for the specified profile @@ -123,6 +138,8 @@ */ function getAllTabsPermission($profileid) { + global $log; + $log->debug("Entering getAllTabsPermission(".$profileid.") method ..."); global $persistPermArray; global $adb,$MAX_TAB_PER; // Mike Crowe Mod -------------------------------------------------------- @@ -130,6 +147,7 @@ { if ( count($persistPermArray) == 0 ) loadAllPerms(); + $log->debug("Exiting getAllTabsPermission method ..."); return $persistPermArray[$profileid]; } else @@ -148,6 +166,7 @@ $tab_per= $adb->query_result($result,$i,'permissions'); $tab_perr_array[$tabid] = $tab_per; } + $log->debug("Exiting getAllTabsPermission method ..."); return $tab_perr_array; } // Mike Crowe Mod ---------------------------------------------------------------- @@ -165,6 +184,8 @@ */ function getTabsPermission($profileid) { + global $log; + $log->debug("Entering getTabsPermission(".$profileid.") method ..."); global $persistPermArray; global $adb; // Mike Crowe Mod ------------------------------------------------------- @@ -175,6 +196,7 @@ $tab_perr_array = $persistPermArray; foreach( array(1,3,16,15) as $tabid ) $tab_perr_array[$tabid] = 0; + $log->debug("Exiting getTabsPermission method ..."); return $tab_perr_array; } else @@ -192,6 +214,7 @@ $tab_perr_array[$tabid] = $tab_per; } } + $log->debug("Exiting getTabsPermission method ..."); return $tab_perr_array; } @@ -208,6 +231,8 @@ */ function getTabsActionPermission($profileid) { + global $log; + $log->debug("Entering getTabsActionPermission(".$profileid.") method ..."); global $adb; $check = Array(); $temp_tabid = Array(); @@ -228,11 +253,8 @@ $per_id = $adb->query_result($result1,$i,'permissions'); $access[$action_id] = $per_id; $check[$tab_id] = $access; - - - } - - + } + $log->debug("Exiting getTabsActionPermission method ..."); return $check; } @@ -248,6 +270,8 @@ function getTabsUtilityActionPermission($profileid) { + global $log; + $log->debug("Entering getTabsUtilityActionPermission(".$profileid.") method ..."); global $adb; $check = Array(); @@ -273,6 +297,7 @@ } + $log->debug("Exiting getTabsUtilityActionPermission method ..."); return $check; } @@ -288,6 +313,8 @@ function getDefaultSharingEditAction() { + global $log; + $log->debug("Entering getDefaultSharingEditAction() method ..."); global $adb; //retreiving the standard permissions $sql= "select * from def_org_share where editstatus=0"; @@ -302,6 +329,7 @@ }while($permissionRow=$adb->fetch_array($result)); + $log->debug("Exiting getDefaultSharingEditAction method ..."); return $copy; } @@ -316,6 +344,8 @@ */ function getDefaultSharingAction() { + global $log; + $log->debug("Entering getDefaultSharingAction() method ..."); global $adb; //retreiving the standard permissions $sql= "select * from def_org_share where editstatus in(0,1)"; @@ -329,6 +359,7 @@ } }while($permissionRow=$adb->fetch_array($result)); + $log->debug("Exiting getDefaultSharingAction method ..."); return $copy; } @@ -345,6 +376,8 @@ */ function getAllDefaultSharingAction() { + global $log; + $log->debug("Entering getAllDefaultSharingAction() method ..."); global $adb; $copy=Array(); //retreiving the standard permissions @@ -360,6 +393,7 @@ } + $log->debug("Exiting getAllDefaultSharingAction method ..."); return $copy; } @@ -370,6 +404,8 @@ */ function setPermittedTabs2Session($profileid) { + global $log; + $log->debug("Entering setPermittedTabs2Session(".$profileid.") method ..."); global $adb; $sql = "select tabid from profile2tab where profileid=" .$profileid ." and permissions =0" ; $result = $adb->query($sql); @@ -387,7 +423,7 @@ }while($tabPermission=$adb->fetch_array($result)); $_SESSION['tab_permission_set']=$copy; - + $log->debug("Exiting setPermittedTabs2Session method ..."); } /* Deprecated Function. To be removed @@ -396,6 +432,8 @@ */ function setPermittedActions2Session($profileid) { + global $log; + $log->debug("Entering setPermittedActions2Session(".$profileid.") method ..."); global $adb; $check = Array(); $sql1 = "select tabid from profile2tab where profileid=" .$profileid ." and permissions =0" ; @@ -445,6 +483,7 @@ } $_SESSION['action_permission_set']=$check; + $log->debug("Entering setPermittedActions2Session method ..."); } /* Deprecated Function. To be removed @@ -453,6 +492,8 @@ */ function setPermittedDefaultSharingAction2Session($profileid) { + global $log; + $log->debug("Entering setPermittedDefaultSharingAction2Session(".$profileid.") method ..."); global $adb; //retreiving the standard permissions //$sql= "select default_org_sharingrule.* from default_org_sharingrule inner join profile2tab on profile2tab.tabid = default_org_sharingrule.tabid where profile2tab.permissions =0 and profile2tab.profileid=".$profileid; @@ -469,7 +510,7 @@ }while($permissionRow=$adb->fetch_array($result)); $_SESSION['defaultaction_sharing_permission_set']=$copy; - + $log->debug("Entering setPermittedDefaultSharingAction2Session method ..."); } @@ -483,6 +524,8 @@ function createRole($roleName,$parentRoleId,$roleProfileArray) { + global $log; + $log->debug("Entering createRole(".$roleName.",".$parentRoleId.",".$roleProfileArray.") method ..."); global $adb; $parentRoleDetails=getRoleInformation($parentRoleId); $parentRoleInfo=$parentRoleDetails[$parentRoleId]; @@ -506,6 +549,7 @@ } } + $log->debug("Exiting createRole method ..."); return $roleId; } @@ -518,6 +562,8 @@ */ function updateRole($roleId,$roleName,$roleProfileArray) { + global $log; + $log->debug("Entering updateRole(".$roleId.",".$roleName.",".$roleProfileArray.") method ..."); global $adb; $sql1 = "update role set rolename='".$roleName."' where roleid='".$roleId."'"; $adb->query($sql1); @@ -532,7 +578,7 @@ insertRole2ProfileRelation($roleId,$profileId); } } - + $log->debug("Exiting updateRole method ..."); } @@ -543,9 +589,12 @@ */ function insertRole2ProfileRelation($roleId,$profileId) { + global $log; + $log->debug("Entering insertRole2ProfileRelation(".$roleId.",".$profileId.") method ..."); global $adb; $query="insert into role2profile values('".$roleId."',".$profileId.")"; $adb->query($query); + $log->debug("Exiting insertRole2ProfileRelation method ..."); } @@ -557,10 +606,14 @@ */ function createNewGroup($groupName,$groupDescription) { - global $adb; - $sql = "insert into groups(name,description) values('" .$groupName ."','". $groupDescription ."')"; - $result = $adb->query($sql); - header("Location: index.php?module=Users&action=listgroups"); + global $log; + $log->debug("Entering createNewGroup(".$groupName.",".$groupDescription.") method ..."); + global $adb; + $sql = "insert into groups(name,description) values('" .$groupName ."','". $groupDescription ."')"; + $result = $adb->query($sql); + $log->debug("Exiting createNewGroup method ..."); + header("Location: index.php?module=Users&action=listgroups"); + } @@ -571,11 +624,14 @@ */ function fetchTabId($moduleName) { - global $adb; - $sql = "select id from tabu where name ='" .$moduleName ."'"; - $result = $adb->query($sql); - $tabid = $adb->query_result($result,0,"id"); - return $tabid; + global $log; + $log->debug("Entering fetchTabId(".$moduleName.") method ..."); + global $adb; + $sql = "select id from tabu where name ='" .$moduleName ."'"; + $result = $adb->query($sql); + $tabid = $adb->query_result($result,0,"id"); + $log->debug("Exiting fetchTabId method ..."); + return $tabid; } @@ -586,6 +642,8 @@ */ function populatePermissions4NewRole($parentroleName,$roleName) { + global $log; + $log->debug("Entering populatePermissions4NewRole(".$parentroleName.",".$roleName.") method ..."); global $adb; //fetch the permissions for the parent role $referenceValues = fetchTabReferenceEntityValues($parentroleName); @@ -605,6 +663,7 @@ //echo $sql_insert; $adb->query($sql_insert); } + $log->debug("Exiting populatePermissions4NewRole method ..."); } @@ -615,10 +674,13 @@ */ function fetchTabReferenceEntityValues($parentrolename) { + global $log; + $log->debug("Entering fetchTabReferenceEntityValues(".$parentrolename.") method ..."); global $adb; $sql = "select tabid,module_permission,description from role2tab where rolename='" .$parentrolename ."'"; //echo $sql; $result=$adb->query($sql); +$log->debug("Exiting fetchTabReferenceEntityValues method ..."); return $result; } @@ -631,9 +693,12 @@ */ function fetchActionReferenceEntityValues($parentrolename) { + global $log; +$log->debug("Entering fetchActionReferenceEntityValues(".$parentrolename.") method ..."); global $adb; $sql = "select tabid,actionname,action_permission,description from role2action where rolename='" .$parentrolename ."'"; $result=$adb->query($sql); +$log->debug("Exiting fetchActionReferenceEntityValues method ..."); return $result; } @@ -644,11 +709,14 @@ */ function fetchRoleId($rolename) { +global $log; +$log->debug("Entering fetchRoleId(".$rolename.") method ..."); global $adb; $sqlfetchroleid = "select roleid from role where rolename='".$rolename ."'"; $resultroleid = $adb->query($sqlfetchroleid); $role_id = $adb->query_result($resultroleid,0,"roleid"); +$log->debug("Exiting fetchRoleId method ..."); return $role_id; } @@ -659,6 +727,8 @@ */ function updateUser2RoleMapping($roleid,$userid) { +global $log; +$log->debug("Entering updateUser2RoleMapping(".$roleid.",".$userid.") method ..."); global $adb; //Check if row already exists $sqlcheck = "select * from user2role where userid=".$userid; @@ -670,6 +740,7 @@ } $sql = "insert into user2role(userid,roleid) values(" .$userid .",'" .$roleid ."')"; $result = $adb->query($sql); + $log->debug("Exiting updateUser2RoleMapping method ..."); } @@ -681,11 +752,14 @@ */ function updateUsers2GroupMapping($groupname,$userid) { +global $log; +$log->debug("Entering updateUsers2GroupMapping(".$groupname.",".$userid.") method ..."); global $adb; $sqldelete = "delete from users2group where userid = '" .$userid ."'"; $result_delete = $adb->query($sqldelete); $sql = "insert into users2group(groupname,userid) values('" .$groupname ."','" .$userid ."')"; $result = $adb->query($sql); + $log->debug("Exiting updateUsers2GroupMapping method ..."); } /** Function to add user to role mapping @@ -695,10 +769,13 @@ */ function insertUser2RoleMapping($roleid,$userid) { +global $log; +$log->debug("Entering insertUser2RoleMapping(".$roleid.",".$userid.") method ..."); global $adb; $sql = "insert into user2role(userid,roleid) values('" .$userid ."','" .$roleid ."')"; $adb->query($sql); +$log->debug("Exiting insertUser2RoleMapping method ..."); } @@ -709,9 +786,12 @@ */ function insertUsers2GroupMapping($groupname,$userid) { +global $log; +$log->debug("Entering insertUsers2GroupMapping(".$groupname.",".$userid.") method ..."); global $adb; $sql = "insert into users2group(groupname,userid) values('" .$groupname ."','" .$userid ."')"; $adb->query($sql); +$log->debug("Exiting insertUsers2GroupMapping method ..."); } /** Function to get the word template resultset @@ -721,9 +801,12 @@ */ function fetchWordTemplateList($module) { +global $log; +$log->debug("Entering fetchWordTemplateList(".$module.") method ..."); global $adb; $sql_word = "select templateid, filename from wordtemplates where module ='".$module."'" ; $result=$adb->query($sql_word); +$log->debug("Exiting fetchWordTemplateList method ..."); return $result; } @@ -736,9 +819,12 @@ */ function fetchEmailTemplateInfo($templateName) { +global $log; +$log->debug("Entering fetchEmailTemplateInfo(".$templateName.") method ..."); global $adb; $sql= "select * from emailtemplates where templatename='" .$templateName ."'"; $result = $adb->query($sql); +$log->debug("Exiting fetchEmailTemplateInfo method ..."); return $result; } @@ -749,7 +835,8 @@ */ function substituteTokens($filename,$globals) { - global $log; +global $log; +$log->debug("Entering substituteTokens(".$filename.",".$globals.") method ..."); $log->debug("in substituteTokens method with filename ".$filename.' and content globals as '.$globals); global $root_directory; @@ -766,6 +853,7 @@ if (!$dump = file ($filename)) { $log->debug("not able to create the file or get access to the file with filename ".$filename." so returning 0"); + $log->debug("Exiting substituteTokens method ..."); return 0; } @@ -786,6 +874,7 @@ } $log->debug("the replacedString is ".$replacedString); + $log->debug("Exiting substituteTokens method ..."); return $replacedString; } @@ -796,9 +885,12 @@ */ function insert2LeadGroupRelation($leadid,$groupname) { + global $log; + $log->debug("Entering insert2LeadGroupRelation(".$leadid.",".$groupname.") method ..."); global $adb; $sql = "insert into leadgrouprelation values (" .$leadid .",'".$groupname."')"; $adb->query($sql); + $log->debug("Exiting insert2LeadGroupRelation method ..."); } @@ -809,11 +901,14 @@ */ function updateLeadGroupRelation($leadid,$groupname) { +global $log; +$log->debug("Entering updateLeadGroupRelation(".$leadid.",".$groupname.") method ..."); global $adb; $sqldelete = "delete from leadgrouprelation where leadid=".$leadid; $adb->query($sqldelete); $sql = "insert into leadgrouprelation values (".$leadid .",'" .$groupname ."')"; $adb->query($sql); + $log->debug("Exiting updateLeadGroupRelation method ..."); } @@ -824,9 +919,12 @@ */ function insert2AccountGroupRelation($accountid,$groupname) { +global $log; +$log->debug("Entering insert2AccountGroupRelation(".$accountid.",".$groupname.") method ..."); global $adb; $sql = "insert into accountgrouprelation values (" .$accountid .",'".$groupname."')"; $adb->query($sql); +$log->debug("Exiting insert2AccountGroupRelation method ..."); } @@ -838,11 +936,14 @@ function updateAccountGroupRelation($accountid,$groupname) { +global $log; +$log->debug("Entering updateAccountGroupRelation(".$accountid.",".$groupname.") method ..."); global $adb; $sqldelete = "delete from accountgrouprelation where accountid=".$accountid; $adb->query($sqldelete); $sql = "insert into accountgrouprelation values (".$accountid .",'" .$groupname ."')"; $adb->query($sql); +$log->debug("Exiting updateAccountGroupRelation method ..."); } @@ -853,9 +954,12 @@ */ function insert2ContactGroupRelation($contactid,$groupname) { +global $log; +$log->debug("Entering insert2ContactGroupRelation(".$contactid.",".$groupname.") method ..."); global $adb; $sql = "insert into contactgrouprelation values (" .$contactid .",'".$groupname."')"; $adb->query($sql); +$log->debug("Exiting insert2ContactGroupRelation method ..."); } @@ -867,11 +971,14 @@ function updateContactGroupRelation($contactid,$groupname) { +global $log; +$log->debug("Entering updateContactGroupRelation(".$contactid.",".$groupname.") method ..."); global $adb; $sqldelete = "delete from contactgrouprelation where contactid=".$contactid; $adb->query($sqldelete); $sql = "insert into contactgrouprelation values (".$contactid .",'" .$groupname ."')"; $adb->query($sql); +$log->debug("Exiting updateContactGroupRelation method ..."); } /** Function to add Potential group relation @@ -881,9 +988,12 @@ */ function insert2PotentialGroupRelation($potentialid,$groupname) { +global $log; +$log->debug("Entering insert2PotentialGroupRelation(".$potentialid.",".$groupname.") method ..."); global $adb; $sql = "insert into potentialgrouprelation values (" .$potentialid .",'".$groupname."')"; $adb->query($sql); + $log->debug("Exiting insert2PotentialGroupRelation method ..."); } @@ -895,11 +1005,14 @@ function updatePotentialGroupRelation($potentialid,$groupname) { +global $log; +$log->debug("Entering updatePotentialGroupRelation(".$potentialid.",".$groupname.") method ..."); global $adb; $sqldelete = "delete from potentialgrouprelation where potentialid=".$potentialid; $adb->query($sqldelete); $sql = "insert into potentialgrouprelation values (".$potentialid .",'" .$groupname ."')"; $adb->query($sql); + $log->debug("Exiting updatePotentialGroupRelation method ..."); } @@ -910,9 +1023,12 @@ */ function insert2QuoteGroupRelation($quoteid,$groupname) { +global $log; +$log->debug("Entering insert2QuoteGroupRelation(".$quoteid.",".$groupname.") method ..."); global $adb; $sql = "insert into quotegrouprelation values (" .$quoteid .",'".$groupname."')"; $adb->query($sql); +$log->debug("Exiting insert2QuoteGroupRelation method ..."); } @@ -924,11 +1040,14 @@ function updateQuoteGroupRelation($quoteid,$groupname) { +global $log; +$log->debug("Entering updateQuoteGroupRelation(".$quoteid.",".$groupname.") method ..."); global $adb; $sqldelete = "delete from quotegrouprelation where quoteid=".$quoteid; $adb->query($sqldelete); $sql = "insert into quotegrouprelation values (".$quoteid .",'" .$groupname ."')"; $adb->query($sql); +$log->debug("Exiting updateQuoteGroupRelation method ..."); } /** Function to add Salesorder group relation @@ -938,9 +1057,12 @@ */ function insert2SoGroupRelation($salesorderid,$groupname) { +global $log; +$log->debug("Entering insert2SoGroupRelation(".$salesorderid.",".$groupname.") method ..."); global $adb; $sql = "insert into sogrouprelation values (" .$salesorderid .",'".$groupname."')"; $adb->query($sql); +$log->debug("Exiting insert2SoGroupRelation method ..."); } @@ -952,11 +1074,14 @@ function updateSoGroupRelation($salesorderid,$groupname) { +global $log; +$log->debug("Entering updateSoGroupRelation(".$salesorderid.",".$groupname.") method ..."); global $adb; $sqldelete = "delete from sogrouprelation where salesorderid=".$salesorderid; $adb->query($sqldelete); $sql = "insert into sogrouprelation values (".$salesorderid .",'" .$groupname ."')"; $adb->query($sql); +$log->debug("Exiting updateSoGroupRelation method ..."); } @@ -967,9 +1092,12 @@ */ function insert2InvoiceGroupRelation($invoiceid,$groupname) { +global $log; +$log->debug("Entering insert2InvoiceGroupRelation(".$invoiceid.",".$groupname.") method ..."); global $adb; $sql = "insert into invoicegrouprelation values (" .$invoiceid .",'".$groupname."')"; $adb->query($sql); +$log->debug("Exiting insert2InvoiceGroupRelation method ..."); } @@ -981,11 +1109,14 @@ function updateInvoiceGroupRelation($invoiceid,$groupname) { +global $log; +$log->debug("Entering updateInvoiceGroupRelation(".$invoiceid.",".$groupname.") method ..."); global $adb; $sqldelete = "delete from invoicegrouprelation where invoiceid=".$invoiceid; $adb->query($sqldelete); $sql = "insert into invoicegrouprelation values (".$invoiceid .",'" .$groupname ."')"; $adb->query($sql); +$log->debug("Exiting updateInvoiceGroupRelation method ..."); } @@ -996,9 +1127,12 @@ */ function insert2PoGroupRelation($poid,$groupname) { +global $log; +$log->debug("Entering insert2PoGroupRelation(".$poid.",".$groupname.") method ..."); global $adb; $sql = "insert into pogrouprelation values (" .$poid .",'".$groupname."')"; $adb->query($sql); +$log->debug("Exiting insert2PoGroupRelation method ..."); } @@ -1010,11 +1144,14 @@ function updatePoGroupRelation($poid,$groupname) { +global $log; +$log->debug("Entering updatePoGroupRelation(".$poid.",".$groupname.") method ..."); global $adb; $sqldelete = "delete from pogrouprelation where purchaseorderid=".$poid; $adb->query($sqldelete); $sql = "insert into pogrouprelation values (".$poid .",'" .$groupname ."')"; $adb->query($sql); +$log->debug("Exiting updatePoGroupRelation method ..."); } @@ -1026,11 +1163,14 @@ */ function updateTicketGroupRelation($ticketid,$groupname) { +global $log; +$log->debug("Entering updateTicketGroupRelation(".$ticketid.",".$groupname.") method ..."); global $adb; $sqldelete = "delete from ticketgrouprelation where ticketid=".$ticketid; $adb->query($sqldelete); $sql = "insert into ticketgrouprelation values (".$ticketid .",'" .$groupname ."')"; $adb->query($sql); +$log->debug("Exiting updateTicketGroupRelation method ..."); } @@ -1042,9 +1182,12 @@ */ function insert2ActivityGroupRelation($activityid,$groupname) { +global $log; +$log->debug("Entering insert2ActivityGroupRelation(".$activityid.",".$groupname.") method ..."); global $adb; $sql = "insert into activitygrouprelation values (" .$activityid .",'".$groupname."')"; $adb->query($sql); +$log->debug("Exiting insert2ActivityGroupRelation method ..."); } @@ -1056,9 +1199,12 @@ */ function insert2TicketGroupRelation($ticketid,$groupname) { +global $log; +$log->debug("Entering insert2TicketGroupRelation(".$ticketid.",".$groupname.") method ..."); global $adb; $sql = "insert into ticketgrouprelation values (" .$ticketid .",'".$groupname."')"; $adb->query($sql); +$log->debug("Exiting insert2TicketGroupRelation method ..."); } @@ -1069,11 +1215,14 @@ */ function updateActivityGroupRelation($activityid,$groupname) { +global $log; +$log->debug("Entering updateActivityGroupRelation(".$activityid.",".$groupname.") method ..."); global $adb; $sqldelete = "delete from activitygrouprelation where activityid=".$activityid; $adb->query($sqldelete); $sql = "insert into activitygrouprelation values (".$activityid .",'" .$groupname ."')"; $adb->query($sql); + $log->debug("Exiting updateActivityGroupRelation method ..."); } @@ -1086,6 +1235,8 @@ */ function getFieldList($fld_module, $profileid) { + global $log; + $log->debug("Entering getFieldList(".$fld_module.",". $profileid.") method ..."); global $adb; if($fld_module == "Accounts") { @@ -1094,6 +1245,7 @@ $query = "select * from profile2field where profileid =".$profileid." and tabid=".$tabid; //echo $query; $result = $adb->query($query); + $log->debug("Exiting getFieldList method ..."); return $result; } @@ -1105,6 +1257,8 @@ */ function getFieldVisibilityArray($fld_module, $profileid) { + global $log; + $log->debug("Entering getFieldVisibilityArray(".$fld_module.",". $profileid.") method ..."); global $adb; if($fld_module == "Accounts") { @@ -1120,6 +1274,7 @@ $fld_name = $adb->query_result($fieldListResult,$i,"fieldname"); $fldVisbArray[$fld_name] = $adb->query_result($fieldListResult,$i,"visible"); } + $log->debug("Exiting getFieldVisibilityArray method ..."); return $fldVisbArray; } @@ -1132,6 +1287,8 @@ */ function getFieldReadOnlyArray($fld_module, $profileid) { + global $log; + $log->debug("Entering getFieldReadOnlyArray(".$fld_module.",". $profileid.") method ..."); global $adb; if($fld_module == "Accounts") { @@ -1148,6 +1305,7 @@ $fldReadOnlyArray[$fld_name] = $adb->query_result($fieldListResult,$i,"readonly"); } + $log->debug("Exiting getFieldReadOnlyArray method ..."); return $fldReadOnlyArray; } @@ -1159,10 +1317,13 @@ */ function getRoleName($roleid) { + global $log; + $log->debug("Entering getRoleName(".$roleid.") method ..."); global $adb; $sql1 = "select * from role where roleid='".$roleid."'"; $result = $adb->query($sql1); $rolename = $adb->query_result($result,0,"rolename"); + $log->debug("Exiting getRoleName method ..."); return $rolename; } @@ -1173,10 +1334,13 @@ */ function getProfileName($profileid) { + global $log; + $log->debug("Entering getProfileName(".$profileid.") method ..."); global $adb; $sql1 = "select * from profile where profileid=".$profileid; $result = $adb->query($sql1); $profilename = $adb->query_result($result,0,"profilename"); + $log->debug("Exiting getProfileName method ..."); return $profilename; } @@ -1189,6 +1353,8 @@ */ function isPermitted($module,$actionname,$record_id='') { + global $log; + $log->debug("Entering isPermitted(".$module.",".$actionname.",".$record_id.") method ..."); global $adb; global $current_user; @@ -1200,6 +1366,7 @@ { //These modules dont have security right now $permission = "yes"; + $log->debug("Exiting isPermitted method ..."); return $permission; } @@ -1215,6 +1382,7 @@ { $permission = "yes"; } + $log->debug("Exiting isPermitted method ..."); return $permission; } @@ -1222,6 +1390,7 @@ if($is_admin) { $permission ="yes"; + $log->debug("Exiting isPermitted method ..."); return $permission; } //Retreiving the Tabid and Action Id @@ -1233,6 +1402,7 @@ if($profileTabsPermission[$tabid] ==0) { $permission = "yes"; + $log->debug("Exiting isPermitted method ..."); return $permission; } else @@ -1249,6 +1419,7 @@ if($actionid == 3 || $actionid == 4) { $permission = "yes"; + $log->debug("Exiting isPermitted method ..."); return $permission; } @@ -1259,6 +1430,7 @@ if($actionid == 3 || $actionid == 4 || $actionid ==0 || $actionid ==1) { $permission = "yes"; + $log->debug("Exiting isPermitted method ..."); return $permission; } @@ -1267,6 +1439,7 @@ if($profileTabsPermission[$tabid] !=0) { $permission = "no"; + $log->debug("Exiting isPermitted method ..."); return $permission; } //Checking for Action Permission @@ -1274,12 +1447,14 @@ if($profileActionPermission[$tabid][$actionid] != 0) { $permission = "no"; + $log->debug("Exiting isPermitted method ..."); return $permission; } //Checking and returning true if recorid is null if($record_id == '') { $permission = "yes"; + $log->debug("Exiting isPermitted method ..."); return $permission; } @@ -1289,6 +1464,7 @@ if($module == 'Notes' || $module == 'Products' || $module == 'Faq' || $module == 'Vendor' || $module == 'PriceBook') { $permission = "yes"; + $log->debug("Exiting isPermitted method ..."); return $permission; } } @@ -1310,6 +1486,7 @@ if($current_user->id == $recOwnId) { $permission = "yes"; + $log->debug("Exiting isPermitted method ..."); return $permission; } //Checking if the Record Owner is the Subordinate User @@ -1318,6 +1495,7 @@ if(in_array($recOwnId,$userids)) { $permission='yes'; + $log->debug("Exiting isPermitted method ..."); return $permission; } @@ -1331,6 +1509,7 @@ if(in_array($recOwnId,$current_user_groups)) { $permission='yes'; + $log->debug("Exiting isPermitted method ..."); return $permission; } } @@ -1342,16 +1521,19 @@ { $permission = isReadWritePermittedBySharing($module,$tabid,$actionid,$record_id); + $log->debug("Exiting isPermitted method ..."); return $permission; } elseif($actionid == 2) { $permission = "no"; + $log->debug("Exiting isPermitted method ..."); return $permission; } else { $permission = "yes"; + $log->debug("Exiting isPermitted method ..."); return $permission; } } @@ -1360,11 +1542,13 @@ if($actionid == 2) { $permission = "no"; + $log->debug("Exiting isPermitted method ..."); return $permission; } else { $permission = "yes"; + $log->debug("Exiting isPermitted method ..."); return $permission; } } @@ -1372,6 +1556,7 @@ { $permission = "yes"; + $log->debug("Exiting isPermitted method ..."); return $permission; } elseif($others_permission_id == 3) @@ -1380,11 +1565,13 @@ if($actionid == 3 || $actionid == 4) { $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); + $log->debug("Exiting isPermitted method ..."); return $permission; } } @@ -1393,6 +1580,7 @@ $permission = "yes"; } + $log->debug("Exiting isPermitted method ..."); return $permission; } @@ -1406,6 +1594,8 @@ */ function isReadPermittedBySharing($module,$tabid,$actionid,$record_id) { + global $log; + $log->debug("Entering isReadPermittedBySharing(".$module.",".$tabid.",".$actionid.",".$record_id.") method ..."); global $adb; global $current_user; require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); @@ -1430,6 +1620,7 @@ if(in_array($ownerid,$userids)) { $sharePer='yes'; + $log->debug("Exiting isReadPermittedBySharing method ..."); return $sharePer; } @@ -1442,6 +1633,7 @@ if(in_array($ownerid,$userids)) { $sharePer='yes'; + $log->debug("Exiting isReadPermittedBySharing method ..."); return $sharePer; } @@ -1454,6 +1646,7 @@ if(array_key_exists($ownerid,$read_grp_per)) { $sharePer='yes'; + $log->debug("Exiting isReadPermittedBySharing method ..."); return $sharePer; } } @@ -1486,6 +1679,7 @@ if(in_array($rel_owner_id,$userids)) { $sharePer='yes'; + $log->debug("Exiting isReadPermittedBySharing method ..."); return $sharePer; } @@ -1497,6 +1691,7 @@ if(in_array($rel_owner_id,$userids)) { $sharePer='yes'; + $log->debug("Exiting isReadPermittedBySharing method ..."); return $sharePer; } @@ -1509,6 +1704,7 @@ if(array_key_exists($rel_owner_id,$read_related_grp_per)) { $sharePer='yes'; + $log->debug("Exiting isReadPermittedBySharing method ..."); return $sharePer; } @@ -1516,6 +1712,7 @@ } } } + $log->debug("Exiting isReadPermittedBySharing method ..."); return $sharePer; } @@ -1530,6 +1727,8 @@ */ function isReadWritePermittedBySharing($module,$tabid,$actionid,$record_id) { + global $log; + $log->debug("Entering isReadWritePermittedBySharing(".$module.",".$tabid.",".$actionid.",".$record_id.") method ..."); global $adb; global $current_user; require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); @@ -1554,6 +1753,7 @@ if(in_array($ownerid,$userids)) { $sharePer='yes'; + $log->debug("Exiting isReadWritePermittedBySharing method ..."); return $sharePer; } @@ -1565,6 +1765,7 @@ if(in_array($ownerid,$userids)) { $sharePer='yes'; + $log->debug("Exiting isReadWritePermittedBySharing method ..."); return $sharePer; } @@ -1577,6 +1778,7 @@ if(array_key_exists($ownerid,$write_grp_per)) { $sharePer='yes'; + $log->debug("Exiting isReadWritePermittedBySharing method ..."); return $sharePer; } } @@ -1608,6 +1810,7 @@ if(in_array($rel_owner_id,$userids)) { $sharePer='yes'; + $log->debug("Exiting isReadWritePermittedBySharing method ..."); return $sharePer; } @@ -1619,6 +1822,7 @@ if(in_array($rel_owner_id,$userids)) { $sharePer='yes'; + $log->debug("Exiting isReadWritePermittedBySharing method ..."); return $sharePer; } @@ -1631,6 +1835,7 @@ if(array_key_exists($rel_owner_id,$write_related_grp_per)) { $sharePer='yes'; + $log->debug("Exiting isReadWritePermittedBySharing method ..."); return $sharePer; } @@ -1639,6 +1844,7 @@ } } + $log->debug("Exiting isReadWritePermittedBySharing method ..."); return $sharePer; } @@ -1651,6 +1857,8 @@ */ function isAllowed_Outlook($module,$action,$user_id,$record_id) { + global $log; + $log->debug("Entering isAllowed_Outlook(".$module.",".$action.",".$user_id.",".$record_id.") method ..."); $permission = "no"; if($module == 'Users' || $module == 'Home' || $module == 'Administration' || $module == 'uploads' || $module == 'Settings' || $module == 'Calendar') @@ -1747,6 +1955,7 @@ $permission = "no"; } } + $log->debug("Exiting isAllowed_Outlook method ..."); return $permission; } @@ -1758,6 +1967,8 @@ */ function setGlobalProfilePermission2Session($profileid) { + global $log; + $log->debug("Entering setGlobalProfilePermission2Session(".$profileid.") method ..."); global $adb; $sql = "select * from profile2globalpermissions where profileid=".$profileid ; $result = $adb->query($sql); @@ -1771,6 +1982,7 @@ } $_SESSION['global_permission_set']=$copy; + $log->debug("Exiting setGlobalProfilePermission2Session method ..."); } @@ -1783,6 +1995,8 @@ */ function getProfileGlobalPermission($profileid) { +global $log; +$log->debug("Entering getProfileGlobalPermission(".$profileid.") method ..."); global $adb; $sql = "select * from profile2globalpermissions where profileid=".$profileid ; $result = $adb->query($sql); @@ -1795,6 +2009,7 @@ $copy[$act_id] = $per_id; } + $log->debug("Exiting getProfileGlobalPermission method ..."); return $copy; } @@ -1806,6 +2021,8 @@ */ function getProfileTabsPermission($profileid) { +global $log; +$log->debug("Entering getProfileTabsPermission(".$profileid.") method ..."); global $adb; $sql = "select * from profile2tab where profileid=".$profileid ; $result = $adb->query($sql); @@ -1818,6 +2035,7 @@ $copy[$tab_id] = $per_id; } +$log->debug("Exiting getProfileTabsPermission method ..."); return $copy; } @@ -1833,6 +2051,8 @@ */ function getProfileActionPermission($profileid) { +global $log; +$log->debug("Entering getProfileActionPermission(".$profileid.") method ..."); global $adb; $check = Array(); $temp_tabid = Array(); @@ -1858,6 +2078,7 @@ } +$log->debug("Exiting getProfileActionPermission method ..."); return $check; } @@ -1873,6 +2094,8 @@ */ function getProfileAllActionPermission($profileid) { +global $log; +$log->debug("Entering getProfileAllActionPermission(".$profileid.") method ..."); global $adb; $actionArr=getProfileActionPermission($profileid); $utilArr=getTabsUtilityActionPermission($profileid); @@ -1885,6 +2108,7 @@ } $actionArr[$tabid]=$act_tab_arr; } +$log->debug("Exiting getProfileAllActionPermission method ..."); return $actionArr; } @@ -1895,6 +2119,8 @@ */ function createProfile($profilename,$parentProfileId,$description) { +global $log; +$log->debug("Entering createProfile(".$profilename.",".$parentProfileId.",".$description.") method ..."); global $adb; //Inserting values into Profile Table $sql1 = "insert into profile values('','".$profilename."','".$description."')"; @@ -1968,6 +2194,7 @@ $sql11="insert into profile2field values(".$current_profile_id.", ".$tab_id.", ".$fieldid.", ".$permissions." ,".$readonly.")"; $adb->query($sql11); } + $log->debug("Exiting createProfile method ..."); } /** Function to delete profile @@ -1976,6 +2203,8 @@ */ function deleteProfile($prof_id,$transfer_profileid='') { + global $log; +$log->debug("Entering deleteProfile(".$prof_id.",".$transfer_profileid.") method ..."); global $adb; //delete from profile2global permissions $sql4 = "delete from profile2globalpermissions where profileid=".$prof_id; @@ -2028,7 +2257,8 @@ //delete from profile table; $sql9 = "delete from profile where profileid=".$prof_id; - $adb->query($sql9); + $adb->query($sql9); + $log->debug("Exiting deleteProfile method ..."); } @@ -2037,6 +2267,8 @@ */ function getAllRoleDetails() { +global $log; +$log->debug("Entering getAllRoleDetails() method ..."); global $adb; $role_det = Array(); $query = "select * from role"; @@ -2078,6 +2310,7 @@ $role_det[$roleid]=$each_role_det; } + $log->debug("Exiting getAllRoleDetails method ..."); return $role_det; } @@ -2087,6 +2320,8 @@ */ function getAllProfileInfo() { + global $log; + $log->debug("Entering getAllProfileInfo() method ..."); global $adb; $query="select * from profile"; $result = $adb->query($query); @@ -2099,6 +2334,7 @@ $prof_details[$profileid]=$profilename; } + $log->debug("Exiting getAllProfileInfo method ..."); return $prof_details; } @@ -2109,6 +2345,8 @@ */ function getRoleInformation($roleid) { + global $log; + $log->debug("Entering getRoleInformation(".$roleid.") method ..."); global $adb; $query = "select * from role where roleid='".$roleid."'"; $result = $adb->query($query); @@ -2124,6 +2362,7 @@ $roleDet[]=$immediateParent; $roleInfo=Array(); $roleInfo[$roleid]=$roleDet; + $log->debug("Exiting getRoleInformation method ..."); return $roleInfo; } @@ -2135,6 +2374,8 @@ */ function getRoleRelatedProfiles($roleId) { + global $log; + $log->debug("Entering getRoleRelatedProfiles(".$roleId.") method ..."); global $adb; $query = "select role2profile.*,profile.profilename from role2profile inner join profile on profile.profileid=role2profile.profileid where roleid='".$roleId."'"; $result = $adb->query($query); @@ -2144,6 +2385,7 @@ { $roleRelatedProfiles[$adb->query_result($result,$i,'profileid')]=$adb->query_result($result,$i,'profilename'); } + $log->debug("Exiting getRoleRelatedProfiles method ..."); return $roleRelatedProfiles; } @@ -2155,6 +2397,8 @@ */ function getRoleUsers($roleId) { + global $log; + $log->debug("Entering getRoleUsers(".$roleId.") method ..."); global $adb; $query = "select user2role.*,users.user_name from user2role inner join users on users.id=user2role.userid where roleid='".$roleId."'"; $result = $adb->query($query); @@ -2164,6 +2408,7 @@ { $roleRelatedUsers[$adb->query_result($result,$i,'userid')]=$adb->query_result($result,$i,'user_name'); } + $log->debug("Exiting getRoleUsers method ..."); return $roleRelatedUsers; @@ -2178,6 +2423,8 @@ function getRoleUserIds($roleId) { + global $log; + $log->debug("Entering getRoleUserIds(".$roleId.") method ..."); global $adb; $query = "select user2role.*,users.user_name from user2role inner join users on users.id=user2role.userid where roleid='".$roleId."'"; $result = $adb->query($query); @@ -2187,6 +2434,7 @@ { $roleRelatedUsers[]=$adb->query_result($result,$i,'userid'); } + $log->debug("Exiting getRoleUserIds method ..."); return $roleRelatedUsers; @@ -2199,6 +2447,8 @@ */ function getRoleAndSubordinateUsers($roleId) { + global $log; + $log->debug("Entering getRoleAndSubordinateUsers(".$roleId.") method ..."); global $adb; $roleInfoArr=getRoleInformation($roleId); $parentRole=$roleInfoArr[$roleId][1]; @@ -2210,6 +2460,7 @@ { $roleRelatedUsers[$adb->query_result($result,$i,'userid')]=$adb->query_result($result,$i,'user_name'); } + $log->debug("Exiting getRoleAndSubordinateUsers method ..."); return $roleRelatedUsers; @@ -2223,6 +2474,8 @@ */ function getRoleAndSubordinateUserIds($roleId) { + global $log; + $log->debug("Entering getRoleAndSubordinateUserIds(".$roleId.") method ..."); global $adb; $roleInfoArr=getRoleInformation($roleId); $parentRole=$roleInfoArr[$roleId][1]; @@ -2234,6 +2487,7 @@ { $roleRelatedUsers[]=$adb->query_result($result,$i,'userid'); } + $log->debug("Exiting getRoleAndSubordinateUserIds method ..."); return $roleRelatedUsers; @@ -2246,6 +2500,8 @@ */ function getRoleAndSubordinatesInformation($roleId) { + global $log; + $log->debug("Entering getRoleAndSubordinatesInformation(".$roleId.") method ..."); global $adb; $roleDetails=getRoleInformation($roleId); $roleInfo=$roleDetails[$roleId]; @@ -2268,6 +2524,7 @@ $roleInfo[$roleid]=$roleDet; } + $log->debug("Exiting getRoleAndSubordinatesInformation method ..."); return $roleInfo; } @@ -2280,6 +2537,8 @@ */ function getRoleAndSubordinatesRoleIds($roleId) { + global $log; + $log->debug("Entering getRoleAndSubordinatesRoleIds(".$roleId.") method ..."); global $adb; $roleDetails=getRoleInformation($roleId); $roleInfo=$roleDetails[$roleId]; @@ -2295,6 +2554,7 @@ $roleInfo[]=$roleid; } + $log->debug("Exiting getRoleAndSubordinatesRoleIds method ..."); return $roleInfo; } @@ -2305,6 +2565,8 @@ */ function deleteRole($roleId,$transferRoleId) { + global $log; + $log->debug("Entering deleteRole(".$roleId.",".$transferRoleId.") method ..."); global $adb; $roleInfo=getRoleAndSubordinatesInformation($roleId); foreach($roleInfo as $roleid=>$roleDetArr) @@ -2336,6 +2598,7 @@ } + $log->debug("Exiting deleteRole method ..."); } @@ -2344,6 +2607,8 @@ */ function deleteRoleRelatedSharingRules($roleId) { + global $log; + $log->debug("Entering deleteRoleRelatedSharingRules(".$roleId.") method ..."); global $adb; $dataShareTableColArr=Array('datashare_grp2role'=>'to_roleid', 'datashare_grp2rs'=>'to_roleandsubid', @@ -2373,6 +2638,7 @@ } } + $log->debug("Exiting deleteRoleRelatedSharingRules method ..."); } /** Function to delete the group related sharing rules @@ -2380,6 +2646,8 @@ */ function deleteGroupRelatedSharingRules($grpId) { + global $log; + $log->debug("Entering deleteGroupRelatedSharingRules(".$grpId.") method ..."); global $adb; $dataShareTableColArr=Array('datashare_grp2grp'=>'share_groupid::to_groupid', @@ -2408,6 +2676,7 @@ } } + $log->debug("Exiting deleteGroupRelatedSharingRules method ..."); } @@ -2417,6 +2686,8 @@ */ function getAllUserName() { + global $log; + $log->debug("Entering getAllUserName() method ..."); global $adb; $query="select * from users where deleted=0"; $result = $adb->query($query); @@ -2429,6 +2700,7 @@ $user_details[$userid]=$username; } + $log->debug("Exiting getAllUserName method ..."); return $user_details; } @@ -2440,6 +2712,8 @@ */ function getAllGroupName() { + global $log; + $log->debug("Entering getAllGroupName() method ..."); global $adb; $query="select * from groups"; $result = $adb->query($query); @@ -2452,6 +2726,7 @@ $group_details[$grpid]=$grpname; } + $log->debug("Exiting getAllGroupName method ..."); return $group_details; } @@ -2462,6 +2737,8 @@ */ function getAllGroupInfo() { + global $log; + $log->debug("Entering getAllGroupInfo() method ..."); global $adb; $query="select * from groups"; $result = $adb->query($query); @@ -2478,6 +2755,7 @@ $group_details[$grpid]=$grpInfo; } + $log->debug("Exiting getAllGroupInfo method ..."); return $group_details; } @@ -2489,7 +2767,9 @@ * @returns $groupId -- Group Id :: Type integer */ function createGroup($groupName,$groupMemberArray,$description) -{ +{ + global $log; + $log->debug("Entering createGroup(".$groupName.",".$groupMemberArray.",".$description.") method ..."); global $adb; $groupId=$adb->getUniqueId("groups"); //Insert into group table @@ -2524,6 +2804,7 @@ { insertGroupToUserRelation($groupId,$userId); } + $log->debug("Exiting createGroup method ..."); return $groupId; } @@ -2534,9 +2815,12 @@ */ function insertGroupToGroupRelation($groupId,$containsGroupId) { + global $log; + $log->debug("Entering insertGroupToGroupRelation(".$groupId.",".$containsGroupId.") method ..."); global $adb; $query="insert into group2grouprel values(".$groupId.",".$containsGroupId.")"; $adb->query($query); + $log->debug("Exiting insertGroupToGroupRelation method ..."); } @@ -2546,9 +2830,12 @@ */ function insertGroupToRoleRelation($groupId,$roleId) { + global $log; + $log->debug("Entering insertGroupToRoleRelation(".$groupId.",".$roleId.") method ..."); global $adb; $query="insert into group2role values(".$groupId.",'".$roleId."')"; $adb->query($query); + $log->debug("Exiting insertGroupToRoleRelation method ..."); } @@ -2558,9 +2845,12 @@ */ function insertGroupToRsRelation($groupId,$rsId) { + global $log; + $log->debug("Entering insertGroupToRsRelation(".$groupId.",".$rsId.") method ..."); global $adb; $query="insert into group2rs values(".$groupId.",'".$rsId."')"; $adb->query($query); + $log->debug("Exiting insertGroupToRsRelation method ..."); } /** Function to insert group to user relation @@ -2569,9 +2859,12 @@ */ function insertGroupToUserRelation($groupId,$userId) { + global $log; + $log->debug("Entering insertGroupToUserRelation(".$groupId.",".$userId.") method ..."); global $adb; $query="insert into users2group values(".$groupId.",".$userId.")"; $adb->query($query); + $log->debug("Exiting insertGroupToUserRelation method ..."); } @@ -2582,6 +2875,8 @@ */ function getGroupInfo($groupId) { + global $log; + $log->debug("Entering getGroupInfo(".$groupId.") method ..."); global $adb; $groupDetailArr=Array(); $groupMemberArr=Array(); @@ -2598,6 +2893,7 @@ $groupDetailArr[]=$groupMemberArr; //Returning the Group Detail Array + $log->debug("Exiting getGroupInfo method ..."); return $groupDetailArr; @@ -2609,12 +2905,15 @@ */ function fetchGroupName($groupId) { + global $log; + $log->debug("Entering fetchGroupName(".$groupId.") method ..."); global $adb; //Retreving the group Info $query="select * from groups where groupid=".$groupId; $result = $adb->query($query); $groupName=$adb->query_result($result,0,'groupname'); + $log->debug("Exiting fetchGroupName method ..."); return $groupName; } @@ -2629,6 +2928,8 @@ */ function getGroupMembers($groupId) { + global $log; + $log->debug("Entering getGroupMembers(".$groupId.") method ..."); $groupMemberArr=Array(); $roleGroupArr=getGroupRelatedRoles($groupId); $rsGroupArr=getGroupRelatedRoleSubordinates($groupId); @@ -2640,6 +2941,7 @@ $groupMemberArr['rs']=$rsGroupArr; $groupMemberArr['users']=$userGroupArr; + $log->debug("Exiting getGroupMembers method ..."); return($groupMemberArr); } @@ -2650,6 +2952,8 @@ */ function getGroupRelatedRoles($groupId) { + global $log; + $log->debug("Entering getGroupRelatedRoles(".$groupId.") method ..."); global $adb; $roleGroupArr=Array(); $query="select * from group2role where groupid=".$groupId; @@ -2660,6 +2964,7 @@ $roleId=$adb->query_result($result,$i,'roleid'); $roleGroupArr[]=$roleId; } + $log->debug("Exiting getGroupRelatedRoles method ..."); return $roleGroupArr; } @@ -2672,6 +2977,8 @@ */ function getGroupRelatedRoleSubordinates($groupId) { + global $log; + $log->debug("Entering getGroupRelatedRoleSubordinates(".$groupId.") method ..."); global $adb; $rsGroupArr=Array(); $query="select * from group2rs where groupid=".$groupId; @@ -2682,6 +2989,7 @@ $roleSubId=$adb->query_result($result,$i,'roleandsubid'); $rsGroupArr[]=$roleSubId; } + $log->debug("Exiting getGroupRelatedRoleSubordinates method ..."); return $rsGroupArr; } @@ -2693,6 +3001,8 @@ */ function getGroupRelatedGroups($groupId) { + global $log; + $log->debug("Entering getGroupRelatedGroups(".$groupId.") method ..."); global $adb; $groupGroupArr=Array(); $query="select * from group2grouprel where groupid=".$groupId; @@ -2703,6 +3013,7 @@ $relGroupId=$adb->query_result($result,$i,'containsgroupid'); $groupGroupArr[]=$relGroupId; } + $log->debug("Exiting getGroupRelatedGroups method ..."); return $groupGroupArr; } @@ -2714,6 +3025,8 @@ */ function getGroupRelatedUsers($groupId) { + global $log; + $log->debug("Entering getGroupRelatedUsers(".$groupId.") method ..."); global $adb; $userGroupArr=Array(); $query="select * from users2group where groupid=".$groupId; @@ -2724,6 +3037,7 @@ $userId=$adb->query_result($result,$i,'userid'); $userGroupArr[]=$userId; } + $log->debug("Exiting getGroupRelatedUsers method ..."); return $userGroupArr; } @@ -2736,6 +3050,8 @@ */ function updateGroup($groupId,$groupName,$groupMemberArray,$description) { + global $log; + $log->debug("Entering updateGroup(".$groupId.",".$groupName.",".$groupMemberArray.",".$description.") method ..."); global $adb; $query="update groups set groupname='".$groupName."',description='".$description."' where groupid=".$groupId; $adb->query($query); @@ -2774,7 +3090,7 @@ { insertGroupToUserRelation($groupId,$userId); } - + $log->debug("Exiting updateGroup method ..."); } @@ -2783,6 +3099,8 @@ */ function deleteGroup($groupId) { + global $log; + $log->debug("Entering deleteGroup(".$groupId.") method ..."); global $adb; deleteGroupRelatedSharingRules($groupId); $query="delete from groups where groupid=".$groupId; @@ -2792,6 +3110,7 @@ deleteGroupRelatedRoles($groupId); deleteGroupRelatedRolesAndSubordinates($groupId); deleteGroupRelatedUsers($groupId); + $log->debug("Exiting deleteGroup method ..."); } @@ -2800,9 +3119,12 @@ */ function deleteGroupRelatedGroups($groupId) { + global $log; + $log->debug("Entering deleteGroupRelatedGroups(".$groupId.") method ..."); global $adb; $query="delete from group2grouprel where groupid=".$groupId; $adb->query($query); + $log->debug("Exiting deleteGroupRelatedGroups method ..."); } @@ -2811,9 +3133,12 @@ */ function deleteGroupRelatedRoles($groupId) { + global $log; + $log->debug("Entering deleteGroupRelatedRoles(".$groupId.") method ..."); global $adb; $query="delete from group2role where groupid=".$groupId; $adb->query($query); + $log->debug("Exiting deleteGroupRelatedRoles method ..."); } @@ -2822,9 +3147,12 @@ */ function deleteGroupRelatedRolesAndSubordinates($groupId) { + global $log; + $log->debug("Entering deleteGroupRelatedRolesAndSubordinates(".$groupId.") method ..."); global $adb; $query="delete from group2rs where groupid=".$groupId; $adb->query($query); + $log->debug("Exiting deleteGroupRelatedRolesAndSubordinates method ..."); } @@ -2833,9 +3161,12 @@ */ function deleteGroupRelatedUsers($groupId) { + global $log; + $log->debug("Entering deleteGroupRelatedUsers(".$groupId.") method ..."); global $adb; $query="delete from users2group where groupid=".$groupId; $adb->query($query); + $log->debug("Exiting deleteGroupRelatedUsers method ..."); } /** This function returns the Default Organisation Sharing Action Name @@ -2844,10 +3175,13 @@ */ function getDefOrgShareActionName($share_action_id) { + global $log; + $log->debug("Entering getDefOrgShareActionName(".$share_action_id.") method ..."); global $adb; $query="select * from org_share_action_mapping where share_action_id=".$share_action_id; $result=$adb->query($query); $share_action_name=$adb->query_result($result,0,"share_action_name"); + $log->debug("Exiting getDefOrgShareActionName method ..."); return $share_action_name; @@ -2864,6 +3198,8 @@ */ function getModuleSharingActionArray($tabid) { + global $log; + $log->debug("Entering getModuleSharingActionArray(".$tabid.") method ..."); global $adb; $share_action_arr=Array(); $query = "select org_share_action_mapping.share_action_name,org_share_action2tab.share_action_id from org_share_action2tab inner join org_share_action_mapping on org_share_action2tab.share_action_id=org_share_action_mapping.share_action_id where org_share_action2tab.tabid=".$tabid; @@ -2875,6 +3211,7 @@ $share_action_id=$adb->query_result($result,$i,"share_action_id"); $share_action_arr[$share_action_id] = $share_action_name; } + $log->debug("Exiting getModuleSharingActionArray method ..."); return $share_action_arr; } @@ -2893,6 +3230,8 @@ */ function addSharingRule($tabid,$shareEntityType,$toEntityType,$shareEntityId,$toEntityId,$sharePermission) { + global $log; + $log->debug("Entering addSharingRule(".$tabid.",".$shareEntityType.",".$toEntityType.",".$shareEntityId.",".$toEntityId.",".$sharePermission.") method ..."); global $adb; $shareid=$adb->getUniqueId("datashare_module_rel"); @@ -2954,6 +3293,7 @@ $query1 = "insert into datashare_module_rel values(".$shareid.",".$tabid.",'".$type_string."')"; $adb->query($query1); $adb->query($query); + $log->debug("Exiting addSharingRule method ..."); return $shareid; } @@ -2974,6 +3314,8 @@ */ function updateSharingRule($shareid,$tabid,$shareEntityType,$toEntityType,$shareEntityId,$toEntityId,$sharePermission) { + global $log; + $log->debug("Entering updateSharingRule(".$shareid.",".$tabid.",".$shareEntityType.",".$toEntityType.",".$shareEntityId.",".$toEntityId.",".$sharePermission.") method ..."); global $adb; $query2="select * from datashare_module_rel where shareid=".$shareid; @@ -3041,6 +3383,7 @@ $query1 = "update datashare_module_rel set relationtype='".$type_string."' where shareid=".$shareid; $adb->query($query1); $adb->query($query); + $log->debug("Exiting updateSharingRule method ..."); return $shareid; } @@ -3052,6 +3395,8 @@ */ function deleteSharingRule($shareid) { + global $log; + $log->debug("Entering deleteSharingRule(".$shareid.") method ..."); global $adb; $query2="select * from datashare_module_rel where shareid=".$shareid; $res=$adb->query($query2); @@ -3065,6 +3410,7 @@ //deleting the releated module sharing permission $query5="delete from datashare_relatedmodule_permission where shareid=".$shareid; $adb->query($query5); + $log->debug("Exiting deleteSharingRule method ..."); } @@ -3082,6 +3428,8 @@ */ function getDataShareTableandColumnArray() { + global $log; + $log->debug("Entering getDataShareTableandColumnArray() method ..."); $dataShareTableColArr=Array('datashare_grp2grp'=>'share_groupid::to_groupid', 'datashare_grp2role'=>'share_groupid::to_roleid', 'datashare_grp2rs'=>'share_groupid::to_roleandsubid', @@ -3091,6 +3439,7 @@ 'datashare_rs2grp'=>'share_roleandsubid::to_groupid', 'datashare_rs2role'=>'share_roleandsubid::to_roleid', 'datashare_rs2rs'=>'share_roleandsubid::to_roleandsubid'); + $log->debug("Exiting getDataShareTableandColumnArray method ..."); return $dataShareTableColArr; } @@ -3104,10 +3453,13 @@ */ function getDSTableColumns($tableName) { + global $log; + $log->debug("Entering getDSTableColumns(".$tableName.") method ..."); $dataShareTableColArr=getDataShareTableandColumnArray(); $dsTableCols=$dataShareTableColArr[$tableName]; $dsTableColsArr=explode('::',$dsTableCols); + $log->debug("Exiting getDSTableColumns method ..."); return $dsTableColsArr; } @@ -3127,6 +3479,8 @@ */ function getDataShareTableName() { + global $log; + $log->debug("Entering getDataShareTableName() method ..."); $dataShareTableColArr=Array('GRP::GRP'=>'datashare_grp2grp', 'GRP::ROLE'=>'datashare_grp2role', 'GRP::RS'=>'datashare_grp2rs', @@ -3136,6 +3490,7 @@ 'RS::GRP'=>'datashare_rs2grp', 'RS::ROLE'=>'datashare_rs2role', 'RS::RS'=>'datashare_rs2rs'); + $log->debug("Exiting getDataShareTableName method ..."); return $dataShareTableColArr; } @@ -3147,8 +3502,11 @@ */ function getDSTableNameForType($typeString) { + global $log; + $log->debug("Entering getDSTableNameForType(".$typeString.") method ..."); $dataShareTableColArr=getDataShareTableName(); $tableName=$dataShareTableColArr[$typeString]; + $log->debug("Exiting getDSTableNameForType method ..."); return $tableName; } @@ -3159,6 +3517,8 @@ */ function getEntityTypeFromCol($colName) { + global $log; + $log->debug("Entering getEntityTypeFromCol(".$colName.") method ..."); if($colName == 'share_groupid' || $colName == 'to_groupid') { @@ -3173,6 +3533,7 @@ $entity_type='rs'; } + $log->debug("Exiting getEntityTypeFromCol method ..."); return $entity_type; } @@ -3184,6 +3545,8 @@ */ function getEntityDisplayLink($entityType,$entityid) { + global $log; + $log->debug("Entering getEntityDisplayLink(".$entityType.",".$entityid.") method ..."); if($entityType == 'groups') { $groupNameArr = getGroupInfo($entityid); @@ -3199,6 +3562,7 @@ $roleName=getRoleName($entityid); $display_out = "RoleAndSubordinate::".$roleName. ""; } + $log->debug("Exiting getEntityDisplayLink method ..."); return $display_out; } @@ -3211,8 +3575,9 @@ */ function getSharingRuleInfo($shareId) { - global $adb; - global $log; + global $log; + $log->debug("Entering getSharingRuleInfo(".$shareId.") method ..."); + global $adb; $shareRuleInfoArr=Array(); $query="select * from datashare_module_rel where shareid=".$shareId; $result=$adb->query($query); @@ -3249,6 +3614,7 @@ $shareRuleInfoArr[]=$to_id; $shareRuleInfoArr[]=$permission; + $log->debug("Exiting getSharingRuleInfo method ..."); return $shareRuleInfoArr; @@ -3262,6 +3628,8 @@ function getRelatedSharingModules($tabid) { + global $log; + $log->debug("Entering getRelatedSharingModules(".$tabid.") method ..."); global $adb; $relatedSharingModuleArray=Array(); $query="select * from datashare_relatedmodules where tabid=".$tabid; @@ -3274,6 +3642,7 @@ $relatedSharingModuleArray[$rel_tabid]=$ds_relmod_id; } + $log->debug("Exiting getRelatedSharingModules method ..."); return $relatedSharingModuleArray; } @@ -3291,10 +3660,13 @@ function addRelatedModuleSharingPermission($shareid,$tabid,$relatedtabid,$sharePermission) { + global $log; + $log->debug("Entering addRelatedModuleSharingPermission(".$shareid.",".$tabid.",".$relatedtabid.",".$sharePermission.") method ..."); global $adb; $relatedModuleSharingId=getRelatedModuleSharingId($tabid,$relatedtabid); $query="insert into datashare_relatedmodule_permission values(".$shareid.", ".$relatedModuleSharingId.", ".$sharePermission.")" ; $result=$adb->query($query); + $log->debug("Exiting addRelatedModuleSharingPermission method ..."); } /** This function is to update the related module sharing permission for a particulare Sharing Rule @@ -3309,10 +3681,13 @@ function updateRelatedModuleSharingPermission($shareid,$tabid,$relatedtabid,$sharePermission) { + global $log; + $log->debug("Entering updateRelatedModuleSharingPermission(".$shareid.",".$tabid.",".$relatedtabid.",".$sharePermission.") method ..."); global $adb; $relatedModuleSharingId=getRelatedModuleSharingId($tabid,$relatedtabid); $query="update datashare_relatedmodule_permission set permission=".$sharePermission." where shareid=".$shareid." and datashare_relatedmodule_id=".$relatedModuleSharingId; $result=$adb->query($query); + $log->debug("Exiting updateRelatedModuleSharingPermission method ..."); } /** This function is to retreive the Related Module Sharing Id @@ -3324,10 +3699,13 @@ function getRelatedModuleSharingId($tabid,$related_tabid) { + global $log; + $log->debug("Entering getRelatedModuleSharingId(".$tabid.",".$related_tabid.") method ..."); global $adb; $query="select datashare_relatedmodule_id from datashare_relatedmodules where tabid=".$tabid." and relatedto_tabid=".$related_tabid ; $result=$adb->query($query); $relatedModuleSharingId=$adb->query_result($result,0,'datashare_relatedmodule_id'); + $log->debug("Exiting getRelatedModuleSharingId method ..."); return $relatedModuleSharingId; } @@ -3344,6 +3722,8 @@ */ function getRelatedModuleSharingPermission($shareid) { + global $log; + $log->debug("Entering getRelatedModuleSharingPermission(".$shareid.") method ..."); global $adb; $relatedSharingModulePermissionArray=Array(); $query="select datashare_relatedmodules.*,datashare_relatedmodule_permission.permission from datashare_relatedmodules inner join datashare_relatedmodule_permission on datashare_relatedmodule_permission.datashare_relatedmodule_id=datashare_relatedmodules.datashare_relatedmodule_id where datashare_relatedmodule_permission.shareid=".$shareid; @@ -3357,6 +3737,7 @@ } + $log->debug("Exiting getRelatedModuleSharingPermission method ..."); return $relatedSharingModulePermissionArray; } @@ -3370,6 +3751,8 @@ */ function getUserProfile($userId) { + global $log; + $log->debug("Entering getUserProfile(".$userId.") method ..."); global $adb; $roleId=fetchUserRole($userId); $profArr=Array(); @@ -3382,6 +3765,7 @@ $profileid= $adb->query_result($result1,$i,"profileid"); $profArr[]=$profileid; } + $log->debug("Exiting getUserProfile method ..."); return $profArr; } @@ -3394,6 +3778,8 @@ */ function getCombinedUserGlobalPermissions($userId) { + global $log; + $log->debug("Entering getCombinedUserGlobalPermissions(".$userId.") method ..."); global $adb; $profArr=getUserProfile($userId); $no_of_profiles=sizeof($profArr); @@ -3425,6 +3811,7 @@ } + $log->debug("Exiting getCombinedUserGlobalPermissions method ..."); return $userGlobalPerrArr; } @@ -3437,6 +3824,8 @@ */ function getCombinedUserTabsPermissions($userId) { + global $log; + $log->debug("Entering getCombinedUserTabsPermissions(".$userId.") method ..."); global $adb; $profArr=getUserProfile($userId); $no_of_profiles=sizeof($profArr); @@ -3467,6 +3856,7 @@ } } + $log->debug("Exiting getCombinedUserTabsPermissions method ..."); return $userTabPerrArr; } @@ -3479,6 +3869,8 @@ */ function getCombinedUserActionPermissions($userId) { + global $log; + $log->debug("Entering getCombinedUserActionPermissions(".$userId.") method ..."); global $adb; $profArr=getUserProfile($userId); $no_of_profiles=sizeof($profArr); @@ -3512,6 +3904,7 @@ } } + $log->debug("Exiting getCombinedUserActionPermissions method ..."); return $actionPerrArr; } @@ -3523,6 +3916,8 @@ */ function getParentRole($roleId) { + global $log; + $log->debug("Entering getParentRole(".$roleId.") method ..."); $roleInfo=getRoleInformation($roleId); $parentRole=$roleInfo[$roleId][1]; $tempParentRoleArr=explode('::',$parentRole); @@ -3534,6 +3929,7 @@ $parentRoleArr[]=$role_id; } } + $log->debug("Exiting getParentRole method ..."); return $parentRoleArr; } @@ -3545,6 +3941,7 @@ */ function getRoleSubordinates($roleId) { + $log->debug("Entering getRoleSubordinates(".$roleId.") method ..."); global $adb; $roleDetails=getRoleInformation($roleId); $roleInfo=$roleDetails[$roleId]; @@ -3561,6 +3958,7 @@ $roleSubordinates[]=$roleid; } + $log->debug("Exiting getRoleSubordinates method ..."); return $roleSubordinates; } @@ -3576,6 +3974,8 @@ */ function getSubordinateRoleAndUsers($roleId) { + global $log; + $log->debug("Entering getSubordinateRoleAndUsers(".$roleId.") method ..."); global $adb; $subRoleAndUsers=Array(); $subordinateRoles=getRoleSubordinates($roleId); @@ -3585,12 +3985,15 @@ $subRoleAndUsers[$subRoleId]=$userArray; } + $log->debug("Exiting getSubordinateRoleAndUsers method ..."); return $subRoleAndUsers; } function getCurrentUserProfileList() { + global $log; + $log->debug("Entering getCurrentUserProfileList() method ..."); global $current_user; require('user_privileges/user_privileges_'.$current_user->id.'.php'); $profList ='('; @@ -3605,6 +4008,7 @@ $i++; } $profList .=')'; + $log->debug("Exiting getCurrentUserProfileList method ..."); return $profList; } @@ -3612,6 +4016,8 @@ function getCurrentUserGroupList() { + global $log; + $log->debug("Entering getCurrentUserGroupList() method ..."); global $current_user; require('user_privileges/user_privileges_'.$current_user->id.'.php'); $grpList=''; @@ -3630,11 +4036,14 @@ } $grpList .=')'; } + $log->debug("Exiting getCurrentUserGroupList method ..."); return $grpList; } function getSubordinateUsersList() { + global $log; + $log->debug("Entering getSubordinateUsersList() method ..."); global $current_user; $user_array=Array(); require('user_privileges/user_privileges_'.$current_user->id.'.php'); @@ -3653,12 +4062,15 @@ } } $subUserList = constructList($user_array,'INTEGER'); + $log->debug("Exiting getSubordinateUsersList method ..."); return $subUserList; } function getReadSharingUsersList($module) { + global $log; + $log->debug("Entering getReadSharingUsersList(".$module.") method ..."); global $adb; global $current_user; $user_array=Array(); @@ -3672,11 +4084,14 @@ $user_array[]=$user_id; } $shareUserList=constructList($user_array,'INTEGER'); + $log->debug("Exiting getReadSharingUsersList method ..."); return $shareUserList; } function getReadSharingGroupsList($module) { + global $log; + $log->debug("Entering getReadSharingGroupsList(".$module.") method ..."); global $adb; global $current_user; $grp_array=Array(); @@ -3690,11 +4105,14 @@ $grp_array[]=$grp_id; } $shareGrpList=constructList($grp_array,'INTEGER'); + $log->debug("Exiting getReadSharingGroupsList method ..."); return $shareGrpList; } function getWriteSharingGroupsList($module) { + global $log; + $log->debug("Entering getWriteSharingGroupsList(".$module.") method ..."); global $adb; global $current_user; $grp_array=Array(); @@ -3708,11 +4126,14 @@ $grp_array[]=$grp_id; } $shareGrpList=constructList($grp_array,'INTEGER'); + $log->debug("Exiting getWriteSharingGroupsList method ..."); return $shareGrpList; } function constructList($array,$data_type) { + global $log; + $log->debug("Entering constructList(".$array.",".$data_type.") method ..."); $list=""; if(sizeof($array) > 0) { @@ -3736,11 +4157,14 @@ } $list.=")"; } + $log->debug("Exiting constructList method ..."); return $list; } function getListViewSecurityParameter($module) { + global $log; + $log->debug("Entering getListViewSecurityParameter(".$module.") method ..."); global $adb; global $current_user; @@ -3952,11 +4376,14 @@ $sec_query .=") "; } + $log->debug("Exiting getListViewSecurityParameter method ..."); return $sec_query; } function get_current_user_access_groups($module) { + global $log; + $log->debug("Entering get_current_user_access_groups(".$module.") method ..."); global $adb,$noof_group_rows; $current_user_group_list=getCurrentUserGroupList(); $sharing_write_group_list=getWriteSharingGroupsList($module); @@ -3975,6 +4402,7 @@ } $result = $adb->query($query); $noof_group_rows=$adb->num_rows($result); + $log->debug("Exiting get_current_user_access_groups method ..."); return $result; } /** Function to get the Group Id for a given group groupname @@ -3984,10 +4412,13 @@ function getGrpId($groupname) { + global $log; + $log->debug("Entering getGrpId(".$groupname.") method ..."); global $adb; $result = $adb->query("select groupid from groups where groupname='".$groupname."'"); $groupid = $adb->query_result($result,0,'groupid'); + $log->debug("Exiting getGrpId method ..."); return $groupid; } @@ -4000,6 +4431,8 @@ */ function getFieldVisibilityPermission($fld_module, $userid, $fieldname) { + global $log; + $log->debug("Entering getFieldVisibilityPermission(".$fld_module.",". $userid.",". $fieldname.") method ..."); global $adb; global $current_user; @@ -4008,8 +4441,11 @@ require('user_privileges/user_privileges_'.$userid.'.php'); if($is_admin) - { return 0; - } else + { + $log->debug("Exiting getFieldVisibilityPermission method ..."); + return 0; + } + else { //get profile list using userid $profilelist = getCurrentUserProfileList(); @@ -4020,6 +4456,7 @@ $query="select profile2field.* from field inner join profile2field on profile2field.fieldid=field.fieldid inner join def_org_field on def_org_field.fieldid=field.fieldid where field.tabid=".$tabid." and profile2field.visible=0 and def_org_field.visible=0 and profile2field.profileid in".$profilelist." and field.fieldname='".$fieldname."' group by field.fieldid"; $result = $adb->query($query); + $log->debug("Exiting getFieldVisibilityPermission method ..."); return $adb->query_result($result,"0","visible"); } } @@ -4030,6 +4467,8 @@ */ function getFieldModuleAccessArray() { + global $log; + $log->debug("Entering getFieldModuleAccessArray() method ..."); $fldModArr=Array('Leads'=>'LBL_LEAD_FIELD_ACCESS', 'Accounts'=>'LBL_ACCOUNT_FIELD_ACCESS', @@ -4049,6 +4488,7 @@ 'Invoice'=>'LBL_INVOICE_FIELD_ACCESS' ); + $log->debug("Exiting getFieldModuleAccessArray method ..."); return $fldModArr; } @@ -4058,6 +4498,8 @@ */ function getPermittedModuleNames() { + global $log; + $log->debug("Entering getPermittedModuleNames() method ..."); global $current_user; $permittedModules=Array(); require('user_privileges/user_privileges_'.$current_user->id.'.php'); @@ -4087,6 +4529,7 @@ } } + $log->debug("Exiting getPermittedModuleNames method ..."); return $permittedModules; } @@ -4098,6 +4541,8 @@ */ function RecalculateSharingRules() { + global $log; + $log->debug("Entering RecalculateSharingRules() method ..."); global $adb; require_once('modules/Users/CreateUserPrivilegeFile.php'); $query="select id from users where deleted=0"; @@ -4108,7 +4553,8 @@ $id=$adb->query_result($result,$i,'id'); createUserPrivilegesfile($id); createUserSharingPrivilegesfile($id); - } + } + $log->debug("Exiting RecalculateSharingRules method ..."); } @@ -4121,9 +4567,12 @@ */ function insert2CampaignGroupRelation($campaignid,$groupname) { + global $log; + $log->debug("Entering insert2CampaignGroupRelation(".$campaignid.",".$groupname.") method ..."); global $adb; $sql = "insert into campaigngrouprelation values (" .$campaignid .",'".$groupname."')"; $adb->query($sql); + $log->debug("Exiting insert2CampaignGroupRelation method ..."); } @@ -4134,11 +4583,14 @@ */ function updateCampaignGroupRelation($campaignid,$groupname) { + global $log; + $log->debug("Entering updateCampaignGroupRelation(".$campaignid.",".$groupname.") method ..."); global $adb; $sqldelete = "delete from campaigngrouprelation where campaignid=".$campaignid; $adb->query($sqldelete); $sql = "insert into campaigngrouprelation values (".$campaignid .",'" .$groupname ."')"; $adb->query($sql); + $log->debug("Exiting updateCampaignGroupRelation method ..."); } //end From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 11:23:25 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 15:23:25 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5504 - /vtigercrm/trunk/include/utils/utils.php Message-ID: <20060427152325.8F2DA40E7BB@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 09:23:20 2006 New Revision: 5504 Log: log entries have been inserted in all functions 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 Apr 27 09:23:20 2006 @@ -43,6 +43,8 @@ function return_name(&$row, $first_column, $last_column) { + global $log; + $log->debug("Entering return_name(".$row.",".$first_column.",".$last_column.") method ..."); $first_name = ""; $last_name = ""; $full_name = ""; @@ -72,31 +74,42 @@ $full_name .= $last_name; } + $log->debug("Exiting return_name method ..."); return $full_name; } //login utils function get_languages() { + global $log; + $log->debug("Entering get_languages() method ..."); global $languages; + $log->debug("Exiting get_languages method ..."); return $languages; } //seems not used function get_language_display($key) { + global $log; + $log->debug("Entering get_language_display(".$key.") method ..."); global $languages; + $log->debug("Exiting get_language_display method ..."); return $languages[$key]; } function get_assigned_user_name(&$assigned_user_id) { + global $log; + $log->debug("Entering get_assigned_user_name(".$assigned_user_id.") method ..."); $user_list = &get_user_array(false,""); if(isset($user_list[$assigned_user_id])) { + $log->debug("Exiting get_assigned_user_name method ..."); return $user_list[$assigned_user_id]; } + $log->debug("Exiting get_assigned_user_name method ..."); return ""; } @@ -104,6 +117,7 @@ function get_user_array($add_blank=true, $status="Active", $assigned_user="",$private="") { global $log; + $log->debug("Entering get_user_array(".$add_blank.",". $status.",".$assigned_user.",".$private.") method ..."); global $current_user; if(isset($current_user) && $current_user->id != '') { @@ -111,7 +125,6 @@ require('user_privileges/user_privileges_'.$current_user->id.'.php'); } static $user_array = null; - global $log; $module=$_REQUEST['module']; if($user_array == null) @@ -158,12 +171,16 @@ $user_array = &$temp_result; } + $log->debug("Exiting get_user_array method ..."); return $user_array; } function clean($string, $maxLength) { + global $log; + $log->debug("Entering clean(".$string.",". $maxLength.") method ..."); $string = substr($string, 0, $maxLength); + $log->debug("Exiting clean method ..."); return escapeshellcmd($string); } @@ -176,7 +193,10 @@ */ function safe_map($request_var, & $focus, $always_copy = false) { + global $log; + $log->debug("Entering safe_map(".$request_var.",".$focus.",".$always_copy.") method ..."); safe_map_named($request_var, $focus, $request_var, $always_copy); + $log->debug("Exiting safe_map method ..."); } /** @@ -189,10 +209,12 @@ function safe_map_named($request_var, & $focus, $member_var, $always_copy) { global $log; + $log->debug("Entering safe_map_named(".$request_var.",".$focus.",".$member_var.",".$always_copy.") method ..."); if (isset($_REQUEST[$request_var]) && ($always_copy || is_null($focus->$member_var))) { $log->debug("safe map named called assigning '{$_REQUEST[$request_var]}' to $member_var"); $focus->$member_var = $_REQUEST[$request_var]; } + $log->debug("Exiting safe_map_named method ..."); } /** This function retrieves an application language file and returns the array of strings included in the $app_list_strings var. @@ -203,6 +225,8 @@ function return_app_list_strings_language($language) { + global $log; + $log->debug("Entering return_app_list_strings_language(".$language.") method ..."); global $app_list_strings, $default_language, $log, $translation_string_prefix; $temp_app_list_strings = $app_list_strings; $language_used = $language; @@ -218,6 +242,7 @@ if(!isset($app_list_strings)) { $log->fatal("Unable to load the application language file for the selected language($language) or the default language($default_language)"); + $log->debug("Exiting return_app_list_strings_language method ..."); return null; } @@ -225,6 +250,7 @@ $return_value = $app_list_strings; $app_list_strings = $temp_app_list_strings; + $log->debug("Exiting return_app_list_strings_language method ..."); return $return_value; } @@ -235,6 +261,8 @@ * If you are using the current language, do not call this function unless you are loading it for the first time */ function return_application_language($language) { + global $log; + $log->debug("Entering return_application_language(".$language.") method ..."); global $app_strings, $default_language, $log, $translation_string_prefix; $temp_app_strings = $app_strings; $language_used = $language; @@ -250,6 +278,7 @@ if(!isset($app_strings)) { $log->fatal("Unable to load the application language file for the selected language($language) or the default language($default_language)"); + $log->debug("Exiting return_application_language method ..."); return null; } @@ -265,6 +294,7 @@ $return_value = $app_strings; $app_strings = $temp_app_strings; + $log->debug("Exiting return_application_language method ..."); return $return_value; } @@ -275,11 +305,14 @@ * If you are in the current module, do not call this function unless you are loading it for the first time */ function return_module_language($language, $module) { + global $log; + $log->debug("Entering return_module_language(".$language.",". $module.") method ..."); global $mod_strings, $default_language, $log, $currentModule, $translation_string_prefix; if($currentModule == $module && isset($mod_strings) && $mod_strings != null) { // We should have already loaded the array. return the current one. + $log->debug("Exiting return_module_language method ..."); return $mod_strings; } @@ -297,6 +330,7 @@ if(!isset($mod_strings)) { $log->fatal("Unable to load the module($module) language file for the selected language($language) or the default language($default_language)"); + $log->debug("Exiting return_module_language method ..."); return null; } @@ -312,6 +346,7 @@ $return_value = $mod_strings; $mod_strings = $temp_mod_strings; + $log->debug("Exiting return_module_language method ..."); return $return_value; } @@ -322,6 +357,8 @@ * If you are using the current language, do not call this function unless you are loading it for the first time */ function return_mod_list_strings_language($language,$module) { + global $log; + $log->debug("Entering return_mod_list_strings_language(".$language.",".$module.") method ..."); global $mod_list_strings, $default_language, $log, $currentModule,$translation_string_prefix; $language_used = $language; @@ -329,6 +366,7 @@ if($currentModule == $module && isset($mod_list_strings) && $mod_list_strings != null) { + $log->debug("Exiting return_mod_list_strings_language method ..."); return $mod_list_strings; } @@ -337,12 +375,14 @@ if(!isset($mod_list_strings)) { $log->fatal("Unable to load the application list language file for the selected language($language) or the default language($default_language)"); + $log->debug("Exiting return_mod_list_strings_language method ..."); return null; } $return_value = $mod_list_strings; $mod_list_strings = $temp_mod_list_strings; + $log->debug("Exiting return_mod_list_strings_language method ..."); return $return_value; } @@ -353,6 +393,8 @@ */ function return_theme_language($language, $theme) { + global $log; + $log->debug("Entering return_theme_language(".$language.",". $theme.") method ..."); global $mod_strings, $default_language, $log, $currentModule, $translation_string_prefix; $language_used = $language; @@ -368,6 +410,7 @@ if(!isset($theme_strings)) { $log->fatal("Unable to load the theme($theme) language file for the selected language($language) or the default language($default_language)"); + $log->debug("Exiting return_theme_language method ..."); return null; } @@ -380,6 +423,7 @@ } } + $log->debug("Exiting return_theme_language method ..."); return $theme_strings; } @@ -392,11 +436,15 @@ */ function return_session_value_or_default($varname, $default) { + global $log; + $log->debug("Entering return_session_value_or_default(".$varname.",". $default.") method ..."); if(isset($_SESSION[$varname]) && $_SESSION[$varname] != "") { + $log->debug("Exiting return_session_value_or_default method ..."); return $_SESSION[$varname]; } + $log->debug("Exiting return_session_value_or_default method ..."); return $default; } @@ -412,6 +460,8 @@ */ function append_where_clause(&$where_clauses, $variable_name, $SQL_name = null) { + global $log; + $log->debug("Entering append_where_clause(".$where_clauses.",".$variable_name.",".$SQL_name.") method ..."); if($SQL_name == null) { $SQL_name = $variable_name; @@ -421,6 +471,7 @@ { array_push($where_clauses, "$SQL_name like '$_REQUEST[$variable_name]%'"); } + $log->debug("Exiting append_where_clause method ..."); } /** @@ -434,6 +485,7 @@ function generate_where_statement($where_clauses) { global $log; + $log->debug("Entering generate_where_statement(".$where_clauses.") method ..."); $where = ""; foreach($where_clauses as $clause) { @@ -443,6 +495,7 @@ } $log->info("Here is the where clause for the list view: $where"); + $log->debug("Exiting generate_where_statement method ..."); return $where; } @@ -456,7 +509,9 @@ */ function create_guid() { - $microTime = microtime(); + global $log; + $log->debug("Entering create_guid() method ..."); + $microTime = microtime(); list($a_dec, $a_sec) = explode(" ", $microTime); $dec_hex = sprintf("%x", $a_dec* 1000000); @@ -478,22 +533,28 @@ $guid .= $sec_hex; $guid .= create_guid_section(6); + $log->debug("Exiting create_guid method ..."); return $guid; } function create_guid_section($characters) { + global $log; + $log->debug("Entering create_guid_section(".$characters.") method ..."); $return = ""; for($i=0; $i<$characters; $i++) { $return .= sprintf("%x", rand(0,15)); } + $log->debug("Exiting create_guid_section method ..."); return $return; } function ensure_length(&$string, $length) { + global $log; + $log->debug("Entering ensure_length(".$string.",". $length.") method ..."); $strlen = strlen($string); if($strlen < $length) { @@ -503,12 +564,16 @@ { $string = substr($string, 0, $length); } + $log->debug("Exiting ensure_length method ..."); } function microtime_diff($a, $b) { - list($a_dec, $a_sec) = explode(" ", $a); - list($b_dec, $b_sec) = explode(" ", $b); - return $b_sec - $a_sec + $b_dec - $a_dec; + global $log; + $log->debug("Entering microtime_diff(".$a.",". $b.") method ..."); + list($a_dec, $a_sec) = explode(" ", $a); + list($b_dec, $b_sec) = explode(" ", $b); + $log->debug("Exiting microtime_diff method ..."); + return $b_sec - $a_sec + $b_dec - $a_dec; } @@ -519,6 +584,8 @@ * Contributor(s): ______________________________________.. */ function get_theme_display($theme) { + global $log; + $log->debug("Entering get_theme_display(".$theme.") method ..."); global $theme_name, $theme_description; $temp_theme_name = $theme_name; $temp_theme_description = $theme_description; @@ -533,6 +600,7 @@ $theme_name = $temp_theme_name; $theme_description = $temp_theme_description; + $log->debug("Exiting get_theme_display method ..."); return $return_theme_value; } @@ -543,6 +611,8 @@ * Contributor(s): ______________________________________.. */ function get_themes() { + global $log; + $log->debug("Entering get_themes() method ..."); if ($dir = @opendir("./themes")) { while (($file = readdir($dir)) !== false) { if ($file != ".." && $file != "." && $file != "CVS" && $file != "Attic" && $file != "akodarkgem" && $file != "bushtree" && $file != "coolblue" && $file != "Amazon" && $file != "busthree" && $file != "Aqua" && $file != "nature" && $file != "orange") { @@ -570,6 +640,7 @@ } ksort($filelist); + $log->debug("Exiting get_themes method ..."); return $filelist; } @@ -582,6 +653,8 @@ * Contributor(s): ______________________________________.. */ function get_clear_form_js () { +global $log; +$log->debug("Entering get_clear_form_js () method ..."); $the_script = << Modified: vtigercrm/branches/4.2/modules/CustomView/EditView.php ============================================================================== --- vtigercrm/branches/4.2/modules/CustomView/EditView.php (original) +++ vtigercrm/branches/4.2/modules/CustomView/EditView.php Thu Apr 27 16:57:39 2006 @@ -48,6 +48,7 @@ $xtpl->assign("APP", $app_strings); $xtpl->assign("IMAGE_PATH", $image_path); $xtpl->assign("MODULE",$cv_module); +$xtpl->assign("MODULENAME",$app_strings[$cv_module]); $xtpl->assign("CVMODULE", $cv_module); $xtpl->assign("CUSTOMVIEWID",$recordid); $xtpl->assign("DATAFORMAT",$current_user->date_format); Modified: vtigercrm/branches/4.2/modules/HelpDesk/ListView.html ============================================================================== --- vtigercrm/branches/4.2/modules/HelpDesk/ListView.html (original) +++ vtigercrm/branches/4.2/modules/HelpDesk/ListView.html Thu Apr 27 16:57:39 2006 @@ -104,7 +104,7 @@ {MOD.LBL_STATISTICS}{MOD.LBL_COLON} - + Modified: vtigercrm/branches/4.2/modules/Invoice/DetailView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Invoice/DetailView.php (original) +++ vtigercrm/branches/4.2/modules/Invoice/DetailView.php Thu Apr 27 16:57:39 2006 @@ -116,7 +116,7 @@ $xtpl->assign("DUPLICATEBUTTON",""); } - $xtpl->assign("CREATEPDF",""); + $xtpl->assign("CREATEPDF",""); if(isPermitted("Invoice",2,$_REQUEST['record']) == 'yes') { Modified: vtigercrm/branches/4.2/modules/Orders/SalesOrderDetailView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Orders/SalesOrderDetailView.php (original) +++ vtigercrm/branches/4.2/modules/Orders/SalesOrderDetailView.php Thu Apr 27 16:57:39 2006 @@ -119,7 +119,7 @@ $xtpl->assign("DUPLICATEBUTTON",""); } - $xtpl->assign("CREATEPDF",""); + $xtpl->assign("CREATEPDF",""); if(isPermitted("Invoice",1,$_REQUEST['record']) == 'yes') Modified: vtigercrm/branches/4.2/modules/Potentials/Forms.php ============================================================================== --- vtigercrm/branches/4.2/modules/Potentials/Forms.php (original) +++ vtigercrm/branches/4.2/modules/Potentials/Forms.php Thu Apr 27 16:57:39 2006 @@ -243,7 +243,7 @@
        $lbl_required_symbol$lbl_account_name
        -   +  
        $lbl_required_symbol$lbl_date_closed
        ($current_user->date_format)
        Modified: vtigercrm/branches/4.2/modules/Quotes/DetailView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Quotes/DetailView.php (original) +++ vtigercrm/branches/4.2/modules/Quotes/DetailView.php Thu Apr 27 16:57:39 2006 @@ -125,7 +125,7 @@ } - $xtpl->assign("CREATEPDF",""); + $xtpl->assign("CREATEPDF",""); if(isPermitted("SalesOrder",1,$_REQUEST['record']) == 'yes') { Modified: vtigercrm/branches/4.2/modules/Users/OrgSharingDetailView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Users/OrgSharingDetailView.php (original) +++ vtigercrm/branches/4.2/modules/Users/OrgSharingDetailView.php Thu Apr 27 16:57:39 2006 @@ -15,7 +15,7 @@ global $app_list_strings; echo '
        '; -echo get_module_title("Security", "Default Organisation Sharing Privileges", true); +echo get_module_title("Security", $mod_strings['LBL_ORG_SHARING_PRIVILEGES_HEADER'], true); global $theme; $theme_path="themes/".$theme."/"; @@ -31,7 +31,7 @@ $output .= ''; $output .= ''; $output .= ''; -$output .= ''; +$output .= ''; $output .= ''; $row=1; Modified: vtigercrm/branches/4.2/modules/Users/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/4.2/modules/Users/language/en_us.lang.php (original) +++ vtigercrm/branches/4.2/modules/Users/language/en_us.lang.php Thu Apr 27 16:57:39 2006 @@ -211,6 +211,8 @@ //Added fields in OrgSharingDetailsView.php 'LBL_ORG_SHARING_PRIVILEGES'=>'Organisation Sharing Privileges', +'LBL_ORG_SHARING_PRIVILEGES_HEADER' => 'Setup: Organisation Sharing Privileges', +'LBL_ACCESS_PRIVILEGE' =>'Access Privilege', 'LBL_EDIT_PERMISSIONS'=>'Edit Permissions', 'LBL_SAVE_PERMISSIONS'=>'Save Permissions', 'LBL_READ_ONLY'=>'Public: Read Only', From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 18:59:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 22:59:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5515 - in /vtigercrm/trunk/Smarty/templates: EditProfile.tpl GroupDetailview.tpl GroupEditView.tpl ListGroup.tpl Message-ID: <20060427225913.2813659B7E9@vtiger.fosslabs.com> Author: don Date: Thu Apr 27 16:59:06 2006 New Revision: 5515 Log: Modified the UI Modified: vtigercrm/trunk/Smarty/templates/EditProfile.tpl vtigercrm/trunk/Smarty/templates/GroupDetailview.tpl vtigercrm/trunk/Smarty/templates/GroupEditView.tpl vtigercrm/trunk/Smarty/templates/ListGroup.tpl Modified: vtigercrm/trunk/Smarty/templates/EditProfile.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/EditProfile.tpl (original) +++ vtigercrm/trunk/Smarty/templates/EditProfile.tpl Thu Apr 27 16:59:06 2006 @@ -1,461 +1,480 @@ - - -
        '.$mod_strings['LBL_ORG_SHARING_PRIVILEGES'].'Access Privilege'.$mod_strings['LBL_ACCESS_PRIVILEGE'].'
        - - {include file='SettingsMenu.tpl'} - - -
        - - - - - - - - - -

        -{$MOD.LBL_SETTINGS} > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_PROFILES} -
        -
        - - - - - - - - - - - - - - - - -
        Details of Profile
        - - - - - -
        - - - - - - -
        - - - - - - - - - - - - - - - -
        - - - - - - - - - -
        Global PrivilegesTab PrivilegesStandard PrivilegesField PrivilegesUtilities
        -
        - - - - - -
        - - - - - - -
        - - - - - - - -
        Global Privileges for "{$PROFILE_NAME}"
        - Select the options below to change global privileges
        		2 enabled, 0 disabled
        - - - - - -
        - - - - -
        - - - - - -
          - - - - - - - - - - - - - - - - - - - - -
        {$GLOBAL_PRIV.0}View all
        Allows "{$PROFILE_NAME}" to view all information / modules of vtiger CRM
         
        {$GLOBAL_PRIV.1}Edit all
        Allows "{$PROFILE_NAME}" to edit all information / modules of vtiger CRM
        -
        -
        - - - - - - - - - - -
        - - - - - - -
         
         
        -    - {if $ACTION eq 'SaveProfile'} -    - {else} -    - {/if} - - -
         
         
        - -        		 
        -
        - - - - {include file='SettingsSubMenu.tpl'} - - + + + + + {include file='SettingsMenu.tpl'} + + +
        + + + + + + {if $MODE neq "edit"} + + +

        + + {$MOD.LBL_SETTINGS} + > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_PROFILES} +
        +
        + + + + + + + {else} + + + +
        + + + Profile Privileges
        + Step 3 Of 3 +
        + + + + + + + {/if} + + + + + + + + +
        + + + Profile Privileges
        + {$PROFILE_NAME} +
        + + + + +
        + + + + + + +
        + + + + + + + + + + + + + + + +
        + + + + + + + + + +
        Global PrivilegesTab PrivilegesStandard PrivilegesField PrivilegesUtilities
        +
        + + + + + +
        + + + + + +
        + + + + + + +
        Global Privileges for "{$PROFILE_NAME}"
        + Select the options below to change global privileges
        +         		 
        + + + + + +
        + + + + +
        + + + + + +
          + + + + + + + + + + + + + + + + + + + + +
        {$GLOBAL_PRIV.0}View all
        Allows "{$PROFILE_NAME}" to view all information / modules of vtiger CRM
         
        {$GLOBAL_PRIV.1}Edit all
        Allows "{$PROFILE_NAME}" to edit all information / modules of vtiger CRM
        +
        +
        + + + + + + + + + + +
        + + + + + + +
        +
        +
         
        + {if $MODE neq "edit"} +    + {/if} + {if $ACTION eq 'SaveProfile'} +    + {else} +    + {/if} + +
        +         		 
        +
        +
        + {include file='SettingsSubMenu.tpl'} + + Modified: vtigercrm/trunk/Smarty/templates/GroupDetailview.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/GroupDetailview.tpl (original) +++ vtigercrm/trunk/Smarty/templates/GroupDetailview.tpl Thu Apr 27 16:59:06 2006 @@ -1,92 +1,118 @@ - - - - - {include file='SettingsMenu.tpl'} - - -
        - - - - - - - - - - - - - - - -

        -{$MOD.LBL_SETTINGS} > {$MOD.LBL_USER_MANAGEMENT} > {$CMOD.LBL_GROUP_MEMBERS_LIST} -
        -
        - - - - - - - - - - - - - - - - - - - - - - - - - - - -
         
        - -    -    -
         
        Group Name : {$GROUPINFO.0.groupname}
        Description : {$GROUPINFO.0.description}
          
        Member List : -
        - - {foreach key=type item=details from=$GROUPINFO.1} - {if $details.0 neq ''} -
      • {$type} - -
        • - {/if} - {/foreach} - -
        -
        - -        		 
        -
        - - - - - {include file='SettingsSubMenu.tpl'} - + + + + + {include file='SettingsMenu.tpl'} + + +
        + + + + + + + + + + + + + + + + +

        + {$MOD.LBL_SETTINGS} > {$MOD.LBL_USER_MANAGEMENT} > {$CMOD.LBL_GROUP_MEMBERS_LIST} +
        +
         
        + + + + + + + + + + + + + +
        {$GROUPINFO.0.groupname} Group
        + Detail view of {$GROUPINFO.0.groupname} Group
         
        + + + + + + + + + + + + + + + + + + + + + + {foreach key=type item=details from=$GROUPINFO.1} + {if $details.0 neq ''} + + {if $type == "User"} + + {/if} + {if $type == "Role" } + + {/if} + {if $type == "Role and Subordinates" } + + {/if} + {if $type == "Group" } + + {/if} + + + + {/if} + {/foreach} + + + +
        Group Details
         Group Name :{$GROUPINFO.0.groupname} 
         Description :{$GROUPINFO.0.description}
         
        Member List
        + + + + + + + + {$type} : + {foreach item=element from=$details} + {$element.membername}
        + {/foreach} +
        + + +   +
         
        + + + + + {include file='SettingsSubMenu.tpl'} + Modified: vtigercrm/trunk/Smarty/templates/GroupEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/GroupEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/GroupEditView.tpl Thu Apr 27 16:59:06 2006 @@ -1,310 +1,307 @@ - - - - - - - {include file='SettingsMenu.tpl'} - - - -
        - - - - - - - - - - - - - - -

        -{$MOD.LBL_SETTINGS} > {$MOD.LBL_USER_MANAGEMENT} > {$CMOD.LBL_CREATE_NEW_GROUP} -
        -
        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
         
          
        Group Name - -
        Description - -
        - - - - - - - -
        Filters - - - - -
        -
        - - - - - - - -
        Member Available
        - - -         		-

        - -         		Selected Member
        - - -
         
           - - -    - -
         
        - -        		 
        - -
        - - -  - - - - - - - - - - {include file='SettingsSubMenu.tpl'} - + + + + + + + {include file='SettingsMenu.tpl'} + + + +
        + +
        + + + + + + + + + + + +

        +{$MOD.LBL_SETTINGS} > {$MOD.LBL_USER_MANAGEMENT} > {$CMOD.LBL_CREATE_NEW_GROUP} +
        +
        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        + + {$CMOD.LBL_CREATE_NEW_GROUP} +
          
        + Group Name : + +
         
        + Description : + +
         
        + Filters :    +   + +
         
        + + + + + + + +
        Member Available
        + + +         		+

        + +         		Selected Member
        + + +
         
        + +    + +
        + +
        +
        +
        + + +  + + + + + + + + + + {include file='SettingsSubMenu.tpl'} + Modified: vtigercrm/trunk/Smarty/templates/ListGroup.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListGroup.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListGroup.tpl Thu Apr 27 16:59:06 2006 @@ -1,70 +1,96 @@ - - - - - {include file='SettingsMenu.tpl'} - - -
        - - - - - - - - - - - - - - -

        -{$MOD.LBL_SETTINGS} > {$MOD.LBL_USER_MANAGEMENT} > {$CMOD.LBL_GROUP_NAME} -
        -
        - - - - - - - - - - - - - - - - {section name=entries loop=$LIST_ENTRIES} - - - - - - {/section} - -
         
         
         
        {$LIST_HEADER.0}{$LIST_HEADER.1}{$LIST_HEADER.2}
          - - Edit -  {$LIST_ENTRIES[entries].groupname}{$LIST_ENTRIES[entries].description} 
        - -        		 
        -
        - - - - - {include file='SettingsSubMenu.tpl'} - + + + + + {include file='SettingsMenu.tpl'} + + +
        + + + + + + + + + + + + + + +

        +{$MOD.LBL_SETTINGS} > {$MOD.LBL_USER_MANAGEMENT} > {$CMOD.LBL_GROUP_NAME} +

        +
        + + + + + + + + + +
        +  {$CMOD.LBL_GROUP_NAME} + + +
         
        + + + + + + + + {section name=entries loop=$LIST_ENTRIES} + + + + + + {/section} + +
        {$LIST_HEADER.1}{$LIST_HEADER.2}{$LIST_HEADER.0}
        {$LIST_ENTRIES[entries].groupname}{$LIST_ENTRIES[entries].description} + + Edit | + +
        +
        + +
        +
        + + + + + {include file='SettingsSubMenu.tpl'} + + From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 19:01:14 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 23:01:14 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5516 - /vtigercrm/trunk/include/utils/CommonUtils.php Message-ID: <20060427230114.5B3F359B7E9@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 17:01:09 2006 New Revision: 5516 Log: Added the function to add security check for each deleted record from ListView using massdelete button-Ahmed 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 Apr 27 17:01:09 2006 @@ -1872,4 +1872,232 @@ } +/** + * Function to Check whether the User is allowed to delete a particular record from listview of each module using + * mass delete button. + * @param string $module -- module name + * @param array $ids_list -- Record id + * Returns the Record Names of each module that is not permitted to delete +**/ +function getEntityName($module, $ids_list) +{ + $list = implode(",",$ids_list); + global $adb; + global $log; + $log->debug("Entering getEntityName(".$module.") method ..."); + + switch ($module) + { + case "Accounts" : $query = "select accountname from account where accountid in (".$list.")"; + $result = $adb->query($query); + $numrows = $adb->num_rows($result); + $account_name = array(); + for ($i = 0; $i < $numrows; $i++) + { + $acc_id = $ids_list[$i]; + $account_name[$acc_id] = $adb->query_result($result,$i,'accountname'); + } + return $account_name; + break; + + case "Leads" : $query = "select concat(firstname,' ',lastname) as leadname from leaddetails where leadid in (".$list.")"; + $result = $adb->query($query); + $numrows = $adb->num_rows($result); + $lead_name = array(); + for($i = 0; $i < $numrows; $i++) + { + $lead_id = $ids_list[$i]; + $lead_name[$lead_id] = $adb->query_result($result,$i,'leadname'); + } + + return $lead_name; + break; + + case "Contacts" : $query = "select concat(firstname,' ',lastname) as contactname from contactdetails where contactid in (".$list.")"; + $result = $adb->query($query); + $numrows = $adb->num_rows($result); + $contact_name = array(); + for($i=0; $i < $numrows; $i++) + { + $cont_id = $ids_list[$i]; + $contact_name[$cont_id] = $adb->query_result($result,$i,'contactname'); + } + + return $contact_name; + break; + + case "Potentials" : $query = "select potentialname from potential where potentialid in (".$list.")"; + $result = $adb->query($query); + $numrows = $adb->num_rows($result); + $potential_name = array(); + for($i=0; $i < $numrows; $i++) + { + $pot_id = $ids_list[$i]; + $potential_name[$pot_id] = $adb->query_result($result,$i,'potentialname'); + } + + return $potential_name; + break; + + case "Quotes" : $query = "select subject from quotes where quoteid in (".$list.")"; + $result = $adb->query($query); + $numrows = $adb->num_rows($result); + $quote_subject = array(); + for($i=0; $i < $numrows; $i++) + { + $quote_id = $ids_list[$i]; + $quote_subject[$quote_id] = $adb->query_result($result,$i,'subject'); + } + + return $quote_subject; + break; + + case "SalesOrder" : $query = "select subject from salesorder where salesorderid in (".$list.")"; + $result = $adb->query($query); + $numrows = $adb->num_rows($result); + $so_subject = array(); + for($i=0; $i < $numrows; $i++) + { + $so_id = $ids_list[$i]; + $so_subject[$so_id] = $adb->query_result($result,$i,'subject'); + } + + return $so_subject; + break; + + case "Invoice" : $query = "select subject from invoice where invoiceid in (".$list.")"; + $result = $adb->query($query); + $numrows = $adb->num_rows($result); + $inv_subject = array(); + for($i=0; $i < $numrows; $i++) + { + $inv_id = $ids_list[$i]; + $inv_subject[$inv_id] = $adb->query_result($result,$i,'subject'); + } + + return $inv_subject; + break; + + case "Products" : $query = "select productname from products where productid in (".$list.")"; + $result = $adb->query($query); + $numrows = $adb->num_rows($result); + $product_name = array(); + for($i=0; $i < $numrows; $i++) + { + $prod_id = $ids_list[$i]; + $product_name[$prod_id] = $adb->query_result($result,$i,'productname'); + } + + return $product_name; + break; + + case "PriceBooks" : $query = "select bookname from pricebook where pricebookid in (".$list.")"; + $result = $adb->query($query); + $numrows = $adb->num_rows($result); + $pbook_name = array(); + for($i=0; $i < $numrows; $i++) + { + $pbook_id = $ids_list[$i]; + $pbook_name[$pbook_id] = $adb->query_result($result,$i,'bookname'); + } + + return $pbook_name; + break; + + case "Notes" : $query = "select title from notes where notesid in (".$list.")"; + $result = $adb->query($query); + $numrows = $adb->num_rows($result); + $notes_title = array(); + for($i=0; $i < $numrows; $i++) + { + $note_id = $ids_list[$i]; + $notes_title[$note_id] = $adb->query_result($result,$i,'title'); + } + + return $notes_title; + break; + + case "Activities" : $query = "select subject from activity where activityid in (".$list.")"; + $result = $adb->query($query); + $numrows = $adb->num_rows($result); + $activity_subject = array(); + for($i=0; $i < $numrows; $i++) + { + $act_id = $ids_list[$i]; + $activity_subject[$act_id] = $adb->query_result($result,$i,'subject'); + } + + return $activity_subject; + break; + + case "Campaigns" : $query = "select campaignname from campaign where campaignid in (".$list.")"; + $result = $adb->query($query); + $numrows = $adb->num_rows($result); + $campaign_name = array(); + for($i=0; $i < $numrows; $i++) + { + $cmpn_id = $ids_list[$i]; + $campaign_name[$cmpn_id] = $adb->query_result($result,$i,'campaignname'); + } + + return $campaign_name; + break; + + case "Faq" : $query = "select question from faq where id in (".$list.")"; + $result = $adb->query($query); + $numrows = $adb->num_rows($result); + $faq_name = array(); + for($i=0; $i < $numrows; $i++) + { + $faq_id = $ids_list[$i]; + $faq_name[$faq_id] = $adb->query_result($result,$i,'question'); + } + + return $faq_name; + break; + + case "Vendors" : $query = "select vendorname from vendor where vendorid in (".$list.")"; + $result = $adb->query($query); + $numrows = $adb->num_rows($result); + $vendor_name = array(); + for($i=0; $i < $numrows; $i++) + { + $ven_id = $ids_list[$i]; + $vendor_name[$ven_id] = $adb->query_result($result,$i,'vendorname'); + } + + return $vendor_name; + break; + + case "PurchaseOrder" : $query = "select subject from purchaseorder where purchaseorderid in (".$list.")"; + $result = $adb->query($query); + $numrows = $adb->num_rows($result); + $po_name = array(); + for($i=0; $i < $numrows; $i++) + { + $po_id = $ids_list[$i]; + $po_name[$po_id] = $adb->query_result($result,$i,'subject'); + } + + return $po_name; + break; + + case "HelpDesk" : $query = "select title from troubletickets where ticketid in (".$list.")"; + $result = $adb->query($query); + $numrows = $adb->num_rows($result); + $ticket_name = array(); + for($i=0; $i < $numrows; $i++) + { + $tick_id = $ids_list[$i]; + $ticket_name[$tick_id] = $adb->query_result($result,$i,'title'); + } + + return $ticket_name; + break; + } + $log->debug("Exiting getEntityName method ..."); +} + + + ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 19:02:14 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 23:02:14 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5517 - in /vtigercrm/trunk/Smarty/templates: ProfileDetailView.tpl RoleDetailView.tpl RoleEditView.tpl Message-ID: <20060427230214.599AE59B7E9@vtiger.fosslabs.com> Author: don Date: Thu Apr 27 17:02:08 2006 New Revision: 5517 Log: fixed the UI issues Modified: vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl vtigercrm/trunk/Smarty/templates/RoleDetailView.tpl vtigercrm/trunk/Smarty/templates/RoleEditView.tpl Modified: vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl Thu Apr 27 17:02:08 2006 @@ -1,477 +1,457 @@ - - - - - {include file='SettingsMenu.tpl'} - - -
        - - - - - - - - - -

        -{$MOD.LBL_SETTINGS} > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_PROFILES} -
        -
        - - - - - - - - - - - - - - - - -
        Details of Profile
        - - - - - -
        - - - - - - -
        - - - - - - - - - - - - - -
        - - - - - - - - - -
        Global PrivilegesTab PrivilegesStandard PrivilegesField PrivilegesUtilities
        -
        - - - - - -
        - - - - - - -
        - - - - - - - -
        Global Privileges for "{$PROFILE_NAME}"
        - Select the options below to change global privileges
        		2 enabled, 0 disabled
        - - - - - -
        - - - - -
        - - - - - -
          - - - - - - - - - - - - - - - - - - - - -
        {$GLOBAL_PRIV.0}View all
        Allows "{$PROFILE_NAME}" to view all information / modules of vtiger CRM
         
        {$GLOBAL_PRIV.1}Edit all
        Allows "{$PROFILE_NAME}" to edit all information / modules of vtiger CRM
        -
        -
        - - - - - - - - - - -
        - - - - - - -
         
         
        -    - { if $PROFILEID != 1 && $PROFILEID != 2 && $PROFILEID != 3 && $PROFILEID != 4 } - -    - {/if} - - -
         
         
        - -        		 
        -
        - - - -
        - - {include file='SettingsSubMenu.tpl'} - - - - + + + + + {include file='SettingsMenu.tpl'} + + + +
        + + + + + + + + + + + + + + + +

        +{$MOD.LBL_SETTINGS} > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_PROFILES} +
        +
        + + + + + + + + + + +
        + + + Detail View of Profile
        + {$PROFILE_NAME} +
        + + + + + + +
        + + + + + + + + + + + + + +
        + + + + + + + + + +
        Global PrivilegesTab PrivilegesStandard PrivilegesField PrivilegesUtilities
        +
        + + + + + +
        + + + + + + +
        + + + + + + + +
        Global Privileges for "{$PROFILE_NAME}"
        + Select the options below to change global privileges
        		 
        + + + + + +
        + + + + +
        + + + + + +
          + + + + + + + + + + + + + + + + + + + + +
        {$GLOBAL_PRIV.0}View all
        Allows "{$PROFILE_NAME}" to view all information / modules of vtiger CRM
         
        {$GLOBAL_PRIV.1}Edit all
        Allows "{$PROFILE_NAME}" to edit all information / modules of vtiger CRM
        +
        +
        + + + + + + + + + + +
        + + + + + + +
         
         
        +    + + +
         
         
        + +        		 
        + + + + + + + {include file='SettingsSubMenu.tpl'} + + Modified: vtigercrm/trunk/Smarty/templates/RoleDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/RoleDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/RoleDetailView.tpl Thu Apr 27 17:02:08 2006 @@ -1,118 +1,116 @@ - - - - - - {include file='SettingsMenu.tpl'} - - - -
        - - - - - - - - - - - - - - - - - -

        -{$MOD.LBL_SETTINGS} > {$MOD.LBL_USER_MANAGEMENT} > {$CMOD.LBL_CREATE_NEW_GROUP} -
        -
        - - - - - - - - - - - - - - - - - - - - -
         
        {$ROLE_NAME} -   -
          
        -
        - - - - - - - - - - - - - - -
        Associated Users : -
          - {foreach item=elements from=$ROLEINFO.userinfo} -
        • {$elements.1}
          • - {/foreach} -
        -
        Associated profiles : -
          - {foreach item=elements from=$ROLEINFO.profileinfo} -
        • {$elements.1}
          • - {/foreach} -
        -
        -
        -
        - -
        - -        		 
        - -
        - -  - - - - - - - - - - {include file='SettingsSubMenu.tpl'} -
        - - + + + + + + {include file='SettingsMenu.tpl'} + + + +
        + +
        + + + + + + + + + + + + + + + + +

        + {$MOD.LBL_SETTINGS} > {$MOD.LBL_USER_MANAGEMENT} > Role of {$ROLE_NAME} +
        +
         
        + + + + + + + + + +
        {$ROLE_NAME} Role
        + Detail view of {$ROLE_NAME} Role
         
        + + + + + + + + + + + + + + + + + + + + + {if $ROLEINFO.userinfo.0 neq ''} + + + + + + {/if} + + + + + +
        Group Details
         Role Name :{$ROLE_NAME} 
         
        Member List
        Associated profiles : + {foreach item=elements from=$ROLEINFO.profileinfo} + {$elements.1}
        + {/foreach} +
        Associated Users : + {foreach item=elements from=$ROLEINFO.userinfo} + {$elements.1}
        + {/foreach} +
         
        + + +   + +
         
        + +
        +
        		 
        + + + + + + + + {include file='SettingsSubMenu.tpl'} +
        + + Modified: vtigercrm/trunk/Smarty/templates/RoleEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/RoleEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/RoleEditView.tpl Thu Apr 27 17:02:08 2006 @@ -1,210 +1,212 @@ - - - - - - - - {include file='SettingsMenu.tpl'} - - - -
        - -
        - - - - - - - - - - - - - - - -

        -{$MOD.LBL_SETTINGS} > {$MOD.LBL_USER_MANAGEMENT} > {$CMOD.LBL_CREATE_NEW_GROUP} -
        -
        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
         
        Step 1 : Role Name
        - Specify a name for new role - - -
         
        Step 2 : Assign Profile(s)
        - Select the Profiles below and click on assign button
          
          - - - - - - -
        Profiles Available
        - -         		- - -
        -
        - -         		Assigned Profiles
        - -
        Reports to:{$PARENTNAME}
         
           -    - -
         
        - -        		 
        -
        -
        - - - - -  - - - - - - - - - {include file='SettingsSubMenu.tpl'} - + + + + + + {include file='SettingsMenu.tpl'} + + +
        +
        + + + + + + + + + + + + + + + +

        + + {$MOD.LBL_SETTINGS} + > {$MOD.LBL_USER_MANAGEMENT} > {$CMOD.LBL_CREATE_NEW_ROLE} +
        +
        + + + + +
        + + {$CMOD.LBL_CREATE_NEW_ROLE} +
        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
         
        + + Role Name
        + Specify a name for new role :  + +
         
        + + Assign Profile(s)
        Select the Profiles below and click on assign button
          
          + + + + + + + + +
        Profiles Available
        + +         		+ + +

        + +         		Assigned Profiles
        + +
        +
          
        Reports to Role
        {$PARENTNAME}
         
           +    + +
        +
        +
        +
        + + + + +  + + + + + + + + + {include file='SettingsSubMenu.tpl'} + From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 19:03:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 23:03:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5518 - /vtigercrm/trunk/Smarty/templates/UserProfile.tpl Message-ID: <20060427230303.1985959AEFA@vtiger.fosslabs.com> Author: don Date: Thu Apr 27 17:02:58 2006 New Revision: 5518 Log: fixed the UI issues Modified: vtigercrm/trunk/Smarty/templates/UserProfile.tpl Modified: vtigercrm/trunk/Smarty/templates/UserProfile.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserProfile.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserProfile.tpl Thu Apr 27 17:02:58 2006 @@ -1,84 +1,84 @@ - - - - - {include file='SettingsMenu.tpl'} - - -
        - - - - - - - - - - - - - - - -

        -{$MOD.LBL_SETTINGS} > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_PROFILES} -
        -
        - - - - - - - - - - - - - - - - {section name=entries loop=$LIST_ENTRIES} - - - - - - {/section} - -
         
         
         
        {$LIST_HEADER.0}{$LIST_HEADER.1}{$LIST_HEADER.2}
          - {if $LIST_ENTRIES[entries].del_permission eq 'yes'} - - {else} -       - {/if} - - Edit -  {$LIST_ENTRIES[entries].profilename}{$LIST_ENTRIES[entries].description} 
        - -        		 
        -
        - - - -
        - - -{include file='SettingsSubMenu.tpl'} - + + + + + {include file='SettingsMenu.tpl'} + + +
        + + + + + + + + + + + + + + + +

        +{$MOD.LBL_SETTINGS} > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_PROFILES} +

        +
        + + + + + + + +
        +   + {$MOD.LBL_PROFILES} +
         
        + + + + + + + {section name=entries loop=$LIST_ENTRIES} + + + + + + {/section} +
        {$LIST_HEADER.1}{$LIST_HEADER.2}{$LIST_HEADER.0}
        {$LIST_ENTRIES[entries].profilename}{$LIST_ENTRIES[entries].description}  + Edit + {if $LIST_ENTRIES[entries].del_permission eq 'yes'} +  |  + + {else} + {/if} +
        +
        +        		 
        +
        + + + +
        + + +{include file='SettingsSubMenu.tpl'} + From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 19:08:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 23:08:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5519 - in /vtigercrm/trunk/themes/blue/images: groups_icon.gif profile_icon.gif roles_icon.gif three.gif user_icon.gif Message-ID: <20060427230841.673A359D476@vtiger.fosslabs.com> Author: don Date: Thu Apr 27 17:08:32 2006 New Revision: 5519 Log: setting user mgmt images Added: vtigercrm/trunk/themes/blue/images/groups_icon.gif (with props) vtigercrm/trunk/themes/blue/images/profile_icon.gif (with props) vtigercrm/trunk/themes/blue/images/roles_icon.gif (with props) vtigercrm/trunk/themes/blue/images/three.gif (with props) vtigercrm/trunk/themes/blue/images/user_icon.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 19:09:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 23:09:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5520 - /vtigercrm/trunk/Smarty/templates/ListView.tpl Message-ID: <20060427230958.8446F59B789@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 17:09:54 2006 New Revision: 5520 Log: Added the split feature to get an alert for error when deleting non permissible records in ListView - Ahmed 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 Thu Apr 27 17:09:54 2006 @@ -24,7 +24,10 @@ function ajaxSaveResponse(response) {ldelim} hide("status"); - document.getElementById("ListViewContents").innerHTML=response.responseText; + result = response.responseText.split('&#&#&#'); + document.getElementById("ListViewContents").innerHTML= result[2]; + if(result[1] != '') + alert(result[1]); {rdelim} function callSearch(searchtype) From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 19:14:01 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 23:14:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5521 - /vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl Message-ID: <20060427231401.7C54E59B789@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 17:13:57 2006 New Revision: 5521 Log: Added the split feature to get an alert for error when deleting non permissible records in ListView - Ahmed 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 Thu Apr 27 17:13:57 2006 @@ -1,4 +1,5 @@ - +&#&#&#{$ERROR}&#&#&# +
        @@ -11,7 +12,7 @@ {foreach key=button_check item=button_label from=$BUTTONS} {if $button_check eq 'del'} - + {elseif $button_check eq 's_mail'} {elseif $button_check eq 's_cmail'} @@ -80,8 +81,8 @@ {foreach key=button_check item=button_label from=$BUTTONS} {if $button_check eq 'del'} - - {elseif $button_check eq 's_mail'} + + ` {elseif $button_check eq 's_mail'} {elseif $button_check eq 's_cmail'} From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 19:19:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 23:19:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5522 - /vtigercrm/trunk/themes/blue/style.css Message-ID: <20060427231927.D319059B789@vtiger.fosslabs.com> Author: don Date: Thu Apr 27 17:19:23 2006 New Revision: 5522 Log: changed styles Modified: vtigercrm/trunk/themes/blue/style.css Modified: vtigercrm/trunk/themes/blue/style.css ============================================================================== --- vtigercrm/trunk/themes/blue/style.css (original) +++ vtigercrm/trunk/themes/blue/style.css Thu Apr 27 17:19:23 2006 @@ -38,20 +38,6 @@ line-height: 12px; color: #ABABAB; } -#PopupLay{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - width:500px; - border:3px solid #CCCCCC; - background-color:#FFFFFF; - padding:5px; - display:none; - position:absolute; - left:100px; - top:100px; -} - .hdrNameBg { background:url(images/topBg.gif); @@ -88,8 +74,8 @@ .level2text { background:#bbbbbb url(images/level2Bg.gif) repeat-x; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; padding-left:20px; padding-right:20px; padding-top:5px; @@ -110,6 +96,18 @@ } +.level2text a sel{ + text-decoration:none; + color:#000000; + +} + +.level2text a.sel:hover { + text-decoration:underline; + color:white; + +} + .level2Bg { background:#bbbbbb url(images/level2Bg.gif) repeat-x; font-family: Arial, Helvetica, sans-serif; @@ -127,6 +125,7 @@ .showPanelBg { background:url(images/showPanelTopBg.gif) repeat-x; + background-position:top; } a { @@ -250,6 +249,7 @@ .dvtCellLabel { background-color:#f6f6f6; padding-right:10px; + padding-left:10px; border-bottom:1px solid #eaeaea; color:#737373; white-space:nowrap; @@ -257,6 +257,7 @@ .dvtCellInfo { padding-left:10px; + padding-right:10px; border-bottom:1px solid #eaeaea; white-space:nowrap; } @@ -591,109 +592,109 @@ .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; + 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:Verdana, Arial, Helvetica, sans-serif; font-size:12px; font-weight:bold; -color:white; - background-color:#DDDDDD; - border-bottom:1px solid #BBBBBB; - text-decoration:none; -width:100%; + color:white; + background-color:#DDDDDD; + border-bottom:1px solid #BBBBBB; + text-decoration:none; + width:100%; } .lftMnuHdr tr td{ font-family:Verdana, 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:20px; - padding-right:5px; - padding-left:0px; + color:white; + background-color:#DDDDDD; + border-bottom:1px solid #BBBBBB; + text-align:left; + text-decoration:none; + height:20px; + padding-right:5px; + padding-left:0px; } a.lftMnuHdr{ font-family:Verdana, 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:20px; - padding-left:5px; - padding-top:3px; -width:100%; -display:block; + color:white; + background-color:#666666; + border-top:1px solid #BBBBBB; + border-bottom:1px solid #999999; + text-align:left; + text-decoration:none; + height:20px; + padding-left:5px; + padding-top:3px; + width:100%; + display:block; } a.lftMnuHdr:Hover{ font-family:Verdana, 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:20px; - padding-left:5px; - padding-top:3px; -width:100%; -display:block; + color:white; + background-color:#666666; + border-top:1px solid #BBBBBB; + border-bottom:1px solid #999999; + text-align:left; + text-decoration:none; + height:20px; + padding-left:5px; + padding-top:3px; + width:100%; + display:block; } a.lftSubMnu{ font-family:Verdana, Arial, Helvetica, sans-serif; font-size:11px; font-weight:normal; -display:block; -color:#666666; -height:20px; -width:95%; - text-align:left; - padding-left:15px; - text-decoration:none; - border-bottom:1px solid #BBBBBB; - padding-top:2px; - white-space:nowrap; + display:block; + color:#666666; + height:20px; + width:95%; + 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:Verdana, Arial, Helvetica, sans-serif; font-size:11px; font-weight:normal; -display:block; -color:#666666; -height:20px; -width:95%; - text-align:left; - padding-left:15px; - text-decoration:none; - border-bottom:1px solid #BBBBBB; - padding-top:2px; - white-space:nowrap; - background-color:#CCCCCC; + display:block; + color:#666666; + height:20px; + width:95%; + text-align:left; + padding-left:15px; + text-decoration:none; + border-bottom:1px solid #BBBBBB; + padding-top:2px; + white-space:nowrap; + background-color:#CCCCCC; } .padTab{ @@ -702,7 +703,7 @@ padding-left:10px; padding-bottom:0px; vertical-align:top; - text-align:left; + background-color:#FFFFFF; } .controlTab{ @@ -711,8 +712,8 @@ text-align:center; font-weight:bold; text-decoration:none; -width:100%; -border:0px; + width:100%; + border:0px; } .controlTab tr td{ @@ -771,14 +772,11 @@ } #mnuTab{ - - position:relative; - - overflow:auto; - - width:100%; - - display:block; + position:relative; + overflow:auto; + width:100%; + display:block; + top: 1px; } @@ -835,6 +833,7 @@ } /*Added for Advance Seearch*/ + #scrollTab{ position:relative; width:100%; @@ -854,10 +853,9 @@ cursor:pointer; border:0px; } - #slideMnu{ background-color:#BBBBBB; - vertical-align:top; + vertical-align:top; } #one{ @@ -873,7 +871,7 @@ width:100%; border-left:0px solid #CCCCCC; border-right:0px solid #CCCCCC; - border-collapse: collapse; + border-collapse:collapse; } .prdTab tr th{ @@ -982,6 +980,8 @@ font-size:11px; background-color:#EBEBEB; width:640px; + height:425px; + overflow:auto; padding-left:5px; padding-top:10px; position:relative; @@ -994,28 +994,17 @@ color:#000000; } -a.tagLink{ - color:#333333; - text-decoration:none; - font-family:arial, Helvetica, sans-serif; -} - -a.tagLink:Hover{ - color:#000000; - text-decoration:underline; - -} - - -/*slide menu css*/ + +/* menu */ #mnuSlide{ position:absolute; left:0px; top:100px; -} - -a.submenu { +/* width:110px;*/ +} + +a.submenu{ font-family:Verdana, Arial, Helvetica, sans-serif; font-size:11px; width:100px; @@ -1030,7 +1019,7 @@ display:block; } -a.submenu:Hover { +a.submenu:Hover{ background-color:#DDDDDD; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:11px; @@ -1046,9 +1035,17 @@ } #mnuKey{ - width:20px; + 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; - height:20px; + vertical-align:top; + height:100px; position:relative; top:0px; left:0px; @@ -1064,135 +1061,6 @@ display:none; } - -/* New Home Page Css */ - -.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; -} - -a.imageTab{ - background-color:#F5F5F5; - border:0px solid #EBEBEB; - width:30px; - height:30px; - display:block; - padding-top:3px; -} - -a.imageTab:Hover{ - background-color:#BFBFFF; - border:0px solid #EBEBEB; - width:30px; - height:30px; - display:block; - opacity:.5; -} - -.mnuTabH{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:12px; - color:#000000; - width:100%; - border:0px solid #000000; -} - -.mnuTabH tr td{ - border-bottom:1px solid #EBEBEB; - padding-left:5px; - 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:Verdana, 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:Verdana, 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; -} - -.padTab1{ - border-bottom:15px solid #EBEBEB; - border-left:15px solid #EBEBEB; - border-top:15px solid #EBEBEB; - vertical-align:top; - padding:5px; -} - -.frmSelect{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - border:1px #EBEBEB; -} - /* clock */ .citystyle{ @@ -1200,7 +1068,7 @@ top:0px; left:0px; text-align:left; - + } #theClockLayer{ position:relative; @@ -1218,7 +1086,6 @@ font-size:2px; background-color:#000000; } - .facestyle{ margin-top:10px; position:absolute; @@ -1253,6 +1120,7 @@ font-size:10px; color:#000000; } + #wclock{ position:absolute; left:100px; @@ -1270,8 +1138,11 @@ } + + /* Calculator */ .calcBg { + /*background-color: #666;*//*BFC1B7*/ background: url(images/cal_bg.gif); border: 1px solid #009900; } @@ -1320,82 +1191,366 @@ } .calcCancBtn { background: url(images/calc_canc_btn.gif) no-repeat; - + } .calcMemBtn { background: url(images/calc_mem_btn.gif) no-repeat; width:25px; -} + /*background-color: #CCC;*/ +} + +/* RSS STYLES */ + +.subHdr{ + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + color:#FFFFFF; + background-image:url(../../design/images/rssHeader.gif); + background-position:top left; + background-repeat:repeat-x; + height:27px; + padding:0px 10px 0px 10px; + vertical-align:middle; +} + +.delBg{ + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + color:#FFFFFF; + background-image:url(../../design/images/rssdelete.gif); + background-position:top left; + background-repeat:repeat-x; + height:27px; + padding:0px 10px 0px 10px; + vertical-align:middle; +} + +#rssScroll{ + font-family:Arial, Helvetica, sans-serif ; + font-size:12px; + background-color:#FFFFFF; + width:100%; + height:150px; + overflow:auto; + border:0px solid #000000; +} + +.rssTable{ + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + width:100%; + border:0px solid #000000; +} + +.rssTable tr th{ + background-color:#F0F0F0; + text-align:left; + border-bottom:1px solid #E5E5E5; + border-top:1px solid #FFFFFF; + color:#000000; + font-weight:normal; + padding-left:5px; + padding-right:5px; + height:20px; +} + +.rssTable tr td{ + text-align:left; + border:0px solid #000000; + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + white-space:nowrap; + padding:5px; + height:20px; +} + +.frameHdr{ + height:32px; + background-image:url(../../design/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; + font-size:12px; + color:#000000; + background-image:url(../../design/images/rssforward.gif); + background-position:top left; + background-repeat:repeat-x; + height:27px; + padding:0px 10px 0px 10px; + vertical-align:middle; + background-color:#D7D7D7; +} + + +/* 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; + color:#000000; + width:100%; + border:0px solid #000000; +} + +.mnuTab tr td{ + border-bottom:1px solid #EBEBEB; + padding-left:5px; + 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; +} + +a.submenu{ + font-family:Verdana, Arial, Helvetica, sans-serif; + font-size:11px; + width:100px; + height:20px; + padding-top:3px; + 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; + width:100px; + height:20px; + padding-top:3px; + 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:#ECECEC; + border-right:1px solid #CCCCCC; + opacity:.8; +} + /* profile */ +.small { + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; +} + .prvPrfBigText { - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; + font-family: Arial, Helvetica, sans-serif; + font-size: 14px; } .prvPrfTopBg { - background-color:#ebebeb; + background-color:#ebebeb; } .prvPrfBottomBg { - background-color:#ebebeb; + background-color:#ebebeb; } .prvPrfOutline { - border:1px solid #ebebeb; + border:1px solid #ebebeb; } .prvPrfSelectedTab { - background:url(images/prvPrfSelectedTab.gif) repeat-x; - cursor:pointer; + background:url(images/prvPrfSelectedTab.gif) repeat-x; + cursor:pointer; } .prvPrfUnSelectedTab { - background:url(images/prvPrfUnSelectedTab.gif) repeat-x; - cursor:pointer; - + background:url(images/prvPrfUnSelectedTab.gif) repeat-x; + cursor:pointer; } .prvPrfTexture { - background:url(images/prvPrfTexture1.gif); + background:url(../images/prvPrfTexture1.gif); } .prvPrfBgOn{ - background-color:#33ee33; + background-color:#33ee33; } .prvPrfBgOff{ - background-color:#cccccc; + background-color:#cccccc; } .prvPrfHoverOn { - background-color:#ffffef; - + background-color:#ffffef; + } .prvPrfHoverOut { - background-color:#ffffff; + background-color:#ffffff; } .prvPrfBgImgGlobal { - background:url(images/prvPrfBgImgGlobal.jpg) top right no-repeat; + background:url(../images/prvPrfBgImgGlobal.jpg) top right no-repeat; } .prvPrfBgImgTab { - background:url(images/prvPrfBgImgTab.jpg) top right no-repeat; + background:url(../images/prvPrfBgImgTab.jpg) top right no-repeat; } .prvPrfBgImgStandard { - background:url(images/prvPrfBgImgStandard.jpg) top right no-repeat; + background:url(../images/prvPrfBgImgStandard.jpg) top right no-repeat; } .prvPrfBgImgUtils { - background:url(images/prvPrfBgImgUtils.jpg) top right no-repeat; + background:url(../images/prvPrfBgImgUtils.jpg) top right no-repeat; } .prvPrfBgImgField { - background:url(images/prvPrfBgImgField.jpg) top right no-repeat; + 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; + border-top:1px solid #ababab; + border-left:1px solid #ababab; + border-right:1px solid #a1a1a1; } /* Organization */ @@ -1404,10 +1559,10 @@ font-family:Arial, Helvetica, sans-serif; font-size:11px; font-weight:normal; -color:#000000; -border:0px solid #9B9B9B; - border-collapse:collapse; -width:100%; + color:#666666; + border:0px solid #9B9B9B; + border-collapse:collapse; + width:100%; } .orgTab tr th{ @@ -1416,8 +1571,8 @@ font-size:12px; text-decoration:none; font-weight:bold; -height:20px; - padding-left:5px; + height:20px; + padding-left:5px; } .orgTab tr td{ @@ -1426,19 +1581,19 @@ text-decoration:none; font-weight:none; padding-left:5px; -height:20px; - border-bottom:1px solid #CCCCCC; - border-right:1px solid #CCCCCC; + height:20px; + border-bottom:1px solid #CCCCCC; + 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%; + color:#000000; + border:1px solid #999999; + border-collapse:collapse; + width:100%; } .globTab tr th{ @@ -1446,49 +1601,39 @@ 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; - + 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:none; - padding-left:5px; -height:20px; -} - -#orgLay{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; -width:500px; -border:3px solid #CCCCCC; - background-color:#FFFFFF; -padding:5px; + border:1px solid #CCCCCC; + color:#666666; + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-decoration:none; + font-weight:none; + 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; + margin:0px; + font-family:Arial, Helvetica, sans-serif; + font-weight:bold; + font-size:12px; + color:#000000; + text-decoration:underline; + text-align:left; } .groupli{ @@ -1497,225 +1642,91 @@ font-weight:normal; font-size:12px; text-decoration:none; -color:#333333; - list-style-type:none; - text-align:left; -} - -#DeleteLay{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; -width:300px; -border:3px solid #CCCCCC; - background-color:#FFFFFF; -padding:5px; + color:#333333; + list-style-type:none; + text-align:left; +} + +/* tree menu */ + +/*Oraganization Edit Features */ + +#orgLay{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + width:500px; + border:3px solid #CCCCCC; + background-color:#FFFFFF; + padding:5px; + display:none; + position:absolute; + left:100px; + top:100px; +} + +/* Role */ + +#roleLay{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + width:300px; + border:3px solid #CCCCCC; + background-color:#FFFFFF; + padding:5px; + display:none; + position:absolute; } .classBtn{ - font-family:Arial, Helvetica, sans-serif; + font-family:Verdana, Arial, Helvetica, sans-serif; text-decoration:none; font-weight:normal; - font-size:11px; - background-color:#999999; -border:1px solid #666666; - text-align:center; -} + font-size:10px; + 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; + padding-top:3px; + padding-bottom:3px; +} + +.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%; border:1px solid #666666; - font-family:Arial, Helvetica, sans-serif; - font-size:11px; -} - -/*cloud css*/ - -.statechange -{ - position:absolute; - visibility:hidden; - left:10px; - top:20px; - width:300px; - border:3px solid #CCCCCC; - background-color:#FFFFFF; -} - - -.cloudLft{ - background-image:url(images/cloud_left_bdr.gif); - background-position:left top; - background-repeat:repeat-y; -} - -.cloudRht{ - background-image:url(images/cloud_right_bdr.gif); - background-position:right top; - background-repeat:repeat-y; -} - -a.tagit{ - font-family:Verdana, Arial, Helvetica, sans-serif; - color:#000066; - text-decoration:none; -} - -a.tagit:hover{ - font-family:Verdana, Arial, Helvetica, sans-serif; - color:#FFFFFF; - text-decoration:none; - background-color:#000066; - opacity:.7; -} - -/*quickcreate css*/ - -.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:#ededed; - -} -/* PICK LIST */ -ul li{ - padding-bottom:2px; - padding-top:2px; -} + font-family:Arial, Helvetica, sans-serif; + font-size:11px; +} + +/* IMPORT LEADS */ + .leadTable{ border:3px solid #CCCCCC; border-collapse:collapse; } .leadTable tr td{ - border:0px solid #CCCCCC; -} - -/* RSS STYLES */ - -.subHdr{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; -color:#FFFFFF; - background-image:url(images/rssHeader.gif); - background-position:top left; - background-repeat:repeat-x; -height:27px; -padding:0px 10px 0px 10px; - vertical-align:middle; -} -.delBg{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; -color:#FFFFFF; - background-image:url(images/rssdelete.gif); - background-position:top left; - background-repeat:repeat-x; -height:27px; -padding:0px 10px 0px 10px; - vertical-align:middle; -} -#rssScroll{ - font-family:Arial, Helvetica, sans-serif ; - font-size:12px; - background-color:#FFFFFF; -width:100%; -height:150px; -overflow:auto; -border:0px solid #000000; -} - -.rssTable{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; -width:100%; -border:0px solid #000000; -} -.rssTable tr th{ - background-color:#F0F0F0; - text-align:left; - border-bottom:1px solid #E5E5E5; - border-top:1px solid #FFFFFF; -color:#000000; - font-weight:normal; - padding-left:5px; - padding-right:5px; -height:20px; -} - -.rssTable tr td{ - text-align:left; -border:0px solid #000000; - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - white-space:nowrap; -padding:5px; -height:20px; -} -.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; - font-size:12px; - color:#000000; - background-image:url(images/rssforward.gif); - background-position:top left; - background-repeat:repeat-x; - height:27px; - padding:0px 10px 0px 10px; - vertical-align:middle; - background-color:#D7D7D7; -} - - -/* IMPORT MODULE STYLE */ - -.leadTable{ - border:3px solid #CCCCCC; - border-collapse:collapse; -} - -.leadTable tr td{ - border:0px solid #CCCCCC; +/* border:0px solid #CCCCCC;*/ } .genHeaderGray{ @@ -1759,20 +1770,102 @@ .txtGreen{ color:green; +} + +/* PICK LIST */ +ul li{ + padding-bottom:2px; + padding-top:2px; +} +/* MY PREFERENCES */ + +#chPhoto{ + position:relative; + display:none; + top:20px; + width:100%; + border:1px dashed #666666; + background-color:#FFFFEC; +} + +/* CSS FOR REPORTS */ + +.reportHdr{ + background-color:#DDDDDD; + font-size:12px; + font-weight:bold; + vertical-align:middle; + text-align:left; + height:30px; + border-bottom:2px solid #959595; + color:#000000; + padding-left:10px; +} + +#reportLay{ + width:175px; + background-color:#CCCCCC; + border:1px solid #DDDDDD; + padding-top:5px; + position:absolute; + display:none; +} + +a.reportMnu{ + font-size:11px; + color:#0070BA; + text-decoration:none; + display:block; + width:155px; + height:20px; + border-bottom:1px solid #E1E1E1; + padding-left:20px; + padding-top:3px; +} + +a.reportMnu:Hover{ + font-size:11px; + color:#0070BA; + text-decoration:underline; + display:block; + width:155px; + height:20px; + 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; +} -} - -.txtRed{ - color:red; -} - +/* END OF REPORT */ /* WEB MAIL */ a.webMnu{ font-size:11px; color:#0070BA; text-decoration:underline; } -a.webMnu:Hover { +a.webMnu:Hover{ font-size:11px; color:#0070BA; text-decoration:underline; @@ -1808,6 +1901,27 @@ } /* END OF WEB MAIL */ +/* POPUP */ + +a.alpha{ + font-size:11px; + color:gray; + text-decoration:none; + padding-Left:5px; + padding-right:5px; + border:1px dotted #CCCCCC; + background-color:#FFFFCC; +} + +a.alpha:Hover{ + font-size:11px; + color:gray; + text-decoration:underline; + padding-Left:5px; + padding-right:5px; + border:1px dotted #CCCCCC; + background-color:#FFFFCC; +} /* Home Page */ .MatrixLayer{ @@ -1840,12 +1954,18 @@ border-left:2px solid #CCCCCC; border-bottom:2px solid #666666; border-right:2px solid #666666; - left:100px; - top:100px; - display:none; + right:300px; + bottom:100px; background-color:#CCCCCC; position:absolute; -} + z-index:1000001; + display:none; +} + +body > div#allMenu { + position: fixed; +} + .allMnuTable{ width:100%; @@ -1911,4 +2031,106 @@ } /* End Of All Menu */ - +/* Calendar */ +.calHdr{ + background-image:url(../images/cal_hdr.jpg); + background-repeat:repeat-x; + background-position:left top; + height:45px; +} + +.calSel{ + background-image:url(../images/cal_sel.jpg); + background-position:center; + background-repeat:no-repeat; + text-align:center; + color:#FFFFFF; + font-weight:bold; + width:8%; +} + +.calUnSel{ + color:#000000; + font-weight:normal; + text-align:center; + 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; +} + +a.calMnu{ + font-size:11px; + color:#0070BA; + text-decoration:none; + display:block; + height:20px; + padding-left:5px; + padding-top:3px; +} + +a.calMnu:Hover{ + font-size:11px; + color:#0070BA; + text-decoration:underline; + display:block; + height:20px; + padding-left:5px; + padding-top:3px; +} + +#hrView{ + display:block; +} + +#lstView{ + display:none; +} +/* End of Calendar */ + +/* Level 2 Menu Selected*/ + +level2Sel{ + color:#000000; + font-weight:bold; + text-decoration:underline; +} + +#DeleteLay{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + width:300px; + border:3px solid #CCCCCC; + background-color:#FFFFFF; + padding:5px; +} + + + + + + From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 19:19:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 23:19:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5523 - /vtigercrm/trunk/modules/Accounts/ListView.php Message-ID: <20060427231937.3841659B789@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 17:19:32 2006 New Revision: 5523 Log: Added the message to inform the user of the security check of each records in listview-Ahmed Modified: vtigercrm/trunk/modules/Accounts/ListView.php Modified: vtigercrm/trunk/modules/Accounts/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/ListView.php (original) +++ vtigercrm/trunk/modules/Accounts/ListView.php Thu Apr 27 17:19:32 2006 @@ -45,6 +45,15 @@ $smarty = new vtigerCRM_Smarty; $other_text = Array(); +if($_REQUEST['errormsg'] != '') +{ + $errormsg = $_REQUEST['errormsg']; + $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); +}else +{ + $smarty->assign("ERROR",""); +} + //<<<<<<< sort ordering >>>>>>>>>>>>> $sorder = $focus->getSortOrder(); $order_by = $focus->getOrderBy(); @@ -184,7 +193,7 @@ } if(isset($ids)) { - echo ""; + $smarty->assign("ALLIDS", implode($ids,";")); } if(isPermitted("Accounts","Merge") == 'yes') { From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 19:24:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 23:24:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5524 - /vtigercrm/trunk/modules/Activities/ListView.php Message-ID: <20060427232409.C467B59B789@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 17:24:05 2006 New Revision: 5524 Log: Enabled the Security check for each record in list view for all modules-Ahmed Modified: vtigercrm/trunk/modules/Activities/ListView.php Modified: vtigercrm/trunk/modules/Activities/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Activities/ListView.php (original) +++ vtigercrm/trunk/modules/Activities/ListView.php Thu Apr 27 17:24:05 2006 @@ -42,6 +42,14 @@ $smarty = new vtigerCRM_Smarty; $other_text = Array(); +if($_REQUEST['errormsg'] != '') +{ + $errormsg = $_REQUEST['errormsg']; + $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); +}else +{ + $smarty->assign("ERROR",""); +} //<<<<<<< sort ordering >>>>>>>>>>>>> $sorder = $focus->getSortOrder(); $order_by = $focus->getOrderBy(); From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 19:26:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 23:26:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5525 - /vtigercrm/trunk/modules/Campaigns/ListView.php Message-ID: <20060427232634.94BA259B789@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 17:26:30 2006 New Revision: 5525 Log: Enabled the Security check for each record in list view for all modules-Ahmed Modified: vtigercrm/trunk/modules/Campaigns/ListView.php Modified: vtigercrm/trunk/modules/Campaigns/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/ListView.php (original) +++ vtigercrm/trunk/modules/Campaigns/ListView.php Thu Apr 27 17:26:30 2006 @@ -30,6 +30,15 @@ $other_text = Array(); $url_string = ''; // assigning http url string +if($_REQUEST['errormsg'] != '') +{ + $errormsg = $_REQUEST['errormsg']; + $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); +}else +{ + $smarty->assign("ERROR",""); +} + //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>> if($_REQUEST['order_by'] != '') $order_by = $_REQUEST['order_by']; @@ -161,7 +170,7 @@ } if(isset($ids)) { - echo ""; + $smarty->assign("ALLIDS", implode($ids,";")); } $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows; From vtiger-tickets at vtiger.fosslabs.com Thu Apr 27 19:27:58 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 27 Apr 2006 23:27:58 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23469=3A_?= =?utf-8?q?group_details_screen_very_poor?= In-Reply-To: <076.b58f99a77ee3fadb31c013aa933cca61@vtiger.fosslabs.com> References: <076.b58f99a77ee3fadb31c013aa933cca61@vtiger.fosslabs.com> Message-ID: <085.c979ed39543750d8ea457fc59fced813@vtiger.fosslabs.com> #469: group details screen very poor ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 19:28:02 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 23:28:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5526 - /vtigercrm/trunk/modules/Contacts/ListView.php Message-ID: <20060427232802.81C8C59044D@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 17:27:58 2006 New Revision: 5526 Log: Enabled the Security check for each record in list view for all modules-Ahmed Modified: vtigercrm/trunk/modules/Contacts/ListView.php Modified: vtigercrm/trunk/modules/Contacts/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/ListView.php (original) +++ vtigercrm/trunk/modules/Contacts/ListView.php Thu Apr 27 17:27:58 2006 @@ -40,6 +40,14 @@ $smarty = new vtigerCRM_Smarty; $other_text = Array(); +if($_REQUEST['errormsg'] != '') +{ + $errormsg = $_REQUEST['errormsg']; + $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); +}else +{ + $smarty->assign("ERROR",""); +} //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>> $sorder = $focus->getSortOrder(); $order_by = $focus->getOrderBy(); @@ -191,7 +199,7 @@ } if(isset($ids)) { - echo ""; + $smarty->assign("ALLIDS", implode($ids,";")); } if(isPermitted("Contacts","Merge") == 'yes') { From vtiger-tickets at vtiger.fosslabs.com Thu Apr 27 19:28:18 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 27 Apr 2006 23:28:18 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23441=3A_?= =?utf-8?q?irregular_fonts_used?= In-Reply-To: <076.7683af9379201de7952667cc27b64a59@vtiger.fosslabs.com> References: <076.7683af9379201de7952667cc27b64a59@vtiger.fosslabs.com> Message-ID: <085.c3fb2ff866906ee4137b5484422aea1f@vtiger.fosslabs.com> #441: irregular fonts used ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: usability ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 27 19:28:43 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 27 Apr 2006 23:28:43 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23433=3A_?= =?utf-8?q?clicking_on_Back_button_takes_to_blank_page?= In-Reply-To: <076.0409a9546e861609b26d500f8cd9e4ca@vtiger.fosslabs.com> References: <076.0409a9546e861609b26d500f8cd9e4ca@vtiger.fosslabs.com> Message-ID: <085.52e324c0b10c7e89dec23d46ba181428@vtiger.fosslabs.com> #433: clicking on Back button takes to blank page ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: group ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 27 19:29:08 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 27 Apr 2006 23:29:08 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23432=3A_?= =?utf-8?q?haphazard_edit_buttons?= In-Reply-To: <076.b837b04c752eb07135fb9ca907770b50@vtiger.fosslabs.com> References: <076.b837b04c752eb07135fb9ca907770b50@vtiger.fosslabs.com> Message-ID: <085.18bdd298e8911f90b81bc3b26923b7b7@vtiger.fosslabs.com> #432: haphazard edit buttons ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: usability ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 19:30:05 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 23:30:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5527 - /vtigercrm/trunk/modules/Faq/ListView.php Message-ID: <20060427233005.0130959B789@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 17:30:01 2006 New Revision: 5527 Log: Enabled the Security check for each record in list view for all modules-Ahmed Modified: vtigercrm/trunk/modules/Faq/ListView.php Modified: vtigercrm/trunk/modules/Faq/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Faq/ListView.php (original) +++ vtigercrm/trunk/modules/Faq/ListView.php Thu Apr 27 17:30:01 2006 @@ -41,6 +41,15 @@ $focus = new Faq(); $other_text = Array(); + +if($_REQUEST['errormsg'] != '') +{ + $errormsg = $_REQUEST['errormsg']; + $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); +}else +{ + $smarty->assign("ERROR",""); +} $url_string = ''; //<<<>>>>>> $oCustomView = new CustomView("Faq"); From vtiger-tickets at vtiger.fosslabs.com Thu Apr 27 19:31:04 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 27 Apr 2006 23:31:04 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23425=3A_?= =?utf-8?q?field_privileges_and_utilies_can_have_the_same_screen?= In-Reply-To: <076.5763624f4d1838daec66c54496d626ff@vtiger.fosslabs.com> References: <076.5763624f4d1838daec66c54496d626ff@vtiger.fosslabs.com> Message-ID: <085.c2ae0352945fd1f128117ff54cc34ee0@vtiger.fosslabs.com> #425: field privileges and utilies can have the same screen ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: profile ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => invalid * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 19:31:44 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 23:31:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5528 - /vtigercrm/trunk/modules/HelpDesk/ListView.php Message-ID: <20060427233144.ED05B59B789@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 17:31:40 2006 New Revision: 5528 Log: Enabled the Security check for each record in list view for all modules-Ahmed Modified: vtigercrm/trunk/modules/HelpDesk/ListView.php Modified: vtigercrm/trunk/modules/HelpDesk/ListView.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/ListView.php (original) +++ vtigercrm/trunk/modules/HelpDesk/ListView.php Thu Apr 27 17:31:40 2006 @@ -32,6 +32,14 @@ $category = getParentTab(); $other_text = Array(); +if($_REQUEST['errormsg'] != '') +{ + $errormsg = $_REQUEST['errormsg']; + $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); +}else +{ + $smarty->assign("ERROR",""); +} $url_string = ''; // assigning http url string //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>> @@ -163,7 +171,7 @@ } if(isset($ids)) { - echo ""; + $smarty->assign("ALLIDS", implode($ids,";")); } if(isPermitted("HelpDesk","Merge") == 'yes') { From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 19:33:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 23:33:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5529 - /vtigercrm/trunk/modules/Invoice/ListView.php Message-ID: <20060427233330.DDD5659B789@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 17:33:26 2006 New Revision: 5529 Log: Enabled the Security check for each record in list view for all modules-Ahmed Modified: vtigercrm/trunk/modules/Invoice/ListView.php Modified: vtigercrm/trunk/modules/Invoice/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/ListView.php (original) +++ vtigercrm/trunk/modules/Invoice/ListView.php Thu Apr 27 17:33:26 2006 @@ -37,6 +37,14 @@ $smarty = new vtigerCRM_Smarty; $other_text = Array(); +if($_REQUEST['errormsg'] != '') +{ + $errormsg = $_REQUEST['errormsg']; + $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); +}else +{ + $smarty->assign("ERROR",""); +} //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>> if($_REQUEST['order_by'] != '') $order_by = $_REQUEST['order_by']; From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 19:35:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 23:35:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5530 - /vtigercrm/trunk/modules/Leads/ListView.php Message-ID: <20060427233506.C7F8759B789@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 17:35:01 2006 New Revision: 5530 Log: Enabled the Security check for each record in list view for all modules-Ahmed Modified: vtigercrm/trunk/modules/Leads/ListView.php Modified: vtigercrm/trunk/modules/Leads/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Leads/ListView.php (original) +++ vtigercrm/trunk/modules/Leads/ListView.php Thu Apr 27 17:35:01 2006 @@ -49,6 +49,15 @@ $focus = new Lead(); $smarty = new vtigerCRM_Smarty; $other_text=Array(); + +if($_REQUEST['errormsg'] != '') +{ + $errormsg = $_REQUEST['errormsg']; + $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); +}else +{ + $smarty->assign("ERROR",""); +} //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>> $sorder = $focus->getSortOrder(); $order_by = $focus->getOrderBy(); @@ -180,7 +189,7 @@ } if(isset($ids)) { - echo ""; + $smarty->assign("ALLIDS", implode($ids,";")); } if(isPermitted("Leads","Merge") == 'yes') { From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 19:37:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 23:37:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5531 - /vtigercrm/trunk/modules/Notes/ListView.php Message-ID: <20060427233713.3CC6259B789@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 17:37:08 2006 New Revision: 5531 Log: Enabled the Security check for each record in list view for all modules-Ahmed Modified: vtigercrm/trunk/modules/Notes/ListView.php Modified: vtigercrm/trunk/modules/Notes/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Notes/ListView.php (original) +++ vtigercrm/trunk/modules/Notes/ListView.php Thu Apr 27 17:37:08 2006 @@ -59,6 +59,14 @@ $smarty = new vtigerCRM_Smarty; $other_text = Array(); +if($_REQUEST['errormsg'] != '') +{ + $errormsg = $_REQUEST['errormsg']; + $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); +}else +{ + $smarty->assign("ERROR",""); +} //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>> if($_REQUEST['order_by'] != '') $order_by = $_REQUEST['order_by']; From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 19:38:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 23:38:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5532 - /vtigercrm/trunk/modules/Potentials/ListView.php Message-ID: <20060427233833.4E52567FE18@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 17:38:29 2006 New Revision: 5532 Log: Enabled the Security check for each record in list view for all modules-Ahmed Modified: vtigercrm/trunk/modules/Potentials/ListView.php Modified: vtigercrm/trunk/modules/Potentials/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/ListView.php (original) +++ vtigercrm/trunk/modules/Potentials/ListView.php Thu Apr 27 17:38:29 2006 @@ -39,6 +39,14 @@ $smarty = new vtigerCRM_Smarty(); $other_text = Array(); +if($_REQUEST['errormsg'] != '') +{ + $errormsg = $_REQUEST['errormsg']; + $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); +}else +{ + $smarty->assign("ERROR",""); +} //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>> if($_REQUEST['order_by'] != '') $order_by = $_REQUEST['order_by']; From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 19:39:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 23:39:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5533 - /vtigercrm/trunk/modules/PriceBooks/ListView.php Message-ID: <20060427233933.D395859AEFA@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 17:39:29 2006 New Revision: 5533 Log: Enabled the Security check for each record in list view for all modules-Ahmed Modified: vtigercrm/trunk/modules/PriceBooks/ListView.php Modified: vtigercrm/trunk/modules/PriceBooks/ListView.php ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/ListView.php (original) +++ vtigercrm/trunk/modules/PriceBooks/ListView.php Thu Apr 27 17:39:29 2006 @@ -33,6 +33,14 @@ $focus = new PriceBook(); $other_text=Array(); +if($_REQUEST['errormsg'] != '') +{ + $errormsg = $_REQUEST['errormsg']; + $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); +}else +{ + $smarty->assign("ERROR",""); +} if (!isset($where)) $where = ""; //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 19:40:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 23:40:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5534 - /vtigercrm/trunk/modules/Products/ListView.php Message-ID: <20060427234055.03F3567FE16@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 17:40:51 2006 New Revision: 5534 Log: Enabled the Security check for each record in list view for all modules-Ahmed Modified: vtigercrm/trunk/modules/Products/ListView.php Modified: vtigercrm/trunk/modules/Products/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Products/ListView.php (original) +++ vtigercrm/trunk/modules/Products/ListView.php Thu Apr 27 17:40:51 2006 @@ -36,6 +36,14 @@ $smarty->assign("CATEGORY",$category); $other_text = Array(); +if($_REQUEST['errormsg'] != '') +{ + $errormsg = $_REQUEST['errormsg']; + $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); +}else +{ + $smarty->assign("ERROR",""); +} $url_string = '&smodule=PRODUCTS'; // assigning http url string $focus = new Product(); From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 19:42:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 23:42:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5535 - /vtigercrm/trunk/modules/PurchaseOrder/ListView.php Message-ID: <20060427234211.11BAE67FE16@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 17:42:06 2006 New Revision: 5535 Log: Enabled the Security check for each record in list view for all modules-Ahmed Modified: vtigercrm/trunk/modules/PurchaseOrder/ListView.php Modified: vtigercrm/trunk/modules/PurchaseOrder/ListView.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/ListView.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/ListView.php Thu Apr 27 17:42:06 2006 @@ -36,6 +36,14 @@ $smarty = new vtigerCRM_Smarty; $other_text = Array(); +if($_REQUEST['errormsg'] != '') +{ + $errormsg = $_REQUEST['errormsg']; + $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); +}else +{ + $smarty->assign("ERROR",""); +} //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>> if($_REQUEST['order_by'] != '') $order_by = $_REQUEST['order_by']; From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 19:43:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 23:43:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5536 - /vtigercrm/trunk/modules/Quotes/ListView.php Message-ID: <20060427234312.6E3D367FE16@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 17:43:06 2006 New Revision: 5536 Log: Enabled the Security check for each record in list view for all modules-Ahmed Modified: vtigercrm/trunk/modules/Quotes/ListView.php Modified: vtigercrm/trunk/modules/Quotes/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/ListView.php (original) +++ vtigercrm/trunk/modules/Quotes/ListView.php Thu Apr 27 17:43:06 2006 @@ -37,6 +37,14 @@ $smarty = new vtigerCRM_Smarty; $other_text = Array(); +if($_REQUEST['errormsg'] != '') +{ + $errormsg = $_REQUEST['errormsg']; + $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); +}else +{ + $smarty->assign("ERROR",""); +} //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>> if($_REQUEST['order_by'] != '') $order_by = $_REQUEST['order_by']; From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 19:44:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 23:44:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5537 - /vtigercrm/trunk/modules/Vendors/ListView.php Message-ID: <20060427234409.40D9067FE16@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 17:44:04 2006 New Revision: 5537 Log: Enabled the Security check for each record in list view for all modules-Ahmed Modified: vtigercrm/trunk/modules/Vendors/ListView.php Modified: vtigercrm/trunk/modules/Vendors/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Vendors/ListView.php (original) +++ vtigercrm/trunk/modules/Vendors/ListView.php Thu Apr 27 17:44:04 2006 @@ -32,6 +32,14 @@ $focus = new Vendor(); $other_text = Array(); +if($_REQUEST['errormsg'] != '') +{ + $errormsg = $_REQUEST['errormsg']; + $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); +}else +{ + $smarty->assign("ERROR",""); +} if (!isset($where)) $where = ""; //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 19:45:19 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 27 Apr 2006 23:45:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5538 - /vtigercrm/trunk/modules/SalesOrder/ListView.php Message-ID: <20060427234519.857DF67FE16@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 17:45:15 2006 New Revision: 5538 Log: Enabled the Security check for each record in list view for all modules-Ahmed Modified: vtigercrm/trunk/modules/SalesOrder/ListView.php Modified: vtigercrm/trunk/modules/SalesOrder/ListView.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/ListView.php (original) +++ vtigercrm/trunk/modules/SalesOrder/ListView.php Thu Apr 27 17:45:15 2006 @@ -34,6 +34,14 @@ $other_text = Array(); $url_string = ''; // assigning http url string +if($_REQUEST['errormsg'] != '') +{ + $errormsg = $_REQUEST['errormsg']; + $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); +}else +{ + $smarty->assign("ERROR",""); +} //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>> if($_REQUEST['order_by'] != '') $order_by = $_REQUEST['order_by']; From vtiger-tickets at vtiger.fosslabs.com Thu Apr 27 20:13:47 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 00:13:47 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23750=3A_?= =?utf-8?q?Integrate_code_contributions?= In-Reply-To: <076.b16a74c382aa688de221822029b26245@vtiger.fosslabs.com> References: <076.b16a74c382aa688de221822029b26245@vtiger.fosslabs.com> Message-ID: <085.8b00418f2df65b3144cf3ed248043103@vtiger.fosslabs.com> #750: Integrate code contributions ------------------------+--------------------------------------------------- Reporter: allanbush | Owner: richie Type: defect | Status: new Priority: minor | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc3 Resolution: | Keywords: ------------------------+--------------------------------------------------- Comment (by allanbush): (In [5539]) Storing sorting in seesion variable from Fredy's contribution (http://forums.vtiger.com/viewtopic.php?t=4633). Refs #750. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 20:13:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 00:13:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5539 - in /vtigercrm/branches/4.2: include/ListView/ modules/Accounts/ modules/Activities/ modules/Contacts/ modules/Emails/ modules/Faq/ modules/HelpDesk/ modules/Invoice/ modules/Leads/ modules/Notes/ modules/Orders/ modules/Potentials/ modules/Products/ modules/Quotes/ Message-ID: <20060428001349.8D28E6949F0@vtiger.fosslabs.com> Author: allanbush Date: Thu Apr 27 18:13:39 2006 New Revision: 5539 Log: Storing sorting in seesion variable from Fredy's contribution (http://forums.vtiger.com/viewtopic.php?t=4633). Refs #750. Modified: vtigercrm/branches/4.2/include/ListView/ListView.php vtigercrm/branches/4.2/modules/Accounts/ListView.php vtigercrm/branches/4.2/modules/Activities/ListView.php vtigercrm/branches/4.2/modules/Contacts/ListView.php vtigercrm/branches/4.2/modules/Emails/ListView.php vtigercrm/branches/4.2/modules/Faq/ListView.php vtigercrm/branches/4.2/modules/HelpDesk/ListView.php vtigercrm/branches/4.2/modules/Invoice/ListView.php vtigercrm/branches/4.2/modules/Leads/ListView.php vtigercrm/branches/4.2/modules/Notes/ListView.php vtigercrm/branches/4.2/modules/Orders/ListView.php vtigercrm/branches/4.2/modules/Orders/SalesOrderListView.php vtigercrm/branches/4.2/modules/Potentials/ListView.php vtigercrm/branches/4.2/modules/Products/ListView.php vtigercrm/branches/4.2/modules/Products/PriceBookListView.php vtigercrm/branches/4.2/modules/Products/VendorListView.php vtigercrm/branches/4.2/modules/Quotes/ListView.php Modified: vtigercrm/branches/4.2/include/ListView/ListView.php ============================================================================== --- vtigercrm/branches/4.2/include/ListView/ListView.php (original) +++ vtigercrm/branches/4.2/include/ListView/ListView.php Thu Apr 27 18:13:39 2006 @@ -578,5 +578,40 @@ } +// as far as I can tell this isn't used anymore, however it is included in listview.php file of every module so I'm going to take advantage of it to put common functionallity in here + +global $currentModule; + +// ugly, because our module handling sucks +$currentModule_name = $currentModule; +$sub_module = (isset($_REQUEST['smodule'])) ? $_REQUEST['smodule'] : ""; +switch($sub_module) { + case 'SO': + $currentModule_name = 'SalesOrder'; + break; + case 'VENDOR': + $currentModule_name = 'Vendor'; + break; + case 'PRICEBOOK': + $currentModule_name = 'PriceBook'; + break; +} + +session_start(); +if (isset($_REQUEST['order_by'])) { + $order_by = $_REQUEST['order_by']; + $_SESSION["ListViewOrder[$currentModule_name][0]"] = $order_by; +} elseif ($_SESSION["ListViewOrder[$currentModule_name][0]"] != '') { + $order_by = $_SESSION["ListViewOrder[$currentModule_name][0]"]; +} + +$sorder = 'ASC'; +if(isset($_REQUEST['sorder']) && $_REQUEST['sorder'] != '') { + $sorder = $_REQUEST['sorder']; + $_SESSION["ListViewOrder[$currentModule_name][1]"] = $sorder; +} elseif ($_SESSION["ListViewOrder[$currentModule_name][1]"] != '') { + $sorder = $_SESSION["ListViewOrder[$currentModule_name][1]"]; +} + ?> Modified: vtigercrm/branches/4.2/modules/Accounts/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Accounts/ListView.php (original) +++ vtigercrm/branches/4.2/modules/Accounts/ListView.php Thu Apr 27 18:13:39 2006 @@ -47,12 +47,7 @@ if (!isset($where)) $where = ""; -if (isset($_REQUEST['order_by'])) $order_by = $_REQUEST['order_by']; - $url_string = ''; -$sorder = 'ASC'; -if(isset($_REQUEST['sorder']) && $_REQUEST['sorder'] != '') -$sorder = $_REQUEST['sorder']; if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { Modified: vtigercrm/branches/4.2/modules/Activities/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Activities/ListView.php (original) +++ vtigercrm/branches/4.2/modules/Activities/ListView.php Thu Apr 27 18:13:39 2006 @@ -25,6 +25,7 @@ require_once('modules/Activities/Activity.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); +require_once('include/ListView/ListView.php'); require_once('include/uifromdbutil.php'); require_once('modules/CustomView/CustomView.php'); @@ -98,12 +99,7 @@ $focus = new Activity(); -if (isset($_REQUEST['order_by'])) $order_by = $_REQUEST['order_by']; - $url_string = ''; // assigning http url string -$sorder = 'ASC'; // Default sort order -if(isset($_REQUEST['sorder']) && $_REQUEST['sorder'] != '') -$sorder = $_REQUEST['sorder']; if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { Modified: vtigercrm/branches/4.2/modules/Contacts/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Contacts/ListView.php (original) +++ vtigercrm/branches/4.2/modules/Contacts/ListView.php Thu Apr 27 18:13:39 2006 @@ -26,6 +26,7 @@ require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ComboUtil.php'); +require_once('include/ListView/ListView.php'); require_once('include/uifromdbutil.php'); require_once('modules/CustomView/CustomView.php'); @@ -47,12 +48,7 @@ if (!isset($where)) $where = ""; -if (isset($_REQUEST['order_by'])) $order_by = $_REQUEST['order_by']; - $url_string = ''; // assigning http url string -$sorder = 'ASC'; // Default sort order -if(isset($_REQUEST['sorder']) && $_REQUEST['sorder'] != '') -$sorder = $_REQUEST['sorder']; $focus = new Contact(); Modified: vtigercrm/branches/4.2/modules/Emails/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Emails/ListView.php (original) +++ vtigercrm/branches/4.2/modules/Emails/ListView.php Thu Apr 27 18:13:39 2006 @@ -25,6 +25,7 @@ require_once('modules/Emails/Email.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); +require_once('include/ListView/ListView.php'); require_once('include/uifromdbutil.php'); require_once('modules/CustomView/CustomView.php'); Modified: vtigercrm/branches/4.2/modules/Faq/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Faq/ListView.php (original) +++ vtigercrm/branches/4.2/modules/Faq/ListView.php Thu Apr 27 18:13:39 2006 @@ -21,6 +21,7 @@ require_once('modules/Faq/Faq.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/uifromdbutil.php'); +require_once('include/ListView/ListView.php'); global $app_strings; global $mod_strings; @@ -33,12 +34,7 @@ $focus = new Faq(); -if (isset($_REQUEST['order_by'])) $order_by = $_REQUEST['order_by']; - $url_string = ''; // assigning http url string -$sorder = 'ASC'; // Default sort order -if(isset($_REQUEST['sorder']) && $_REQUEST['sorder'] != '') -$sorder = $_REQUEST['sorder']; //Constructing the Search Form if (!isset($_REQUEST['search_form']) || $_REQUEST['search_form'] != 'false') { Modified: vtigercrm/branches/4.2/modules/HelpDesk/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/HelpDesk/ListView.php (original) +++ vtigercrm/branches/4.2/modules/HelpDesk/ListView.php Thu Apr 27 18:13:39 2006 @@ -19,6 +19,7 @@ require_once('XTemplate/xtpl.php'); require_once("data/Tracker.php"); require_once('include/logging.php'); +require_once('include/ListView/ListView.php'); require_once('include/ComboUtil.php'); require_once('include/utils.php'); require_once('modules/HelpDesk/HelpDeskUtil.php'); @@ -44,12 +45,7 @@ $focus = new HelpDesk(); -if (isset($_REQUEST['order_by'])) $order_by = $_REQUEST['order_by']; - $url_string = ''; // assigning http url string -$sorder = 'ASC'; // Default sort order -if(isset($_REQUEST['sorder']) && $_REQUEST['sorder'] != '') -$sorder = $_REQUEST['sorder']; if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { Modified: vtigercrm/branches/4.2/modules/Invoice/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Invoice/ListView.php (original) +++ vtigercrm/branches/4.2/modules/Invoice/ListView.php Thu Apr 27 18:13:39 2006 @@ -47,12 +47,7 @@ if (!isset($where)) $where = ""; -if (isset($_REQUEST['order_by'])) $order_by = $_REQUEST['order_by']; - $url_string = ''; -$sorder = 'ASC'; -if(isset($_REQUEST['sorder']) && $_REQUEST['sorder'] != '') -$sorder = $_REQUEST['sorder']; if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { Modified: vtigercrm/branches/4.2/modules/Leads/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Leads/ListView.php (original) +++ vtigercrm/branches/4.2/modules/Leads/ListView.php Thu Apr 27 18:13:39 2006 @@ -49,12 +49,7 @@ if (!isset($where)) $where = ""; -if (isset($_REQUEST['order_by'])) $order_by = $_REQUEST['order_by']; - $url_string = ''; // assigning http url string -$sorder = 'ASC'; // Default sort order -if(isset($_REQUEST['sorder']) && $_REQUEST['sorder'] != '') -$sorder = $_REQUEST['sorder']; if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { Modified: vtigercrm/branches/4.2/modules/Notes/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Notes/ListView.php (original) +++ vtigercrm/branches/4.2/modules/Notes/ListView.php Thu Apr 27 18:13:39 2006 @@ -93,12 +93,7 @@ if (!isset($where)) $where = ""; -if (isset($_REQUEST['order_by'])) $order_by = $_REQUEST['order_by']; - $url_string = ''; // assigning http url string -$sorder = 'ASC'; // Default sort order -if(isset($_REQUEST['sorder']) && $_REQUEST['sorder'] != '') -$sorder = $_REQUEST['sorder']; if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { Modified: vtigercrm/branches/4.2/modules/Orders/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Orders/ListView.php (original) +++ vtigercrm/branches/4.2/modules/Orders/ListView.php Thu Apr 27 18:13:39 2006 @@ -47,12 +47,7 @@ if (!isset($where)) $where = ""; -if (isset($_REQUEST['order_by'])) $order_by = $_REQUEST['order_by']; - $url_string = '&smodule=PO'; -$sorder = 'ASC'; -if(isset($_REQUEST['sorder']) && $_REQUEST['sorder'] != '') -$sorder = $_REQUEST['sorder']; if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { Modified: vtigercrm/branches/4.2/modules/Orders/SalesOrderListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Orders/SalesOrderListView.php (original) +++ vtigercrm/branches/4.2/modules/Orders/SalesOrderListView.php Thu Apr 27 18:13:39 2006 @@ -13,6 +13,7 @@ require_once('modules/Orders/SalesOrder.php'); require_once('include/utils.php'); require_once('include/uifromdbutil.php'); +require_once('include/ListView/ListView.php'); require_once('modules/CustomView/CustomView.php'); global $app_strings; @@ -44,12 +45,7 @@ */ $focus = new SalesOrder(); -if (isset($_REQUEST['order_by'])) $order_by = $_REQUEST['order_by']; - $url_string = '&smodule=SO'; // assigning http url string -$sorder = 'ASC'; // Default sort order -if(isset($_REQUEST['sorder']) && $_REQUEST['sorder'] != '') -$sorder = $_REQUEST['sorder']; if(isset($_REQUEST['query']) && $_REQUEST['query'] != '' && $_REQUEST['query'] == 'true') { Modified: vtigercrm/branches/4.2/modules/Potentials/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Potentials/ListView.php (original) +++ vtigercrm/branches/4.2/modules/Potentials/ListView.php Thu Apr 27 18:13:39 2006 @@ -47,12 +47,7 @@ $focus = new Potential(); -if (isset($_REQUEST['order_by'])) $order_by = $_REQUEST['order_by']; - $url_string = ''; // assigning http url string -$sorder = 'ASC'; // Default sort order -if(isset($_REQUEST['sorder']) && $_REQUEST['sorder'] != '') -$sorder = $_REQUEST['sorder']; if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { Modified: vtigercrm/branches/4.2/modules/Products/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Products/ListView.php (original) +++ vtigercrm/branches/4.2/modules/Products/ListView.php Thu Apr 27 18:13:39 2006 @@ -14,6 +14,7 @@ require_once('include/utils.php'); require_once('include/ComboUtil.php'); require_once('include/uifromdbutil.php'); +require_once('include/ListView/ListView.php'); require_once('modules/CustomView/CustomView.php'); global $app_strings; @@ -44,12 +45,7 @@ $focus = new Product(); -if (isset($_REQUEST['order_by'])) $order_by = $_REQUEST['order_by']; - $url_string = '&smodule=PRODUCTS'; // assigning http url string -$sorder = 'ASC'; // Default sort order -if(isset($_REQUEST['sorder']) && $_REQUEST['sorder'] != '') -$sorder = $_REQUEST['sorder']; if(isset($_REQUEST['query']) && $_REQUEST['query'] != '' && $_REQUEST['query'] == 'true') { Modified: vtigercrm/branches/4.2/modules/Products/PriceBookListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Products/PriceBookListView.php (original) +++ vtigercrm/branches/4.2/modules/Products/PriceBookListView.php Thu Apr 27 18:13:39 2006 @@ -13,6 +13,7 @@ require_once('modules/Products/PriceBook.php'); require_once('include/utils.php'); require_once('include/uifromdbutil.php'); +require_once('include/ListView/ListView.php'); require_once('modules/CustomView/CustomView.php'); global $app_strings; @@ -46,12 +47,7 @@ if (!isset($where)) $where = ""; -if (isset($_REQUEST['order_by'])) $order_by = $_REQUEST['order_by']; - $url_string = '&smodule=PRICEBOOK'; // assigning http url string -$sorder = 'ASC'; // Default sort order -if(isset($_REQUEST['sorder']) && $_REQUEST['sorder'] != '') -$sorder = $_REQUEST['sorder']; if(isset($_REQUEST['query']) && $_REQUEST['query'] != '' && $_REQUEST['query'] == 'true') { Modified: vtigercrm/branches/4.2/modules/Products/VendorListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Products/VendorListView.php (original) +++ vtigercrm/branches/4.2/modules/Products/VendorListView.php Thu Apr 27 18:13:39 2006 @@ -13,6 +13,7 @@ require_once('modules/Products/Vendor.php'); require_once('include/utils.php'); require_once('include/uifromdbutil.php'); +require_once('include/ListView/ListView.php'); require_once('modules/CustomView/CustomView.php'); global $app_strings; @@ -46,12 +47,7 @@ if (!isset($where)) $where = ""; -if (isset($_REQUEST['order_by'])) $order_by = $_REQUEST['order_by']; - $url_string = '&smodule=VENDOR'; // assigning http url string -$sorder = 'ASC'; // Default sort order -if(isset($_REQUEST['sorder']) && $_REQUEST['sorder'] != '') -$sorder = $_REQUEST['sorder']; if(isset($_REQUEST['query']) && $_REQUEST['query'] != '' && $_REQUEST['query'] == 'true') { Modified: vtigercrm/branches/4.2/modules/Quotes/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Quotes/ListView.php (original) +++ vtigercrm/branches/4.2/modules/Quotes/ListView.php Thu Apr 27 18:13:39 2006 @@ -46,12 +46,7 @@ if (!isset($where)) $where = ""; -if (isset($_REQUEST['order_by'])) $order_by = $_REQUEST['order_by']; - $url_string = ''; -$sorder = 'ASC'; -if(isset($_REQUEST['sorder']) && $_REQUEST['sorder'] != '') -$sorder = $_REQUEST['sorder']; if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { From vtiger-tickets at vtiger.fosslabs.com Thu Apr 27 22:43:29 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 02:43:29 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23711=3A_?= =?utf-8?q?Campaign_Creation_-_Accepts_=27None=27_for_manditory?= In-Reply-To: <076.218e270d39da0f8cbb22282a81567967@vtiger.fosslabs.com> References: <076.218e270d39da0f8cbb22282a81567967@vtiger.fosslabs.com> Message-ID: <085.765d5822b634960934eb78748cb1f7dd@vtiger.fosslabs.com> #711: Campaign Creation - Accepts 'None' for manditory ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mangai Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Campaigns Create ------------------------+--------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Apr 27 22:48:39 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 02:48:39 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23711=3A_?= =?utf-8?q?Campaign_Creation_-_Accepts_=27None=27_for_manditory?= In-Reply-To: <076.218e270d39da0f8cbb22282a81567967@vtiger.fosslabs.com> References: <076.218e270d39da0f8cbb22282a81567967@vtiger.fosslabs.com> Message-ID: <085.b38e039390755a412052ee7dd4e9e18c@vtiger.fosslabs.com> #711: Campaign Creation - Accepts 'None' for manditory ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mangai Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Campaigns Create ------------------------+--------------------------------------------------- Changes (by mangai): * resolution: => fixed * milestone: => 5.0.0 * status: new => closed Comment: This has been fixed and it will be available in our next release. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 23:00:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 03:00:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5540 - /vtigercrm/trunk/include/clock/Clock.php Message-ID: <20060428030052.736236AB213@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 21:00:47 2006 New Revision: 5540 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/include/clock/Clock.php Modified: vtigercrm/trunk/include/clock/Clock.php ============================================================================== --- vtigercrm/trunk/include/clock/Clock.php (original) +++ vtigercrm/trunk/include/clock/Clock.php Thu Apr 27 21:00:47 2006 @@ -10,6 +10,8 @@ ********************************************************************************/ function get_world_clock($image_path) { +global $log; +log->debug("Entering get_world_clock(".$image_path.") method ..."); $the_clock = << @@ -453,7 +455,7 @@ EOQ; - +$log->debug("Exiting get_world_clock method ..."); return $the_clock; } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 23:02:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 03:02:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5541 - /vtigercrm/trunk/include/calculator/Calc.php Message-ID: <20060428030215.6F1366AB213@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 21:02:11 2006 New Revision: 5541 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/include/calculator/Calc.php Modified: vtigercrm/trunk/include/calculator/Calc.php ============================================================================== --- vtigercrm/trunk/include/calculator/Calc.php (original) +++ vtigercrm/trunk/include/calculator/Calc.php Thu Apr 27 21:02:11 2006 @@ -10,6 +10,8 @@ ********************************************************************************/ function get_calc($image_path) { +global $log; +$log->debug("Entering get_calc(".$image_path.") method ..."); $the_calc = << @@ -81,7 +83,7 @@ EOQ; - +$log->debug("Exiting get_calc method ..."); return $the_calc; } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 23:04:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 03:04:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5542 - /vtigercrm/trunk/include/ComboUtil.php Message-ID: <20060428030452.BA0136AB213@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 21:04:48 2006 New Revision: 5542 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/include/ComboUtil.php Modified: vtigercrm/trunk/include/ComboUtil.php ============================================================================== --- vtigercrm/trunk/include/ComboUtil.php (original) +++ vtigercrm/trunk/include/ComboUtil.php Thu Apr 27 21:04:48 2006 @@ -12,6 +12,8 @@ require_once('include/database/PearDatabase.php'); function getComboArray($combofieldNames) { + global $log; + $log->debug("Entering getComboArray(".$combofieldNames.") method ..."); global $adb; $comboFieldArray = Array(); foreach ($combofieldNames as $tableName => $arrayName) @@ -26,6 +28,7 @@ } $comboFieldArray[$fldArrName] = $arrayName; } + $log->debug("Exiting getComboArray method ..."); return $comboFieldArray; } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 23:26:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 03:26:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5543 - /vtigercrm/trunk/include/CustomFieldUtil.php Message-ID: <20060428032640.20D306AB50B@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 21:26:36 2006 New Revision: 5543 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/include/CustomFieldUtil.php Modified: vtigercrm/trunk/include/CustomFieldUtil.php ============================================================================== --- vtigercrm/trunk/include/CustomFieldUtil.php (original) +++ vtigercrm/trunk/include/CustomFieldUtil.php Thu Apr 27 21:26:36 2006 @@ -20,6 +20,8 @@ function getCustomFieldTypeName($uitype) { global $log; + $log->debug("Entering getCustomFieldTypeName(".$uitype.") method ..."); + global $log; $log->info("uitype is ".$uitype); $fldname = ''; @@ -75,6 +77,7 @@ { $fldname = 'Multi-Select Combo Box'; } +$log->debug("Exiting getCustomFieldTypeName method ..."); return $fldname; } @@ -85,6 +88,8 @@ */ function getCustomFieldArray($module) { + global $log; + $log->debug("Entering getCustomFieldArray(".$module.") method ..."); global $adb; $custquery = "select * from field where tablename='".$module."'"; $custresult = $adb->query($custquery); @@ -95,6 +100,7 @@ $colName=$adb->query_result($custresult,$i,"column_name"); $custFldArray[$colName] = $i; } + $log->debug("Exiting getCustomFieldArray method ..."); return $custFldArray; } @@ -107,6 +113,8 @@ */ function getCustomFieldTrans($module, $trans_array) { + global $log; + $log->debug("Entering getCustomFieldTrans(".$module.",". $trans_array.") method ..."); global $adb; $tab_id = getTabid($module); $custquery = "select columnname,fieldlabel from field where generatedtype=2 and tabid=".$tab_id; @@ -119,6 +127,7 @@ $fldLbl = $adb->query_result($custresult,$i,"fieldlabel"); $trans_array[$colName] = $fldLbl; } + $log->debug("Exiting getCustomFieldTrans method ..."); } @@ -131,10 +140,13 @@ */ function getCustomFieldData($tab,$id,$datatype) { + global $log; + $log->debug("Entering getCustomFieldData(".$tab.",".$id.",".$datatype.") method ..."); global $adb; $query = "select * from field where tabid=".$tab." and fieldid=".$id; $result = $adb->query($query); $return_data=$adb->fetch_array($result); + $log->debug("Exiting getCustomFieldData method ..."); return $return_data[$datatype]; } @@ -148,6 +160,8 @@ */ function getFldTypeandLengthValue($label,$typeofdata) { + global $log; + $log->debug("Entering getFldTypeandLengthValue(".$label.",".$typeofdata.") method ..."); if($label == 'Text') { $types = explode("~",$typeofdata); @@ -206,6 +220,7 @@ { $fieldtype = '11'; } + $log->debug("Exiting getFldTypeandLengthValue method ..."); return $fieldtype; } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 23:27:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 03:27:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5544 - /vtigercrm/trunk/include/file.php Message-ID: <20060428032743.D48336AB213@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 21:27:39 2006 New Revision: 5544 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/include/file.php Modified: vtigercrm/trunk/include/file.php ============================================================================== --- vtigercrm/trunk/include/file.php (original) +++ vtigercrm/trunk/include/file.php Thu Apr 27 21:27:39 2006 @@ -32,6 +32,8 @@ class File { function File ($id='',$name='',$module='Notes') { + global $log; + $log->debug("Entering File (".$id.",".$name.",".$module.") method ..."); $this->id = $id; $this->name = $name; $this->module = $module; @@ -42,6 +44,7 @@ * All Rights Reserved. * Contributor(s): SugarCRM Inc. */ $this->folder = '/'.UPLOAD_FOLDER; + $log->debug("Exiting File method ..."); /** END CONTRIBUTION */ } @@ -50,6 +53,8 @@ */ function Upload ($fieldname) { + global $log; + $log->debug("Entering Upload (".$fieldname.") method ..."); global $root_directory; /** BEGIN CONTRIBUTION * Date: 09/08/04 @@ -59,6 +64,7 @@ global $upload_badext; /** END CONTRIBUTION */ if (!isset ($_FILES[$fieldname]) || empty ($_FILES[$fieldname]['tmp_name'])) { + $log->debug("Exiting Upload method ..."); return true; // uploading an empty file can't fail... } $this->name = $_FILES[$fieldname]['name']; @@ -81,7 +87,10 @@ if (!is_dir($this->folder)) { if (mkdir($root_directory.$this->folder, 0755)) + { + $log->debug("Exiting Upload method ..."); return move_uploaded_file($_FILES[$fieldname]['tmp_name'], $dest); + } else { // how to handle such error ? @@ -89,24 +98,32 @@ } } } + $log->debug("Exiting Upload method ..."); return true; } function SetID ($id) { + global $log; + $log->debug("Entering SetID (".$id.") method ..."); global $root_directory; if (empty ($this->name)) + { $log->debug("Exiting SetID method ..."); return; + } if (empty ($id)) die ("id empty"); $this->id = $id; $path = $root_directory.$this->folder; rename ($path.$this->name,$path.$id.$this->name); + $log->debug("Exiting SetID method ..."); } function URL () { + global $log; + $log->debug("Entering URL () method ..."); /** VTIGER CRM CONTRIBUTION BEGINS */ $web_root = $_SERVER['SERVER_NAME']. ":" .$_SERVER['SERVER_PORT']; @@ -116,6 +133,7 @@ */ //global $site_URL; + $log->debug("Exiting URL method ..."); return $web_root.$this->folder.$this->id.rawurlencode($this->name); } @@ -126,7 +144,10 @@ * Contributor(s): SugarCRM Inc. */ function Delete ($old_file) { + global $log; + $log->debug("Entering Delete (".$old_file.") method ..."); global $root_directory, $upload_dir; + $log->debug("Exiting Delete method ..."); return unlink($root_directory . "/" . $upload_dir . $old_file); } /* END CONTRIBUTION */ From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 23:28:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 03:28:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5545 - /vtigercrm/trunk/include/formbase.php Message-ID: <20060428032822.68DFE6AB50B@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 21:28:18 2006 New Revision: 5545 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/include/formbase.php Modified: vtigercrm/trunk/include/formbase.php ============================================================================== --- vtigercrm/trunk/include/formbase.php (original) +++ vtigercrm/trunk/include/formbase.php Thu Apr 27 21:28:18 2006 @@ -22,14 +22,20 @@ function checkRequired($prefix, $required){ + global $log; + $log->debug("Entering checkRequired(".$prefix.",". $required.") method ..."); foreach($required as $key){ if(!isset($_POST[$prefix.$key]) ||empty($_POST[$prefix.$key])){ + $log->debug("Exiting checkRequired method ..."); return false; } } + $log->debug("Exiting checkRequired method ..."); return true; } function populateFromPost($prefix, $focus){ + global $log; + $log->debug("Entering populateFromPost(".$prefix.",". $focus.") method ..."); $focus->retrieve($_POST[$prefix.'record']); foreach($focus->column_fields as $field) { @@ -46,27 +52,33 @@ $focus->$field = $value; } } + $log->debug("Exiting populateFromPost method ..."); return $focus; } function getPostToForm(){ + global $log; + $log->debug("Entering getPostToForm() method ..."); $fields = ''; foreach ($_POST as $key=>$value){ $fields.= ""; } + $log->debug("Exiting getPostToForm method ..."); return $fields; } function handleRedirect($return_id, $return_module){ + global $log; + $log->debug("Entering handleRedirect(".$return_id.",". $return_module.") method ..."); if(isset($_POST['return_module']) && $_POST['return_module'] != "") $return_module = $_POST['return_module']; else $return_module = $return_module; if(isset($_POST['return_action']) && $_POST['return_action'] != "") $return_action = $_POST['return_action']; else $return_action = "DetailView"; if(isset($_POST['return_id']) && $_POST['return_id'] != "") $return_id = $_POST['return_id']; + $log->debug("Exiting handleRedirect method ..."); header("Location: index.php?action=$return_action&module=$return_module&record=$return_id"); } -?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 23:29:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 03:29:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5546 - /vtigercrm/trunk/include/FormValidationUtil.php Message-ID: <20060428032913.3AE7F6AB50B@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 21:29:09 2006 New Revision: 5546 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/include/FormValidationUtil.php Modified: vtigercrm/trunk/include/FormValidationUtil.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 23:36:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 03:36:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5547 - /vtigercrm/trunk/include/db_backup/backup.php Message-ID: <20060428033613.C4F2D6AB577@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 21:36:10 2006 New Revision: 5547 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/include/db_backup/backup.php Modified: vtigercrm/trunk/include/db_backup/backup.php ============================================================================== --- vtigercrm/trunk/include/db_backup/backup.php (original) +++ vtigercrm/trunk/include/db_backup/backup.php Thu Apr 27 21:36:10 2006 @@ -18,6 +18,8 @@ function get_structure() { + global $log; + $log->debug("Entering get_structure() method ..."); mysql_connect(dbserver, dbuser, dbpass); mysql_select_db(dbname); $tables = mysql_list_tables(dbname); @@ -47,16 +49,20 @@ } } } + $log->debug("Exiting get_structure method ..."); return $SQL; } function save_structure($filename, $root_directory) { + global $log; + $log->debug("Entering save_structure(".$filename.",".$root_directory.") method ..."); $sql = get_structure(); $sql = implode("\r", $sql); $handle = fopen($root_directory.'/'.$filename,"wb") ; fwrite($handle,$sql,9999999999); fclose($handle); + $log->debug("Exiting save_structure method ..."); } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 23:36:54 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 03:36:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5548 - /vtigercrm/trunk/include/db_backup/ftp.php Message-ID: <20060428033655.0D4C06AB587@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 21:36:51 2006 New Revision: 5548 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/include/db_backup/ftp.php Modified: vtigercrm/trunk/include/db_backup/ftp.php ============================================================================== --- vtigercrm/trunk/include/db_backup/ftp.php (original) +++ vtigercrm/trunk/include/db_backup/ftp.php Thu Apr 27 21:36:51 2006 @@ -11,11 +11,13 @@ function ftpBackupFile($source_file, $ftpserver, $ftpuser, $ftppassword) { - + global $log; + $log->debug("Entering ftpBackupFile(".$source_file.", ".$ftpserver.", ".$ftpuser.", ".$ftppassword.") method ..."); // set up basic connection $conn_id = @ftp_connect($ftpserver); if(!$conn_id) { + $log->debug("Exiting ftpBackupFile method ..."); return; } @@ -27,6 +29,7 @@ if(!$login_result) { ftp_close($conn_id); + $log->debug("Exiting ftpBackupFile method ..."); return; } @@ -47,6 +50,7 @@ // check upload status if (!$upload) { ftp_close($conn_id); + $log->debug("Exiting ftpBackupFile method ..."); return; } /* @@ -56,5 +60,6 @@ // close the FTP stream ftp_close($conn_id); + $log->debug("Exiting ftpBackupFile method ..."); } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 23:40:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 03:40:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5549 - /vtigercrm/trunk/include/PopulateComboValues.php Message-ID: <20060428034056.5E37F6AB59A@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 21:40:52 2006 New Revision: 5549 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/include/PopulateComboValues.php Modified: vtigercrm/trunk/include/PopulateComboValues.php ============================================================================== --- vtigercrm/trunk/include/PopulateComboValues.php (original) +++ vtigercrm/trunk/include/PopulateComboValues.php Thu Apr 27 21:40:52 2006 @@ -20,6 +20,8 @@ function insertComboValues($values, $tableName) { + global $log; + $log->debug("Entering insertComboValues(".$values.", ".$tableName.") method ..."); global $adb; $i=0; foreach ($values as $val => $cal) @@ -34,10 +36,14 @@ } $i++; } + $log->debug("Exiting insertComboValues method ..."); } function create_tables () { + global $log; + $log->debug("Entering create_tables () method ..."); + global $app_list_strings,$adb; global $combo_strings; $comboTables = Array('leadsource','accounttype','industry','leadstatus','rating','licencekeystatus','opportunity_type','salutationtype','sales_stage','ticketstatus','ticketpriorities','ticketseverities','ticketcategories','duration_minutes','eventstatus','taskstatus','taskpriority','manufacturer','productcategory','activitytype','currency','faqcategories','rsscategory','usageunit','glacct','quotestage','carrier','taxclass','recurringtype','faqstatus','invoicestatus','postatus','sostatus','visibility','campaigntype','campaignstatus','expectedresponse'); @@ -46,6 +52,7 @@ { $this->insertComboValues($combo_strings[$comTab."_dom"],$comTab); } + $log->debug("Exiting create_tables () method ..."); } } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 27 23:43:02 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 03:43:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5550 - /vtigercrm/trunk/include/PopulateCustomFieldTables.php Message-ID: <20060428034302.C66686AB59A@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 21:42:59 2006 New Revision: 5550 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/include/PopulateCustomFieldTables.php Modified: vtigercrm/trunk/include/PopulateCustomFieldTables.php ============================================================================== --- vtigercrm/trunk/include/PopulateCustomFieldTables.php (original) +++ vtigercrm/trunk/include/PopulateCustomFieldTables.php Thu Apr 27 21:42:59 2006 @@ -10,6 +10,9 @@ require_once('include/database/PearDatabase.php'); function create_custom_field_tables () { + global $log; + $log->debug("Entering create_custom_field_tables () method ..."); global $adb; + $log->debug("Exiting create_custom_field_tables method ..."); } ?> From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 28 00:03:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 04:03:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5551 - /vtigercrm/trunk/include/upload_file.php Message-ID: <20060428040333.279176AB61C@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 22:03:29 2006 New Revision: 5551 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/include/upload_file.php Modified: vtigercrm/trunk/include/upload_file.php ============================================================================== --- vtigercrm/trunk/include/upload_file.php (original) +++ vtigercrm/trunk/include/upload_file.php Thu Apr 27 22:03:29 2006 @@ -28,30 +28,41 @@ function UploadFile ($field_name) { + global $log; + $log->debug("Entering UploadFile (".$field_name.") method ..."); $this->field_name = $field_name; + $log->debug("Exiting UploadFile method ..."); } function get_url($stored_file_name,$bean_id) { + global $log; + $log->debug("Entering get_url(".$stored_file_name.",".$bean_id.") method ..."); global $site_URL; global $upload_dir; //echo $site_URL.'/'.$upload_dir.$bean_id.$stored_file_name; //echo $_ENV['HOSTNAME'] .':' .$_SERVER["SERVER_PORT"].'/'.$upload_dir.$bean_id.$stored_file_name; + $log->debug("Exiting get_url method ..."); return 'http://'.$_ENV['HOSTNAME'] .':' .$_SERVER["SERVER_PORT"].'/'.$upload_dir.$bean_id.$stored_file_name; //return $site_URL.'/'.$upload_dir.$bean_id.$stored_file_name; } function duplicate_file($old_id, $new_id, $file_name) { + global $log; + $log->debug("Entering duplicate_file(".$old_id.", ".$new_id.", ".$file_name.") method ..."); global $root_directory; global $upload_dir; $source = $root_directory.'/'.$upload_dir.$old_id.$file_name; $destination = $root_directory.'/'.$upload_dir.$new_id.$file_name; copy( $source,$destination); + $log->debug("Exiting duplicate_file method ..."); } function confirm_upload() { + global $log; + $log->debug("Eentering confirm_upload() method ..."); global $root_directory; global $upload_dir; global $upload_maxsize; @@ -60,6 +71,7 @@ if (!is_uploaded_file($_FILES[$this->field_name]['tmp_name']) ) { + $log->debug("Exiting confirm_upload method ..."); return false; } else if ($_FILES[$this->field_name]['size'] > $upload_maxsize) @@ -74,17 +86,22 @@ } $this->stored_file_name = $this->create_stored_filename(); - + $log->debug("Exiting confirm_upload method ..."); return true; } function get_stored_file_name() { + global $log; + $log->debug("Entering get_stored_file_name() method ..."); + $log->debug("Exiting get_stored_file_name method ..."); return $this->stored_file_name; } function create_stored_filename() { + global $log; + $log->debug("Entering create_stored_filename() method ..."); global $upload_badext; $stored_file_name = $_FILES[$this->field_name]['name']; @@ -96,12 +113,14 @@ { $stored_file_name .= ".txt"; } - + $log->debug("Exiting create_stored_filename method ..."); return $stored_file_name; } function final_move($bean_id) { + global $log; + $log->debug("Entering final_move(".$bean_id.") method ..."); global $root_directory; global $upload_dir; @@ -113,7 +132,7 @@ { die ("ERROR: can't move_uploaded_file to $destination"); } - + $log->debug("Exiting final_move method ..."); return true; @@ -121,8 +140,11 @@ function unlink_file($bean_id,$file_name) { + global $log; + $log->debug("Entering unlink_file(".$bean_id.",".$file_name.") method ..."); global $root_directory; global $upload_dir; + $log->debug("Exiting unlink_file method ..."); return unlink($root_directory."/".$upload_dir.$bean_id.$file_name); } From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 28 00:04:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 04:04:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5552 - /vtigercrm/trunk/include/SearchBlock.php Message-ID: <20060428040452.993F86AB61C@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 22:04:48 2006 New Revision: 5552 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/include/SearchBlock.php Modified: vtigercrm/trunk/include/SearchBlock.php ============================================================================== --- vtigercrm/trunk/include/SearchBlock.php (original) +++ vtigercrm/trunk/include/SearchBlock.php Thu Apr 27 22:04:48 2006 @@ -11,6 +11,8 @@ function BuildSearchForm($focus) { + global $log; + $log->debug("Entering BuildSearchForm(".$focus.") method ..."); global $current_module_strings,$app_strings,$adb; $advanced = (isset($_REQUEST['advanced']) && $_REQUEST['advanced'] == 'true'); @@ -20,6 +22,7 @@ print_r($base); print_r($custom); print_r($focus); + $log->debug("Exiting BuildSearchForm method ..."); return ""; } @@ -57,11 +60,14 @@ // Now, reset/reload template so partials are scanned $search_form->blocks = $search_form->maketree($search_form->filecontents,"main"); $search_form->scan_globals(); + $log->debug("Exiting BuildSearchForm method ..."); return $search_form; } function SearchFieldBlock($tableName,$colidName,$tabsrch, $basic=true,$advanced=false,$block=0,$label="",$fields=array(),$doadvanced=true) { + global $log; + $log->debug("Entering SearchFieldBlock(".$tableName.",".$colidName.",".$tabsrch.",". $basic.",".$advanced.",".$block.",".$label.",".$fields.") method ..."); global $sorder, $order_by, $viewid, $currentModule; global $adb,$app_strings,$mod_strings; @@ -251,6 +257,7 @@ echo ""; */ + $log->debug("Exiting SearchFieldBlock method ..."); return $res; } } From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 28 00:05:47 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 04:05:47 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5553 - /vtigercrm/trunk/include/RelatedListView.php Message-ID: <20060428040547.13E1A6AB61C@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 22:05:43 2006 New Revision: 5553 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/include/RelatedListView.php Modified: vtigercrm/trunk/include/RelatedListView.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 28 00:12:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 04:12:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5554 - /vtigercrm/trunk/include/utils/UserInfoUtil.php Message-ID: <20060428041220.B33886AB544@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 22:12:16 2006 New Revision: 5554 Log: global variable declared in getRoleSubordinates method 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 Thu Apr 27 22:12:16 2006 @@ -3941,6 +3941,7 @@ */ function getRoleSubordinates($roleId) { + global $log; $log->debug("Entering getRoleSubordinates(".$roleId.") method ..."); global $adb; $roleDetails=getRoleInformation($roleId); From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 00:20:17 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 04:20:17 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23750=3A_?= =?utf-8?q?Integrate_code_contributions?= In-Reply-To: <076.b16a74c382aa688de221822029b26245@vtiger.fosslabs.com> References: <076.b16a74c382aa688de221822029b26245@vtiger.fosslabs.com> Message-ID: <085.36b2d3e86fa9ca460c81177124d90a23@vtiger.fosslabs.com> #750: Integrate code contributions ------------------------+--------------------------------------------------- Reporter: allanbush | Owner: richie Type: defect | Status: new Priority: minor | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc3 Resolution: | Keywords: ------------------------+--------------------------------------------------- Comment (by allanbush): (In [5555]) Added rdhital's Improved pagination for List Views (http://forums.vtiger.com/viewtopic.php?t=3251). Refs #750. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 28 00:20:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 04:20:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5555 - in /vtigercrm/branches/4.2: include/ modules/Accounts/ modules/Activities/ modules/Contacts/ modules/Emails/ modules/Faq/ modules/HelpDesk/ modules/Invoice/ modules/Leads/ modules/Notes/ modules/Orders/ modules/Potentials/ modules/Products/ modules/Quotes/ Message-ID: <20060428042018.94D836AB66F@vtiger.fosslabs.com> Author: allanbush Date: Thu Apr 27 22:20:06 2006 New Revision: 5555 Log: Added rdhital's Improved pagination for List Views (http://forums.vtiger.com/viewtopic.php?t=3251). Refs #750. Modified: vtigercrm/branches/4.2/include/uifromdbutil.php vtigercrm/branches/4.2/include/utils.php vtigercrm/branches/4.2/modules/Accounts/ListView.php vtigercrm/branches/4.2/modules/Activities/ListView.php vtigercrm/branches/4.2/modules/Contacts/ListView.php vtigercrm/branches/4.2/modules/Emails/ListView.php vtigercrm/branches/4.2/modules/Faq/ListView.php vtigercrm/branches/4.2/modules/HelpDesk/ListView.php vtigercrm/branches/4.2/modules/Invoice/ListView.php vtigercrm/branches/4.2/modules/Leads/ListView.php vtigercrm/branches/4.2/modules/Notes/ListView.php vtigercrm/branches/4.2/modules/Orders/ListView.php vtigercrm/branches/4.2/modules/Orders/SalesOrderListView.php vtigercrm/branches/4.2/modules/Potentials/ListView.php vtigercrm/branches/4.2/modules/Products/ListView.php vtigercrm/branches/4.2/modules/Products/PriceBookListView.php vtigercrm/branches/4.2/modules/Products/VendorListView.php vtigercrm/branches/4.2/modules/Quotes/ListView.php Modified: vtigercrm/branches/4.2/include/uifromdbutil.php ============================================================================== --- vtigercrm/branches/4.2/include/uifromdbutil.php (original) +++ vtigercrm/branches/4.2/include/uifromdbutil.php Thu Apr 27 22:20:06 2006 @@ -140,29 +140,34 @@ $output = ''; $dir_name=getModuleDirName($module); - if(isset($navigation_array['prev'])) - { + $output .= ''.$navigation_array['allflag'].' '; + if(($navigation_array['prev']) != 0) { $output .= ' '; $output .= ' '; - } - else - { + } else { $output .= ' '; $output .= ' '; } - if(isset($navigation_array['next'])) - { + + for ($i=$navigation_array['first'];$i<=$navigation_array['end'];$i++) { + if ($navigation_array['current']==$i) { + $output .=''.$i.' '; + } else { + $output .= ''.$i.' '; + } + } + + if(($navigation_array['next']) !=0) { $output .= ' '; - $output .= ' '; - } - else - { + $output .= ' '; + } else { $output .= ' '; $output .= ' '; } + $output .= ''; - return $output; + return $output; } ?> Modified: vtigercrm/branches/4.2/include/utils.php ============================================================================== --- vtigercrm/branches/4.2/include/utils.php (original) +++ vtigercrm/branches/4.2/include/utils.php Thu Apr 27 22:20:06 2006 @@ -2486,69 +2486,68 @@ return $user_id; } //outlook security -function getNavigationValues($start, $noofrows, $list_max_entries_per_page) -{ +function getNavigationValues($display, $noofrows, $limit) +{ + global $limitpage_navigation; + if(!isset($limitpage_navigation)) $limitpage_navigation = 5; + $navigation_array = Array(); - require_once('config.php'); - //Setting the start to end counter - $starttoendvaluecounter = $list_max_entries_per_page - 1; - //Setting the ending value - if($noofrows > $list_max_entries_per_page) - { - $end = $start + $starttoendvaluecounter; - if($end > $noofrows) - { - $end = $noofrows; - } - $startvalue = 1; - $remainder = $noofrows % $list_max_entries_per_page; - if($remainder > 0) - { - $endval = $noofrows - $remainder + 1; - } - elseif($remainder == 0) - { - $endval = $noofrows - $starttoendvaluecounter; - } - } - else - { + if(isset($_REQUEST['allflag']) && $_REQUEST['allflag'] == 'All') { + $navigation_array['start'] =1; + $navigation_array['first'] = 1; + $navigation_array['end'] = 1; + $navigation_array['prev'] =0; + $navigation_array['next'] =0; + $navigation_array['end_val'] =$noofrows; + $navigation_array['current'] =1; + $navigation_array['allflag'] ='Normal'; + $navigation_array['verylast'] =1; + return $navigation_array; + } + + $start = ((($display * $limit) - $limit)+1); + $end = $start + ($limit-1); + if($end > $noofrows) { $end = $noofrows; } - - - //Setting the next and previous value - if(isset($start) && $start != '') - { - $tempnextstartvalue = $start + $list_max_entries_per_page; - if($tempnextstartvalue <= $noofrows) - { - - $nextstartvalue = $tempnextstartvalue; - } - $tempprevvalue = $_REQUEST['start'] - $list_max_entries_per_page; - if($tempprevvalue > 0) - { - $prevstartvalue = $tempprevvalue; - } - } - else - { - if($noofrows > $list_max_entries_per_page) - { - $nextstartvalue = $list_max_entries_per_page + 1; - } + $paging = ceil ($noofrows / $limit); + // Display the navigation + if ($display > 1) { + $previous = $display - 1; + } else { + $previous=0; + } + if ($noofrows != $limit) { + $last = $paging; + $first = 1; + if ($paging > $limitpage_navigation) { + $first = $display-floor(($limitpage_navigation/2)); + if ($first<1) $first=1; + $last = ($limitpage_navigation - 1) + $first; + } + if ($last > $paging ) { + $first = $paging - ($limitpage_navigation - 1); + $last = $paging; + } + } + if ($display < $paging) { + $next = $display + 1; + } else { + $next=0; } $navigation_array['start'] = $start; - $navigation_array['end'] = $endval; - $navigation_array['prev'] = $prevstartvalue; - $navigation_array['next'] = $nextstartvalue; + $navigation_array['first'] = $first; + $navigation_array['end'] = $last; + $navigation_array['prev'] = $previous; + $navigation_array['next'] = $next; $navigation_array['end_val'] = $end; - return $navigation_array; - -} + $navigation_array['current'] = $display; + $navigation_array['allflag'] ='All'; + $navigation_array['verylast'] =$paging; + return $navigation_array; +} function getURLstring($focus) { Modified: vtigercrm/branches/4.2/modules/Accounts/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Accounts/ListView.php (original) +++ vtigercrm/branches/4.2/modules/Accounts/ListView.php Thu Apr 27 22:20:06 2006 @@ -430,49 +430,17 @@ $noofrows = $adb->num_rows($list_result); //Retreiving the start value from request -if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') -{ +if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') { $start = $_REQUEST['start']; -} -else -{ - +} else { $start = 1; } //Retreive the Navigation array $navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page); - -// Setting the record count string -if ($navigation_array['start'] == 1) -{ - if($noofrows != 0) - $start_rec = $navigation_array['start']; - else - $start_rec = 0; - if($noofrows > $list_max_entries_per_page) - { - $end_rec = $navigation_array['start'] + $list_max_entries_per_page - 1; - } - else - { - $end_rec = $noofrows; - } - -} -else -{ - if($navigation_array['next'] > $list_max_entries_per_page) - { - $start_rec = $navigation_array['next'] - $list_max_entries_per_page; - $end_rec = $navigation_array['next'] - 1; - } - else - { - $start_rec = $navigation_array['prev'] + $list_max_entries_per_page; - $end_rec = $noofrows; - } -} +$start_rec = $navigation_array['start']; +$end_rec = $navigation_array['end_val']; + $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows; //Retreive the List View Table Header Modified: vtigercrm/branches/4.2/modules/Activities/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Activities/ListView.php (original) +++ vtigercrm/branches/4.2/modules/Activities/ListView.php Thu Apr 27 22:20:06 2006 @@ -317,48 +317,16 @@ $noofrows = $adb->num_rows($list_result); //Retreiving the start value from request -if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') -{ +if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') { $start = $_REQUEST['start']; -} -else -{ - +} else { $start = 1; } //Retreive the Navigation array $navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page); - -// Setting the record count string -if ($navigation_array['start'] == 1) -{ - if($noofrows != 0) - $start_rec = $navigation_array['start']; - else - $start_rec = 0; - if($noofrows > $list_max_entries_per_page) - { - $end_rec = $navigation_array['start'] + $list_max_entries_per_page - 1; - } - else - { - $end_rec = $noofrows; - } - -} -else -{ - if($navigation_array['next'] > $list_max_entries_per_page) - { - $start_rec = $navigation_array['next'] - $list_max_entries_per_page; - $end_rec = $navigation_array['next'] - 1; - } - else - { - $start_rec = $navigation_array['prev'] + $list_max_entries_per_page; - $end_rec = $noofrows; - } -} +$start_rec = $navigation_array['start']; +$end_rec = $navigation_array['end_val']; + $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows; //Retreive the List View Table Header Modified: vtigercrm/branches/4.2/modules/Contacts/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Contacts/ListView.php (original) +++ vtigercrm/branches/4.2/modules/Contacts/ListView.php Thu Apr 27 22:20:06 2006 @@ -394,48 +394,17 @@ $noofrows = $adb->num_rows($list_result); //Retreiving the start value from request -if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') -{ +if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') { $start = $_REQUEST['start']; -} -else -{ +} else { $start = 1; } //Retreive the Navigation array $navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page); - -// Setting the record count string -if ($navigation_array['start'] == 1) -{ - if($noofrows != 0) - $start_rec = $navigation_array['start']; - else - $start_rec = 0; - if($noofrows > $list_max_entries_per_page) - { - $end_rec = $navigation_array['start'] + $list_max_entries_per_page - 1; - } - else - { - $end_rec = $noofrows; - } - -} -else -{ - if($navigation_array['next'] > $list_max_entries_per_page) - { - $start_rec = $navigation_array['next'] - $list_max_entries_per_page; - $end_rec = $navigation_array['next'] - 1; - } - else - { - $start_rec = $navigation_array['prev'] + $list_max_entries_per_page; - $end_rec = $noofrows; - } -} +$start_rec = $navigation_array['start']; +$end_rec = $navigation_array['end_val']; + $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows; //Retreive the List View Table Header Modified: vtigercrm/branches/4.2/modules/Emails/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Emails/ListView.php (original) +++ vtigercrm/branches/4.2/modules/Emails/ListView.php Thu Apr 27 22:20:06 2006 @@ -315,48 +315,16 @@ $noofrows = $adb->num_rows($list_result); //Retreiving the start value from request -if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') -{ +if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') { $start = $_REQUEST['start']; -} -else -{ - +} else { $start = 1; } //Retreive the Navigation array $navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page); - -// Setting the record count string -if ($navigation_array['start'] == 1) -{ - if($noofrows != 0) - $start_rec = $navigation_array['start']; - else - $start_rec = 0; - if($noofrows > $list_max_entries_per_page) - { - $end_rec = $navigation_array['start'] + $list_max_entries_per_page - 1; - } - else - { - $end_rec = $noofrows; - } - -} -else -{ - if($navigation_array['next'] > $list_max_entries_per_page) - { - $start_rec = $navigation_array['next'] - $list_max_entries_per_page; - $end_rec = $navigation_array['next'] - 1; - } - else - { - $start_rec = $navigation_array['prev'] + $list_max_entries_per_page; - $end_rec = $noofrows; - } -} +$start_rec = $navigation_array['start']; +$end_rec = $navigation_array['end_val']; + $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows; //Retreive the List View Table Header Modified: vtigercrm/branches/4.2/modules/Faq/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Faq/ListView.php (original) +++ vtigercrm/branches/4.2/modules/Faq/ListView.php Thu Apr 27 22:20:06 2006 @@ -127,48 +127,16 @@ $noofrows = $adb->num_rows($list_result); //Retreiving the start value from request -if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') -{ +if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') { $start = $_REQUEST['start']; -} -else -{ - +} else { $start = 1; } //Retreive the Navigation array $navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page); +$start_rec = $navigation_array['start']; +$end_rec = $navigation_array['end_val']; -// Setting the record count string -if ($navigation_array['start'] == 1) -{ - if($noofrows != 0) - $start_rec = $navigation_array['start']; - else - $start_rec = 0; - if($noofrows > $list_max_entries_per_page) - { - $end_rec = $navigation_array['start'] + $list_max_entries_per_page - 1; - } - else - { - $end_rec = $noofrows; - } - -} -else -{ - if($navigation_array['next'] > $list_max_entries_per_page) - { - $start_rec = $navigation_array['next'] - $list_max_entries_per_page; - $end_rec = $navigation_array['next'] - 1; - } - else - { - $start_rec = $navigation_array['prev'] + $list_max_entries_per_page; - $end_rec = $noofrows; - } -} $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows; //Retreive the List View Table Header Modified: vtigercrm/branches/4.2/modules/HelpDesk/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/HelpDesk/ListView.php (original) +++ vtigercrm/branches/4.2/modules/HelpDesk/ListView.php Thu Apr 27 22:20:06 2006 @@ -398,48 +398,16 @@ $noofrows = $adb->num_rows($list_result); //Retreiving the start value from request -if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') -{ +if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') { $start = $_REQUEST['start']; -} -else -{ - +} else { $start = 1; } //Retreive the Navigation array $navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page); - -// Setting the record count string -if ($navigation_array['start'] == 1) -{ - if($noofrows != 0) - $start_rec = $navigation_array['start']; - else - $start_rec = 0; - if($noofrows > $list_max_entries_per_page) - { - $end_rec = $navigation_array['start'] + $list_max_entries_per_page - 1; - } - else - { - $end_rec = $noofrows; - } - -} -else -{ - if($navigation_array['next'] > $list_max_entries_per_page) - { - $start_rec = $navigation_array['next'] - $list_max_entries_per_page; - $end_rec = $navigation_array['next'] - 1; - } - else - { - $start_rec = $navigation_array['prev'] + $list_max_entries_per_page; - $end_rec = $noofrows; - } -} +$start_rec = $navigation_array['start']; +$end_rec = $navigation_array['end_val']; + $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows; //Retreive the List View Table Header Modified: vtigercrm/branches/4.2/modules/Invoice/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Invoice/ListView.php (original) +++ vtigercrm/branches/4.2/modules/Invoice/ListView.php Thu Apr 27 22:20:06 2006 @@ -290,49 +290,17 @@ $noofrows = $adb->num_rows($list_result); //Retreiving the start value from request -if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') -{ +if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') { $start = $_REQUEST['start']; -} -else -{ - +} else { $start = 1; } //Retreive the Navigation array $navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page); - -// Setting the record count string -if ($navigation_array['start'] == 1) -{ - if($noofrows != 0) - $start_rec = $navigation_array['start']; - else - $start_rec = 0; - if($noofrows > $list_max_entries_per_page) - { - $end_rec = $navigation_array['start'] + $list_max_entries_per_page - 1; - } - else - { - $end_rec = $noofrows; - } - -} -else -{ - if($navigation_array['next'] > $list_max_entries_per_page) - { - $start_rec = $navigation_array['next'] - $list_max_entries_per_page; - $end_rec = $navigation_array['next'] - 1; - } - else - { - $start_rec = $navigation_array['prev'] + $list_max_entries_per_page; - $end_rec = $noofrows; - } -} +$start_rec = $navigation_array['start']; +$end_rec = $navigation_array['end_val']; + $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows; //Retreive the List View Table Header Modified: vtigercrm/branches/4.2/modules/Leads/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Leads/ListView.php (original) +++ vtigercrm/branches/4.2/modules/Leads/ListView.php Thu Apr 27 22:20:06 2006 @@ -410,48 +410,16 @@ $noofrows = $adb->num_rows($list_result); //Retreiving the start value from request -if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') -{ +if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') { $start = $_REQUEST['start']; -} -else -{ - +} else { $start = 1; } //Retreive the Navigation array $navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page); - -// Setting the record count string -if ($navigation_array['start'] == 1) -{ - if($noofrows != 0) - $start_rec = $navigation_array['start']; - else - $start_rec = 0; - if($noofrows > $list_max_entries_per_page) - { - $end_rec = $navigation_array['start'] + $list_max_entries_per_page - 1; - } - else - { - $end_rec = $noofrows; - } - -} -else -{ - if($navigation_array['next'] > $list_max_entries_per_page) - { - $start_rec = $navigation_array['next'] - $list_max_entries_per_page; - $end_rec = $navigation_array['next'] - 1; - } - else - { - $start_rec = $navigation_array['prev'] + $list_max_entries_per_page; - $end_rec = $noofrows; - } -} +$start_rec = $navigation_array['start']; +$end_rec = $navigation_array['end_val']; + $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows; //Retreive the List View Table Header Modified: vtigercrm/branches/4.2/modules/Notes/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Notes/ListView.php (original) +++ vtigercrm/branches/4.2/modules/Notes/ListView.php Thu Apr 27 22:20:06 2006 @@ -238,48 +238,16 @@ "; //Retreiving the start value from request -if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') -{ +if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') { $start = $_REQUEST['start']; -} -else -{ - +} else { $start = 1; } //Retreive the Navigation array $navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page); - -// Setting the record count string -if ($navigation_array['start'] == 1) -{ - if($noofrows != 0) - $start_rec = $navigation_array['start']; - else - $start_rec = 0; - if($noofrows > $list_max_entries_per_page) - { - $end_rec = $navigation_array['start'] + $list_max_entries_per_page - 1; - } - else - { - $end_rec = $noofrows; - } - -} -else -{ - if($navigation_array['next'] > $list_max_entries_per_page) - { - $start_rec = $navigation_array['next'] - $list_max_entries_per_page; - $end_rec = $navigation_array['next'] - 1; - } - else - { - $start_rec = $navigation_array['prev'] + $list_max_entries_per_page; - $end_rec = $noofrows; - } -} +$start_rec = $navigation_array['start']; +$end_rec = $navigation_array['end_val']; + $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows; Modified: vtigercrm/branches/4.2/modules/Orders/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Orders/ListView.php (original) +++ vtigercrm/branches/4.2/modules/Orders/ListView.php Thu Apr 27 22:20:06 2006 @@ -301,49 +301,17 @@ $noofrows = $adb->num_rows($list_result); //Retreiving the start value from request -if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') -{ +if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') { $start = $_REQUEST['start']; -} -else -{ - +} else { $start = 1; } //Retreive the Navigation array $navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page); - -// Setting the record count string -if ($navigation_array['start'] == 1) -{ - if($noofrows != 0) - $start_rec = $navigation_array['start']; - else - $start_rec = 0; - if($noofrows > $list_max_entries_per_page) - { - $end_rec = $navigation_array['start'] + $list_max_entries_per_page - 1; - } - else - { - $end_rec = $noofrows; - } - -} -else -{ - if($navigation_array['next'] > $list_max_entries_per_page) - { - $start_rec = $navigation_array['next'] - $list_max_entries_per_page; - $end_rec = $navigation_array['next'] - 1; - } - else - { - $start_rec = $navigation_array['prev'] + $list_max_entries_per_page; - $end_rec = $noofrows; - } -} +$start_rec = $navigation_array['start']; +$end_rec = $navigation_array['end_val']; + $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows; //Retreive the List View Table Header Modified: vtigercrm/branches/4.2/modules/Orders/SalesOrderListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Orders/SalesOrderListView.php (original) +++ vtigercrm/branches/4.2/modules/Orders/SalesOrderListView.php Thu Apr 27 22:20:06 2006 @@ -283,48 +283,16 @@ "; //Retreiving the start value from request -if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') -{ +if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') { $start = $_REQUEST['start']; -} -else -{ - +} else { $start = 1; } //Retreive the Navigation array $navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page); - -// Setting the record count string -if ($navigation_array['start'] == 1) -{ - if($noofrows != 0) - $start_rec = $navigation_array['start']; - else - $start_rec = 0; - if($noofrows > $list_max_entries_per_page) - { - $end_rec = $navigation_array['start'] + $list_max_entries_per_page - 1; - } - else - { - $end_rec = $noofrows; - } - -} -else -{ - if($navigation_array['next'] > $list_max_entries_per_page) - { - $start_rec = $navigation_array['next'] - $list_max_entries_per_page; - $end_rec = $navigation_array['next'] - 1; - } - else - { - $start_rec = $navigation_array['prev'] + $list_max_entries_per_page; - $end_rec = $noofrows; - } -} +$start_rec = $navigation_array['start']; +$end_rec = $navigation_array['end_val']; + $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows; //Retreive the List View Table Header Modified: vtigercrm/branches/4.2/modules/Potentials/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Potentials/ListView.php (original) +++ vtigercrm/branches/4.2/modules/Potentials/ListView.php Thu Apr 27 22:20:06 2006 @@ -400,47 +400,16 @@ $noofrows = $adb->num_rows($list_result); //Retreiving the start value from request -if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') -{ +if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') { $start = $_REQUEST['start']; -} -else -{ +} else { $start = 1; } //Retreive the Navigation array $navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page); - -// Setting the record count string -if ($navigation_array['start'] == 1) -{ - if($noofrows != 0) - $start_rec = $navigation_array['start']; - else - $start_rec = 0; - if($noofrows > $list_max_entries_per_page) - { - $end_rec = $navigation_array['start'] + $list_max_entries_per_page - 1; - } - else - { - $end_rec = $noofrows; - } - -} -else -{ - if($navigation_array['next'] > $list_max_entries_per_page) - { - $start_rec = $navigation_array['next'] - $list_max_entries_per_page; - $end_rec = $navigation_array['next'] - 1; - } - else - { - $start_rec = $navigation_array['prev'] + $list_max_entries_per_page; - $end_rec = $noofrows; - } -} +$start_rec = $navigation_array['start']; +$end_rec = $navigation_array['end_val']; + $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows; //Retreive the List View Table Header Modified: vtigercrm/branches/4.2/modules/Products/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Products/ListView.php (original) +++ vtigercrm/branches/4.2/modules/Products/ListView.php Thu Apr 27 22:20:06 2006 @@ -342,48 +342,16 @@ $noofrows = $adb->num_rows($list_result); //Retreiving the start value from request -if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') -{ +if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') { $start = $_REQUEST['start']; -} -else -{ - +} else { $start = 1; } //Retreive the Navigation array $navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page); - -// Setting the record count string -if ($navigation_array['start'] == 1) -{ - if($noofrows != 0) - $start_rec = $navigation_array['start']; - else - $start_rec = 0; - if($noofrows > $list_max_entries_per_page) - { - $end_rec = $navigation_array['start'] + $list_max_entries_per_page - 1; - } - else - { - $end_rec = $noofrows; - } - -} -else -{ - if($navigation_array['next'] > $list_max_entries_per_page) - { - $start_rec = $navigation_array['next'] - $list_max_entries_per_page; - $end_rec = $navigation_array['next'] - 1; - } - else - { - $start_rec = $navigation_array['prev'] + $list_max_entries_per_page; - $end_rec = $noofrows; - } -} +$start_rec = $navigation_array['start']; +$end_rec = $navigation_array['end_val']; + $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows; //Retreive the List View Table Header Modified: vtigercrm/branches/4.2/modules/Products/PriceBookListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Products/PriceBookListView.php (original) +++ vtigercrm/branches/4.2/modules/Products/PriceBookListView.php Thu Apr 27 22:20:06 2006 @@ -242,48 +242,16 @@ $noofrows = $adb->num_rows($list_result); //Retreiving the start value from request -if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') -{ +if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') { $start = $_REQUEST['start']; -} -else -{ - +} else { $start = 1; } //Retreive the Navigation array $navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page); - -// Setting the record count string -if ($navigation_array['start'] == 1) -{ - if($noofrows != 0) - $start_rec = $navigation_array['start']; - else - $start_rec = 0; - if($noofrows > $list_max_entries_per_page) - { - $end_rec = $navigation_array['start'] + $list_max_entries_per_page - 1; - } - else - { - $end_rec = $noofrows; - } - -} -else -{ - if($navigation_array['next'] > $list_max_entries_per_page) - { - $start_rec = $navigation_array['next'] - $list_max_entries_per_page; - $end_rec = $navigation_array['next'] - 1; - } - else - { - $start_rec = $navigation_array['prev'] + $list_max_entries_per_page; - $end_rec = $noofrows; - } -} +$start_rec = $navigation_array['start']; +$end_rec = $navigation_array['end_val']; + $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows; //Retreive the List View Table Header Modified: vtigercrm/branches/4.2/modules/Products/VendorListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Products/VendorListView.php (original) +++ vtigercrm/branches/4.2/modules/Products/VendorListView.php Thu Apr 27 22:20:06 2006 @@ -347,48 +347,16 @@ "; //Retreiving the start value from request -if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') -{ +if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') { $start = $_REQUEST['start']; -} -else -{ - +} else { $start = 1; } //Retreive the Navigation array $navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page); - -// Setting the record count string -if ($navigation_array['start'] == 1) -{ - if($noofrows != 0) - $start_rec = $navigation_array['start']; - else - $start_rec = 0; - if($noofrows > $list_max_entries_per_page) - { - $end_rec = $navigation_array['start'] + $list_max_entries_per_page - 1; - } - else - { - $end_rec = $noofrows; - } - -} -else -{ - if($navigation_array['next'] > $list_max_entries_per_page) - { - $start_rec = $navigation_array['next'] - $list_max_entries_per_page; - $end_rec = $navigation_array['next'] - 1; - } - else - { - $start_rec = $navigation_array['prev'] + $list_max_entries_per_page; - $end_rec = $noofrows; - } -} +$start_rec = $navigation_array['start']; +$end_rec = $navigation_array['end_val']; + $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows; //Retreive the List View Table Header Modified: vtigercrm/branches/4.2/modules/Quotes/ListView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Quotes/ListView.php (original) +++ vtigercrm/branches/4.2/modules/Quotes/ListView.php Thu Apr 27 22:20:06 2006 @@ -312,49 +312,17 @@ $noofrows = $adb->num_rows($list_result); //Retreiving the start value from request -if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') -{ +if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') { $start = $_REQUEST['start']; -} -else -{ - +} else { $start = 1; } //Retreive the Navigation array $navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page); - -// Setting the record count string -if ($navigation_array['start'] == 1) -{ - if($noofrows != 0) - $start_rec = $navigation_array['start']; - else - $start_rec = 0; - if($noofrows > $list_max_entries_per_page) - { - $end_rec = $navigation_array['start'] + $list_max_entries_per_page - 1; - } - else - { - $end_rec = $noofrows; - } - -} -else -{ - if($navigation_array['next'] > $list_max_entries_per_page) - { - $start_rec = $navigation_array['next'] - $list_max_entries_per_page; - $end_rec = $navigation_array['next'] - 1; - } - else - { - $start_rec = $navigation_array['prev'] + $list_max_entries_per_page; - $end_rec = $noofrows; - } -} +$start_rec = $navigation_array['start']; +$end_rec = $navigation_array['end_val']; + $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows; //Retreive the List View Table Header From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 28 00:35:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 04:35:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5556 - /vtigercrm/trunk/include/ListView/ListView.php Message-ID: <20060428043549.A47956B046E@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 22:35:44 2006 New Revision: 5556 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/include/ListView/ListView.php Modified: vtigercrm/trunk/include/ListView/ListView.php ============================================================================== --- vtigercrm/trunk/include/ListView/ListView.php (original) +++ vtigercrm/trunk/include/ListView/ListView.php Thu Apr 27 22:35:44 2006 @@ -45,7 +45,10 @@ * Contributor(s): ______________________________________. */ function setDisplayHeaderAndFooter($bool){ + global $log; + $log->debug("Entering setDisplayHeaderAndFooter(".$bool.") method ..."); $this->display_header_and_footer = $bool; + $log->debug("Exiting setDisplayHeaderAndFooter method ..."); } /**initializes ListView @@ -54,6 +57,8 @@ * Contributor(s): ______________________________________. */ function ListView(){ + global $log; + $log->debug("Entering ListView() method ..."); if(!$this->initialized){ @@ -70,7 +75,7 @@ $this->local_image_path = 'themes/'.$theme.'/images'; } $this->log = LoggerManager::getLogger('listView_'.$this->local_current_module); - + $log->debug("Exiting ListView method ..."); } } /**sets how many records should be displayed per page in the list view @@ -79,11 +84,17 @@ * Contributor(s): ______________________________________. */ function setRecordsPerPage($count){ + global $log; + $log->debug("Entering setRecordsPerPage(".$count.") method ..."); $this->records_per_page = $count; + $log->debug("Exiting setRecordsPerPage method ..."); } /**sets the header title */ function setHeaderTitle($value){ + global $log; + $log->debug("Entering setHeaderTitle(".$value.") method ..."); $this->header_title = $value; + $log->debug("Exiting setHeaderTitle method ..."); } /**sets the header text this is text thats appended to the header table and is usually used for the creation of buttons * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. @@ -91,7 +102,10 @@ * Contributor(s): ______________________________________. */ function setHeaderText($value){ + global $log; + $log->debug("Entering setHeaderText(".$value.") method ..."); $this->header_text = $value; + $log->debug("Exiting setHeaderText method ..."); } /**sets the path for the XTemplate HTML file to be used this is only needed to be set if you are allowing ListView to create the XTemplate * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. @@ -99,7 +113,10 @@ * Contributor(s): ______________________________________. */ function setXTemplatePath($value){ + global $log; + $log->debug("Entering setXTemplatePath(".$value.") method ..."); $this->xTemplatePath= $value; + $log->debug("Exiting setXTemplatePath method ..."); } /**this is a helper function for allowing ListView to create a new XTemplate it groups parameters that should be set into a single function @@ -108,11 +125,14 @@ * Contributor(s): ______________________________________. */ function initNewXTemplate($XTemplatePath, &$modString, $imagePath = null){ + global $log; + $log->debug("Entering initNewXTemplate(".$XTemplatePath.",".$modString.",". $imagePath = null.") method ..."); $this->setXTemplatePath($XTemplatePath); if(isset($modString)) $this->setModStrings($modString); if(isset($imagePath)) - $this->setImagePath($imagePath); + $this->setImagePath($imagePath); + $log->debug("Exiting initNewXTemplate method ..."); } @@ -122,6 +142,8 @@ * Contributor(s): ______________________________________. */ function setQuery($where, $limit, $orderBy, $varName, $allowOrderByOveride= true){ + global $log; + $log->debug("Entering setQuery(".$where.",". $limit.",". $orderBy.",". $varName.",". $allowOrderByOveride.") method ..."); $this->query_where = $where; if($this->getSessionVariable("query", "where") != $where){ $this->querey_where_has_changed = true; @@ -131,6 +153,7 @@ $this->query_limit = $limit; if(!$allowOrderByOveride){ $this->query_orderby = $orderBy; + $log->debug("Exiting setQuery method ..."); return; } $sortBy = $this->getSessionVariable($varName, "ORDER_BY") ; @@ -172,7 +195,7 @@ }else { $this->query_orderby = ""; } - + $log->debug("Exiting setQuery method ..."); @@ -180,6 +203,9 @@ } function displayArrow(){ + global $log; + $log->debug("Entering displayArrow() method ..."); + $log->debug("Exiting displayArrow method ..."); } @@ -189,8 +215,11 @@ * Contributor(s): ______________________________________. */ function setTheme($theme){ + global $log; + $log->debug("Entering setTheme(".$theme.") method ..."); $this->local_theme = $theme; if(isset($this->xTemplate))$this->xTemplate->assign("THEME", $this->local_theme ); + $log->debug("Exiting setTheme method ..."); } /**sets the AppStrings used only use if it is different from the global @@ -199,9 +228,12 @@ * Contributor(s): ______________________________________. */ function setAppStrings(&$app_strings){ + global $log; + $log->debug("Entering setAppStrings(".$app_strings.") method ..."); unset($this->local_app_strings); $this->local_app_strings = $app_strings; if(isset($this->xTemplate))$this->xTemplate->assign("APP", $this->local_app_strings ); + $log->debug("Exiting setAppStrings method ..."); } /**sets the ModStrings used @@ -210,9 +242,12 @@ * Contributor(s): ______________________________________. */ function setModStrings(&$mod_strings){ + global $log; + $log->debug("Entering setModStrings(".$mod_strings.") method ..."); unset($this->local_module_strings); $this->local_mod_strings = $mod_strings; if(isset($this->xTemplate))$this->xTemplate->assign("MOD", $this->local_mod_strings ); + $log->debug("Exiting setModStrings method ..."); } /**sets the ImagePath used @@ -221,11 +256,14 @@ * Contributor(s): ______________________________________. */ function setImagePath($image_path){ + global $log; + $log->debug("Entering setImagePath(".$image_path.") method ..."); $this->local_image_path = $image_path; if(empty($this->local_image_path)){ $this->local_image_path = 'themes/'.$this->local_theme.'/images'; } if(isset($this->xTemplate))$this->xTemplate->assign("IMAGE_PATH", $this->local_image_path ); + $log->debug("Exiting setImagePath method ..."); } /**sets the currentModule only use if this is different from the global @@ -234,10 +272,14 @@ * Contributor(s): ______________________________________. */ function setCurrentModule($currentModule){ + global $log; + $log->debug("Entering setCurrentModule(".$currentModule.") method ..."); unset($this->local_current_module); $this->local_current_module = $currentModule; $this->log = LoggerManager::getLogger('listView_'.$this->local_current_module); - if(isset($this->xTemplate))$this->xTemplate->assign("MODULE_NAME", $this->local_current_module ); + if(isset($this->xTemplate))$this->xTemplate->assign("MODULE_NAME", $this->local_current_module ); + $log->debug("Exiting setCurrentModule method ..."); + } /**INTERNAL FUNCTION creates an XTemplate DO NOT CALL THIS THIS IS AN INTERNAL FUNCTION @@ -246,6 +288,8 @@ * Contributor(s): ______________________________________. */ function createXTemplate(){ + global $log; + $log->debug("Entering createXTemplate() method ..."); if(!isset($this->xTemplate)){ if(isset($this->xTemplatePath)){ $this->xTemplate = new XTemplate ($this->xTemplatePath); @@ -258,6 +302,7 @@ $log->error("NO XTEMPLATEPATH DEFINED CANNOT CREATE XTEMPLATE"); } } + $log->debug("Exiting createXTemplate method ..."); } /**sets the XTemplate telling ListView to use newXTemplate as its current XTemplate @@ -266,7 +311,10 @@ * Contributor(s): ______________________________________. */ function setXTemplate(&$newXTemplate){ + global $log; + $log->debug("Entering setXTemplate(".$newXTemplate.") method ..."); $this->xTemplate = $newXTemplate; + $log->debug("Exiting setXTemplate method ..."); } /**returns the XTemplate @@ -274,7 +322,10 @@ * All Rights Reserved. * Contributor(s): ______________________________________. */ - function getXTemplate(){ + function getXTemplate(){ + global $log; + $log->debug("Entering getXTemplate() method ..."); + $log->debug("Exiting getXTemplate method ..."); return $this->xTemplate; } @@ -284,11 +335,14 @@ * Contributor(s): ______________________________________. */ function xTemplateAssign($name, $value){ + global $log; + $log->debug("Entering xTemplateAssign(".$name.",". $value.") method ..."); if(!isset($this->xTemplate)){ $this->createXTemplate(); } $this->xTemplate->assign($name, $value); + $log->debug("Exiting xTemplateAssign method ..."); } @@ -298,13 +352,17 @@ * Contributor(s): ______________________________________. */ function getOffset($localVarName){ + global $log; + $log->debug("Entering getOffset(".$localVarName.") method ..."); if($this->querey_where_has_changed){ $this->setSessionVariable($localVarName,"offset", 0); } $offset = $this->getSessionVariable($localVarName,"offset"); if(isset($offset)){ + $log->debug("Exiting getOffset method ..."); return $offset; } + $log->debug("Exiting getOffset method ..."); return 0; } @@ -314,7 +372,10 @@ * Contributor(s): ______________________________________. */ function setOffset($localVarName, $value){ + global $log; + $log->debug("Entering setOffset(".$localVarName.",". $value.") method ..."); $this->setSessionVariable($localVarName, "offset", $value); + $log->debug("Exiting setOffset method ..."); } /**INTERNAL FUNCTION sets a session variable @@ -323,12 +384,18 @@ * Contributor(s): ______________________________________. */ function setSessionVariable($localVarName,$varName, $value){ + global $log; + $log->debug("Entering setSessionVariable(".$localVarName.",".$varName.",". $value.") method ..."); $_SESSION[$this->local_current_module."_".$localVarName."_".$varName] = $value; + $log->debug("Exiting setSessionVariable method ..."); } function setUserVariable($localVarName,$varName, $value){ + global $log; + $log->debug("Entering setUserVariable(".$localVarName.",".$varName.",". $value.") method ..."); global $current_user; $current_user->setPreference($this->local_current_module."_".$localVarName."_".$varName, $value); + $log->debug("Exiting setUserVariable method ..."); } /**INTERNAL FUNCTION returns a session variable first checking the querey for it then checking the session @@ -337,12 +404,16 @@ * Contributor(s): ______________________________________. */ function getSessionVariable($localVarName,$varName){ + global $log; + $log->debug("Entering getSessionVariable(".$localVarName.",".$varName.") method ..."); if(isset($_REQUEST[$this->getSessionVariableName($localVarName, $varName)])){ $this->setSessionVariable($localVarName,$varName,$_REQUEST[$this->getSessionVariableName($localVarName, $varName)]); } if(isset($_SESSION[$this->getSessionVariableName($localVarName, $varName)])){ + $log->debug("Exiting getSessionVariable method ..."); return $_SESSION[$this->getSessionVariableName($localVarName, $varName)]; } + $log->debug("Exiting getSessionVariable method ..."); return ""; } @@ -361,6 +432,9 @@ * Contributor(s): ______________________________________.. */ function getSessionVariableName($localVarName,$varName){ + global $log; + $log->debug("Entering getSessionVariableName(".$localVarName.",".$varName.") method ..."); + $log->debug("Exiting getSessionVariableName method ..."); return $this->local_current_module."_".$localVarName."_".$varName; } @@ -379,6 +453,8 @@ * Contributor(s): ______________________________________.. */ function processSugarBean($xtemplateSection, $html_varName, $seed){ + global $log; + $log->debug("Entering processSugarBean(".$xtemplateSection.",". $html_varName.",". $seed.") method ..."); $current_offset = $this->getOffset($html_varName); $response = $seed->get_list($this->query_orderby, $this->query_where, $current_offset, $this->query_limit); $list = $response['list']; @@ -386,6 +462,7 @@ $next_offset = $response['next_offset']; $previous_offset = $response['previous_offset']; $this->processListNavigation( $xtemplateSection,$html_varName, $current_offset, $next_offset, $previous_offset, $row_count); + $log->debug("Exiting processSugarBean method ..."); return $list; } @@ -401,6 +478,8 @@ * Contributor(s): ______________________________________.. */ function processListNavigation( $xtemplateSection, $html_varName, $current_offset, $next_offset, $previous_offset, $row_count ){ + global $log; + $log->debug("Entering processListNavigation(".$xtemplateSection.",". $html_varName.",". $current_offset.",". $next_offset.",". $previous_offset.",". $row_count.") method ..."); global $current_user; global $allow_exports; $start_record = $current_offset + 1; @@ -483,7 +562,7 @@ $this->xTemplate->assign("EXPORT_LINK", " [ ".$export_link." ]"); } $this->xTemplate->parse($xtemplateSection.".list_nav_row"); - + $log->debug("Exiting processListNavigation method ..."); } } /** @@ -498,6 +577,8 @@ * Contributor(s): ______________________________________.. */ function processListRows(&$data,$xtemplateSection, $html_varName){ + global $log; + $log->debug("Entering processListRows(".$data.",".$xtemplateSection.",". $html_varName.") method ..."); $oddRow = true; foreach($data as $aItem) { @@ -518,6 +599,7 @@ $this->xTemplate->parse($xtemplateSection.".row"); } $this->xTemplate->parse($xtemplateSection); + $log->debug("Exiting processListRows method ..."); } /** @@ -535,6 +617,8 @@ * Contributor(s): ______________________________________.. */ function processListView($seed, $xTemplateSection, $html_varName){ + global $log; + $log->debug("Entering processListView(".$seed.",". $xTemplateSection.",". $html_varName.") method ..."); if(!isset($this->xTemplate)) $this->createXTemplate(); $isSugarBean = is_subclass_of($seed, "SugarBean"); @@ -554,6 +638,7 @@ echo get_form_footer(); if($isSugarBean ) echo "\n\n"; + $log->debug("Exiting processListView method ..."); //if(isset($_SESSION['validation'])){ // print base64_decode('PGEgaHJlZj0naHR0cDovL3d3dy5zdWdhcmNybS5jb20nPlBPV0VSRUQmbmJzcDtCWSZuYnNwO1NVR0FSQ1JNPC9hPg=='); @@ -562,6 +647,8 @@ } function processSortArrows($html_varName){ + global $log; + $log->debug("Entering processSortArrows(".$html_varName.") method ..."); $orderBy = $this->getSessionVariable($html_varName, "ORDER_BY_LAST"); $desc = $this->getSessionVariable($html_varName, $orderBy.'_desc'); $imgArrow = " "; @@ -572,7 +659,8 @@ $this->xTemplateAssign('amount_arrow', $imgArrow); else{ $this->xTemplateAssign($orderBy.'_arrow', $imgArrow); - } + } + $log->debug("Exiting processSortArrows method ..."); } } From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 28 01:01:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 05:01:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5557 - /vtigercrm/trunk/modules/Accounts/ListViewTop.php Message-ID: <20060428050110.A6A436B046E@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 23:01:06 2006 New Revision: 5557 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/modules/Accounts/ListViewTop.php Modified: vtigercrm/trunk/modules/Accounts/ListViewTop.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/ListViewTop.php (original) +++ vtigercrm/trunk/modules/Accounts/ListViewTop.php Thu Apr 27 23:01:06 2006 @@ -21,6 +21,8 @@ ********************************************************************************/ function getTopAccounts() { + $log = LoggerManager::getLogger('top accounts_list'); + $log->debug("Entering getTopAccounts() method ..."); require_once("data/Tracker.php"); require_once('modules/Potentials/Opportunity.php'); require_once('include/logging.php'); @@ -30,7 +32,6 @@ global $current_language; global $current_user; $current_module_strings = return_module_language($current_language, "Accounts"); - $log = LoggerManager::getLogger('top accounts_list'); $list_query = 'select account.accountid, account.accountname, account.tickersymbol, sum(potential.amount) as amount from potential inner join crmentity on (potential.potentialid=crmentity.crmid) inner join account on (potential.accountid=account.accountid) where crmentity.deleted=0 AND crmentity.smownerid="'.$current_user->id.'" and potential.sales_stage <> "'.$app_strings['LBL_CLOSE_WON'].'" and potential.sales_stage <> "'.$app_strings['LBL_CLOSE_LOST'].'" group by account.accountname order by 3 desc;'; $list_result=$adb->query($list_query); @@ -75,6 +76,7 @@ } $values=Array('Title'=>$title,'Header'=>$header,'Entries'=>$entries); if ( ($display_empty_home_blocks && count($open_accounts_list) == 0 ) || (count($open_accounts_list)>0) ) + $log->debug("Exiting getTopAccounts method ..."); return $values; } ?> From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 28 01:01:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 05:01:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5558 - /vtigercrm/trunk/modules/Accounts/Forms.php Message-ID: <20060428050156.E255E6B046E@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 23:01:52 2006 New Revision: 5558 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/modules/Accounts/Forms.php Modified: vtigercrm/trunk/modules/Accounts/Forms.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 28 01:02:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 05:02:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5559 - /vtigercrm/trunk/modules/Accounts/Save.php Message-ID: <20060428050255.173446AB67C@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 23:02:49 2006 New Revision: 5559 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/modules/Accounts/Save.php Modified: vtigercrm/trunk/modules/Accounts/Save.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 28 01:14:05 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 05:14:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5560 - /vtigercrm/trunk/modules/Accounts/Account.php Message-ID: <20060428051405.AC9916AB658@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 23:14:01 2006 New Revision: 5560 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/modules/Accounts/Account.php Modified: vtigercrm/trunk/modules/Accounts/Account.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 28 01:19:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 05:19:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5561 - /vtigercrm/trunk/modules/Campaigns/Campaign.php Message-ID: <20060428051911.96CA86AB658@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 23:19:07 2006 New Revision: 5561 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/modules/Campaigns/Campaign.php Modified: vtigercrm/trunk/modules/Campaigns/Campaign.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/Campaign.php (original) +++ vtigercrm/trunk/modules/Campaigns/Campaign.php Thu Apr 27 23:19:07 2006 @@ -60,6 +60,8 @@ function get_contacts($id) { + global $log; + $log->debug("Entering get_contacts(".$id.") method ..."); global $mod_strings; $focus = new Contact(); @@ -67,11 +69,13 @@ $returnset = '&return_module=Campaigns&return_action=DetailView&return_id='.$id; $query = 'SELECT contactdetails.*, crmentity.crmid, users.user_name, groups.groupname, crmentity.smownerid from contactdetails inner join crmentity on crmentity.crmid = contactdetails.contactid left join users on crmentity.smownerid = users.id left join contactgrouprelation on contactdetails.contactid=contactgrouprelation.contactid left join groups on groups.groupname=contactgrouprelation.groupname where crmentity.deleted=0 and contactdetails.campaignid = '.$id; - + $log->debug("Exiting get_contacts method ..."); return GetRelatedList('Campaigns','Contacts',$focus,$query,$button,$returnset); } function get_leads($id) { + global $log; + $log->debug("Entering get_leads(".$id.") method ..."); global $mod_strings; $focus = new Lead(); @@ -80,7 +84,7 @@ $returnset = '&return_module=Campaigns&return_action=DetailView&return_id='.$id; $query = 'SELECT leaddetails.*, crmentity.crmid, users.user_name, groups.groupname, crmentity.smownerid from leaddetails inner join crmentity on crmentity.crmid = leaddetails.leadid left join users on crmentity.smownerid = users.id left join leadgrouprelation on leaddetails.leadid=leadgrouprelation.leadid left join groups on groups.groupname=leadgrouprelation.groupname where crmentity.deleted=0 and leaddetails.campaignid = '.$id; - + $log->debug("Exiting get_leads method ..."); return GetRelatedList('Campaigns','Leads',$focus,$query,$button,$returnset); } From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 28 01:37:25 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 05:37:25 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5562 - /vtigercrm/trunk/modules/Activities/Activity.php Message-ID: <20060428053725.B95FE6B50DE@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 23:37:21 2006 New Revision: 5562 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/modules/Activities/Activity.php Modified: vtigercrm/trunk/modules/Activities/Activity.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 28 01:39:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 05:39:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5563 - /vtigercrm/trunk/modules/Activities/Event.php Message-ID: <20060428053937.572D56B0473@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 23:39:33 2006 New Revision: 5563 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/modules/Activities/Event.php Modified: vtigercrm/trunk/modules/Activities/Event.php ============================================================================== --- vtigercrm/trunk/modules/Activities/Event.php (original) +++ vtigercrm/trunk/modules/Activities/Event.php Thu Apr 27 23:39:33 2006 @@ -86,14 +86,17 @@ function getCount($user_name) { + global $log; + $log->debug("Entering getCount(".$user_name.") method ..."); $query = "select count(*) from tasks inner join users on users.id=tasks.assigned_user_id where user_name='" .$user_name ."' and tasks.deleted=0"; // echo "\n Query is " .$query ."\n"; $result = $this->db->query($query,true,"Error retrieving contacts count"); $rows_found = $this->db->getRowCount($result); $row = $this->db->fetchByAssoc($result, 0); + - + $log->debug("Exiting getCount method ..."); return $row["count(*)"]; } From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 28 01:43:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 05:43:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5564 - /vtigercrm/trunk/modules/Activities/OpenListView.php Message-ID: <20060428054359.34B136B0473@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 23:43:55 2006 New Revision: 5564 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/modules/Activities/OpenListView.php Modified: vtigercrm/trunk/modules/Activities/OpenListView.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 28 01:47:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 05:47:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5565 - /vtigercrm/trunk/modules/Activities/RenderRelatedListUI.php Message-ID: <20060428054724.05AB46D8FCF@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 23:47:21 2006 New Revision: 5565 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/modules/Activities/RenderRelatedListUI.php Modified: vtigercrm/trunk/modules/Activities/RenderRelatedListUI.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 28 01:49:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 05:49:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5566 - /vtigercrm/trunk/modules/Activities/Save.php Message-ID: <20060428054941.44D056D8FCF@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 23:49:37 2006 New Revision: 5566 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/modules/Activities/Save.php Modified: vtigercrm/trunk/modules/Activities/Save.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 28 01:54:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 05:54:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5567 - /vtigercrm/trunk/modules/Activities/Forms.php Message-ID: <20060428055412.4B8166D9008@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 27 23:54:07 2006 New Revision: 5567 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/modules/Activities/Forms.php Modified: vtigercrm/trunk/modules/Activities/Forms.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 28 02:24:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 06:24:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5568 - /vtigercrm/trunk/modules/Contacts/Contact.php Message-ID: <20060428062433.DF1C26D9038@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 28 00:24:24 2006 New Revision: 5568 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/modules/Contacts/Contact.php Modified: vtigercrm/trunk/modules/Contacts/Contact.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/Contact.php (original) +++ vtigercrm/trunk/modules/Contacts/Contact.php Fri Apr 28 00:24:24 2006 @@ -155,27 +155,33 @@ // Mike Crowe Mod --------------------------------------------------------Default ordering for us function getSortOrder() { + global $log; + $log->debug("Entering getSortOrder() method ..."); if(isset($_REQUEST['sorder'])) $sorder = $_REQUEST['sorder']; else $sorder = (($_SESSION['CONTACTS_SORT_ORDER'] != '')?($_SESSION['CONTACTS_SORT_ORDER']):($this->default_sort_order)); - + $log->debug("Exiting getSortOrder method ..."); return $sorder; } function getOrderBy() { + global $log; + $log->debug("Entering getOrderBy() method ..."); if (isset($_REQUEST['order_by'])) $order_by = $_REQUEST['order_by']; else $order_by = (($_SESSION['CONTACTS_ORDER_BY'] != '')?($_SESSION['CONTACTS_ORDER_BY']):($this->default_order_by)); - + $log->debug("Exiting getOrderBy method ..."); return $order_by; } // Mike Crowe Mod -------------------------------------------------------- function getCount($user_name) { + global $log; + $log->debug("Entering getCount(".$user_name.") method ..."); $query = "select count(*) from contactdetails inner join crmentity on crmentity.crmid=contactdetails.contactid inner join users on users.id=crmentity.smownerid where user_name='" .$user_name ."' and crmentity.deleted=0"; $result = $this->db->query($query,true,"Error retrieving contacts count"); @@ -183,20 +189,27 @@ $row = $this->db->fetchByAssoc($result, 0); - return $row["count(*)"]; + $log->debug("Exiting getCount method ..."); + return $row["count(*)"]; } function get_contacts1($user_name,$email_address) { + global $log; + $log->debug("Entering get_contacts1(".$user_name.",".$email_address.") method ..."); $query = "select users.user_name,groups.groupname, contactdetails.lastname last_name,contactdetails.firstname first_name,contactdetails.contactid as id, contactdetails.salutation as salutation, contactdetails.email as email1,contactdetails.title as title,contactdetails.mobile as phone_mobile,account.accountname as account_name,account.accountid as account_id from contactdetails inner join crmentity on crmentity.crmid=contactdetails.contactid inner join users on users.id=crmentity.smownerid left join account on account.accountid=contactdetails.accountid left join contactaddress on contactaddress.contactaddressid=contactdetails.contactid left join contactgrouprelation on contactdetails.contactid=contactgrouprelation.contactid where user_name='" .$user_name ."' and crmentity.deleted=0 and contactdetails.email like '%" .$email_address ."%' limit 50"; + $log->debug("Exiting get_contacts1 method ..."); return $this->process_list_query1($query); } function get_contacts($user_name,$from_index,$offset) { + global $log; + $log->debug("Entering get_contacts(".$user_name.",".$from_index.",".$offset.") method ..."); $query = "select users.user_name,groups.groupname,contactdetails.department department, contactdetails.phone office_phone, contactdetails.fax fax, contactsubdetails.assistant assistant_name, contactsubdetails.otherphone other_phone, contactsubdetails.homephone home_phone,contactsubdetails.birthday birthdate, contactdetails.lastname last_name,contactdetails.firstname first_name,contactdetails.contactid as id, contactdetails.salutation as salutation, contactdetails.email as email1,contactdetails.title as title,contactdetails.mobile as phone_mobile,account.accountname as account_name,account.accountid as account_id, contactaddress.mailingcity as primary_address_city,contactaddress.mailingstreet as primary_address_street, contactaddress.mailingcountry as primary_address_country,contactaddress.mailingstate as primary_address_state, contactaddress.mailingzip as primary_address_postalcode, contactaddress.othercity as alt_address_city,contactaddress.otherstreet as alt_address_street, contactaddress.othercountry as alt_address_country,contactaddress.otherstate as alt_address_state, contactaddress.otherzip as alt_address_postalcode from contactdetails inner join crmentity on crmentity.crmid=contactdetails.contactid inner join users on users.id=crmentity.smownerid left join account on account.accountid=contactdetails.accountid left join contactaddress on contactaddress.contactaddressid=contactdetails.contactid left join contactsubdetails on contactsubdetails.contactsubscriptionid = contactdetails.contactid left join contactgrouprelation on contactdetails.contactid=contactgrouprelation.contactid left join groups on groups.groupname=contactgrouprelation.groupname left join users on crmentity.smownerid=users.id where user_name='" .$user_name ."' and crmentity.deleted=0 limit " .$from_index ."," .$offset; + $log->debug("Exiting get_contacts method ..."); return $this->process_list_query1($query); } @@ -204,6 +217,8 @@ function process_list_query1($query) { + global $log; + $log->debug("Entering process_list_query1(".$query.") method ..."); $result =& $this->db->query($query,true,"Error retrieving $this->object_name list: "); $list = Array(); @@ -240,6 +255,7 @@ $response['previous_offset'] = $previous_offset; + $log->debug("Exiting process_list_query1 method ..."); return $response; } @@ -252,6 +268,7 @@ function get_opportunities($id) { global $log; + $log->debug("Entering get_opportunities(".$id.") method ..."); global $mod_strings; $focus = new Potential(); @@ -270,6 +287,7 @@ $query = 'select users.user_name,groups.groupname,contactdetails.accountid, contactdetails.contactid , potential.potentialid, potential.potentialname, potential.potentialtype, potential.sales_stage, potential.amount, potential.closingdate, crmentity.crmid, crmentity.smownerid from contactdetails inner join potential on contactdetails.accountid = potential.accountid inner join crmentity on crmentity.crmid = potential.potentialid left join potentialgrouprelation on potential.potentialid=potentialgrouprelation.potentialid left join groups on groups.groupname=potentialgrouprelation.groupname left join users on users.id=crmentity.smownerid where contactdetails.contactid = '.$id.' and crmentity.deleted=0'; if($this->column_fields['account_id'] != 0) + $log->debug("Exiting get_opportunities method ..."); return GetRelatedList('Contacts','Potentials',$focus,$query,$button,$returnset); } @@ -281,7 +299,8 @@ */ function get_activities($id) { - global $log; + global $log; + $log->debug("Entering get_activities(".$id.") method ..."); global $mod_strings; $focus = new Activity(); @@ -298,13 +317,15 @@ $log->info("Activity Related List for Contact Displayed"); $query = "SELECT contactdetails.lastname, contactdetails.firstname, activity.activityid , activity.subject, activity.activitytype, activity.date_start, activity.due_date, cntactivityrel.contactid, crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, recurringevents.recurringtype from contactdetails inner join cntactivityrel on cntactivityrel.contactid = contactdetails.contactid inner join activity on cntactivityrel.activityid=activity.activityid inner join crmentity on crmentity.crmid = cntactivityrel.activityid left outer join recurringevents on recurringevents.activityid=activity.activityid left join activitygrouprelation on activitygrouprelation.activityid=crmentity.crmid left join groups on groups.groupname=activitygrouprelation.groupname where contactdetails.contactid=".$id." and crmentity.deleted = 0 and (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task') AND ( activity.status is NULL || activity.status != 'Completed' ) and ( activity.eventstatus is NULL || activity.eventstatus != 'Held') and ( activity.eventstatus is NULL || activity.eventstatus != 'Not Held' )"; //recurring type is added in Query -Jaguar - + $log->debug("Exiting get_activities method ..."); return GetRelatedList('Contacts','Activities',$focus,$query,$button,$returnset); } function get_history($id) { + global $log; + $log->debug("Entering get_history(".$id.") method ..."); $query = "SELECT activity.activityid, activity.subject, activity.status, activity.eventstatus, activity.activitytype, contactdetails.contactid, contactdetails.firstname, contactdetails.lastname, crmentity.modifiedtime, @@ -321,7 +342,7 @@ and (activity.status = 'Completed' or activity.status = 'Deferred' or (activity.eventstatus != 'Planned' and activity.eventstatus != '')) and cntactivityrel.contactid=".$id; //Don't add order by, because, for security, one more condition will be added with this query in include/RelatedListView.php - + $log->debug("Entering get_history method ..."); return getHistory('Contacts',$query,$id); } @@ -329,7 +350,7 @@ { global $log; global $app_strings; - + $log->debug("Entering get_tickets(".$id.") method ..."); $focus = new HelpDesk(); $button = ' '; @@ -337,12 +358,14 @@ $query = "select crmentity.crmid, troubletickets.title, contactdetails.contactid, troubletickets.parent_id, contactdetails.firstname, contactdetails.lastname, troubletickets.status, troubletickets.priority, crmentity.smownerid from troubletickets inner join crmentity on crmentity.crmid=troubletickets.ticketid left join contactdetails on contactdetails.contactid=troubletickets.parent_id left join users on users.id=crmentity.smownerid left join ticketgrouprelation on troubletickets.ticketid=ticketgrouprelation.ticketid left join groups on groups.groupname=ticketgrouprelation.groupname where crmentity.deleted=0 and contactdetails.contactid=".$id; $log->info("Ticket Related List for Contact Displayed"); + $log->debug("Exiting get_tickets method ..."); return GetRelatedList('Contacts','HelpDesk',$focus,$query,$button,$returnset); } function get_attachments($id) { global $log; + $log->debug("Entering get_attachments(".$id.") method ..."); $query = "select notes.title,'Notes ' ActivityType, notes.filename, attachments.type FileType,crm2.modifiedtime lastmodified, seattachmentsrel.attachmentsid attachmentsid, notes.notesid crmid, @@ -367,11 +390,14 @@ where crmentity.crmid=".$id." order by createdtime desc"; $log->info("Notes&Attachmenmts for Contact Displayed"); + $log->debug("Exiting get_attachments method ..."); return getAttachmentsAndNotes('Contacts',$query,$id); } function get_quotes($id) { + global $log; + $log->debug("Entering get_quotes(".$id.") method ..."); global $app_strings; require_once('modules/Quotes/Quote.php'); $focus = new Quote(); @@ -383,11 +409,14 @@ } $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; $query = "select crmentity.*, quotes.*,potential.potentialname,contactdetails.lastname from quotes inner join crmentity on crmentity.crmid=quotes.quoteid left outer join contactdetails on contactdetails.contactid=quotes.contactid left outer join potential on potential.potentialid=quotes.potentialid left join quotegrouprelation on quotes.quoteid=quotegrouprelation.quoteid left join groups on groups.groupname=quotegrouprelation.groupname where crmentity.deleted=0 and contactdetails.contactid=".$id; + $log->debug("Exiting get_quotes method ..."); return GetRelatedList('Contacts','Quotes',$focus,$query,$button,$returnset); } function get_salesorder($id) { + global $log; + $log->debug("Entering get_salesorder(".$id.") method ..."); require_once('modules/SalesOrder/SalesOrder.php'); global $app_strings; $focus = new SalesOrder(); @@ -401,12 +430,14 @@ $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; $query = "select crmentity.*, salesorder.*, quotes.subject as quotename, account.accountname, contactdetails.lastname from salesorder inner join crmentity on crmentity.crmid=salesorder.salesorderid left outer join quotes on quotes.quoteid=salesorder.quoteid left outer join account on account.accountid=salesorder.accountid left outer join contactdetails on contactdetails.contactid=salesorder.contactid left join sogrouprelation on salesorder.salesorderid=sogrouprelation.salesorderid left join groups on groups.groupname=sogrouprelation.groupname where crmentity.deleted=0 and salesorder.contactid = ".$id; + $log->debug("Exiting get_salesorder method ..."); return GetRelatedList('Contacts','SalesOrder',$focus,$query,$button,$returnset); } function get_products($id) { - + global $log; + $log->debug("Entering get_products(".$id.") method ..."); global $app_strings; require_once('modules/Products/Product.php'); $focus = new Product(); @@ -420,11 +451,14 @@ $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; $query = 'select products.productid, products.productname, products.productcode, products.commissionrate, products.qty_per_unit, products.unit_price, crmentity.crmid, crmentity.smownerid,contactdetails.lastname from products inner join crmentity on crmentity.crmid = products.productid left outer join contactdetails on contactdetails.contactid = products.contactid where contactdetails.contactid = '.$id.' and crmentity.deleted = 0'; + $log->debug("Exiting get_products method ..."); return GetRelatedList('Contacts','Products',$focus,$query,$button,$returnset); } function get_purchase_orders($id) { + global $log; + $log->debug("Entering get_purchase_orders(".$id.") method ..."); global $app_strings; require_once('modules/PurchaseOrder/PurchaseOrder.php'); $focus = new Order(); @@ -439,6 +473,7 @@ $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; $query = "select crmentity.*, purchaseorder.*,vendor.vendorname,contactdetails.lastname from purchaseorder inner join crmentity on crmentity.crmid=purchaseorder.purchaseorderid left outer join vendor on purchaseorder.vendorid=vendor.vendorid left outer join contactdetails on contactdetails.contactid=purchaseorder.contactid left join pogrouprelation on purchaseorder.purchaseorderid=pogrouprelation.purchaseorderid left join groups on groups.groupname=pogrouprelation.groupname where crmentity.deleted=0 and purchaseorder.contactid=".$id; + $log->debug("Exiting get_purchase_orders method ..."); return GetRelatedList('Contacts','PurchaseOrder',$focus,$query,$button,$returnset); } @@ -450,6 +485,7 @@ function get_emails($id) { global $log; + $log->debug("Entering get_emails(".$id.") method ..."); global $mod_strings; $focus = new Email(); @@ -465,6 +501,7 @@ $log->info("Email Related List for Contact Displayed"); $query = 'select activity.activityid, activity.activityid, activity.subject, activity.activitytype, users.user_name, crmentity.modifiedtime, crmentity.crmid, crmentity.smownerid, activity.date_start from activity, seactivityrel, contactdetails, users, crmentity left join activitygrouprelation on activitygrouprelation.activityid=crmentity.crmid left join groups on groups.groupname=activitygrouprelation.groupname where seactivityrel.activityid = activity.activityid and contactdetails.contactid = seactivityrel.crmid and users.id=crmentity.smownerid and crmentity.crmid = activity.activityid and contactdetails.contactid = '.$id.' and activity.activitytype="Emails" and crmentity.deleted = 0'; + $log->debug("Exiting get_emails method ..."); return GetRelatedList('Contacts','Emails',$focus,$query,$button,$returnset); } @@ -475,6 +512,7 @@ function create_export_query(&$order_by, &$where) { global $log; + $log->debug("Entering create_export_query(".$order_by.",".$where.") method ..."); if($this->checkIfCustomTableExists('contactscf')) { $query = $this->constructCustomQueryAddendum('contactscf','Contacts') .", @@ -504,6 +542,7 @@ where crmentity.deleted=0 and users.status='Active' "; } $log->info("Export Query Constructed Successfully"); + $log->debug("Exiting create_export_query method ..."); return $query; } @@ -511,6 +550,8 @@ //Used By vtigerCRM Word Add-In function getColumnNames() { + global $log; + $log->debug("Entering getColumnNames() method ..."); $sql1 = "select fieldlabel from field where tabid=4 and block <> 4"; $result = $this->db->query($sql1); $numRows = $this->db->num_rows($result); @@ -521,6 +562,7 @@ $custom_fields[$i] = strtoupper($custom_fields[$i]); } $mergeflds = $custom_fields; + $log->debug("Exiting getColumnNames method ..."); return $mergeflds; } //End @@ -528,6 +570,8 @@ //Used By vtigerCRM Outlook Add-In function get_searchbyemailid($username,$emailaddress) { + global $log; + $log->debug("Entering get_searchbyemailid(".$username.",".$emailaddress.") method ..."); $query = "select contactdetails.lastname as last_name,contactdetails.firstname as first_name, contactdetails.contactid as id, contactdetails.salutation as salutation, contactdetails.email as email1,contactdetails.title as title, @@ -539,11 +583,14 @@ left join contactaddress on contactaddress.contactaddressid=contactdetails.contactid where user_name='" .$username ."' and crmentity.deleted=0 and contactdetails.email like '%".$emailaddress."%'"; + $log->debug("Exiting get_searchbyemailid method ..."); return $this->process_list_query1($query); } function get_contactsforol($user_name) { + global $log; + $log->debug("Entering get_contactsforol(".$user_name.") method ..."); $query = "select contactdetails.department department, contactdetails.phone, contactdetails.fax, contactsubdetails.assistant assistant_name, contactsubdetails.assistantphone, @@ -566,6 +613,7 @@ left join contactsubdetails on contactsubdetails.contactsubscriptionid = contactdetails.contactid where users.user_name='" .$user_name ."' and crmentity.deleted=0"; + $log->debug("Exiting get_contactsforol method ..."); return $query; } //End From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 28 02:25:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 06:25:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5569 - /vtigercrm/trunk/modules/Contacts/Save.php Message-ID: <20060428062524.0A7806D9038@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 28 00:25:14 2006 New Revision: 5569 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/modules/Contacts/Save.php Modified: vtigercrm/trunk/modules/Contacts/Save.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 28 02:28:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 06:28:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5570 - /vtigercrm/trunk/modules/Contacts/Forms.php Message-ID: <20060428062834.2C5FD6D9038@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 28 00:28:25 2006 New Revision: 5570 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/modules/Contacts/Forms.php Modified: vtigercrm/trunk/modules/Contacts/Forms.php ============================================================================== Binary files - no diff available. From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 02:42:09 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 06:42:09 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23750=3A_?= =?utf-8?q?Integrate_code_contributions?= In-Reply-To: <076.b16a74c382aa688de221822029b26245@vtiger.fosslabs.com> References: <076.b16a74c382aa688de221822029b26245@vtiger.fosslabs.com> Message-ID: <085.e3dfb1fa013f57ff984f5354003bb145@vtiger.fosslabs.com> #750: Integrate code contributions ------------------------+--------------------------------------------------- Reporter: allanbush | Owner: richie Type: defect | Status: new Priority: minor | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc3 Resolution: | Keywords: ------------------------+--------------------------------------------------- Comment (by allanbush): (In [5571]) Added rdhital's pagination in related modules view (http://forums.vtiger.com/viewtopic.php?t=4861). Refs #750. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 28 02:42:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 06:42:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5571 - in /vtigercrm/branches/4.2/include: RelatedListView.html RelatedListView.php uifromdbutil.php utils.php Message-ID: <20060428064209.046EF6D9544@vtiger.fosslabs.com> Author: allanbush Date: Fri Apr 28 00:42:05 2006 New Revision: 5571 Log: Added rdhital's pagination in related modules view (http://forums.vtiger.com/viewtopic.php?t=4861). Refs #750. Modified: vtigercrm/branches/4.2/include/RelatedListView.html (contents, props changed) vtigercrm/branches/4.2/include/RelatedListView.php vtigercrm/branches/4.2/include/uifromdbutil.php vtigercrm/branches/4.2/include/utils.php Modified: vtigercrm/branches/4.2/include/RelatedListView.html ============================================================================== Binary files - no diff available. Modified: vtigercrm/branches/4.2/include/RelatedListView.php ============================================================================== --- vtigercrm/branches/4.2/include/RelatedListView.php (original) +++ vtigercrm/branches/4.2/include/RelatedListView.php Fri Apr 28 00:42:05 2006 @@ -98,17 +98,14 @@ $noofrows = $adb->num_rows($list_result); //Retreiving the start value from request -if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') -{ - $start = $_REQUEST['start']; -} -else -{ - +$start_idx = $relatedmodule.'start'; +if(isset($_REQUEST[$start_idx]) && $_REQUEST[$start_idx] != '') { + $start = $_REQUEST[$start_idx]; +} else { $start = 1; } //Retreive the Navigation array -$navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page); +$navigation_array = getRelatedNavigationValues($start, $noofrows, $list_max_entries_per_page, $relatedmodule); //Retreive the List View Table Header if($noofrows == 0) @@ -118,7 +115,7 @@ else { $listview_header = getListViewHeader($focus,$relatedmodule,'','','','relatedlist');//"Accounts"); - if ($noofrows > 15) + if ($navigation_array[$relatedmodule.'end_val'] - $navigation_array[$relatedmodule.'start'] > 15) { $xtpl->assign('SCROLLSTART','
        '); $xtpl->assign('SCROLLSTOP','
        '); @@ -144,10 +141,25 @@ //$listview_entries = getListViewEntries1($focus,"Accounts",$list_result,$navigation_array); $xtpl->assign("LISTENTITY", $listview_entries); $xtpl->assign("SELECT_SCRIPT", $view_script); - $navigationOutput = getTableHeaderNavigation($navigation_array, $url_qry,$relatedmodule); + $navigationOutput = getTableHeaderNavigation($navigation_array, $url_qry,$relatedmodule, 'DetailView', ''); //echo $navigationOutput; - //$xtpl->assign("NAVIGATION", $navigationOutput); + $navigationOutput = ' + + + + +
        + + '.$navigationOutput.' +
        +
        '; + + + if($navigation_array[$relatedmodule.'allflag'] != 'All' || $navigation_array[$relatedmodule.'verylast'] > 1) { + // only show if navigation is possible + $xtpl->assign("NAVIGATION", $navigationOutput); + } $xtpl->parse("main"); $xtpl->out("main"); Modified: vtigercrm/branches/4.2/include/uifromdbutil.php ============================================================================== --- vtigercrm/branches/4.2/include/uifromdbutil.php (original) +++ vtigercrm/branches/4.2/include/uifromdbutil.php Fri Apr 28 00:42:05 2006 @@ -137,30 +137,42 @@ global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; + + $record = isset($_REQUEST['record']) ? $_REQUEST['record'] : ''; + $relmodule = $_REQUEST['module'] == $module ? '' : $module; + $start = $relmodule.'start'; + $end_val = $relmodule.'end_val'; + $first = $relmodule.'first'; + $end = $relmodule.'end'; + $allflag = $relmodule.'allflag'; + $current = $relmodule.'current'; + $next = $relmodule.'next'; + $verylast = $relmodule.'verylast'; + $prev = $relmodule.'prev'; + $dir_name = $_REQUEST['module']; + $output = ''; - - $dir_name=getModuleDirName($module); - $output .= ''.$navigation_array['allflag'].' '; - if(($navigation_array['prev']) != 0) { - $output .= ' '; - $output .= ' '; + $output .= ''.$navigation_array[$allflag].' '; + if(($navigation_array[$prev]) != 0) { + $output .= ' '; + $output .= ' '; } else { $output .= ' '; $output .= ' '; } - for ($i=$navigation_array['first'];$i<=$navigation_array['end'];$i++) { - if ($navigation_array['current']==$i) { + for ($i=$navigation_array[$first];$i<=$navigation_array[$end];$i++) { + if ($navigation_array[$current]==$i) { $output .=''.$i.' '; } else { - $output .= ''.$i.' '; + $output .= ''.$i.' '; } } - if(($navigation_array['next']) !=0) { - $output .= ' '; - $output .= ' '; + if(($navigation_array[$next]) !=0) { + $output .= ' '; + $output .= ' '; } else { $output .= ' '; $output .= ' '; Modified: vtigercrm/branches/4.2/include/utils.php ============================================================================== --- vtigercrm/branches/4.2/include/utils.php (original) +++ vtigercrm/branches/4.2/include/utils.php Fri Apr 28 00:42:05 2006 @@ -2485,24 +2485,39 @@ } return $user_id; } -//outlook security + function getNavigationValues($display, $noofrows, $limit) +{ + return getRelatedNavigationValues($display, $noofrows, $limit, ''); +} + +function getRelatedNavigationValues($display, $noofrows, $limit, $relatedmodule) { global $limitpage_navigation; if(!isset($limitpage_navigation)) $limitpage_navigation = 5; $navigation_array = Array(); - if(isset($_REQUEST['allflag']) && $_REQUEST['allflag'] == 'All') { - $navigation_array['start'] =1; - $navigation_array['first'] = 1; - $navigation_array['end'] = 1; - $navigation_array['prev'] =0; - $navigation_array['next'] =0; - $navigation_array['end_val'] =$noofrows; - $navigation_array['current'] =1; - $navigation_array['allflag'] ='Normal'; - $navigation_array['verylast'] =1; + $start_idx = $relatedmodule.'start'; + $first_idx = $relatedmodule.'first'; + $end_idx = $relatedmodule.'end'; + $prev_idx = $relatedmodule.'prev'; + $next_idx = $relatedmodule.'next'; + $end_val_idx = $relatedmodule.'end_val'; + $allflag_idx = $relatedmodule.'allflag'; + $current_idx = $relatedmodule.'current'; + $verylast_idx = $relatedmodule.'verylast'; + + if(isset($_REQUEST[$allflag_idx]) && $_REQUEST[$allflag_idx] == 'All') { + $navigation_array[$start_idx] =1; + $navigation_array[$first_idx] = 1; + $navigation_array[$end_idx] = 1; + $navigation_array[$prev_idx] =0; + $navigation_array[$next_idx] =0; + $navigation_array[$end_val_idx] =$noofrows; + $navigation_array[$current_idx] =1; + $navigation_array[$allflag_idx] ='Normal'; + $navigation_array[$verylast_idx] =1; return $navigation_array; } @@ -2537,15 +2552,15 @@ $next=0; } - $navigation_array['start'] = $start; - $navigation_array['first'] = $first; - $navigation_array['end'] = $last; - $navigation_array['prev'] = $previous; - $navigation_array['next'] = $next; - $navigation_array['end_val'] = $end; - $navigation_array['current'] = $display; - $navigation_array['allflag'] ='All'; - $navigation_array['verylast'] =$paging; + $navigation_array[$start_idx] = $start; + $navigation_array[$first_idx] = $first; + $navigation_array[$end_idx] = $last; + $navigation_array[$prev_idx] = $previous; + $navigation_array[$next_idx] = $next; + $navigation_array[$end_val_idx] = $end; + $navigation_array[$current_idx] = $display; + $navigation_array[$allflag_idx] ='All'; + $navigation_array[$verylast_idx] =$paging; return $navigation_array; } @@ -3034,7 +3049,10 @@ } } - for ($i=$navigation_array['start']; $i<=$navigation_array['end_val']; $i++) + $relmodule = $_REQUEST['module'] == $module || $_REQUEST['module'] == 'Home' ? '' : $module; + $start = $relmodule.'start'; + $end_val = $relmodule.'end_val'; + for ($i=$navigation_array[$start]; $i<=$navigation_array[$end_val]; $i++) { if (($i%2)==0) $list_header .= ''; From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 28 03:06:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 07:06:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5572 - /vtigercrm/trunk/modules/Potentials/Forms.php Message-ID: <20060428070612.DF5776AB5F0@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 28 01:05:45 2006 New Revision: 5572 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/modules/Potentials/Forms.php Modified: vtigercrm/trunk/modules/Potentials/Forms.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 28 03:20:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 07:20:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5573 - /vtigercrm/trunk/modules/Potentials/ListViewTop.php Message-ID: <20060428072020.DC87E6DAC2C@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 28 01:20:03 2006 New Revision: 5573 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/modules/Potentials/ListViewTop.php Modified: vtigercrm/trunk/modules/Potentials/ListViewTop.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 28 03:21:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 07:21:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5574 - /vtigercrm/trunk/modules/Potentials/Opportunity.php Message-ID: <20060428072148.BF4D26DAC2C@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 28 01:21:35 2006 New Revision: 5574 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/modules/Potentials/Opportunity.php Modified: vtigercrm/trunk/modules/Potentials/Opportunity.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 28 03:22:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 07:22:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5575 - /vtigercrm/trunk/modules/Potentials/Charts.php Message-ID: <20060428072237.BB1DF6DAC2C@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 28 01:22:19 2006 New Revision: 5575 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/modules/Potentials/Charts.php Modified: vtigercrm/trunk/modules/Potentials/Charts.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 28 03:49:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 07:49:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5576 - /vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php Message-ID: <20060428074907.BA7496DB0B5@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 28 01:48:54 2006 New Revision: 5576 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php Modified: vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php Fri Apr 28 01:48:54 2006 @@ -116,6 +116,8 @@ */ function get_activities($id) { + global $log; + $log->debug("Entering get_activities(".$id.") method ..."); global $app_strings; require_once('modules/Activities/Activity.php'); $focus = new Activity(); @@ -125,6 +127,7 @@ $returnset = '&return_module=PurchaseOrder&return_action=DetailView&return_id='.$id; $query = "SELECT contactdetails.lastname, contactdetails.firstname, contactdetails.contactid,activity.*,seactivityrel.*,crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, users.user_name from activity inner join seactivityrel on seactivityrel.activityid=activity.activityid inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid = cntactivityrel.contactid left join users on users.id=crmentity.smownerid left join activitygrouprelation on activitygrouprelation.activityid=crmentity.crmid left join groups on groups.groupname=activitygrouprelation.groupname where seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and crmentity.deleted=0 and (activity.status is not NULL && activity.status != 'Completed') and (activity.status is not NULL && activity.status != 'Deferred') or (activity.eventstatus != '' && activity.eventstatus = 'Planned')"; + $log->debug("Exiting get_activities method ..."); return GetRelatedList('PurchaseOrder','Activities',$focus,$query,$button,$returnset); } @@ -134,6 +137,8 @@ */ function get_history($id) { + global $log; + $log->debug("Entering get_history(".$id.") method ..."); $query = "SELECT contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, activity.* ,seactivityrel.*, crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, crmentity.createdtime, crmentity.description, users.user_name @@ -150,6 +155,7 @@ and seactivityrel.crmid=".$id; //Don't add order by, because, for security, one more condition will be added with this query in include/RelatedListView.php + $log->debug("Exiting get_history method ..."); return getHistory('PurchaseOrder',$query,$id); } @@ -159,6 +165,8 @@ */ function get_attachments($id) { + global $log; + $log->debug("Entering get_attachments(".$id.") method ..."); // Armando L?scher 18.10.2005 -> ?visibleDescription // Desc: Inserted crm2.createdtime, notes.notecontent description, users.user_name // Inserted inner join users on crm2.smcreatorid= users.id @@ -190,6 +198,7 @@ inner join users on crm2.smcreatorid= users.id where crmentity.crmid=".$id." order by createdtime desc"; + $log->debug("Exiting get_attachments method ..."); return getAttachmentsAndNotes('PurchaseOrder',$query,$id,$sid='purchaseorderid'); } From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 28 03:50:19 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 07:50:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5577 - /vtigercrm/trunk/modules/SalesOrder/SalesOrder.php Message-ID: <20060428075019.740206D9544@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 28 01:50:06 2006 New Revision: 5577 Log: logs entries inserted in all functions 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 Fri Apr 28 01:50:06 2006 @@ -122,14 +122,17 @@ */ function get_activities($id) { + global $log; + $log->debug("Entering get_activities(".$id.") method ..."); global $app_strings; - require_once('modules/Activities/Activity.php'); + require_once('modules/Activities/Activity.php'); $focus = new Activity(); $button = ''; $returnset = '&return_module=SalesOrder&return_action=DetailView&return_id='.$id; $query = "SELECT contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, activity.*,seactivityrel.*,crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, users.user_name from activity inner join seactivityrel on seactivityrel.activityid=activity.activityid inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid = cntactivityrel.contactid left join users on users.id=crmentity.smownerid left join activitygrouprelation on activitygrouprelation.activityid=crmentity.crmid left join groups on groups.groupname=activitygrouprelation.groupname where seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and crmentity.deleted=0 and (activity.status is not NULL && activity.status != 'Completed') and (activity.status is not NULL && activity.status !='Deferred') or (activity.eventstatus != '' && activity.eventstatus = 'Planned')"; + $log->debug("Exiting get_activities method ..."); return GetRelatedList('SalesOrder','Activities',$focus,$query,$button,$returnset); } @@ -139,6 +142,8 @@ */ function get_history($id) { + global $log; + $log->debug("Entering get_history(".$id.") method ..."); $query = "SELECT contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, activity.*, seactivityrel.*, crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, crmentity.createdtime, crmentity.description, users.user_name @@ -155,6 +160,7 @@ and seactivityrel.crmid=".$id; //Don't add order by, because, for security, one more condition will be added with this query in include/RelatedListView.php + $log->debug("Exiting get_history method ..."); return getHistory('SalesOrder',$query,$id); } @@ -164,6 +170,8 @@ */ function get_attachments($id) { + global $log; + $log->debug("Entering get_attachments(".$id.") method ..."); // Armando L?scher 18.10.2005 -> ?visibleDescription // Desc: Inserted crmentity.createdtime, notes.notecontent description, users.user_name // Inserted inner join users on crmentity.smcreatorid= users.id @@ -195,6 +203,7 @@ inner join users on crmentity.smcreatorid= users.id where crmentity.crmid=".$id." order by createdtime desc"; + $log->debug("Exiting get_attachments method ..."); return getAttachmentsAndNotes('SalesOrder',$query,$id,$sid='salesorderid'); } @@ -204,6 +213,8 @@ */ function get_invoices($id) { + global $log; + $log->debug("Entering get_invoices(".$id.") method ..."); require_once('modules/Invoice/Invoice.php'); $focus = new Invoice(); @@ -213,6 +224,7 @@ $query = "select crmentity.*, invoice.*, account.accountname, salesorder.subject as salessubject from invoice inner join crmentity on crmentity.crmid=invoice.invoiceid left outer join account on account.accountid=invoice.accountid inner join salesorder on salesorder.salesorderid=invoice.salesorderid left join invoicegrouprelation on invoice.invoiceid=invoicegrouprelation.invoiceid left join groups on groups.groupname=invoicegrouprelation.groupname where crmentity.deleted=0 and salesorder.salesorderid=".$id; + $log->debug("Exiting get_invoices method ..."); return GetRelatedList('SalesOrder','Invoice',$focus,$query,$button,$returnset); } From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 28 03:51:31 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 07:51:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5578 - /vtigercrm/trunk/modules/Quotes/Quote.php Message-ID: <20060428075131.6FDC56DB0B5@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 28 01:51:16 2006 New Revision: 5578 Log: logs entries inserted in all functions Modified: vtigercrm/trunk/modules/Quotes/Quote.php Modified: vtigercrm/trunk/modules/Quotes/Quote.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/Quote.php (original) +++ vtigercrm/trunk/modules/Quotes/Quote.php Fri Apr 28 01:51:16 2006 @@ -116,32 +116,40 @@ function get_salesorder($id) { + global $log; + $log->debug("Entering get_salesorder(".$id.") method ..."); require_once('modules/SalesOrder/SalesOrder.php'); - $focus = new SalesOrder(); + $focus = new SalesOrder(); $button = ''; $returnset = '&return_module=Quotes&return_action=DetailView&return_id='.$id; $query = "select crmentity.*, salesorder.*, quotes.subject as quotename, account.accountname from salesorder inner join crmentity on crmentity.crmid=salesorder.salesorderid left outer join quotes on quotes.quoteid=salesorder.quoteid left outer join account on account.accountid=salesorder.accountid left join sogrouprelation on salesorder.salesorderid=sogrouprelation.salesorderid left join groups on groups.groupname=sogrouprelation.groupname where crmentity.deleted=0 and salesorder.quoteid = ".$id; + $log->debug("Exiting get_salesorder method ..."); return GetRelatedList('Quotes','SalesOrder',$focus,$query,$button,$returnset); } function get_activities($id) { + global $log; + $log->debug("Entering get_activities(".$id.") method ..."); global $app_strings; require_once('modules/Activities/Activity.php'); - $focus = new Activity(); + $focus = new Activity(); $button = ''; $returnset = '&return_module=Quotes&return_action=DetailView&return_id='.$id; $query = "SELECT contactdetails.contactid, contactdetails.lastname, contactdetails.firstname, activity.*,seactivityrel.*,crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, users.user_name,recurringevents.recurringtype from activity inner join seactivityrel on seactivityrel.activityid=activity.activityid inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid = cntactivityrel.contactid left join users on users.id=crmentity.smownerid left outer join recurringevents on recurringevents.activityid=activity.activityid left join activitygrouprelation on activitygrouprelation.activityid=crmentity.crmid left join groups on groups.groupname=activitygrouprelation.groupname where seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and (activity.status is not NULL && activity.status != 'Completed') and (activity.status is not NULL && activity.status != 'Deferred') or (activity.eventstatus !='' && activity.eventstatus = 'Planned')"; + $log->debug("Exiting get_activities method ..."); return GetRelatedList('Quotes','Activities',$focus,$query,$button,$returnset); } function get_history($id) { + global $log; + $log->debug("Entering get_history(".$id.") method ..."); $query = "SELECT activity.activityid, activity.subject, activity.status, activity.eventstatus, activity.activitytype, contactdetails.contactid, contactdetails.firstname, contactdetails.lastname, crmentity.modifiedtime, @@ -159,6 +167,7 @@ and seactivityrel.crmid=".$id; //Don't add order by, because, for security, one more condition will be added with this query in include/RelatedListView.php + $log->debug("Exiting get_history method ..."); return getHistory('Quotes',$query,$id); } } From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 04:44:11 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 08:44:11 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23628=3A_?= =?utf-8?q?Issue_in_User_Detail_View?= In-Reply-To: <076.090b02b860493e91e7c111b10940640a@vtiger.fosslabs.com> References: <076.090b02b860493e91e7c111b10940640a@vtiger.fosslabs.com> Message-ID: <085.bec6f111ea8e226ecd635b5293045ca3@vtiger.fosslabs.com> #628: Issue in User Detail View ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: Browser ---------------------------+------------------------------------------------ Changes (by anonymous): * resolution: => duplicate * status: new => closed Comment: 630 -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 04:44:36 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 08:44:36 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23534=3A_?= =?utf-8?q?Issue_in_History?= In-Reply-To: <076.36403516d3a9ceec9637b1a7e733713f@vtiger.fosslabs.com> References: <076.36403516d3a9ceec9637b1a7e733713f@vtiger.fosslabs.com> Message-ID: <085.3a0591994962339219a65a92f8af2017@vtiger.fosslabs.com> #534: Issue in History ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: wontfix | Keywords: Related Lists ---------------------------+------------------------------------------------ Changes (by anonymous): * resolution: => wontfix * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 04:55:12 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 08:55:12 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23122=3A_?= =?utf-8?q?Issue_in_Mass_Delete?= In-Reply-To: <076.89726d02571017484d27333203347a97@vtiger.fosslabs.com> References: <076.89726d02571017484d27333203347a97@vtiger.fosslabs.com> Message-ID: <085.721edf9c40d0eb9398c2e6d1ce4cba9a@vtiger.fosslabs.com> #122: Issue in Mass Delete ------------------------+--------------------------------------------------- Reporter: jeri | Owner: philip Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: massdelete ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => duplicate * status: new => closed Comment: 121 -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 04:58:55 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 08:58:55 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23340=3A_?= =?utf-8?q?massdelete_in_ListView_shows_hacking_attempt?= In-Reply-To: <076.8bb0c18a8c6f0b2898b70887f00fcb22@vtiger.fosslabs.com> References: <076.8bb0c18a8c6f0b2898b70887f00fcb22@vtiger.fosslabs.com> Message-ID: <085.9251f9440dd326de8b9339ea47d56dc6@vtiger.fosslabs.com> #340: massdelete in ListView shows hacking attempt ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: massdelete ---------------------------+------------------------------------------------ Changes (by anonymous): * resolution: => duplicate * status: new => closed Comment: 340 -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:04:23 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:04:23 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23659=3A_?= =?utf-8?q?Editor_=28email/notes=29?= In-Reply-To: <076.eacd6674a1378a68e62435b8bb9421fd@vtiger.fosslabs.com> References: <076.eacd6674a1378a68e62435b8bb9421fd@vtiger.fosslabs.com> Message-ID: <085.c7ea17c57faed75b9d0f7246fa258440@vtiger.fosslabs.com> #659: Editor (email/notes) ------------------------+--------------------------------------------------- Reporter: Balduin | Owner: richie Type: defect | Status: new Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => richie Comment: i am unable to reproduce it here. Kindly let me know the steps that you have taken to get the issue. Thanks, Richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:06:20 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:06:20 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23489=3A_?= =?utf-8?q?scroll_bar_in_notes_editview?= In-Reply-To: <076.d4c6aa1353950d65538e5120738ca06a@vtiger.fosslabs.com> References: <076.d4c6aa1353950d65538e5120738ca06a@vtiger.fosslabs.com> Message-ID: <085.c6709f8f3f8105a3a817ece74c120c22@vtiger.fosslabs.com> #489: scroll bar in notes editview --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: --------------------------------+------------------------------------------- Changes (by anonymous): * resolution: => invalid * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:22:24 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:22:24 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23498=3A_?= =?utf-8?q?Validation_for_create_profile?= In-Reply-To: <076.1673d619387215c8f124824ecac30cb2@vtiger.fosslabs.com> References: <076.1673d619387215c8f124824ecac30cb2@vtiger.fosslabs.com> Message-ID: <085.82c8a08f1443ac1ffeefb9ebe3daaffa@vtiger.fosslabs.com> #498: Validation for create profile ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: validation ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:24:38 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:24:38 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23211=3A_?= =?utf-8?q?The_Assigned_to_Field_in_Leads_list_view_is_empty?= In-Reply-To: <076.8a65622385fd35a1361b3352db58a27a@vtiger.fosslabs.com> References: <076.8a65622385fd35a1361b3352db58a27a@vtiger.fosslabs.com> Message-ID: <085.f102825679654e6e49c623a502e20a28@vtiger.fosslabs.com> #211: The Assigned to Field in Leads list view is empty ------------------------+--------------------------------------------------- Reporter: don | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:24:45 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:24:45 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23274=3A_?= =?utf-8?q?Usability_Issue_in_Picklist_edit?= In-Reply-To: <076.4ffdd920d7a10450ecd5a4fafd680079@vtiger.fosslabs.com> References: <076.4ffdd920d7a10450ecd5a4fafd680079@vtiger.fosslabs.com> Message-ID: <085.6c73460a05e5dd0c20b5a0bdce0ab489@vtiger.fosslabs.com> #274: Usability Issue in Picklist edit ------------------------+--------------------------------------------------- Reporter: don | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => duplicate * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:25:12 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:25:12 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23516=3A_?= =?utf-8?q?Org_Sharing_privileges_UI_Issue?= In-Reply-To: <076.3238204aa46c47b221faa15a66761b82@vtiger.fosslabs.com> References: <076.3238204aa46c47b221faa15a66761b82@vtiger.fosslabs.com> Message-ID: <085.ac48f4363d2af75b4658df9a03bf4bc5@vtiger.fosslabs.com> #516: Org Sharing privileges UI Issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: anonymous Type: defect | Status: closed Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: Security ---------------------------+------------------------------------------------ Changes (by don): * resolution: => invalid * status: assigned => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:26:28 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:26:28 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23683=3A_?= =?utf-8?q?Settings_Menu_should_not_be_shown_in_My_Preference_Page?= In-Reply-To: <076.bf8980ab378cbfb991ebb9daeafbe17b@vtiger.fosslabs.com> References: <076.bf8980ab378cbfb991ebb9daeafbe17b@vtiger.fosslabs.com> Message-ID: <085.374776596b02c74d2e131381466d8aef@vtiger.fosslabs.com> #683: Settings Menu should not be shown in My Preference Page ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: ahmed Type: defect | Status: closed Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Users ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:28:46 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:28:46 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23582=3A_?= =?utf-8?q?Notes_Security_Issue?= In-Reply-To: <076.774ad43eec994f96640a83f35f43701e@vtiger.fosslabs.com> References: <076.774ad43eec994f96640a83f35f43701e@vtiger.fosslabs.com> Message-ID: <085.48ef14268c14057a26b54a0db308fe5a@vtiger.fosslabs.com> #582: Notes Security Issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Security ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:30:58 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:30:58 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23376=3A_?= =?utf-8?q?Issues_in_List_View_of_Tag_-_HelpDesk?= In-Reply-To: <076.a20bd48d395e5686a72ac3d38bf859e1@vtiger.fosslabs.com> References: <076.a20bd48d395e5686a72ac3d38bf859e1@vtiger.fosslabs.com> Message-ID: <085.9a11fc876b0a2cc83766035341884887@vtiger.fosslabs.com> #376: Issues in List View of Tag - HelpDesk ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => invalid * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:31:52 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:31:52 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23391=3A_?= =?utf-8?q?Issue_in_Profiles?= In-Reply-To: <076.b90f1eece8a6f489625e9df58a52bad4@vtiger.fosslabs.com> References: <076.b90f1eece8a6f489625e9df58a52bad4@vtiger.fosslabs.com> Message-ID: <085.b6d2a2b3377e2d71ad6c469afdfccba6@vtiger.fosslabs.com> #391: Issue in Profiles ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: profiles ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:32:42 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:32:42 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23468=3A_?= =?utf-8?q?Issue_in_List_View?= In-Reply-To: <076.7f645c990ec63ad9af747a3c7223e9ac@vtiger.fosslabs.com> References: <076.7f645c990ec63ad9af747a3c7223e9ac@vtiger.fosslabs.com> Message-ID: <085.733791bcbbbe75f59982cba4bdb59b8e@vtiger.fosslabs.com> #468: Issue in List View ------------------------+--------------------------------------------------- Reporter: don | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:32:43 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:32:43 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23499=3A_?= =?utf-8?q?Create_Profile_Issue?= In-Reply-To: <076.8c766e916e9590364dfb9cad98a94c57@vtiger.fosslabs.com> References: <076.8c766e916e9590364dfb9cad98a94c57@vtiger.fosslabs.com> Message-ID: <085.586d31f4bb773765b4a57af9ef9f97bd@vtiger.fosslabs.com> #499: Create Profile Issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:39:16 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:39:16 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23588=3A_?= =?utf-8?q?In_Users_List_View_the_role_link_is_not_proper?= In-Reply-To: <076.288cc004f52efd816910739cc64dd80b@vtiger.fosslabs.com> References: <076.288cc004f52efd816910739cc64dd80b@vtiger.fosslabs.com> Message-ID: <085.e7406140643a644d21c9724d1bfe834c@vtiger.fosslabs.com> #588: In Users List View the role link is not proper ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: ela Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: assigned => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:43:50 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:43:50 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23195=3A_?= =?utf-8?q?edit_picklist?= In-Reply-To: <076.2ce061c7989257e6a4907a4e0fdd829d@vtiger.fosslabs.com> References: <076.2ce061c7989257e6a4907a4e0fdd829d@vtiger.fosslabs.com> Message-ID: <085.4355370618164b92baf92de1b86b2f0c@vtiger.fosslabs.com> #195: edit picklist ------------------------+--------------------------------------------------- Reporter: richie | Owner: ela Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => ela -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:44:00 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:44:00 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23205=3A_?= =?utf-8?q?no_image_mail_server_info?= In-Reply-To: <076.d44d3396d8e036259f267ae772a82b40@vtiger.fosslabs.com> References: <076.d44d3396d8e036259f267ae772a82b40@vtiger.fosslabs.com> Message-ID: <085.5f23d24cd740fb9d291d465cb30f08cb@vtiger.fosslabs.com> #205: no image mail server info ------------------------+--------------------------------------------------- Reporter: richie | Owner: ela Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: mail server info ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => ela -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:44:07 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:44:07 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23228=3A_?= =?utf-8?q?migration_screen_to_be_revamped?= In-Reply-To: <076.cef784e4a7cc85c86c5698ecbe3dfa5a@vtiger.fosslabs.com> References: <076.cef784e4a7cc85c86c5698ecbe3dfa5a@vtiger.fosslabs.com> Message-ID: <085.f75d43cfe06fe6e82ea5c1e0a5547fa5@vtiger.fosslabs.com> #228: migration screen to be revamped ------------------------+--------------------------------------------------- Reporter: richie | Owner: ela Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: migration ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => ela -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:44:18 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:44:18 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23242=3A_?= =?utf-8?q?Security_Settings_-_LHS_navigation_missing_for_Roles_section?= In-Reply-To: <076.978f8d6d19ec9e1fa5607e8f75858cd8@vtiger.fosslabs.com> References: <076.978f8d6d19ec9e1fa5607e8f75858cd8@vtiger.fosslabs.com> Message-ID: <085.c7ee3aee6be45221adbf652fc82d212e@vtiger.fosslabs.com> #242: Security Settings - LHS navigation missing for Roles section ------------------------+--------------------------------------------------- Reporter: gopal | Owner: ela Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => ela -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:44:23 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:44:23 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23392=3A_?= =?utf-8?q?Issue_in_Field_Access_IE_browser?= In-Reply-To: <076.da3a82840e4830a891413c4cbde054cd@vtiger.fosslabs.com> References: <076.da3a82840e4830a891413c4cbde054cd@vtiger.fosslabs.com> Message-ID: <085.b34ed112d09162acff925cde0a10ccaa@vtiger.fosslabs.com> #392: Issue in Field Access IE browser ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: ela Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: UI ---------------------------+------------------------------------------------ Changes (by richie): * owner: developer => ela -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:44:43 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:44:43 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23153=3A_?= =?utf-8?q?More_Information=2C_Address_Information_fails_IE?= In-Reply-To: <076.6b87af7d35ac5bf492e6e729ae7b5c58@vtiger.fosslabs.com> References: <076.6b87af7d35ac5bf492e6e729ae7b5c58@vtiger.fosslabs.com> Message-ID: <085.02b0fe405d7448417b7f8b0f08270979@vtiger.fosslabs.com> #153: More Information, Address Information fails IE ------------------------+--------------------------------------------------- Reporter: richie | Owner: richie Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: More Info ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:44:55 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:44:55 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23119=3A_?= =?utf-8?q?Edit_and_Delete_button_missing_in_List_View?= In-Reply-To: <076.899bb8c824af029fef6ad40fc6e7f7c4@vtiger.fosslabs.com> References: <076.899bb8c824af029fef6ad40fc6e7f7c4@vtiger.fosslabs.com> Message-ID: <085.f8c90c28fe8b728374180d72510958db@vtiger.fosslabs.com> #119: Edit and Delete button missing in List View ------------------------+--------------------------------------------------- Reporter: don | Owner: ahmed Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:45:05 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:45:05 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23125=3A_?= =?utf-8?q?Annoying_shortcut_icon_on_left_side_of_screen?= In-Reply-To: <076.6a9687bb44cf232867d02b741ef9c704@vtiger.fosslabs.com> References: <076.6a9687bb44cf232867d02b741ef9c704@vtiger.fosslabs.com> Message-ID: <085.56bfd16997267debc7a7a6cb87986247@vtiger.fosslabs.com> #125: Annoying shortcut icon on left side of screen ------------------------+--------------------------------------------------- Reporter: richie | Owner: ela Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: arrow ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => ela -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:45:12 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:45:12 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23146=3A_?= =?utf-8?q?labels_not_in_single_line?= In-Reply-To: <076.21d4bebde0f315778a165da1f2c19f1f@vtiger.fosslabs.com> References: <076.21d4bebde0f315778a165da1f2c19f1f@vtiger.fosslabs.com> Message-ID: <085.16611e7fe6623209e98257442a3ffe07@vtiger.fosslabs.com> #146: labels not in single line ------------------------+--------------------------------------------------- Reporter: richie | Owner: saint Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: staggered ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => saint -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:45:35 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:45:35 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23167=3A_?= =?utf-8?q?standarduser_detail_view_screen_proper?= In-Reply-To: <076.1d766ff6b338fa4771ae7fe7e1bd0c51@vtiger.fosslabs.com> References: <076.1d766ff6b338fa4771ae7fe7e1bd0c51@vtiger.fosslabs.com> Message-ID: <085.20f4825eab07fe8493379878b8bc0bf9@vtiger.fosslabs.com> #167: standarduser detail view screen proper ------------------------+--------------------------------------------------- Reporter: richie | Owner: ela Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => ela -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:45:46 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:45:46 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23153=3A_?= =?utf-8?q?More_Information=2C_Address_Information_fails_IE?= In-Reply-To: <076.6b87af7d35ac5bf492e6e729ae7b5c58@vtiger.fosslabs.com> References: <076.6b87af7d35ac5bf492e6e729ae7b5c58@vtiger.fosslabs.com> Message-ID: <085.19b51217c432627e893d811499033bbe@vtiger.fosslabs.com> #153: More Information, Address Information fails IE ------------------------+--------------------------------------------------- Reporter: richie | Owner: saint Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: More Info ------------------------+--------------------------------------------------- Changes (by richie): * owner: richie => saint -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:46:09 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:46:09 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23144=3A_?= =?utf-8?q?Statistics_not_in_the_same_plane_as_List_View_Users?= In-Reply-To: <076.6ff95a784ff00fd4b095cf6a1e5450fa@vtiger.fosslabs.com> References: <076.6ff95a784ff00fd4b095cf6a1e5450fa@vtiger.fosslabs.com> Message-ID: <085.fe5ed1ea3d26688e98f2b24ab7bd2395@vtiger.fosslabs.com> #144: Statistics not in the same plane as List View Users ------------------------+--------------------------------------------------- Reporter: richie | Owner: saint Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Statistics ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => saint -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:46:17 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:46:17 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23141=3A_?= =?utf-8?q?screen_collapses_IE_User_view?= In-Reply-To: <076.983bdaff841a5d9cb10d3b2b92e4308e@vtiger.fosslabs.com> References: <076.983bdaff841a5d9cb10d3b2b92e4308e@vtiger.fosslabs.com> Message-ID: <085.65f82d09b9b93b24aae29fcb5b1da707@vtiger.fosslabs.com> #141: screen collapses IE User view ------------------------+--------------------------------------------------- Reporter: richie | Owner: saint Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: screen collapse ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => saint -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:46:27 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:46:27 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23137=3A_?= =?utf-8?q?Settings-=3EConfiguration_click_shakes_page?= In-Reply-To: <076.c084681044a7a82003c2285e066904e4@vtiger.fosslabs.com> References: <076.c084681044a7a82003c2285e066904e4@vtiger.fosslabs.com> Message-ID: <085.a37afc7d2e2b537938ce4f7c2029918c@vtiger.fosslabs.com> #137: Settings->Configuration click shakes page ------------------------+--------------------------------------------------- Reporter: richie | Owner: ela Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: page shift ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => ela -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:46:38 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:46:38 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23135=3A_?= =?utf-8?q?missing_communication_templates?= In-Reply-To: <076.5997046850f52c2dcc019dbeb3ff2438@vtiger.fosslabs.com> References: <076.5997046850f52c2dcc019dbeb3ff2438@vtiger.fosslabs.com> Message-ID: <085.6497a0f5356c3d5143c588463b62cbbc@vtiger.fosslabs.com> #135: missing communication templates ------------------------+--------------------------------------------------- Reporter: richie | Owner: ahmed Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:47:03 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:47:03 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23632=3A_?= =?utf-8?q?Issue_in_User_List_View?= In-Reply-To: <076.e81a56a5d59831c54878804f0147eb62@vtiger.fosslabs.com> References: <076.e81a56a5d59831c54878804f0147eb62@vtiger.fosslabs.com> Message-ID: <085.d41d8e9a845bbbac5edd62150053526d@vtiger.fosslabs.com> #632: Issue in User List View ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Browser ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:48:41 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:48:41 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23212=3A_?= =?utf-8?q?Inbox_link_under_=27Qualified_Mails=27_is_not_working?= In-Reply-To: <076.883d6a1d409206fc372b8c61a2c9b9f9@vtiger.fosslabs.com> References: <076.883d6a1d409206fc372b8c61a2c9b9f9@vtiger.fosslabs.com> Message-ID: <085.4d7e03138af6542e5ae8a5ac187b928f@vtiger.fosslabs.com> #212: Inbox link under 'Qualified Mails' is not working --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: email inbox --------------------------------+------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:48:49 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:48:49 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23213=3A_?= =?utf-8?q?no_image_backup_server_config?= In-Reply-To: <076.3f0dea16607ae71bf674ea181a738a8e@vtiger.fosslabs.com> References: <076.3f0dea16607ae71bf674ea181a738a8e@vtiger.fosslabs.com> Message-ID: <085.6537bdd3bdebfaf3f0eaadda19e5db4b@vtiger.fosslabs.com> #213: no image backup server config ------------------------+--------------------------------------------------- Reporter: richie | Owner: ela Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: backup server config ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => ela -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:49:17 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:49:17 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23202=3A_?= =?utf-8?q?=27no_image=27_while_company_info_edit?= In-Reply-To: <076.49b980f60f323d38dd3fb5eb903756ac@vtiger.fosslabs.com> References: <076.49b980f60f323d38dd3fb5eb903756ac@vtiger.fosslabs.com> Message-ID: <085.03085abe629d7dec4dbc2bd04f481258@vtiger.fosslabs.com> #202: 'no image' while company info edit ------------------------+--------------------------------------------------- Reporter: richie | Owner: ela Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: company info ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => ela -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:50:52 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:50:52 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23269=3A_?= =?utf-8?q?Calendar_Day_View_-_No_link_at_Time?= In-Reply-To: <076.d9a8f2b119b3df78319e486bdc48f2e9@vtiger.fosslabs.com> References: <076.d9a8f2b119b3df78319e486bdc48f2e9@vtiger.fosslabs.com> Message-ID: <085.c3049455dafd6990cd0db70f12b11f58@vtiger.fosslabs.com> #269: Calendar Day View - No link at Time ------------------------+--------------------------------------------------- Reporter: gopal | Owner: ela Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => ela -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:50:58 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:50:58 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23259=3A_?= =?utf-8?q?New_User_-_Reports_To_-_CSS_Not_applied_properly?= In-Reply-To: <076.8733a323192caf9065436361d9d6cd14@vtiger.fosslabs.com> References: <076.8733a323192caf9065436361d9d6cd14@vtiger.fosslabs.com> Message-ID: <085.7d72193a11f086bb3012bcb5b5e60dee@vtiger.fosslabs.com> #259: New User - Reports To - CSS Not applied properly ------------------------+--------------------------------------------------- Reporter: gopal | Owner: ela Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => ela -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:51:14 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:51:14 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23282=3A_?= =?utf-8?q?No_Validation_for_Quick_Create_Ticket?= In-Reply-To: <076.f2ce9ea579ed2c3cb483f6fd2702aa69@vtiger.fosslabs.com> References: <076.f2ce9ea579ed2c3cb483f6fd2702aa69@vtiger.fosslabs.com> Message-ID: <085.8f11f2f9ebeacea7194ca944ead4bd8e@vtiger.fosslabs.com> #282: No Validation for Quick Create Ticket ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: ahmed Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:51:22 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:51:22 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23285=3A_?= =?utf-8?q?Usability_issue_in_picklist_edit?= In-Reply-To: <076.37f58295d8c930da3b24bcd877110dea@vtiger.fosslabs.com> References: <076.37f58295d8c930da3b24bcd877110dea@vtiger.fosslabs.com> Message-ID: <085.460a49d0796cb7146f2f478ca7b3a3d2@vtiger.fosslabs.com> #285: Usability issue in picklist edit ------------------------+--------------------------------------------------- Reporter: don | Owner: ela Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => ela -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:51:35 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:51:35 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23292=3A_?= =?utf-8?q?No_Validation_for_Quick_Edit_of_Mandatory_Fields_-_HelpDesk?= In-Reply-To: <076.60e672e646ab98c96bf4604e5fa4889a@vtiger.fosslabs.com> References: <076.60e672e646ab98c96bf4604e5fa4889a@vtiger.fosslabs.com> Message-ID: <085.99635e6279f3aa2a1399f7577b9edba2@vtiger.fosslabs.com> #292: No Validation for Quick Edit of Mandatory Fields - HelpDesk ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: ahmed Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:54:46 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:54:46 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23439=3A_?= =?utf-8?q?Validation_is_not_working_for_quick_create_form?= In-Reply-To: <076.edf94bb3508212d7dd3244389b2a56d2@vtiger.fosslabs.com> References: <076.edf94bb3508212d7dd3244389b2a56d2@vtiger.fosslabs.com> Message-ID: <085.3d4c471b409ec400a3d1b411408bd5f4@vtiger.fosslabs.com> #439: Validation is not working for quick create form ------------------------+--------------------------------------------------- Reporter: don | Owner: ahmed Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:55:25 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:55:25 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23409=3A_?= =?utf-8?q?The_copy_address_button_is_missing_in_Create_Contact_Form?= In-Reply-To: <076.c249f9559187934331b763992d94b565@vtiger.fosslabs.com> References: <076.c249f9559187934331b763992d94b565@vtiger.fosslabs.com> Message-ID: <085.98c754f2ae50844c3ca3f26ab61aa668@vtiger.fosslabs.com> #409: The copy address button is missing in Create Contact Form ------------------------+--------------------------------------------------- Reporter: don | Owner: ela Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => ela -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:55:26 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:55:26 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2392=3A_E?= =?utf-8?q?mail_template_Subject_Does_not_carry_over=2E?= In-Reply-To: <076.59a21343597c2ac30fcc51aff8a565e1@vtiger.fosslabs.com> References: <076.59a21343597c2ac30fcc51aff8a565e1@vtiger.fosslabs.com> Message-ID: <085.5ed5dcb07edde5e787c45cc313d07be3@vtiger.fosslabs.com> #92: Email template Subject Does not carry over. ------------------------+--------------------------------------------------- Reporter: vito | Owner: ahmed Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:55:36 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:55:36 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2399=3A_v?= =?utf-8?q?alidation_is_not_working_for_Notes_module?= In-Reply-To: <076.7a3afc76bba03ac9644950c05984d3a1@vtiger.fosslabs.com> References: <076.7a3afc76bba03ac9644950c05984d3a1@vtiger.fosslabs.com> Message-ID: <085.1ca2d6ed6f1baec6cecdf40d50394423@vtiger.fosslabs.com> #99: validation is not working for Notes module ------------------------+--------------------------------------------------- Reporter: Minnie | Owner: ahmed Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * owner: mangai => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:55:45 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:55:45 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23100=3A_?= =?utf-8?q?overlapping_of_layers_in_notes_editview?= In-Reply-To: <076.c00285d475a3ef3ed881eaab34f77db7@vtiger.fosslabs.com> References: <076.c00285d475a3ef3ed881eaab34f77db7@vtiger.fosslabs.com> Message-ID: <085.f2ac4b6c793d24e6f4f8ac131bcb31b0@vtiger.fosslabs.com> #100: overlapping of layers in notes editview ------------------------+--------------------------------------------------- Reporter: Minnie | Owner: ela Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: overlapping ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => ela -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:58:09 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:58:09 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23453=3A_?= =?utf-8?q?Issue_in_Globale_Seach?= In-Reply-To: <076.ac20c5429ded63fb3c6424d497bb6088@vtiger.fosslabs.com> References: <076.ac20c5429ded63fb3c6424d497bb6088@vtiger.fosslabs.com> Message-ID: <085.9ab8c90abea830991c7f307b85db4fa6@vtiger.fosslabs.com> #453: Issue in Globale Seach ------------------------+--------------------------------------------------- Reporter: don | Owner: mickie Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => duplicate * status: assigned => closed Comment: 465 -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 05:58:47 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 09:58:47 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23519=3A_?= =?utf-8?q?validation_for_notes_quickreate?= In-Reply-To: <076.a1e19f784ca3cb33edb5fa2c87c26e5a@vtiger.fosslabs.com> References: <076.a1e19f784ca3cb33edb5fa2c87c26e5a@vtiger.fosslabs.com> Message-ID: <085.a5f44a2a0b3e06c1735de4493d798282@vtiger.fosslabs.com> #519: validation for notes quickreate --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: ahmed Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: --------------------------------+------------------------------------------- Changes (by richie): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 06:03:01 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 10:03:01 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23397=3A_?= =?utf-8?q?Create_role_issue?= In-Reply-To: <076.aefea6f19aa5f2a517b9bdf77c3ee53f@vtiger.fosslabs.com> References: <076.aefea6f19aa5f2a517b9bdf77c3ee53f@vtiger.fosslabs.com> Message-ID: <085.994e6696732f335b6e1c87b74a8cf205@vtiger.fosslabs.com> #397: Create role issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 28 06:08:14 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 10:08:14 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5579 - /vtigercrm/trunk/modules/Users/listroles.php Message-ID: <20060428100814.985A96E5EA9@vtiger.fosslabs.com> Author: don Date: Fri Apr 28 04:08:10 2006 New Revision: 5579 Log: Added parenttab as Settings Modified: vtigercrm/trunk/modules/Users/listroles.php Modified: vtigercrm/trunk/modules/Users/listroles.php ============================================================================== --- vtigercrm/trunk/modules/Users/listroles.php (original) +++ vtigercrm/trunk/modules/Users/listroles.php Fri Apr 28 04:08:10 2006 @@ -130,7 +130,7 @@ echo ''; if(! $roledepth == 0) { - echo ' Add | Edit | Delete | View'; + echo ' Add | Edit | Delete | View'; } else { From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 06:08:41 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 10:08:41 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23404=3A_?= =?utf-8?q?Parent_tab_issue_in_AddRole_Page?= In-Reply-To: <076.044d1f48966c0d70d4c32e54efa789ea@vtiger.fosslabs.com> References: <076.044d1f48966c0d70d4c32e54efa789ea@vtiger.fosslabs.com> Message-ID: <085.ed724b43a0f936dc258d7d2ab54d8a7f@vtiger.fosslabs.com> #404: Parent tab issue in AddRole Page ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Parenttab ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 06:09:22 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 10:09:22 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23405=3A_?= =?utf-8?q?Parent_tab_issue_in_Role_Create=2CSave=2CEdit=2CDelete_Pages?= In-Reply-To: <076.aec1f3244221babda23f926c84f5a963@vtiger.fosslabs.com> References: <076.aec1f3244221babda23f926c84f5a963@vtiger.fosslabs.com> Message-ID: <085.2bc6d98ed1ef01701a51d0bea0ba1dff@vtiger.fosslabs.com> #405: Parent tab issue in Role Create,Save,Edit,Delete Pages ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Parenttab ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 06:09:24 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 10:09:24 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23110=3A_?= =?utf-8?q?Issue_in_the_quick_edit_provided_in_detail_view?= In-Reply-To: <076.786d590796362f282d8e6c86c1e443ce@vtiger.fosslabs.com> References: <076.786d590796362f282d8e6c86c1e443ce@vtiger.fosslabs.com> Message-ID: <085.84c6d73651ae629a820dda0942bc9810@vtiger.fosslabs.com> #110: Issue in the quick edit provided in detail view ------------------------+--------------------------------------------------- Reporter: don | Owner: ahmed Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 06:10:09 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 10:10:09 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23491=3A_?= =?utf-8?q?Edit_Role_Page_Issue?= In-Reply-To: <076.04381931e5dbfbd8cb44eaf74f781e97@vtiger.fosslabs.com> References: <076.04381931e5dbfbd8cb44eaf74f781e97@vtiger.fosslabs.com> Message-ID: <085.93594a1e4e4140d5809eb69960477197@vtiger.fosslabs.com> #491: Edit Role Page Issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 06:15:11 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 10:15:11 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23492=3A_?= =?utf-8?q?Edit_Role_Page_Issue?= In-Reply-To: <076.65ede321df17b6a66866db833adcbc30@vtiger.fosslabs.com> References: <076.65ede321df17b6a66866db833adcbc30@vtiger.fosslabs.com> Message-ID: <085.d0f63361645e6c798025036224d67871@vtiger.fosslabs.com> #492: Edit Role Page Issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 28 06:15:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 10:15:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5580 - /vtigercrm/trunk/Smarty/templates/RoleEditView.tpl Message-ID: <20060428101513.D58126E5FDB@vtiger.fosslabs.com> Author: don Date: Fri Apr 28 04:15:06 2006 New Revision: 5580 Log: modified save to create Modified: vtigercrm/trunk/Smarty/templates/RoleEditView.tpl Modified: vtigercrm/trunk/Smarty/templates/RoleEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/RoleEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/RoleEditView.tpl Fri Apr 28 04:15:06 2006 @@ -113,7 +113,7 @@      -    +    From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 06:15:46 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 10:15:46 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23493=3A_?= =?utf-8?q?Role_DetailView_issue?= In-Reply-To: <076.1d6d9c2d1e47e1eaf37d1812ae640278@vtiger.fosslabs.com> References: <076.1d6d9c2d1e47e1eaf37d1812ae640278@vtiger.fosslabs.com> Message-ID: <085.1251608d28d1a2dc62c1075c618559f8@vtiger.fosslabs.com> #493: Role DetailView issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: ela Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: assigned => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 06:17:16 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 10:17:16 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23496=3A_?= =?utf-8?q?Selected_Info_in_profiles?= In-Reply-To: <076.1b493a92b2d40095c75bb184f4af88eb@vtiger.fosslabs.com> References: <076.1b493a92b2d40095c75bb184f4af88eb@vtiger.fosslabs.com> Message-ID: <085.2e41be8148eb91a01f6c1c6d3546aed0@vtiger.fosslabs.com> #496: Selected Info in profiles ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: ela Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: assigned => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 06:18:14 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 10:18:14 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23497=3A_?= =?utf-8?q?Title_for_profiles?= In-Reply-To: <076.ab007d7fbc97d0b7307ccf3f269a5ad2@vtiger.fosslabs.com> References: <076.ab007d7fbc97d0b7307ccf3f269a5ad2@vtiger.fosslabs.com> Message-ID: <085.88e509f81616870041c1ebbea1297f1a@vtiger.fosslabs.com> #497: Title for profiles ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: anonymous Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: assigned => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 06:19:24 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 10:19:24 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23500=3A_?= =?utf-8?q?Profile_Editview_Issue?= In-Reply-To: <076.b74511bfdcaedb6377789083d2ea3a57@vtiger.fosslabs.com> References: <076.b74511bfdcaedb6377789083d2ea3a57@vtiger.fosslabs.com> Message-ID: <085.b2ac58ad32778e1dbf023aa2e27573d4@vtiger.fosslabs.com> #500: Profile Editview Issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: ela Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: assigned => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 06:22:56 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 10:22:56 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23506=3A_?= =?utf-8?q?Issue_in_Role_Detail_View?= In-Reply-To: <076.667f41f22d766211e84d7731abf53842@vtiger.fosslabs.com> References: <076.667f41f22d766211e84d7731abf53842@vtiger.fosslabs.com> Message-ID: <085.f1e92ce861aceff292e200a39f3c0a24@vtiger.fosslabs.com> #506: Issue in Role Detail View ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 06:25:39 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 10:25:39 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23521=3A_?= =?utf-8?q?Parenttab_Missing_for_Roles?= In-Reply-To: <076.f20ed03a279890af8fd43854390efb9c@vtiger.fosslabs.com> References: <076.f20ed03a279890af8fd43854390efb9c@vtiger.fosslabs.com> Message-ID: <085.e9fdf5f17e929f2a76615629f45c00b2@vtiger.fosslabs.com> #521: Parenttab Missing for Roles ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 06:27:29 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 10:27:29 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23522=3A_?= =?utf-8?q?Parenttab_Missing_for_Profiles=2CGroups?= In-Reply-To: <076.6c1a52af5f2215bd4588470b8cbb73c4@vtiger.fosslabs.com> References: <076.6c1a52af5f2215bd4588470b8cbb73c4@vtiger.fosslabs.com> Message-ID: <085.3fabe57ec1211cbaa785946f8d822a60@vtiger.fosslabs.com> #522: Parenttab Missing for Profiles,Groups ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 06:28:50 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 10:28:50 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23626=3A_?= =?utf-8?q?Issue_in_Profile_listview?= In-Reply-To: <076.49353d33bac9954935073df4c5448b1c@vtiger.fosslabs.com> References: <076.49353d33bac9954935073df4c5448b1c@vtiger.fosslabs.com> Message-ID: <085.3069817c78ca597c414f30b4476f9fcc@vtiger.fosslabs.com> #626: Issue in Profile listview ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: ela Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Browser ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: assigned => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 06:32:19 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 10:32:19 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23666=3A_?= =?utf-8?q?Navigation_not_aligned_proper_in_Users_ListVIew?= In-Reply-To: <076.d4f93c4fb638bae64a73526f41a5c82e@vtiger.fosslabs.com> References: <076.d4f93c4fb638bae64a73526f41a5c82e@vtiger.fosslabs.com> Message-ID: <085.0874832297d3e69f48d0443254443195@vtiger.fosslabs.com> #666: Navigation not aligned proper in Users ListVIew ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: ela Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: assigned => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 07:16:37 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 11:16:37 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2396=3A_P?= =?utf-8?q?DF-generation_=28invoice=29_sometimes_fails?= In-Reply-To: <076.4c46ddeaf8a9bd9a0763c3db83037d45@vtiger.fosslabs.com> References: <076.4c46ddeaf8a9bd9a0763c3db83037d45@vtiger.fosslabs.com> Message-ID: <085.99fa70ecb12da34b4bc828f932f731ae@vtiger.fosslabs.com> #96: PDF-generation (invoice) sometimes fails -----------------------------------+---------------------------------------- Reporter: hpw at softechmatrix.nl | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 4.2.4 Component: vtigercrm | Version: 4.2.3 Resolution: fixed | Keywords: error pdf invoice order -----------------------------------+---------------------------------------- Comment (by hpw at softechmatrix.nl): Allan, thanks for testing again. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 07:18:52 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 11:18:52 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23270=3A_?= =?utf-8?q?Add_Notes_error?= In-Reply-To: <076.4dce61f119947dc3253c993bd923c96c@vtiger.fosslabs.com> References: <076.4dce61f119947dc3253c993bd923c96c@vtiger.fosslabs.com> Message-ID: <085.fe37f7f85b542bceb21718bca3fde0db@vtiger.fosslabs.com> #270: Add Notes error ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: notes ---------------------------+------------------------------------------------ Changes (by richie): * resolution: => fixed * status: new => closed Comment: Fixed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 07:20:09 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 11:20:09 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23273=3A_?= =?utf-8?q?Add_Attachment_issue?= In-Reply-To: <076.f69cbeb2597585fcdeb2060bb5e8ee53@vtiger.fosslabs.com> References: <076.f69cbeb2597585fcdeb2060bb5e8ee53@vtiger.fosslabs.com> Message-ID: <085.feed34c46e7079d236b18aff9e5f5c31@vtiger.fosslabs.com> #273: Add Attachment issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: attachments ---------------------------+------------------------------------------------ Changes (by richie): * resolution: => fixed * status: new => closed Comment: Fixed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 07:21:30 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 11:21:30 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23241=3A_?= =?utf-8?q?Settings_-_Navigation_Links_not_working?= In-Reply-To: <076.f8fb65f8228b4c3942e2d9a6fc7943ff@vtiger.fosslabs.com> References: <076.f8fb65f8228b4c3942e2d9a6fc7943ff@vtiger.fosslabs.com> Message-ID: <085.84d36f9ffd39c60719cbb78d045af31e@vtiger.fosslabs.com> #241: Settings - Navigation Links not working ------------------------+--------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: wontfix | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => wontfix * status: new => closed Comment: Expected Behaviour. Will not be handled. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 07:25:09 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 11:25:09 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23442=3A_?= =?utf-8?q?Improper_message_in_Contact_Detail_View?= In-Reply-To: <076.1dbbaff7c9be01da8e3358818b36ffef@vtiger.fosslabs.com> References: <076.1dbbaff7c9be01da8e3358818b36ffef@vtiger.fosslabs.com> Message-ID: <085.987e858cf26c94dfffd429153d5d2606@vtiger.fosslabs.com> #442: Improper message in Contact Detail View ------------------------+--------------------------------------------------- Reporter: don | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 28 07:51:47 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 11:51:47 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5581 - /vtigercrm/trunk/include/utils/SearchUtils.php Message-ID: <20060428115147.775856E5EA4@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 28 05:51:32 2006 New Revision: 5581 Log: Related to field removed from advance 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 Fri Apr 28 05:51:32 2006 @@ -390,10 +390,13 @@ } $fieldlabel1 = str_replace(" ","_",$fieldlabel); - if ($i==0) - $OPTION_SET .= ""; - else - $OPTION_SET .= ""; + if($fieldlabel != 'Related to') + { + if ($i==0) + $OPTION_SET .= ""; + else + $OPTION_SET .= ""; + } } $log->debug("Exiting getAdvSearchfields method ..."); return $OPTION_SET; From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 08:01:00 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 12:01:00 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23741=3A_?= =?utf-8?q?Create_Group_-_Default_filter_selection?= In-Reply-To: <076.2a6d5517e6c3b15c30ace383f35ae26b@vtiger.fosslabs.com> References: <076.2a6d5517e6c3b15c30ace383f35ae26b@vtiger.fosslabs.com> Message-ID: <085.d162225ee1cfcc5039d77a24fbd4fb5e@vtiger.fosslabs.com> #741: Create Group - Default filter selection ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: wontfix | Keywords: Create group ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => wontfix * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 08:04:09 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 12:04:09 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23607=3A_?= =?utf-8?q?Unable_to_create_new_ticket=2E?= In-Reply-To: <076.ec2f296a02d16f9111b0d6b6fd3ed24c@vtiger.fosslabs.com> References: <076.ec2f296a02d16f9111b0d6b6fd3ed24c@vtiger.fosslabs.com> Message-ID: <085.119d5789e50906d88f1bd4f91c289747@vtiger.fosslabs.com> #607: Unable to create new ticket. ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mickie Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: assigned => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 08:11:40 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 12:11:40 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23605=3A_?= =?utf-8?q?Incomplete_description_for_Pick_List_Editor?= In-Reply-To: <076.39e93a7028e5b13d3dd484adfef8ba8a@vtiger.fosslabs.com> References: <076.39e93a7028e5b13d3dd484adfef8ba8a@vtiger.fosslabs.com> Message-ID: <085.e6d8169f2a3cbcb88332933b08927eb3@vtiger.fosslabs.com> #605: Incomplete description for Pick List Editor ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mangai Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Pick List ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed Comment: (In [5582]) incomplete description removed. Fixes #605 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 28 08:11:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 12:11:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5582 - /vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl Message-ID: <20060428121141.1996D6E782A@vtiger.fosslabs.com> Author: richie Date: Fri Apr 28 06:11:25 2006 New Revision: 5582 Log: incomplete description removed. Fixes #605 Modified: vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl Fri Apr 28 06:11:25 2006 @@ -102,7 +102,6 @@ {$MOD.LBL_PICKLIST_EDITOR}
        - picklist Editor allows you to   From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 08:12:37 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 12:12:37 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23294=3A_?= =?utf-8?q?UI_Issue_in_Create_Email_Screen?= In-Reply-To: <076.9fb6d611537efe4edae1ae1f973444b1@vtiger.fosslabs.com> References: <076.9fb6d611537efe4edae1ae1f973444b1@vtiger.fosslabs.com> Message-ID: <085.d6639546d01e532a6e483414dd1e0d54@vtiger.fosslabs.com> #294: UI Issue in Create Email Screen ------------------------+--------------------------------------------------- Reporter: don | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => invalid * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Apr 28 08:12:49 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 28 Apr 2006 12:12:49 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23208=3A_?= =?utf-8?q?unable_to_edit_outgoing_mailserver_info?= In-Reply-To: <076.b22ddb2182867579185c133f4cf84897@vtiger.fosslabs.com> References: <076.b22ddb2182867579185c133f4cf84897@vtiger.fosslabs.com> Message-ID: <085.7944b73ac7634da9591158f5fef85eca@vtiger.fosslabs.com> #208: unable to edit outgoing mailserver info ------------------------+--------------------------------------------------- Reporter: richie | Owner: mickie Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: wontfix | Keywords: outgoing mailserver info ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => wontfix * status: assigned => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 28 09:06:39 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 28 Apr 2006 13:06:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5583 - /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Message-ID: <20060428130639.DAC1C6E9706@vtiger.fosslabs.com> Author: saraj Date: Fri Apr 28 07:06:34 2006 New Revision: 5583 Log: * Changes made for Campaiign module because this module has been totally changed Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php ============================================================================== --- vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php (original) +++ vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Fri Apr 28 07:06:34 2006 @@ -1662,29 +1662,40 @@ $insert_query8 = "insert into blocks values(76,26,'LBL_CAMPAIGN_INFORMATION',1,0,0,0,0,0)"; Execute($insert_query8); -$insert_query9 = "insert into blocks values(77,26,'LBL_DESCRIPTION_INFORMATION',2,0,0,0,0,0)"; +$insert_query8 = "insert into blocks values (77,26,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)"; +Execute($insert_query8); +$insert_query9 = "insert into blocks values(78,26,'LBL_DESCRIPTION_INFORMATION',3,0,0,0,0,0)"; Execute($insert_query9); $insert_query_array24 = Array( - "insert into field values(26,".$conn->getUniqueID("field").",'campaignname','campaign',1,'2','campaignname','Campaign Name',1,0,0,100,1,76,1,'V~M',0,1,'BAS')", - "insert into field values(26,".$conn->getUniqueID("field").",'campaigntype','campaign',1,15,'campaigntype','Campaign Type',1,0,0,100,2,76,1,'V~O',0,5,'BAS')", - "insert into field values(26,".$conn->getUniqueID("field").",'campaignstatus','campaign',1,15,'campaignstatus','Campaign Status',1,0,0,100,3,76,1,'V~O',0,5,'BAS')", - "insert into field values(26,".$conn->getUniqueID("field").",'closingdate','campaign',1,'23','closingdate','Expected Close Date',1,0,0,100,5,76,1,'D~M',0,3,'BAS')", - "insert into field values(26,".$conn->getUniqueID("field").",'expectedrevenue','campaign',1,'15','expectedrevenue','Expected Revenue',1,0,0,100,6,76,1,'V~O',1,null,'BAS')", - "insert into field values(26,".$conn->getUniqueID("field").",'budgetcost','campaign',1,'1','budgetcost','Budget Cost',1,0,0,100,7,76,1,'V~O',1,null,'BAS')", - "insert into field values(26,".$conn->getUniqueID("field").",'actualcost','campaign',1,'15','actualcost','Actual Cost',1,0,0,100,8,76,1,'V~O',1,null,'BAS')", - "insert into field values(26,".$conn->getUniqueID("field").",'expectedresponse','campaign',1,'16','expectedresponse','Expected Response',1,0,0,100,9,76,1,'V~O',0,4,'BAS')", - "insert into field values(26,".$conn->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,10,76,1,'V~M',1,null,'BAS')", - "insert into field values(26,".$conn->getUniqueID("field").",'numsent','campaign',1,'9','numsent','Num Sent',1,0,0,100,11,76,1,'N~O',1,null,'BAS')", - "insert into field values(26,".$conn->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,13,76,2,'T~O',1,null,'BAS')", - "insert into field values(26,".$conn->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,14,76,2,'T~O',1,null,'BAS')", - "insert into field values(26,".$conn->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,77,1,'V~O',1,null,'BAS')" + "insert into field values (26,".$conn->getUniqueID("field").",'campaignname','campaign',1,'2','campaignname','Campaign Name',1,0,0,100,1,76,1,'V~M',0,1,'BAS')", + "insert into field values (26,".$conn->getUniqueID("field").",'campaigntype','campaign',1,15,'campaigntype','Campaign Type',1,0,0,100,2,76,1,'V~O',0,5,'BAS')", + "insert into field values (26,".$conn->getUniqueID("field").",'product_id','campaign',1,59,'product_id','Product',1,0,0,100,3,76,1,'I~O',0,5,'BAS')", + "insert into field values (26,".$conn->getUniqueID("field").",'campaignstatus','campaign',1,15,'campaignstatus','Campaign Status',1,0,0,100,4,76,1,'V~O',0,5,'BAS')", + "insert into field values (26,".$conn->getUniqueID("field").",'closingdate','campaign',1,'23','closingdate','Expected Close Date',1,0,0,100,5,76,1,'D~M',0,3,'BAS')", + "insert into field values (26,".$conn->getUniqueID("field").",'expectedrevenue','campaign',1,'1','expectedrevenue','Expected Revenue',1,0,0,100,6,76,1,'I~O',1,null,'BAS')", + "insert into field values (26,".$conn->getUniqueID("field").",'budgetcost','campaign',1,'1','budgetcost','Budget Cost',1,0,0,100,7,76,1,'I~O',1,null,'BAS')", + "insert into field values (26,".$conn->getUniqueID("field").",'actualcost','campaign',1,'1','actualcost','Actual Cost',1,0,0,100,8,76,1,'I~O',1,null,'BAS')", + "insert into field values (26,".$conn->getUniqueID("field").",'expectedresponse','campaign',1,'15','expectedresponse','Expected Response',1,0,0,100,9,76,1,'V~O',0,4,'BAS')", + "insert into field values (26,".$conn->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,10,76,1,'V~M',1,null,'BAS')", + "insert into field values (26,".$conn->getUniqueID("field").",'numsent','campaign',1,'9','numsent','Num Sent',1,0,0,100,11,76,1,'N~O',1,null,'BAS')", + "insert into field values (26,".$conn->getUniqueID("field").",'sponsor','campaign',1,'1','sponsor','Sponsor',1,0,0,100,12,76,1,'V~O',1,null,'BAS')", + "insert into field values (26,".$conn->getUniqueID("field").",'targetaudience','campaign',1,'1','targetaudience','Target Audience',1,0,0,100,13,76,1,'V~O',1,null,'BAS')", + "insert into field values (26,".$conn->getUniqueID("field").",'targetsize','campaign',1,'1','targetsize','TargetSize',1,0,0,100,14,76,1,'N~O',1,null,'BAS')", + "insert into field values (26,".$conn->getUniqueID("field").",'expectedresponsecount','campaign',1,'1','expectedresponsecount','Expected Response Count',1,0,0,100,17,76,1,'N~O',1,null,'BAS')", + "insert into field values (26,".$conn->getUniqueID("field").",'expectedsalescount','campaign',1,'1','expectedsalescount','Expected Sales Count',1,0,0,100,15,76,1,'N~O',1,null,'BAS')", + "insert into field values (26,".$conn->getUniqueID("field").",'expectedroi','campaign',1,'1','expectedroi','Expected ROI',1,0,0,100,19,76,1,'N~O',1,null,'BAS')", + "insert into field values (26,".$conn->getUniqueID("field").",'actualresponsecount','campaign',1,'1','actualresponsecount','Actual Response Count',1,0,0,100,18,76,1,'N~O',1,null,'BAS')", + "insert into field values (26,".$conn->getUniqueID("field").",'actualsalescount','campaign',1,'1','actualsalescount','Actual Sales Count',1,0,0,100,16,76,1,'N~O',1,null,'BAS')", + "insert into field values (26,".$conn->getUniqueID("field").",'actualroi','campaign',1,'1','actualroi','Actual ROI',1,0,0,100,20,76,1,'N~O',1,null,'BAS')", + "insert into field values (26,".$conn->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,15,76,2,'T~O',1,null,'BAS')", + "insert into field values (26,".$conn->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,16,76,2,'T~O',1,null,'BAS')", + "insert into field values (26,".$conn->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,78,1,'V~O',1,null,'BAS')" ); foreach($insert_query_array24 as $query) { Execute($query); } - $insert_query_array25 = Array( "insert into relatedlists values (".$conn->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Contacts").",'get_contacts',1,'Contacts',0)", @@ -1705,41 +1716,76 @@ Execute($query); } - -$create_query24 = "CREATE TABLE `campaign` ( - `campaignname` varchar(255) NOT NULL default '', - `campaigntype` varchar(255) default NULL, - `campaignstatus` varchar(255) default NULL, - `expectedrevenue` decimal(11,3) default NULL, - `budgetcost` decimal(11,3) default NULL, - `actualcost` decimal(11,3) default NULL, - `expectedresponse` decimal(10,0) default NULL, - `numsent` decimal(11,0) default NULL, - `campaignid` int(7) default NULL, - `closingdate` date default NULL, - PRIMARY KEY (`campaignname`), - KEY `idx_campaignid` (`campaignid`), - KEY `idx_campaignname` (`campaignname`) -) ENGINE=InnoDB"; +$create_query24 = " +CREATE TABLE `campaign` ( + `campaignname` varchar(255) default NULL, + `campaigntype` varchar(255) default NULL, + `campaignstatus` varchar(255) default NULL, + `expectedrevenue` int(19) default NULL, + `budgetcost` int(19) default NULL, + `actualcost` int(19) default NULL, + `expectedresponse` varchar(255) default NULL, + `numsent` decimal(11,0) default NULL, + `product_id` int(19) default NULL, + `sponsor` varchar(255) default NULL, + `targetaudience` varchar(255) default NULL, + `targetsize` int(19) default NULL, + `expectedresponsecount` int(19) default NULL, + `expectedsalescount` int(19) default NULL, + `expectedroi` int(19) default NULL, + `actualresponsecount` int(19) default NULL, + `actualsalescount` int(19) default NULL, + `actualroi` int(19) default NULL, + `campaignid` int(19) NOT NULL, + `closingdate` date default NULL, + PRIMARY KEY (`campaignid`), + KEY `idx_campaignstatus` (`campaignstatus`), + KEY `idx_campaignname` (`campaignname`), + KEY `idx_campaignid` (`campaignid`) +) ENGINE=InnoDB + "; Execute($create_query24); + + $create_query25 = "CREATE TABLE `campaigncontrel` ( `campaignid` int(19) NOT NULL default '0', `contactid` int(19) NOT NULL default '0', PRIMARY KEY (`campaignid`), KEY `CampaignContRel_IDX1` (`contactid`), - CONSTRAINT `fk_CampaignContRel2` FOREIGN KEY (`contactid`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE + CONSTRAINT `fk_CampaignContRel2` FOREIGN KEY (`contactid`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE, + CONSTRAINT `fk_CampaignContRel1` FOREIGN KEY (`campaignid`) REFERENCES `campaign` (`campaignid`) ON DELETE CASCADE ) ENGINE=InnoDB"; Execute($create_query25); + +$create_table_query = " +CREATE TABLE `campaigngrouprelation` ( + `campaignid` int(19) NOT NULL, + `groupname` varchar(100) default NULL, + PRIMARY KEY (`campaignid`), + KEY `campaigngrouprelation_IDX1` (`groupname`), + CONSTRAINT `fk_campaigngrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `groups` (`groupname`) ON DELETE CASCADE, + CONSTRAINT `fk_campaigngrouprelation1` FOREIGN KEY (`campaignid`) REFERENCES `campaign` (`campaignid`) ON DELETE CASCADE +) ENGINE=InnoDB"; +Execute($create_table_query); + $create_query26 = "CREATE TABLE `campaignleadrel` ( `campaignid` int(19) NOT NULL default '0', `leadid` int(19) NOT NULL default '0', PRIMARY KEY (`campaignid`), - KEY `CampaignLeadRel_IDX1` (`leadid`), - CONSTRAINT `fk_CampaignLeadRel2` FOREIGN KEY (`leadid`) REFERENCES `leaddetails` (`leadid`) ON DELETE CASCADE + KEY `CampaignLeadRel_IDX1` (`leadid`,`campaignid`), + CONSTRAINT `fk_CampaignLeadRel1234` FOREIGN KEY (`campaignid`) REFERENCES `campaign` (`campaignid`) ON DELETE CASCADE, + CONSTRAINT `fk_CampaignLeadRel2423` FOREIGN KEY (`leadid`) REFERENCES `leaddetails` (`leadid`) ON DELETE CASCADE ) ENGINE=InnoDB"; Execute($create_query26); + +$create_table_query1 = "CREATE TABLE `campaignscf` ( + `campaignid` int(19) NOT NULL default '0', + PRIMARY KEY (`campaignid`), + CONSTRAINT `fk_CampaignsCF` FOREIGN KEY (`campaignid`) REFERENCES `campaign` (`campaignid`) ON DELETE CASCADE +) ENGINE=InnoDB"; +Execute($create_table_query1); $alter_query_array18 = Array( "alter table leaddetails add column campaignid int(19) default NULL after leadid", @@ -1884,7 +1930,7 @@ `presence` int(1) NOT NULL default '1', PRIMARY KEY (`campaignstatusid`), KEY `Campaignstatus_UK01` (`campaignstatus`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1", +) ENGINE=InnoDB", "CREATE TABLE `campaigntype` ( `campaigntypeid` int(19) NOT NULL auto_increment, @@ -1893,7 +1939,7 @@ `presence` int(1) NOT NULL default '1', PRIMARY KEY (`campaigntypeid`), UNIQUE KEY `Campaigntype_UK01` (`campaigntype`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1", +) ENGINE=InnoDB", "CREATE TABLE `currency_info_seq` ( `id` int(11) NOT NULL @@ -2055,7 +2101,7 @@ `presence` int(1) NOT NULL default '1', PRIMARY KEY (`expectedresponseid`), UNIQUE KEY `CampaignExpRes_UK01` (`expectedresponse`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1", +) ENGINE=InnoDB", "CREATE TABLE `expectedrevenue` ( `expectedrevenueid` int(19) NOT NULL auto_increment, @@ -2202,13 +2248,6 @@ "ALTER TABLE `blocks` MODIFY COLUMN `tabid` INTEGER(19) NOT NULL UNIQUE", "ALTER TABLE `blocks` MODIFY COLUMN `sequence` INTEGER(10) DEFAULT NULL", "ALTER TABLE `blocks` MODIFY COLUMN `show_title` INTEGER(2) DEFAULT NULL", -"ALTER TABLE `campaign` MODIFY COLUMN `campaignname` VARCHAR(255) COLLATE latin1_swedish_ci DEFAULT NULL UNIQUE", -"ALTER TABLE `campaign` MODIFY COLUMN `campaignstatus` VARCHAR(255) COLLATE latin1_swedish_ci DEFAULT NULL UNIQUE", -"ALTER TABLE `campaign` MODIFY COLUMN `expectedrevenue` VARCHAR(255) DEFAULT NULL", -"ALTER TABLE `campaign` MODIFY COLUMN `budgetcost` VARCHAR(255) DEFAULT NULL", -"ALTER TABLE `campaign` MODIFY COLUMN `actualcost` VARCHAR(255) DEFAULT NULL", -"ALTER TABLE `campaign` MODIFY COLUMN `expectedresponse` VARCHAR(255) DEFAULT NULL", -"ALTER TABLE `campaign` MODIFY COLUMN `campaignid` INTEGER(11) NOT NULL PRIMARY KEY", "ALTER TABLE `chat_msg` MODIFY COLUMN `id` INTEGER(20) NOT NULL AUTO_INCREMENT PRIMARY KEY", "ALTER TABLE `chat_msg` MODIFY COLUMN `chat_from` INTEGER(20) NOT NULL DEFAULT '0' UNIQUE", "ALTER TABLE `chat_msg` MODIFY COLUMN `chat_to` INTEGER(20) NOT NULL DEFAULT '0' UNIQUE", @@ -2419,11 +2458,6 @@ "ALTER TABLE `activity` ADD KEY `status1` (`status`, `eventstatus`)", "ALTER TABLE `attachments` ADD KEY `attachmentsid1` (`attachmentsid`)", "ALTER TABLE `blocks` ADD KEY `block_tabid` (`tabid`)", -"ALTER TABLE `campaign` DROP PRIMARY KEY", -"ALTER TABLE `campaign` ADD PRIMARY KEY (`campaignid`)", -"ALTER TABLE `campaign` ADD KEY `idx_campaignstatus` (`campaignstatus`)", -"ALTER TABLE `campaignleadrel` DROP INDEX CampaignLeadRel_IDX1", -"ALTER TABLE `campaignleadrel` ADD INDEX `CampaignLeadRel_IDX1` (`leadid`, `campaignid`)", "ALTER TABLE `carrier` ADD UNIQUE KEY `carrier_UK01` (`carrier`)", "ALTER TABLE `chat_msg` ADD KEY `chat_msg_IDX0` (`chat_from`)", "ALTER TABLE `chat_msg` ADD KEY `chat_msg_IDX1` (`chat_to`)", @@ -2496,8 +2530,6 @@ "ALTER TABLE `users2group` ADD KEY `fk_users2group2` (`userid`)", "ALTER TABLE `accountgrouprelation` ADD CONSTRAINT `fk_accountgrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `groups` (`groupname`) ON DELETE CASCADE", "ALTER TABLE `accountgrouprelation` ADD CONSTRAINT `fk_accountgrouprelation123` FOREIGN KEY (`accountid`) REFERENCES `account` (`accountid`) ON DELETE CASCADE", -"ALTER TABLE `campaigncontrel` ADD CONSTRAINT `fk_CampaignContRel1` FOREIGN KEY (`campaignid`) REFERENCES `campaign` (`campaignid`) ON DELETE CASCADE", -"ALTER TABLE `campaignleadrel` ADD CONSTRAINT `fk_CampaignLeadRel1234` FOREIGN KEY (`campaignid`) REFERENCES `campaign` (`campaignid`) ON DELETE CASCADE", "ALTER TABLE `contactgrouprelation` ADD CONSTRAINT `fk_contactgrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `groups` (`groupname`) ON DELETE CASCADE", "ALTER TABLE `contactgrouprelation` ADD CONSTRAINT `fk_contactgrouprelation123` FOREIGN KEY (`contactid`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE", "ALTER TABLE `customaction` ADD CONSTRAINT `customaction_FK1` FOREIGN KEY (`cvid`) REFERENCES `customview` (`cvid`) ON DELETE CASCADE", @@ -2596,7 +2628,7 @@ require_once('include/ComboStrings.php'); global $combo_strings; -$comboTables = Array('campaigntype','campaignstatus','expectedrevenue','actualcost','expectedresponse'); +$comboTables = Array('campaigntype','campaignstatus','expectedresponse'); foreach ($comboTables as $tablename) { $values = $combo_strings[$tablename."_dom"]; From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 29 08:57:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sat, 29 Apr 2006 12:57:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5584 - /vtigercrm/trunk/Smarty/templates/HomePage.tpl Message-ID: <20060429125710.5F2086EA6C7@vtiger.fosslabs.com> Author: don Date: Sat Apr 29 06:57:05 2006 New Revision: 5584 Log: Made changes to Homepage.tpl for New Home Page UI 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 Apr 29 06:57:05 2006 @@ -5,11 +5,7 @@ - - - - @@ -51,8 +47,8 @@ Show World Clock... Open Calculator... -   - Open All Menu... +   + Open All Menu... @@ -132,87 +128,69 @@ - + + + + + + + + + + + +
         
        + + + + + + + {foreach item=entries from=$ACTIVITIES.0.Entries} + + + + + {/foreach} + +
        Upcoming Events
        23 Events For Today
        {$entries.IMAGE}{$entries.0}
        1 800 800 8000
        +

        + + + + + + + + + +
        + Pending Events
        + 7 Events in Past 10 days        		 +  
        + + + + + {foreach item=entries from=$ACTIVITIES.1.Entries} + + + + + {/foreach} + + + +
        {$entries.IMAGE}{$entries.0}
        1 800 800 8000
        + + + -{* Quick Access Functionality *} -
        - - - - - - - - - - - -
        Jump To -
        - - Home - Home - Activities - Calander - Email - Sales - - Leads - Accounts - Contacts - Potentials - Quotes - Sales Order - - Invoice - Campaigns - Products - Price Books - Notes - - Support - Help Desk - Faq - Accounts - Contacts - - Products - Notes - Analytics - Dashboard - Reports - Inventory - - Products - Vendors - Price Books - PurchaseOrder - SalesOrder - Quotes - - Invoice - - Tools - Rss - Portal - Notes - - Settings - Settings -
        -
        - {literal} - - -{* Begining of Slide Menu *} +{* Begining of Slide Menu
        @@ -300,7 +300,28 @@ - + *} + +{* Quick Access Functionality *} +
        +
        + + +
        + {assign var="parentno" value=0} + {foreach name=parenttablist key=parenttab item=details from=$QUICKACCESS} + {$parenttab} + {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} + {assign var="parentno" value=$num} + {if $loopvalue eq '0'} + + {/if} + {$modules.1} + {/foreach} + {/foreach} +
        From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 29 09:03:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sat, 29 Apr 2006 13:03:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5586 - /vtigercrm/trunk/include/utils/CommonUtils.php Message-ID: <20060429130356.51AA340E816@vtiger.fosslabs.com> Author: don Date: Sat Apr 29 07:03:52 2006 New Revision: 5586 Log: Added new function getAllParenttabmoduleslist() for new Home Page UI 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 Sat Apr 29 07:03:52 2006 @@ -2098,6 +2098,22 @@ $log->debug("Exiting getEntityName method ..."); } +function getAllParenttabmoduleslist() +{ + global $adb; + $resultant_array = Array(); + $query = 'select name,tablabel,parenttab_label from parenttabrel inner join tab on parenttabrel.tabid = tab.tabid in +ner join parenttab on parenttabrel.parenttabid = parenttab.parenttabid order by parenttab.sequence'; + $result = $adb->query($query); + for($i=0;$i<$adb->num_rows($result);$i++) + { + $parenttabname = $adb->query_result($result,$i,'parenttab_label'); + $modulename = $adb->query_result($result,$i,'name'); + $tablabel = $adb->query_result($result,$i,'tablabel'); + $resultant_array[$parenttabname][] = Array($modulename,$tablabel); + } + return $resultant_array; +} ?> From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 29 09:06:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sat, 29 Apr 2006 13:06:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5587 - /vtigercrm/trunk/include/js/general.js Message-ID: <20060429130630.2C7A149A75E@vtiger.fosslabs.com> Author: don Date: Sat Apr 29 07:06:25 2006 New Revision: 5587 Log: Made changed in general.js for new Homepage UI Modified: vtigercrm/trunk/include/js/general.js Modified: vtigercrm/trunk/include/js/general.js ============================================================================== --- vtigercrm/trunk/include/js/general.js (original) +++ vtigercrm/trunk/include/js/general.js Sat Apr 29 07:06:25 2006 @@ -1356,6 +1356,7 @@ function fnvshNrm(Lay){ var tagName = document.getElementById(Lay); tagName.style.visibility = 'visible'; + tagName.style.display = 'block'; } From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 29 09:15:14 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sat, 29 Apr 2006 13:15:14 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5588 - /vtigercrm/trunk/modules/Home/index.php Message-ID: <20060429131514.7084749A75E@vtiger.fosslabs.com> Author: don Date: Sat Apr 29 07:15:10 2006 New Revision: 5588 Log: Made changes in /Home/index.php for new Homepage UI 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 Sat Apr 29 07:15:10 2006 @@ -63,8 +63,10 @@ case 'OLV': if(isPermitted('Activities','index') == "yes") { - include("modules/Activities/OpenListView.php") ; - $home_values[]= getPendingActivities(); + $activities = Array(); + include("modules/Activities/OpenListView.php") ; + $activities[] = getPendingActivities(0); + $activities[] = getPendingActivities(1); } break; case 'ALVT': @@ -156,6 +158,7 @@ $smarty->assign("IMAGE_PATH",$image_path); $smarty->assign("HOMEDETAILS",$home_values); $smarty->assign("HOMEDEFAULTVIEW",DefHomeView()); +$smarty->assign("ACTIVITIES",$activities); $smarty->display("HomePage.tpl"); function getLoginHistory() From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 29 09:23:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sat, 29 Apr 2006 13:23:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5589 - /vtigercrm/trunk/themes/blue/header.php Message-ID: <20060429132324.B8B8349A75E@vtiger.fosslabs.com> Author: don Date: Sat Apr 29 07:23:20 2006 New Revision: 5589 Log: Made changes in header.php for new Homepage UI Modified: vtigercrm/trunk/themes/blue/header.php Modified: vtigercrm/trunk/themes/blue/header.php ============================================================================== --- vtigercrm/trunk/themes/blue/header.php (original) +++ vtigercrm/trunk/themes/blue/header.php Sat Apr 29 07:23:20 2006 @@ -79,6 +79,8 @@ $smarty->assign("MODULELISTS",$app_list_strings['moduleList']); $smarty->assign("CATEGORY",getParentTab()); $smarty->assign("CALC",get_calc($image_path)); +$smarty->assign("QUICKACCESS",getAllParenttabmoduleslist()); + if (is_admin($current_user)) $smarty->assign("ADMIN_LINK", "".$app_strings['LBL_SETTINGS'].""); From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 29 09:25:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sat, 29 Apr 2006 13:25:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5590 - /vtigercrm/trunk/themes/blue/style.css Message-ID: <20060429132515.CAF756EB721@vtiger.fosslabs.com> Author: don Date: Sat Apr 29 07:25:11 2006 New Revision: 5590 Log: added style for new Homepage UI Modified: vtigercrm/trunk/themes/blue/style.css Modified: vtigercrm/trunk/themes/blue/style.css ============================================================================== --- vtigercrm/trunk/themes/blue/style.css (original) +++ vtigercrm/trunk/themes/blue/style.css Sat Apr 29 07:25:11 2006 @@ -1950,6 +1950,7 @@ /* All Menu */ #allMenu{ width:500px; + z-index:10000002; border-top:2px solid #CCCCCC; border-left:2px solid #CCCCCC; border-bottom:2px solid #666666; From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 29 09:31:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sat, 29 Apr 2006 13:31:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5591 - /vtigercrm/trunk/themes/blue/images/pending_left.gif Message-ID: <20060429133117.ECBB56F0F2D@vtiger.fosslabs.com> Author: richie Date: Sat Apr 29 07:31:13 2006 New Revision: 5591 Log: Added new images/pending_left.gif for Homepage ui Added: vtigercrm/trunk/themes/blue/images/pending_left.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 29 09:32:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sat, 29 Apr 2006 13:32:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5592 - in /vtigercrm/trunk/themes/blue/images: pendingEvents.gif pending_right.gif Message-ID: <20060429133207.8F1DB49A75E@vtiger.fosslabs.com> Author: richie Date: Sat Apr 29 07:32:01 2006 New Revision: 5592 Log: Added two images for new homepage ui Added: vtigercrm/trunk/themes/blue/images/pendingEvents.gif (with props) vtigercrm/trunk/themes/blue/images/pending_right.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 29 09:33:04 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sat, 29 Apr 2006 13:33:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5593 - in /vtigercrm/trunk/themes/blue/images: up.gif upcomingEvents.gif upcoming_left.gif upcoming_right.gif Message-ID: <20060429133304.1116149A75E@vtiger.fosslabs.com> Author: richie Date: Sat Apr 29 07:32:51 2006 New Revision: 5593 Log: Added 4 images for new homepage ui Added: vtigercrm/trunk/themes/blue/images/up.gif (with props) vtigercrm/trunk/themes/blue/images/upcomingEvents.gif (with props) vtigercrm/trunk/themes/blue/images/upcoming_left.gif (with props) vtigercrm/trunk/themes/blue/images/upcoming_right.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 29 13:06:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sat, 29 Apr 2006 17:06:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5594 - /vtigercrm/trunk/modules/Reports/ Message-ID: <20060429170657.D91AD6F0F74@vtiger.fosslabs.com> Author: don Date: Sat Apr 29 11:06:37 2006 New Revision: 5594 Log: New UI has been integrated for Reports Added: vtigercrm/trunk/modules/Reports/ChangeFolder.php vtigercrm/trunk/modules/Reports/ReportsAjax.php Modified: vtigercrm/trunk/modules/Reports/AdvancedFilter.php vtigercrm/trunk/modules/Reports/CreatePDF.php vtigercrm/trunk/modules/Reports/CreateXL.php vtigercrm/trunk/modules/Reports/Delete.php vtigercrm/trunk/modules/Reports/DeleteReportFolder.php vtigercrm/trunk/modules/Reports/ListView.php vtigercrm/trunk/modules/Reports/NewReport0.php vtigercrm/trunk/modules/Reports/NewReport1.php vtigercrm/trunk/modules/Reports/Report.js vtigercrm/trunk/modules/Reports/ReportColumns.php vtigercrm/trunk/modules/Reports/ReportColumnsTotal.php vtigercrm/trunk/modules/Reports/ReportFilters.php vtigercrm/trunk/modules/Reports/ReportGrouping.php vtigercrm/trunk/modules/Reports/ReportRun.php vtigercrm/trunk/modules/Reports/ReportType.php vtigercrm/trunk/modules/Reports/Reports.php vtigercrm/trunk/modules/Reports/Save.php vtigercrm/trunk/modules/Reports/SaveAndRun.php vtigercrm/trunk/modules/Reports/SaveReportFolder.php vtigercrm/trunk/modules/Reports/StandardFilter.php Modified: vtigercrm/trunk/modules/Reports/AdvancedFilter.php ============================================================================== --- vtigercrm/trunk/modules/Reports/AdvancedFilter.php (original) +++ vtigercrm/trunk/modules/Reports/AdvancedFilter.php Sat Apr 29 11:06:37 2006 @@ -8,80 +8,52 @@ * All Rights Reserved. * ********************************************************************************/ -require_once('XTemplate/xtpl.php'); -require_once("data/Tracker.php"); -require_once('themes/'.$theme.'/layout_utils.php'); -require_once('include/logging.php'); -require_once('include/utils/utils.php'); -require_once('modules/Reports/Reports.php'); -require_once('include/database/PearDatabase.php'); - -global $app_strings; -global $app_list_strings; -global $mod_strings; -$current_module_strings = return_module_language($current_language, 'Reports'); - -global $list_max_entries_per_page; -global $urlPrefix; - -$log = LoggerManager::getLogger('adv_report'); - -global $currentModule; -global $image_path; -global $theme; - -global $adv_filter_options; - -$adv_report=new XTemplate ('modules/Reports/AdvancedFilter.html'); -$adv_report->assign("MOD", $mod_strings); -$adv_report->assign("APP", $app_strings); - if(isset($_REQUEST["record"])) { $reportid = $_REQUEST["record"]; -$oReport = new Reports(); +$oReport = new Reports($reportid); $oReport->getAdvancedFilterList($reportid); -$BLOCK1 = getPrimaryColumns_AdvFilterHTML($primarymodule,$oReport->advft_column[0]); -$BLOCK1 .= getSecondaryColumns_AdvFilterHTML($secondarymodule,$oReport->advft_column[0]); -$adv_report->assign("BLOCK1", $BLOCK1); +$BLOCK1 = getPrimaryColumns_AdvFilterHTML($oReport->primodule,$oReport->advft_column[0]); +$BLOCK1 .= getSecondaryColumns_AdvFilterHTML($oReport->secmodule,$oReport->advft_column[0]); +$report_std_filter->assign("BLOCK1", $BLOCK1); -$BLOCK2 = getPrimaryColumns_AdvFilterHTML($primarymodule,$oReport->advft_column[1]); -$BLOCK2 .= getSecondaryColumns_AdvFilterHTML($secondarymodule,$oReport->advft_column[1]); -$adv_report->assign("BLOCK2", $BLOCK2); +$BLOCK2 = getPrimaryColumns_AdvFilterHTML($oReport->primodule,$oReport->advft_column[1]); +$BLOCK2 .= getSecondaryColumns_AdvFilterHTML($oReport->secmodule,$oReport->advft_column[1]); +$report_std_filter->assign("BLOCK2", $BLOCK2); -$BLOCK3 = getPrimaryColumns_AdvFilterHTML($primarymodule,$oReport->advft_column[2]); -$BLOCK3 .= getSecondaryColumns_AdvFilterHTML($secondarymodule,$oReport->advft_column[2]); -$adv_report->assign("BLOCK3", $BLOCK3); +$BLOCK3 = getPrimaryColumns_AdvFilterHTML($oReport->primodule,$oReport->advft_column[2]); +$BLOCK3 .= getSecondaryColumns_AdvFilterHTML($oReport->secmodule,$oReport->advft_column[2]); +$report_std_filter->assign("BLOCK3", $BLOCK3); -$BLOCK4 = getPrimaryColumns_AdvFilterHTML($primarymodule,$oReport->advft_column[3]); -$BLOCK4 .= getSecondaryColumns_AdvFilterHTML($secondarymodule,$oReport->advft_column[3]); -$adv_report->assign("BLOCK4", $BLOCK4); +$BLOCK4 = getPrimaryColumns_AdvFilterHTML($oReport->primodule,$oReport->advft_column[3]); +$BLOCK4 .= getSecondaryColumns_AdvFilterHTML($oReport->secmodule,$oReport->advft_column[3]); +$report_std_filter->assign("BLOCK4", $BLOCK4); -$BLOCK5 = getPrimaryColumns_AdvFilterHTML($primarymodule,$oReport->advft_column[4]); -$BLOCK5 .= getSecondaryColumns_AdvFilterHTML($secondarymodule,$oReport->advft_column[4]); -$adv_report->assign("BLOCK5", $BLOCK5); +$BLOCK5 = getPrimaryColumns_AdvFilterHTML($oReport->primodule,$oReport->advft_column[4]); +$BLOCK5 .= getSecondaryColumns_AdvFilterHTML($oReport->secmodule,$oReport->advft_column[4]); +$report_std_filter->assign("BLOCK5", $BLOCK5); $FILTEROPTION1 = getAdvCriteriaHTML($oReport->advft_option[0]); -$adv_report->assign("FOPTION1",$FILTEROPTION1); +$report_std_filter->assign("FOPTION1",$FILTEROPTION1); $FILTEROPTION2 = getAdvCriteriaHTML($oReport->advft_option[1]); -$adv_report->assign("FOPTION2",$FILTEROPTION2); +$report_std_filter->assign("FOPTION2",$FILTEROPTION2); $FILTEROPTION3 = getAdvCriteriaHTML($oReport->advft_option[2]); -$adv_report->assign("FOPTION3",$FILTEROPTION3); +$report_std_filter->assign("FOPTION3",$FILTEROPTION3); $FILTEROPTION4 = getAdvCriteriaHTML($oReport->advft_option[3]); -$adv_report->assign("FOPTION4",$FILTEROPTION4); +$report_std_filter->assign("FOPTION4",$FILTEROPTION4); $FILTEROPTION5 = getAdvCriteriaHTML($oReport->advft_option[4]); -$adv_report->assign("FOPTION5",$FILTEROPTION5); +$report_std_filter->assign("FOPTION5",$FILTEROPTION5); -$adv_report->assign("VALUE1",$oReport->advft_value[0]); -$adv_report->assign("VALUE2",$oReport->advft_value[1]); -$adv_report->assign("VALUE3",$oReport->advft_value[2]); -$adv_report->assign("VALUE4",$oReport->advft_value[3]); -$adv_report->assign("VALUE5",$oReport->advft_value[4]); +$report_std_filter->assign("VALUE1",$oReport->advft_value[0]); +$report_std_filter->assign("VALUE2",$oReport->advft_value[1]); +$report_std_filter->assign("VALUE3",$oReport->advft_value[2]); +$report_std_filter->assign("VALUE4",$oReport->advft_value[3]); +$report_std_filter->assign("VALUE5",$oReport->advft_value[4]); }else { @@ -89,11 +61,11 @@ $secondarymodule = $_REQUEST["secondarymodule"]; $BLOCK1 = getPrimaryColumns_AdvFilterHTML($primarymodule); $BLOCK1 .= getSecondaryColumns_AdvFilterHTML($secondarymodule); -$adv_report->assign("BLOCK1", $BLOCK1); -$adv_report->assign("BLOCK2", $BLOCK1); -$adv_report->assign("BLOCK3", $BLOCK1); -$adv_report->assign("BLOCK4", $BLOCK1); -$adv_report->assign("BLOCK5", $BLOCK1); +$report_std_filter->assign("BLOCK1", $BLOCK1); +$report_std_filter->assign("BLOCK2", $BLOCK1); +$report_std_filter->assign("BLOCK3", $BLOCK1); +$report_std_filter->assign("BLOCK4", $BLOCK1); +$report_std_filter->assign("BLOCK5", $BLOCK1); } @@ -108,9 +80,7 @@ global $ogReport; global $app_list_strings; global $current_language; - $mod_strings = return_module_language($current_language,$module); - foreach($ogReport->module_list[$module] as $key=>$value) { $shtml .= ""; @@ -223,7 +193,5 @@ return $shtml; } -$adv_report->parse("main"); -$adv_report->out("main"); ?> Modified: vtigercrm/trunk/modules/Reports/CreatePDF.php ============================================================================== --- vtigercrm/trunk/modules/Reports/CreatePDF.php (original) +++ vtigercrm/trunk/modules/Reports/CreatePDF.php Sat Apr 29 11:06:37 2006 @@ -370,7 +370,7 @@ $count = 0; foreach($arr_val[0] as $key=>$value) { - $headerHTML .= ''.$key.''; + $headerHTML .= ''.$key.''; $count = $count + 1; } Modified: vtigercrm/trunk/modules/Reports/CreateXL.php ============================================================================== --- vtigercrm/trunk/modules/Reports/CreateXL.php (original) +++ vtigercrm/trunk/modules/Reports/CreateXL.php Sat Apr 29 11:06:37 2006 @@ -33,8 +33,10 @@ # Write out the data $reportid = $_REQUEST["record"]; $oReport = new Reports($reportid); -$filtercolumn = $stdDateFilterField; -$filter = $stdDateFilter; +$filtercolumn = $_REQUEST['stdDateFilterField']; +$filter = $_REQUEST['stdDateFilter']; +$startdate = $_REQUEST['startdate']; +$enddate = $_REQUEST['enddate']; $oReportRun = new ReportRun($reportid); $filterlist = $oReportRun->RunTimeFilter($filtercolumn,$filter,$startdate,$enddate); Modified: vtigercrm/trunk/modules/Reports/Delete.php ============================================================================== --- vtigercrm/trunk/modules/Reports/Delete.php (original) +++ vtigercrm/trunk/modules/Reports/Delete.php Sat Apr 29 11:06:37 2006 @@ -12,16 +12,29 @@ require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); -global $adb; +if(isset($_REQUEST['idlist']) && $_REQUEST['idlist']!= '') +{ + $id_array = Array(); + $id_array = explode(':',$_REQUEST['idlist']); + for($i = 0;$i < count($id_array)-1;$i++) + { + DeleteReport($id_array[$i]); + } + header("Location: index.php?action=ReportsAjax&file=ListView&mode=ajax&module=Reports"); +}elseif(isset($_REQUEST['record']) && $_REQUEST['record']!= '') +{ + $id = $_REQUEST["record"]; + DeleteReport($id); + header("Location: index.php?action=ReportsAjax&file=ListView&mode=ajaxdelete&module=Reports"); +} -$reportid = $_REQUEST["record"]; -if($reportid != "") +function DeleteReport($reportid) { + global $adb; $idelreportsql = "delete from selectquery where queryid=".$reportid; $idelreportsqlresult = $adb->query($idelreportsql); $ireportsql = "delete from report where reportid=".$reportid; - $ireportsqlresult = $adb->query($ireportsql); + $ireportsqlresult = $adb->query($ireportsql); } -header("Location: index.php?action=index&module=Reports"); ?> Modified: vtigercrm/trunk/modules/Reports/DeleteReportFolder.php ============================================================================== --- vtigercrm/trunk/modules/Reports/DeleteReportFolder.php (original) +++ vtigercrm/trunk/modules/Reports/DeleteReportFolder.php Sat Apr 29 11:06:37 2006 @@ -8,29 +8,20 @@ * All Rights Reserved. * ********************************************************************************/ -require_once('modules/Reports/Reports.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); global $adb; $local_log =& LoggerManager::getLogger('index'); -$focus = new Reports(); - $rfid = $_REQUEST['record']; - -if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] != "") $return_module = $_REQUEST['return_module']; -else $return_module = "Reports"; -if(isset($_REQUEST['return_action']) && $_REQUEST['return_action'] != "") $return_action = $_REQUEST['return_action']; -else $return_action = "index"; - if($rfid != "") { $sql .= "delete from reportfolder where folderid=".$rfid; $result = $adb->query($sql); if($result!=false) { - header("Location: index.php?action=$return_action&module=$return_module"); + header("Location: index.php?action=ReportsAjax&mode=ajax&file=ListView&module=Reports"); }else { include('themes/'.$theme.'/header.php'); Modified: vtigercrm/trunk/modules/Reports/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Reports/ListView.php (original) +++ vtigercrm/trunk/modules/Reports/ListView.php Sat Apr 29 11:06:37 2006 @@ -8,8 +8,8 @@ * All Rights Reserved. * ********************************************************************************/ -require_once('XTemplate/xtpl.php'); require_once("data/Tracker.php"); +require_once('Smarty_setup.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/utils/utils.php'); @@ -31,26 +31,40 @@ global $image_path; global $theme; +global $theme; +$theme_path="themes/".$theme."/"; +$image_path=$theme_path."images/"; // focus_list is the means of passing data to a ListView. global $focus_list; -$list_report_form=new XTemplate ('modules/Reports/ListView.html'); +$list_report_form = new vtigerCRM_Smarty; $list_report_form->assign("MOD", $mod_strings); $list_report_form->assign("APP", $app_strings); - +$list_report_form->assign("APPLIST", $app_list_strings); $list_report_form->assign("IMAGE_PATH", $image_path); -//report creation button -$newrpt_button = ''; -//report folder creation button -$newrpt_fldr_button = ''; - +$list_report_form->assign("CATEGORY",getParentTab()); +$list_report_form->assign("MODULE",$currentModule); $list_report_form->assign("NEWRPT_BUTTON",$newrpt_button); $list_report_form->assign("NEWRPT_FLDR_BUTTON",$newrpt_fldr_button); $repObj = new Reports (); -$list_report_form->assign("REPT_FLDR_BLK",$repObj->sgetRptFldr()); -$list_report_form->assign("JAVASCRIPT",""); -$list_report_form->parse("main"); -$list_report_form->out("main"); +$list_report_form->assign("REPT_FLDR",$repObj->sgetRptFldr('SAVED')); +$cusFldrDtls = Array(); +$cusFldrDtls = $repObj->sgetRptFldr('CUSTOMIZED'); +$list_report_form->assign("REPT_CUSFLDR",$cusFldrDtls); +foreach($cusFldrDtls as $entries) +{ + $fldrids_lists [] =$entries['id']; +} +if(count($fldrids_lists) > 0) + $list_report_form->assign("FOLDE_IDS",implode(',',$fldrids_lists)); +$list_report_form->assign("REPT_MODULES",getReportsModuleList()); +$list_report_form->assign("REPT_FOLDERS",$repObj->sgetRptFldr()); +if($_REQUEST['mode'] == 'ajax') + $list_report_form->display("ReportsCustomize.tpl"); +elseif($_REQUEST['mode'] == 'ajaxdelete') + $list_report_form->display("ReportContents.tpl"); +else + $list_report_form->display("Reports.tpl"); ?> Modified: vtigercrm/trunk/modules/Reports/NewReport0.php ============================================================================== --- vtigercrm/trunk/modules/Reports/NewReport0.php (original) +++ vtigercrm/trunk/modules/Reports/NewReport0.php Sat Apr 29 11:06:37 2006 @@ -8,7 +8,7 @@ * All Rights Reserved. * ********************************************************************************/ -require_once('XTemplate/xtpl.php'); +require_once('Smarty_setup.php'); require_once("data/Tracker.php"); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); @@ -27,90 +27,21 @@ global $theme; global $focus_list; -echo get_module_title($mod_strings['LBL_MODULE_NAME'],$mod_strings['LBL_CREATE_REPORT'], true); -echo "\n
        \n"; - -/** Function to get the primary module list in reports - * This function generates the list of primary modules in reports - * and returns the module in a combo HTML values - */ - -function getPrimaryModuleList() -{ - global $adb; - global $app_list_strings; - global $report_modules; - global $mod_strings; - - $count_flag = 0; - foreach($app_list_strings['moduleList'] as $key=>$value) - { - for($i=0;$i$value"; - } - } - } - - } - if($count_flag == 0) - { - $shtml .= ""; - } - return $shtml; -} - -/** Function to get the Related module list in reports - * This function generates the list of secondary modules in reports - * and returns the related module in a combo HTML values - */ - -function getRelatedModuleList() -{ - global $app_list_strings; - global $related_modules; - global $mod_strings; - - foreach($related_modules as $key_module=>$rel_modules) - { - if(isPermitted($key_module,'index') == "yes") - { - $shtml .= ""; - } - } - - return $shtml; -} - -$primary_module_html = getPrimaryModuleList(); -$related_module_html = getRelatedModuleList(); -$list_report_form=new XTemplate ('modules/Reports/NewReport0.html'); +$theme_path="themes/".$theme."/"; +$image_path=$theme_path."images/"; +require_once($theme_path.'layout_utils.php'); +$list_report_form = new vtigerCRM_Smarty; $list_report_form->assign("MOD", $mod_strings); $list_report_form->assign("APP", $app_strings); -$list_report_form->assign("PRIMARYMODULE",$primary_module_html); -$list_report_form->assign("RELATEDMODULES",$related_module_html); +if($_REQUEST['reportmodule'] != '') +{ + $list_report_form->assign("RELATEDMODULES",getReportRelatedModules($_REQUEST['reportmodule'])); + $list_report_form->assign("REP_MODULE",$_REQUEST['reportmodule']); +} +$repObj = new Reports (); +$list_report_form->assign("REP_FOLDERS",$repObj->sgetRptFldr()); $list_report_form->assign("IMAGE_PATH", $image_path); $list_report_form->assign("ERROR_MSG", $mod_strings['LBL_NO_PERMISSION']); -$list_report_form->parse("main"); -$list_report_form->out("main"); +$list_report_form->display("ReportsStep0.tpl"); ?> Modified: vtigercrm/trunk/modules/Reports/NewReport1.php ============================================================================== --- vtigercrm/trunk/modules/Reports/NewReport1.php (original) +++ vtigercrm/trunk/modules/Reports/NewReport1.php Sat Apr 29 11:06:37 2006 @@ -8,12 +8,12 @@ * All Rights Reserved. * ********************************************************************************/ -require_once('XTemplate/xtpl.php'); require_once("data/Tracker.php"); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/utils/utils.php'); require_once('modules/Reports/Reports.php'); +require_once('Smarty_setup.php'); global $app_strings; global $app_list_strings; @@ -29,19 +29,16 @@ // focus_list is the means of passing data to a ListView. global $focus_list; -if(isset($_REQUEST["record"])) -{ - echo get_module_title($mod_strings['LBL_MODULE_NAME'], $mod_strings['LBL_CUSTOMIZE_REPORT'], true); - echo "\n
        \n"; -}else -{ - echo get_module_title($mod_strings['LBL_MODULE_NAME'],$mod_strings['LBL_CREATE_REPORT'], true); - echo "\n
        \n"; - -} +$theme_path="themes/".$theme."/"; +$image_path=$theme_path."images/"; +require_once($theme_path.'layout_utils.php'); +$list_report_form = new vtigerCRM_Smarty; +$list_report_form->assign("MOD", $mod_strings); +$list_report_form->assign("APP", $app_strings); if(isset($_REQUEST["record"])) { $reportid = $_REQUEST["record"]; + $list_report_form->assign('REPORT_ID',$reportid); $oReport = new Reports($reportid); $primarymodule = $oReport->primodule; $secondarymodule = $oReport->secmodule; @@ -54,201 +51,20 @@ $ogReport->getSecModuleColumnsList($oReport->secmodule); }else { - $primarymodule=$_REQUEST["primarymodule"]; - $secondarymodule=$_REQUEST["secondarymodule"]; + $primarymodule = $_REQUEST["primarymodule"]; + $secondarymodule = $_REQUEST["secondarymodule"]; + $reportname = $_REQUEST["reportname"]; + $reportdescription = $_REQUEST["reportdes"]; + $folderid = $_REQUEST["reportfolder"]; $ogReport = new Reports(); $ogReport->getPriModuleColumnsList($primarymodule); $ogReport->getSecModuleColumnsList($secondarymodule); } +$list_report_form->assign('PRI_MODULE',$primarymodule); +$list_report_form->assign('SEC_MODULE',$secondarymodule); +$list_report_form->assign('REPORT_NAME',$reportname); +$list_report_form->assign('REPORT_DESC',$reportdescription); +$list_report_form->assign('FOLDERID',$folderid); +$list_report_form->assign("IMAGE_PATH", $image_path); +$list_report_form->display("ReportsStep1.tpl"); ?> - - - - -
        - - - - - - - - - - - - - - - -
        - - - -
        - -
        - - - - -
        - - - - - - - - -
        - - - - - - - - -
        - - - - - - - - -
        - - - - - - - - -

        - - -
        - - Modified: vtigercrm/trunk/modules/Reports/Report.js ============================================================================== --- vtigercrm/trunk/modules/Reports/Report.js (original) +++ vtigercrm/trunk/modules/Reports/Report.js Sat Apr 29 11:06:37 2006 @@ -141,25 +141,8 @@ goToURL( "?module=Reports&action=NewReport0&return_module=Reports&return_action=index" ); return; } - if( actionName == "newReportFolder" ) - { - goToURL( "?module=Reports&action=NewReportFolder&return_module=Reports&return_action=index" ); - return; - } goToURL( "/crm/ScheduleReport.do?step=showAllSchedules" ); } -function showRelatedModules(currmodule) - { - for (i=0;iassign("MOD", $mod_strings); $report_column->assign("APP", $app_strings); $report_column->assign("IMAGE_PATH",$image_path); @@ -126,7 +126,6 @@ return $shtml; } -$report_column->parse("main"); -$report_column->out("main"); +$report_column->display("ReportColumns.tpl"); ?> Modified: vtigercrm/trunk/modules/Reports/ReportColumnsTotal.php ============================================================================== --- vtigercrm/trunk/modules/Reports/ReportColumnsTotal.php (original) +++ vtigercrm/trunk/modules/Reports/ReportColumnsTotal.php Sat Apr 29 11:06:37 2006 @@ -8,8 +8,8 @@ * All Rights Reserved. * ********************************************************************************/ -require_once('XTemplate/xtpl.php'); require_once("data/Tracker.php"); +require_once('Smarty_setup.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/utils/utils.php'); @@ -29,7 +29,7 @@ global $currentModule; global $image_path; global $theme; -$report_column_tot=new XTemplate('modules/Reports/ReportColumnsTotal.html'); +$report_column_tot=new vtigerCRM_Smarty; $report_column_tot->assign("MOD", $mod_strings); $report_column_tot->assign("APP", $app_strings); $report_column_tot->assign("IMAGE_PATH",$image_path); @@ -39,16 +39,14 @@ $recordid = $_REQUEST["record"]; $oReport = new Reports($recordid); $BLOCK1 = $oReport->sgetColumntoTotalSelected($oReport->primodule,$oReport->secmodule,$recordid); - $report_column_tot->assign("BLOCK1",$BLOCK1); + $report_column_tot->assign("BLOCK1",$BLOCK1); }else { $primarymodule = $_REQUEST["primarymodule"]; $secondarymodule = $_REQUEST["secondarymodule"]; $oReport = new Reports(); $BLOCK1 = $oReport->sgetColumntoTotal($primarymodule,$secondarymodule); - $report_column_tot->assign("BLOCK1",$BLOCK1); + $report_column_tot->assign("BLOCK1",$BLOCK1); } - -$report_column_tot->parse("main"); -$report_column_tot->out("main"); +$report_column_tot->display('ReportColumnsTotal.tpl'); ?> Modified: vtigercrm/trunk/modules/Reports/ReportFilters.php ============================================================================== --- vtigercrm/trunk/modules/Reports/ReportFilters.php (original) +++ vtigercrm/trunk/modules/Reports/ReportFilters.php Sat Apr 29 11:06:37 2006 @@ -7,39 +7,37 @@ * Portions created by vtiger are Copyright (C) vtiger. * All Rights Reserved. * - ********************************************************************************/ + *****************************************************>***************************/ + +require_once('Smarty_setup.php'); +require_once("data/Tracker.php"); +require_once('themes/'.$theme.'/layout_utils.php'); +require_once('include/logging.php'); +require_once('include/utils/utils.php'); +require_once('modules/Reports/Reports.php'); +require_once('include/database/PearDatabase.php'); + + +global $app_strings; +global $app_list_strings; global $mod_strings; +$current_module_strings = return_module_language($current_language, 'Reports'); +global $list_max_entries_per_page; +global $urlPrefix; + +$log = LoggerManager::getLogger('report_type'); +global $currentModule; +global $image_path; +global $theme; + +$report_std_filter = new vtigerCRM_Smarty; +$report_std_filter->assign("MOD", $mod_strings); +$report_std_filter->assign("APP", $app_strings); +$report_std_filter->assign("IMAGE_PATH",$image_path); + +include("modules/Reports/StandardFilter.php"); +include("modules/Reports/AdvancedFilter.php"); + + +$report_std_filter->display('ReportFilters.tpl'); ?> - - - - - - - - - - -
        -
        - - - - - -
        :
        - -
        -
        - - - - - -
        :
        - -
        -
        -
        - - Modified: vtigercrm/trunk/modules/Reports/ReportGrouping.php ============================================================================== --- vtigercrm/trunk/modules/Reports/ReportGrouping.php (original) +++ vtigercrm/trunk/modules/Reports/ReportGrouping.php Sat Apr 29 11:06:37 2006 @@ -8,7 +8,7 @@ * All Rights Reserved. * ********************************************************************************/ -require_once('XTemplate/xtpl.php'); +require_once('Smarty_setup.php'); require_once("data/Tracker.php"); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); @@ -29,41 +29,40 @@ global $currentModule; global $image_path; global $theme; -$report_group=new XTemplate('modules/Reports/ReportGrouping.html'); +$report_group=new vtigerCRM_Smarty; $report_group->assign("MOD", $mod_strings); $report_group->assign("APP", $app_strings); $report_group->assign("IMAGE_PATH",$image_path); if(isset($_REQUEST["record"])) { + $reportid = $_REQUEST["record"]; + $oReport = new Reports($reportid); + $list_array = $oReport->getSelctedSortingColumns($reportid); -$reportid = $_REQUEST["record"]; -$oReport = new Reports($reportid); -$list_array = $oReport->getSelctedSortingColumns($reportid); + $BLOCK1 = getPrimaryColumns_GroupingHTML($oReport->primodule,$list_array[0]); + $BLOCK1 .= getSecondaryColumns_GroupingHTML($oReport->secmodule,$list_array[0]); + $report_group->assign("BLOCK1",$BLOCK1); -$BLOCK1 = getPrimaryColumns_GroupingHTML($primarymodule,$list_array[0]); -$BLOCK1 .= getSecondaryColumns_GroupingHTML($secondarymodule,$list_array[0]); -$report_group->assign("BLOCK1",$BLOCK1); + $BLOCK2 = getPrimaryColumns_GroupingHTML($oReport->primodule,$list_array[1]); + $BLOCK2 .= getSecondaryColumns_GroupingHTML($oReport->secmodule,$list_array[1]); + $report_group->assign("BLOCK2",$BLOCK2); -$BLOCK2 = getPrimaryColumns_GroupingHTML($primarymodule,$list_array[1]); -$BLOCK2 .= getSecondaryColumns_GroupingHTML($secondarymodule,$list_array[1]); -$report_group->assign("BLOCK2",$BLOCK2); + $BLOCK3 = getPrimaryColumns_GroupingHTML($oReport->primodule,$list_array[2]); + $BLOCK3 .= getSecondaryColumns_GroupingHTML($oReport->secmodule,$list_array[2]); + $report_group->assign("BLOCK3",$BLOCK3); -$BLOCK3 = getPrimaryColumns_GroupingHTML($primarymodule,$list_array[2]); -$BLOCK3 .= getSecondaryColumns_GroupingHTML($secondarymodule,$list_array[2]); -$report_group->assign("BLOCK3",$BLOCK3); - -$sortorder = $oReport->ascdescorder; + $sortorder = $oReport->ascdescorder; }else { -$primarymodule = $_REQUEST["primarymodule"]; -$secondarymodule = $_REQUEST["secondarymodule"]; -$BLOCK1 = getPrimaryColumns_GroupingHTML($primarymodule); -$BLOCK1 .= getSecondaryColumns_GroupingHTML($secondarymodule); -$report_group->assign("BLOCK1",$BLOCK1); -$report_group->assign("BLOCK2",$BLOCK1); -$report_group->assign("BLOCK3",$BLOCK1); + $primarymodule = $_REQUEST["primarymodule"]; + $secondarymodule = $_REQUEST["secondarymodule"]; + $BLOCK1 = getPrimaryColumns_GroupingHTML($primarymodule); + $BLOCK1 .= getSecondaryColumns_GroupingHTML($secondarymodule); + $report_group->assign("BLOCK1",$BLOCK1); + $report_group->assign("BLOCK2",$BLOCK1); + $report_group->assign("BLOCK3",$BLOCK1); } @@ -190,7 +189,6 @@ "; } $report_group->assign("ASCDESC3",$shtml); +$report_group->display("ReportGrouping.tpl"); -$report_group->parse("main"); -$report_group->out("main"); ?> Modified: vtigercrm/trunk/modules/Reports/ReportRun.php ============================================================================== --- vtigercrm/trunk/modules/Reports/ReportRun.php (original) +++ vtigercrm/trunk/modules/Reports/ReportRun.php Sat Apr 29 11:06:37 2006 @@ -71,7 +71,6 @@ $columnslist[$fieldcolname] = $querycolumns; } } - //print_r($columnslist); $log->info("ReportRun :: Successfully returned getQueryColumnsList".$reportid); return $columnslist; } @@ -79,14 +78,6 @@ function getEscapedColumns($selectedfields) { $fieldname = $selectedfields[3]; - /*if($fieldname == "assigned_user_id") - { - $querycolumn = "usersRel.user_name"." ".$selectedfields[2]; - }*/ - /*if($fieldname == "account_id") - { - $querycolumn = "accountRel.accountname"." ".$selectedfields[2]; - }*/ if($fieldname == "parent_id") { if($this->primarymodule == "HelpDesk") @@ -102,22 +93,6 @@ $querycolumn = "case crmentityRelActivities.setype when 'Accounts' then accountRelActivities.accountname when 'Leads' then leaddetailsRelActivities.lastname when 'Potentials' then potentialRelActivities.potentialname when 'Quotes' then quotesRelActivities.subject when 'PurchaseOrder' then purchaseorderRelActivities.subject when 'Invoice' then invoiceRelActivities.subject End"." '".$selectedfields[2]."', crmentityRelActivities.setype 'Entity_type'"; } } - /*if($fieldname == "contact_id") - { - $querycolumn = "contactdetailsRel.lastname"." ".$selectedfields[2]; - }*/ - /*if($fieldname == "vendor_id") - { - $querycolumn = "vendorRel.name"." ".$selectedfields[2]; - } - if($fieldname == "potential_id") - { - $querycolumn = "potentialRel.potentialname"." ".$selectedfields[2]; - } - if($fieldname == "assigned_user_id1") - { - $querycolumn = "usersRel1.user_name"." ".$selectedfields[2]; - }*/ return $querycolumn; } @@ -584,7 +559,6 @@ $datevalue[1] = ""; } - //$log->info("ReportRun :: Successfully returned getQueryColumnsList".$reportid); return $datevalue; } @@ -632,7 +606,6 @@ global $adb; global $modules; global $log; - //$modules = array("Leads_", "Accounts_", "Potentials_", "Contacts_","_"); $sreportsortsql = "select reportsortcol.* from report"; $sreportsortsql .= " inner join reportsortcol on report.reportid = reportsortcol.reportid"; @@ -961,7 +934,6 @@ function getReportsQuery($module) { global $log; - //echo $this->secondarymodule."
        "; if($module == "Leads") { $query = "from leaddetails @@ -991,6 +963,7 @@ $query = "from contactdetails inner join crmentity as crmentityContacts on crmentityContacts.crmid = contactdetails.contactid inner join contactaddress on contactdetails.contactid = contactaddress.contactaddressid + inner join customerdetails on customerdetails.customerid = contactdetails.contactid inner join contactsubdetails on contactdetails.contactid = contactsubdetails.contactsubscriptionid inner join contactscf on contactdetails.contactid = contactscf.contactid left join contactdetails as contactdetailsContacts on contactdetailsContacts.contactid = contactdetails.reportsto @@ -1220,7 +1193,7 @@ for ($x=0; $x<$y; $x++) { $fld = $adb->field_name($result, $x); - $header .= "".str_replace($modules," ",$fld->name).""; + $header .= "".str_replace($modules," ",$fld->name).""; } $noofrows = $adb->num_rows($result); @@ -1308,37 +1281,23 @@ $arr_val[] = $arraylists; }while($custom_field_values = $adb->fetch_array($result)); - - $totalhtml = ' - - '.$mod_strings['LBL_GRAND_TOTAL'].': '.$noofrows.' Records - '; - - $sHTML = ' - - - - - - + $sHTML ='
        '.$this->reportname.'
        '. $header .''. $valtemplate - .'' - .$totalhtml. - '
        - - '; + .' + '; //<<<<<<<>>>>>>>>>>> - return $sHTML; + $return_data[] = $sHTML; + $return_data[] = $noofrows; + return $return_data; } }elseif($outputformat == "PDF") { $sSQL = $this->sGetSQLforReport($this->reportid,$filterlist); - //$modules = array("Leads_", "Accounts_", "Potentials_", "Contacts_","_"); $result = $adb->query($sSQL); $y=$adb->num_fields($result); @@ -1346,8 +1305,6 @@ { $noofrows = $adb->num_rows($result); $custom_field_values = $adb->fetch_array($result); - - //$modules = array("Leads_", "Accounts_", "Potentials_", "Contacts_","_"); do { @@ -1373,14 +1330,13 @@ $sSQL = $this->sGetSQLforReport($this->reportid,$filterlist,"COLUMNSTOTOTAL"); if(isset($this->totallist)) { - //print_r($this->totallist); if($sSQL != "") { $result = $adb->query($sSQL); $y=$adb->num_fields($result); $custom_field_values = $adb->fetch_array($result); - $coltotalhtml .= ""; + $coltotalhtml .= "
        TotalsSUMAVGMINMAX
        "; foreach($this->totallist as $key=>$value) { @@ -1436,7 +1392,6 @@ $coltotalhtml .= ''; } -// print_r($keyhdr); $coltotalhtml .= "
        TotalsSUMAVGMINMAX
        "; } } Modified: vtigercrm/trunk/modules/Reports/ReportType.php ============================================================================== --- vtigercrm/trunk/modules/Reports/ReportType.php (original) +++ vtigercrm/trunk/modules/Reports/ReportType.php Sat Apr 29 11:06:37 2006 @@ -8,13 +8,12 @@ * All Rights Reserved. * ********************************************************************************/ -require_once('XTemplate/xtpl.php'); require_once("data/Tracker.php"); -require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/utils/utils.php'); require_once('modules/Reports/Reports.php'); require_once('include/database/PearDatabase.php'); +require_once('Smarty_setup.php'); global $app_strings; global $app_list_strings; @@ -29,10 +28,13 @@ global $currentModule; global $image_path; global $theme; -$report_type=new XTemplate('modules/Reports/ReportType.html'); -$report_type->assign("MOD", $mod_strings); -$report_type->assign("APP", $app_strings); -$report_type->assign("IMAGE_PATH",$image_path); +$theme_path="themes/".$theme."/"; +$image_path=$theme_path."images/"; +require_once($theme_path.'layout_utils.php'); +$list_report_form = new vtigerCRM_Smarty; +$list_report_form->assign("MOD", $mod_strings); +$list_report_form->assign("APP", $app_strings); +$list_report_form->assign("IMAGE_PATH",$image_path); if(isset($_REQUEST["record"])) { $recordid = $_REQUEST["record"]; @@ -42,27 +44,6 @@ { $selectedreporttype = "tabular"; } -if($selectedreporttype == "tabular") -{ - $shtml = ''; -}else -{ - $shtml = ''; -} - -$report_type->assign("REPORT_TAB_TYPE",$shtml); - -if($selectedreporttype == "summary") -{ - $sumhtml = ''; -}else -{ - $sumhtml = ''; -} - -$report_type->assign("REPORT_SUM_TYPE",$sumhtml); - -$report_type->parse("main"); - -$report_type->out("main"); +$list_report_form->assign("REPORT_TYPE",$selectedreporttype); +$list_report_form->display("ReportsType.tpl"); ?> Modified: vtigercrm/trunk/modules/Reports/Reports.php ============================================================================== --- vtigercrm/trunk/modules/Reports/Reports.php (original) +++ vtigercrm/trunk/modules/Reports/Reports.php Sat Apr 29 11:06:37 2006 @@ -23,7 +23,7 @@ global $related_modules; global $profileList; -$profileList = getCurrentUserProfileList(); +//$profileList = getCurrentUserProfileList(); $adv_filter_options = array("e"=>"equals", "n"=>"not equal to", "s"=>"starts with", @@ -39,7 +39,7 @@ 'HelpDesk','Quotes','PurchaseOrder','Invoice','Activities' ); -$related_modules = Array('Leads'=>Array(''), +$related_modules = Array('Leads'=>Array(), 'Accounts'=>Array('Potentials','Contacts','Products','Quotes','Invoice'), 'Contacts'=>Array('Accounts','Potentials','Quotes','PurchaseOrder'), 'Potentials'=>Array('Accounts','Contacts','Quotes'), @@ -153,51 +153,45 @@ * contains HTML */ - function sgetRptFldr() + function sgetRptFldr($mode='') { global $adb; global $log; - + $returndata = Array(); $sql = "select * from reportfolder order by folderid"; $result = $adb->query($sql); $reportfldrow = $adb->fetch_array($result); - $x = 0; - do - { - $reporttempid = $reportfldrow["folderid"]."RptFldr"; - $reporttempidjs[$x] = "'".$reportfldrow["folderid"]."RptFldr'"; - - $shtml .= "
        - - - - -
        -
        - -
        -         		- ".$reportfldrow["foldername"].""; - if($reportfldrow["state"]=="SAVED") - { - $shtml .=""; - }else - { - $shtml .="  [ Edit Folder - | - Del Folder ]"; - } - $shtml .=" -
        "; - $shtml .= $this->sgetRptsforFldr($reportfldrow["folderid"]); - $x = $x + 1; - - }while($reportfldrow = $adb->fetch_array($result)); - $this->srptfldridjs = implode(",",$reporttempidjs); + if($mode != '') + { + do + { + if($reportfldrow["state"] == $mode) + { + $details = Array(); + $details['state'] = $reportfldrow["state"]; + $details['id'] = $reportfldrow["folderid"]; + $details['name'] = $reportfldrow["foldername"]; + $details['description'] = $reportfldrow["description"]; + $details['details'] = $this->sgetRptsforFldr($reportfldrow["folderid"]); + $returndata[] = $details; + } + }while($reportfldrow = $adb->fetch_array($result)); + }else + { + do + { + $details = Array(); + $details['state'] = $reportfldrow["state"]; + $details['id'] = $reportfldrow["folderid"]; + $details['name'] = $reportfldrow["foldername"]; + $details['description'] = $reportfldrow["description"]; + $returndata[] = $details; + }while($reportfldrow = $adb->fetch_array($result)); + } $log->info("Reports :: ListView->Successfully returned report folder HTML"); - return $shtml; + return $returndata; } /** Function to get the Reports inside each modules @@ -212,6 +206,7 @@ global $adb; global $log; global $mod_strings; + $returndata = Array(); require_once('include/utils/UserInfoUtil.php'); @@ -221,72 +216,23 @@ $report = $adb->fetch_array($result); if(count($report)>0) { - $srptdetails .= '
        - - - - - -
          - - - - - - '; - $rowcnt = 1; - $count_flag = 0; do { - /* if(isPermitted($report['primarymodule'],'index') == "yes" && (isPermitted($report['secondarymodules'],'index')== "yes" || $report['secondarymodules'] == '')) - {*/ - $count_flag = 1; - if ($rowcnt%2 == 0) - $srptdetails .= ''; - else - $srptdetails .= ''; - - $srptdetails .= ' - - - '; - $rowcnt++; - // } + $report_details = Array(); + $report_details ['customizable'] = $report["customizable"]; + $report_details ['reportid'] = $report["reportid"]; + $report_details ['primarymodule'] = $report["primarymodule"]; + $report_details ['secondarymodules'] = $report["secondarymodules"]; + $report_details ['state'] = $report["state"]; + $report_details ['description'] = $report["description"]; + $report_details ['reportname'] = $report["reportname"]; + + $returndata []=$report_details; }while($report = $adb->fetch_array($result)); - /* if($count_flag == 0) - { - $srptdetails .= ""; - } -*/ - $srptdetails .= '
        Report NameDescription
        -
        '; - if($report["customizable"]==1) - { - $srptdetails .= 'Customize'; - } - - if($report["state"] !="SAVED") - { - $srptdetails .= " | Del"; - } - $srptdetails .='
        -         		'.$report["reportname"].''.$report["description"].'
        ".$mod_strings['LBL_NO_PERMISSION']."
        -
        -
        '; - }else - { - $srptdetails .= '
        - - - - - -
        No reports in this folder
        -
        '; } $log->info("Reports :: ListView->Successfully returned report details HTML"); - return $srptdetails; + return $returndata; } /** Function to get the array of ids @@ -504,7 +450,6 @@ $tabid = getTabid($module); global $profile_id; - foreach($this->module_list[$module] as $key=>$blockid) { $blockids[] = $blockid; @@ -846,9 +791,7 @@ global $adb; global $modules; global $log; - - $ssql = "select relcriteria.* from report inner join selectquery on relcriteria.queryid = report.queryid"; - $ssql.= " left join relcriteria on relcriteria.queryid = selectquery.queryid"; + $ssql = 'select relcriteria.* from report inner join relcriteria on relcriteria.queryid = report.queryid left join selectquery on relcriteria.queryid = selectquery.queryid'; $ssql.= " where report.reportid =".$reportid." order by relcriteria.columnindex"; $result = $adb->query($ssql); @@ -897,17 +840,17 @@ function sgetColumntoTotal($primarymodule,$secondarymodule) { - $shtml = $this->sgetColumnstoTotalHTML($primarymodule,0); + $options = Array(); + $options []= $this->sgetColumnstoTotalHTML($primarymodule,0); if($secondarymodule != "") { $secondarymodule = explode(":",$secondarymodule); for($i=0;$i < count($secondarymodule) ;$i++) { - $shtml .= $this->sgetColumnstoTotalHTML($secondarymodule[$i],($i+1)); - } - } - - return $shtml; + $options []= $this->sgetColumnstoTotalHTML($secondarymodule[$i],($i+1)); + } + } + return $options; } /** Function to get the selected columns of total fields in Reports @@ -921,7 +864,7 @@ { global $adb; global $log; - + $options = Array(); if($reportid != "") { $ssql = "select reportsummary.* from reportsummary inner join report on report.reportid = reportsummary.reportsummaryid where report.reportid=".$reportid; @@ -937,18 +880,18 @@ }while($reportsummaryrow = $adb->fetch_array($result)); } } - $shtml = $this->sgetColumnstoTotalHTML($primarymodule,0); + $options []= $this->sgetColumnstoTotalHTML($primarymodule,0); if($secondarymodule != "") { $secondarymodule = explode(":",$secondarymodule); for($i=0;$i < count($secondarymodule) ;$i++) { - $shtml .= $this->sgetColumnstoTotalHTML($secondarymodule[$i],($i+1)); + $options []= $this->sgetColumnstoTotalHTML($secondarymodule[$i],($i+1)); } } $log->info("Reports :: Successfully returned sgetColumntoTotalSelected"); - return $shtml; + return $options; } @@ -979,22 +922,14 @@ } $result = $adb->query($ssql); $columntototalrow = $adb->fetch_array($result); - $n = 0; + $options_list = Array(); do { $typeofdata = explode("~",$columntototalrow["typeofdata"]); - - if($typeofdata[0] == "N" || $typeofdata[0] == "I") - { - - if(($n % 2) == 0) - { - $shtml .= ''; - }else - { - $shtml .= ''; - } - + + if($typeofdata[0] == "N" || $typeofdata[0] == "I") + { + $options = Array(); if(isset($this->columnssummary)) { $selectedcolumn = ""; @@ -1017,72 +952,101 @@ } $columntototalrow['fieldlabel'] = str_replace(" ","_",$columntototalrow['fieldlabel']); - $shtml .= ''.$columntototalrow['tablabel'].' - '.$columntototalrow['fieldlabel'].' -
        '; - + $options []= $columntototalrow['tablabel'].' - '.$columntototalrow['fieldlabel']; if($selectedcolumn1[2] == "cb:".$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel']."_SUM:2") { - $shtml .= ''; }else + $options []= ''; + }else { - $shtml .= ''; + $options []= ''; } - $shtml .= '
        -
        '; if($selectedcolumn1[3] == "cb:".$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel']."_AVG:3") { - $shtml .= ''; + $options []= ''; }else { - $shtml .= ''; + $options []= ''; } - $shtml .= '
        -
        '; if($selectedcolumn1[4] == "cb:".$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel']."_MIN:4") { - $shtml .= ''; + $options []= ''; }else { - $shtml .= ''; + $options []= ''; } - $shtml .= '
        -
        '; if($selectedcolumn1[5] == "cb:".$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel']."_MAX:5") { - $shtml .= ''; + $options []= ''; }else { - $shtml .= ''; + $options []= ''; } - - $shtml .= '
        - '; - $n = $n + 1; - }else { - $shtml .= ''.$columntototalrow['tablabel'].' - '.$columntototalrow['fieldlabel'].' -
        - -
        -
        - -
        -
        - -
        -
        - -
        - '; - $n = $n + 1; + $options []= $columntototalrow['tablabel'].' - '.$columntototalrow['fieldlabel']; + $options []= ''; + $options []= ''; + $options []= ''; + $options [] =''; } + $options_list [] = $options; } }while($columntototalrow = $adb->fetch_array($result)); $log->info("Reports :: Successfully returned sgetColumnstoTotalHTML"); - return $shtml; - } + return $options_list; + } +} + +/** Function to get the primary module list in reports + * This function generates the list of primary modules in reports + * and returns an array of permitted modules + */ + +function getReportsModuleList() +{ + global $adb; + global $app_list_strings; + global $report_modules; + global $mod_strings; + $modules = Array(); + foreach($app_list_strings['moduleList'] as $key=>$value) + { + for($i=0;$i Modified: vtigercrm/trunk/modules/Reports/Save.php ============================================================================== --- vtigercrm/trunk/modules/Reports/Save.php (original) +++ vtigercrm/trunk/modules/Reports/Save.php Sat Apr 29 11:06:37 2006 @@ -190,13 +190,13 @@

      " ; echo $errormessage; } - header("Location: index.php?action=SaveAndRun&module=Reports&record=$genQueryId"); + echo ''; } }else { if($reportid != "") { - if($selectedcolumnstring != "") + if($selectedcolumnstring != "") { $idelcolumnsql = "delete from selectcolumn where queryid=".$reportid; $idelcolumnsqlresult = $adb->query($idelcolumnsql); @@ -212,7 +212,7 @@ } } } - + $ireportsql = "update report set"; $ireportsql .= " REPORTNAME='".$reportname."',"; $ireportsql .= " DESCRIPTION='".$reportdescription."',"; @@ -268,29 +268,29 @@ $ireportsummarysql = "insert into reportsummary (REPORTSUMMARYID,SUMMARYTYPE,COLUMNNAME) values (".$reportid.",".$i.",'".$columnstototal[$i]."')"; $ireportsummaryresult = $adb->query($ireportsummarysql); } - $log->info("Reports :: Save->Successfully saved reportsummary"); + $log->info("Reports :: Save->Successfully saved reportsummary"); //<<<>>>>>> //<<<>>>>>> - $idelrelcriteriasql = "delete from relcriteria where queryid=".$reportid; - $idelrelcriteriasqlresult = $adb->query($idelrelcriteriasql); - - for ($i=0;$iquery($irelcriteriasql); - } - $log->info("Reports :: Save->Successfully saved relcriteria"); + $idelrelcriteriasql = "delete from relcriteria where queryid=".$reportid; + $idelrelcriteriasqlresult = $adb->query($idelrelcriteriasql); + + for ($i=0;$iquery($irelcriteriasql); + } + $log->info("Reports :: Save->Successfully saved relcriteria"); //<<<>>>>>> }else { include('themes/'.$theme.'/header.php'); $errormessage = "Error Message
        -
      • Error while inserting the record -

      " ; +
    • Error while inserting the record +

    " ; echo $errormessage; } }else @@ -301,6 +301,6 @@
    " ; echo $errormessage; } - header("Location: index.php?action=SaveAndRun&module=Reports&record=$reportid"); + echo ''; } ?> Modified: vtigercrm/trunk/modules/Reports/SaveAndRun.php ============================================================================== --- vtigercrm/trunk/modules/Reports/SaveAndRun.php (original) +++ vtigercrm/trunk/modules/Reports/SaveAndRun.php Sat Apr 29 11:06:37 2006 @@ -18,13 +18,13 @@ require_once('include/database/PearDatabase.php'); require_once("modules/Reports/ReportRun.php"); require_once('include/utils/utils.php'); -include('themes/'.$theme.'/header.php'); +require_once('Smarty_setup.php'); global $adb; global $mod_strings; $reportid = $_REQUEST["record"]; - +$folderid = $_REQUEST["folderid"]; $filtercolumn = $_REQUEST["stdDateFilterField"]; $filter = $_REQUEST["stdDateFilter"]; $startdate = $_REQUEST["startdate"]; @@ -45,74 +45,145 @@ $totalhtml = $oReportRun->GenerateReport("TOTALHTML",$filterlist); if(isPermitted($primarymodule,'index') == "yes" && (isPermitted($secondarymodule,'index')== "yes")) { -?> - - -reportname, false); -?> -
    -
    - - - - - - - -
    :
    - -
    - - - - - - - - -
    - - -
    - - + $list_report_form = new vtigerCRM_Smarty; + $ogReport->getSelectedStandardCriteria($reportid); - - - + $BLOCK1 = getPrimaryStdFilterHTML($ogReport->primodule,$ogReport->stdselectedcolumn); + $BLOCK1 .= getSecondaryStdFilterHTML($ogReport->secmodule,$ogReport->stdselectedcolumn); + $list_report_form->assign("BLOCK1",$BLOCK1); + $BLOCKJS = $ogReport->getCriteriaJS(); + $list_report_form->assign("BLOCKJS",$BLOCKJS); - + $BLOCKCRITERIA = $ogReport->getSelectedStdFilterCriteria($ogReport->stdselectedfilter); + $list_report_form->assign("BLOCKCRITERIA",$BLOCKCRITERIA); -
    -
    - - - - -
    -
    - -
    - - - - -
    -
    -startdate; + $list_report_form->assign("STARTDATE",$startdate); + + $enddate = $ogReport->enddate; + $list_report_form->assign("ENDDATE",$enddate); + + $list_report_form->assign("MOD", $mod_strings); + $list_report_form->assign("APP", $app_strings); + $list_report_form->assign("IMAGE_PATH", $image_path); + $list_report_form->assign("REPORTID", $reportid); + $list_report_form->assign("REPORTNAME", $ogReport->reportname); + $list_report_form->assign("REPORTHTML", $sshtml); + $list_report_form->assign("REPORTTOTHTML", $totalhtml); + $list_report_form->assign("FOLDERID", $folderid); + if($_REQUEST['mode'] != 'ajax') + { + $list_report_form->assign("REPINFOLDER", getReportsinFolder($folderid)); + include('themes/'.$theme.'/header.php'); + $list_report_form->display('ReportRun.tpl'); + } + else + { + $list_report_form->display('ReportRunContents.tpl'); + } } else { echo $mod_strings['LBL_NO_PERMISSION']." ".$primarymodule." ".$secondarymodule; } +function getPrimaryStdFilterHTML($module,$selected="") +{ + global $app_list_strings; + global $ogReport; + global $current_language; + + $mod_strings = return_module_language($current_language,$module); + + $result = $ogReport->getStdCriteriaByModule($module); + + if(isset($result)) + { + foreach($result as $key=>$value) + { + if(isset($mod_strings[$value])) + { + if($key == $selected) + { + $shtml .= ""; + }else + { + $shtml .= ""; + } + }else + { + if($key == $selected) + { + $shtml .= ""; + }else + { + $shtml .= ""; + } + } + } + } + + return $shtml; +} + +function getSecondaryStdFilterHTML($module,$selected="") +{ + global $app_list_strings; + global $ogReport; + global $current_language; + + if($module != "") + { + $secmodule = explode(":",$module); + for($i=0;$i < count($secmodule) ;$i++) + { + $result = $ogReport->getStdCriteriaByModule($secmodule[$i]); + $mod_strings = return_module_language($current_language,$secmodule[$i]); + if(isset($result)) + { + foreach($result as $key=>$value) + { + if(isset($mod_strings[$value])) + { + if($key == $selected) + { + $shtml .= ""; + }else + { + $shtml .= ""; + } + }else + { + if($key == $selected) + { + $shtml .= ""; + }else + { + $shtml .= ""; + } + } + } + } + + } + } + return $shtml; +} +function getReportsinFolder($folderid) +{ + global $adb; + $query = 'select reportid,reportname from report where folderid='.$folderid; + $result = $adb->query($query); + $reports_array = Array(); + for($i=0;$i < $adb->num_rows($result);$i++) + { + $reportid = $adb->query_result($result,$i,'reportid'); + $reportname = $adb->query_result($result,$i,'reportname'); + $reports_array[$reportid] = $reportname; + } + if(count($reports_array) > 0) + return $reports_array; + else + return false; +} +?> Modified: vtigercrm/trunk/modules/Reports/SaveReportFolder.php ============================================================================== --- vtigercrm/trunk/modules/Reports/SaveReportFolder.php (original) +++ vtigercrm/trunk/modules/Reports/SaveReportFolder.php Sat Apr 29 11:06:37 2006 @@ -18,16 +18,11 @@ $focus = new Reports(); $rfid = $_REQUEST['record']; -$mode = $_REQUEST['mode']; -$foldername = addslashes($_REQUEST["folderName"]); -$folderdesc = addslashes($_REQUEST["folderDesc"]); -//echo $id.$mode."1".$foldername."2".$folderdesc; - -if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] != "") $return_module = $_REQUEST['return_module']; -else $return_module = "Reports"; -if(isset($_REQUEST['return_action']) && $_REQUEST['return_action'] != "") $return_action = $_REQUEST['return_action']; -else $return_action = "index"; - +$mode = $_REQUEST['savemode']; +$foldername = addslashes($_REQUEST["foldername"]); +$folderdesc = addslashes($_REQUEST["folderdesc"]); +$foldername = str_replace('*amp*','&',$foldername); +$folderdesc = str_replace('*amp*','&',$folderdesc); if($mode=="Save") { if($rfid=="") @@ -38,7 +33,7 @@ $result = $adb->query($sql); if($result!=false) { - header("Location: index.php?action=$return_action&module=$return_module"); + header("Location: index.php?action=ReportsAjax&file=ListView&mode=ajax&module=Reports"); }else { include('themes/'.$theme.'/header.php'); @@ -59,7 +54,7 @@ $result = $adb->query($sql); if($result!=false) { - header("Location: index.php?action=$return_action&module=$return_module"); + header("Location: index.php?action=ReportsAjax&file=ListView&mode=ajax&module=Reports"); }else { include('themes/'.$theme.'/header.php'); Modified: vtigercrm/trunk/modules/Reports/StandardFilter.php ============================================================================== --- vtigercrm/trunk/modules/Reports/StandardFilter.php (original) +++ vtigercrm/trunk/modules/Reports/StandardFilter.php Sat Apr 29 11:06:37 2006 @@ -8,31 +8,6 @@ * All Rights Reserved. * ********************************************************************************/ -require_once('XTemplate/xtpl.php'); -require_once("data/Tracker.php"); -require_once('themes/'.$theme.'/layout_utils.php'); -require_once('include/logging.php'); -require_once('include/utils/utils.php'); -require_once('modules/Reports/Reports.php'); -require_once('include/database/PearDatabase.php'); - -global $app_strings; -global $app_list_strings; -global $mod_strings; -$current_module_strings = return_module_language($current_language, 'Reports'); - -global $list_max_entries_per_page; -global $urlPrefix; - -$log = LoggerManager::getLogger('report_type'); - -global $currentModule; -global $image_path; -global $theme; -$report_std_filter=new XTemplate('modules/Reports/StandardFilter.html'); -$report_std_filter->assign("MOD", $mod_strings); -$report_std_filter->assign("APP", $app_strings); -$report_std_filter->assign("IMAGE_PATH",$image_path); if(isset($_REQUEST["record"]) == false) { @@ -43,11 +18,11 @@ $BLOCK1 = getPrimaryStdFilterHTML($primarymodule); $BLOCK1 .= getSecondaryStdFilterHTML($secondarymodule); - $report_std_filter->assign("BLOCK1",$BLOCK1); + $report_std_filter->assign("BLOCK1_STD",$BLOCK1); $BLOCKJS = $oReport->getCriteriaJS(); - $report_std_filter->assign("BLOCKJS",$BLOCKJS); + $report_std_filter->assign("BLOCKJS_STD",$BLOCKJS); $BLOCKCRITERIA = $oReport->getSelectedStdFilterCriteria(); - $report_std_filter->assign("BLOCKCRITERIA",$BLOCKCRITERIA); + $report_std_filter->assign("BLOCKCRITERIA_STD",$BLOCKCRITERIA); }elseif(isset($_REQUEST["record"]) == true) { @@ -55,21 +30,21 @@ $oReport = new Reports($reportid); $oReport->getSelectedStandardCriteria($reportid); - $BLOCK1 = getPrimaryStdFilterHTML($primarymodule,$oReport->stdselectedcolumn); - $BLOCK1 .= getSecondaryStdFilterHTML($secondarymodule,$oReport->stdselectedcolumn); - $report_std_filter->assign("BLOCK1",$BLOCK1); + $BLOCK1 = getPrimaryStdFilterHTML($oReport->primodule,$oReport->stdselectedcolumn); + $BLOCK1 .= getSecondaryStdFilterHTML($oReport->secmodule,$oReport->stdselectedcolumn); + $report_std_filter->assign("BLOCK1_STD",$BLOCK1); $BLOCKJS = $oReport->getCriteriaJS(); - $report_std_filter->assign("BLOCKJS",$BLOCKJS); + $report_std_filter->assign("BLOCKJS_STD",$BLOCKJS); $BLOCKCRITERIA = $oReport->getSelectedStdFilterCriteria($oReport->stdselectedfilter); - $report_std_filter->assign("BLOCKCRITERIA",$BLOCKCRITERIA); + $report_std_filter->assign("BLOCKCRITERIA_STD",$BLOCKCRITERIA); $startdate = $oReport->startdate; - $report_std_filter->assign("STARTDATE",$startdate); + $report_std_filter->assign("STARTDATE_STD",$startdate); $enddate = $oReport->enddate; - $report_std_filter->assign("ENDDATE",$enddate); + $report_std_filter->assign("ENDDATE_STD",$enddate); } @@ -117,7 +92,6 @@ global $app_list_strings; global $ogReport; global $current_language; - if($module != "") { $secmodule = explode(":",$module); @@ -155,7 +129,5 @@ } return $shtml; } -$report_std_filter->parse("main"); -$report_std_filter->out("main"); ?> From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 29 13:10:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sat, 29 Apr 2006 17:10:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5595 - /vtigercrm/trunk/Smarty/templates/ Message-ID: <20060429171037.CC9696F0F6D@vtiger.fosslabs.com> Author: don Date: Sat Apr 29 11:10:25 2006 New Revision: 5595 Log: Reports Smartified and New UI has been integrated Added: vtigercrm/trunk/Smarty/templates/ReportColumns.tpl vtigercrm/trunk/Smarty/templates/ReportColumnsTotal.tpl vtigercrm/trunk/Smarty/templates/ReportContents.tpl vtigercrm/trunk/Smarty/templates/ReportFilters.tpl vtigercrm/trunk/Smarty/templates/ReportGrouping.tpl vtigercrm/trunk/Smarty/templates/ReportRun.tpl vtigercrm/trunk/Smarty/templates/ReportRunContents.tpl vtigercrm/trunk/Smarty/templates/Reports.tpl vtigercrm/trunk/Smarty/templates/ReportsCustomize.tpl vtigercrm/trunk/Smarty/templates/ReportsStep0.tpl vtigercrm/trunk/Smarty/templates/ReportsStep1.tpl vtigercrm/trunk/Smarty/templates/ReportsType.tpl From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 29 13:16:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sat, 29 Apr 2006 17:16:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5596 - /vtigercrm/trunk/themes/blue/style.css Message-ID: <20060429171630.A32F56F0F50@vtiger.fosslabs.com> Author: don Date: Sat Apr 29 11:16:26 2006 New Revision: 5596 Log: New Css added for Report HTML Generation Modified: vtigercrm/trunk/themes/blue/style.css Modified: vtigercrm/trunk/themes/blue/style.css ============================================================================== --- vtigercrm/trunk/themes/blue/style.css (original) +++ vtigercrm/trunk/themes/blue/style.css Sat Apr 29 11:16:26 2006 @@ -2130,8 +2130,81 @@ padding:5px; } - - - - - + +/* For Report HTML Generation*/ +.rptCellLabel { + background-color:#f6f6f6; + padding-right:10px; + border-right: 1px solid #DDDDDD; + border-bottom:1px solid #eaeaea; + color:#737373; + white-space:nowrap; +} +.rptTable { + border-left: 1px solid #DDDDDD; + border-bottom: 1px solid #DDDDDD; + border-top: 1px solid #DDDDDD; +} +.rptTitle, .rptHead, .rptData, .rptGrpHead, .rptGrp1Total, .rptGrp2Total, .rptTotal { + font-family: Verdana, Arial, Helvetica, Sans-serif; + font-size: 11px; + font-weight: bold; +height: 20px; +padding: 4px; + border-right: 1px solid #DDDDDD; + border-bottom: 1px solid #DDDDDD; +background: #DDDDDD; +} +.rptTitle { + border-right: 1px solid #333; + border-bottom: 1px solid #333; +background: #2C527C; +color: #FFF; +} +.rptGrpHead { +background: #FFF; + border-bottom: 1px solid #FFF; + border-top: 1px solid #DDDDDD; + font-weight: normal; +} + +.rptData { + background: #FFF; + font-weight: normal; +} +.rptGrp1Total { + background: #E3F4F4; +} +.rptGrp2Total { + background: #F1FBEC; +} +.rptTotal { + background: #FFF7DD; +} +.rptEmptyGrp { + background: #FFF; + border-right: 1px solid #DDDDDD; +} +.statechange +{ + position:absolute; + visibility:hidden; + left:10px; + top:20px; + width:300px; + border:3px solid #CCCCCC; + background-color:#FFFFFF; +} +#PopupLay{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + width:500px; + border:3px solid #CCCCCC; + background-color:#FFFFFF; + padding:5px; + display:none; + position:absolute; + left:100px; + top:100px; +} From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 29 13:22:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sat, 29 Apr 2006 17:22:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5597 - in /vtigercrm/trunk/themes/blue/images: Reports_arrow.gif report_bg.gif report_bottom.gif report_btn.gif report_newHdr.gif Message-ID: <20060429172243.A31656F0F76@vtiger.fosslabs.com> Author: don Date: Sat Apr 29 11:22:33 2006 New Revision: 5597 Log: images added for the new UI for Reports Added: vtigercrm/trunk/themes/blue/images/Reports_arrow.gif (with props) vtigercrm/trunk/themes/blue/images/report_bg.gif (with props) vtigercrm/trunk/themes/blue/images/report_bottom.gif (with props) vtigercrm/trunk/themes/blue/images/report_btn.gif (with props) vtigercrm/trunk/themes/blue/images/report_newHdr.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Sun Apr 30 02:37:29 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sun, 30 Apr 2006 06:37:29 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5598 - in /vtigercrm/trunk: modules/Reports/ReportRun.php themes/blue/style.css Message-ID: <20060430063729.8E3926F0FB2@vtiger.fosslabs.com> Author: don Date: Sun Apr 30 00:37:23 2006 New Revision: 5598 Log: css issues has been fixed for reports Modified: vtigercrm/trunk/modules/Reports/ReportRun.php vtigercrm/trunk/themes/blue/style.css Modified: vtigercrm/trunk/modules/Reports/ReportRun.php ============================================================================== --- vtigercrm/trunk/modules/Reports/ReportRun.php (original) +++ vtigercrm/trunk/modules/Reports/ReportRun.php Sun Apr 30 00:37:23 2006 @@ -1356,37 +1356,37 @@ $arraykey = trim($value).'_SUM'; if(isset($keyhdr[$arraykey])) { - $coltotalhtml .= ''.$keyhdr[$arraykey].''; + $coltotalhtml .= ''.$keyhdr[$arraykey].''; }else { - $coltotalhtml .= ' '; + $coltotalhtml .= ' '; } $arraykey = trim($value).'_AVG'; if(isset($keyhdr[$arraykey])) { - $coltotalhtml .= ''.$keyhdr[$arraykey].''; + $coltotalhtml .= ''.$keyhdr[$arraykey].''; }else { - $coltotalhtml .= ' '; + $coltotalhtml .= ' '; } $arraykey = trim($value).'_MIN'; if(isset($keyhdr[$arraykey])) { - $coltotalhtml .= ''.$keyhdr[$arraykey].''; + $coltotalhtml .= ''.$keyhdr[$arraykey].''; }else { - $coltotalhtml .= ' '; + $coltotalhtml .= ' '; } $arraykey = trim($value).'_MAX'; if(isset($keyhdr[$arraykey])) { - $coltotalhtml .= ''.$keyhdr[$arraykey].''; + $coltotalhtml .= ''.$keyhdr[$arraykey].''; }else { - $coltotalhtml .= ' '; + $coltotalhtml .= ' '; } $coltotalhtml .= ''; Modified: vtigercrm/trunk/themes/blue/style.css ============================================================================== --- vtigercrm/trunk/themes/blue/style.css (original) +++ vtigercrm/trunk/themes/blue/style.css Sun Apr 30 00:37:23 2006 @@ -2138,6 +2138,7 @@ border-right: 1px solid #DDDDDD; border-bottom:1px solid #eaeaea; color:#737373; + font-weight: bold; white-space:nowrap; } .rptTable { @@ -2145,45 +2146,48 @@ border-bottom: 1px solid #DDDDDD; border-top: 1px solid #DDDDDD; } -.rptTitle, .rptHead, .rptData, .rptGrpHead, .rptGrp1Total, .rptGrp2Total, .rptTotal { +.rptTitle, .rptHead, .rptData, .rptGrpHead{ font-family: Verdana, Arial, Helvetica, Sans-serif; font-size: 11px; - font-weight: bold; -height: 20px; -padding: 4px; - border-right: 1px solid #DDDDDD; - border-bottom: 1px solid #DDDDDD; -background: #DDDDDD; + text-align:left; + font-weight: normal; + height: 20px; + padding: 4px; + border-right: 1px solid #DDDDDD; + border-bottom: 1px solid #DDDDDD; + background: #DDDDDD; +} +.rptGrp1Total, .rptGrp2Total, .rptTotal { + font-family: Verdana, Arial, Helvetica, Sans-serif; + font-size: 11px; + text-align:center; + font-weight: normal; + background: #FFF; + height: 20px; + 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; + background: #2C527C; + color: #FFF; } .rptGrpHead { -background: #FFF; - border-bottom: 1px solid #FFF; - border-top: 1px solid #DDDDDD; - font-weight: normal; + background: #FFF; + border-bottom: 1px solid #FFF; + border-top: 1px solid #DDDDDD; + font-weight: normal; } .rptData { background: #FFF; - font-weight: normal; -} -.rptGrp1Total { - background: #E3F4F4; -} -.rptGrp2Total { - background: #F1FBEC; -} -.rptTotal { - background: #FFF7DD; + font-weight: normal; } .rptEmptyGrp { background: #FFF; - border-right: 1px solid #DDDDDD; + border-right: 1px solid #DDDDDD; } .statechange { From vtigercrm-commits at vtiger.fosslabs.com Sun Apr 30 03:08:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sun, 30 Apr 2006 07:08:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5599 - /vtigercrm/trunk/Smarty/templates/ReportRun.tpl Message-ID: <20060430070855.3AF856F0FC6@vtiger.fosslabs.com> Author: don Date: Sun Apr 30 01:08:51 2006 New Revision: 5599 Log: Report Info message changed Modified: vtigercrm/trunk/Smarty/templates/ReportRun.tpl Modified: vtigercrm/trunk/Smarty/templates/ReportRun.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ReportRun.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ReportRun.tpl Sun Apr 30 01:08:51 2006 @@ -156,10 +156,10 @@ if(startdatevalue != '' && enddatevalue=='') { - var reportinfr = 'Reporting "'+stdDateFilterFieldvalue+'" of "'+stdDateFiltervalue+'" (from '+startdatevalue+' )'; + var reportinfr = 'Reporting "'+stdDateFilterFieldvalue+'" (from '+startdatevalue+' )'; }else if(startdatevalue == '' && enddatevalue !='') { - var reportinfr = 'Reporting "'+stdDateFilterFieldvalue+'" of "'+stdDateFiltervalue+'" ( till '+enddatevalue+')'; + var reportinfr = 'Reporting "'+stdDateFilterFieldvalue+'" ( till '+enddatevalue+')'; }else if(startdatevalue == '' && enddatevalue =='') { var reportinfr = 'No filter Selected'; From vtigercrm-commits at vtiger.fosslabs.com Sun Apr 30 04:34:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sun, 30 Apr 2006 08:34:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5600 - /vtigercrm/trunk/themes/blue/style.css Message-ID: <20060430083433.6E2FC6F0FD8@vtiger.fosslabs.com> Author: don Date: Sun Apr 30 02:34:29 2006 New Revision: 5600 Log: css added for reports Modified: vtigercrm/trunk/themes/blue/style.css Modified: vtigercrm/trunk/themes/blue/style.css ============================================================================== --- vtigercrm/trunk/themes/blue/style.css (original) +++ vtigercrm/trunk/themes/blue/style.css Sun Apr 30 02:34:29 2006 @@ -2212,3 +2212,13 @@ left:100px; top:100px; } + +#folderLay{ + width:175px; + background-color:#CCCCCC; + border:1px solid #DDDDDD; + padding-top:5px; + position:absolute; + display:none; +} + From accounts at eBay.com Sun Apr 30 05:10:57 2006 From: accounts at eBay.com (eBay) Date: Sun, 30 Apr 2006 02:10:57 -0700 (PDT) Subject: [Vtigercrm-commits] Question about your item -- respond now Message-ID: <1146388257.138339.qmail@eBay.com> An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20060430/970b1ac9/attachment-0002.html From vtigercrm-commits at vtiger.fosslabs.com Sun Apr 30 06:05:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sun, 30 Apr 2006 10:05:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5601 - in /vtigercrm/trunk/modules/Dashboard: Entity_charts.php ReportsCharts.php Message-ID: <20060430100540.83A0D6ECFC9@vtiger.fosslabs.com> Author: richie Date: Sun Apr 30 04:05:34 2006 New Revision: 5601 Log: Charts in Reports has been integrated Added: vtigercrm/trunk/modules/Dashboard/ReportsCharts.php Modified: vtigercrm/trunk/modules/Dashboard/Entity_charts.php Modified: vtigercrm/trunk/modules/Dashboard/Entity_charts.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/Entity_charts.php (original) +++ vtigercrm/trunk/modules/Dashboard/Entity_charts.php Sun Apr 30 04:05:34 2006 @@ -57,12 +57,13 @@ global $adb; global $days,$date_array,$period_type; - $where= " and crmentity.smownerid=".$user_id." and crmentity.createdtime between '".$date_start."' and '".$end_date."'" ; + //$where= " and crmentity.smownerid=".$user_id." and crmentity.createdtime between '".$date_start."' and '".$end_date."'" ; $query.=$where; if($added_qry!="") $query.=$added_qry; $result=$adb->query($query); + $no_of_rows=$adb->num_rows($result); $mod_count_array=array(); $mod_name_array=array(); @@ -261,7 +262,7 @@ else { $data=0; - echo "

    The data is not available with the specified time period

    "; + return "

    The data is not available with the specified time period

    "; } return $data; } From vtigercrm-commits at vtiger.fosslabs.com Sun Apr 30 06:10:16 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sun, 30 Apr 2006 10:10:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5602 - in /vtigercrm/trunk/modules/Reports: ReportRun.php SaveAndRun.php Message-ID: <20060430101016.E721A6EB3DC@vtiger.fosslabs.com> Author: richie Date: Sun Apr 30 04:10:12 2006 New Revision: 5602 Log: Charts in Reports has been integrated Modified: vtigercrm/trunk/modules/Reports/ReportRun.php vtigercrm/trunk/modules/Reports/SaveAndRun.php Modified: vtigercrm/trunk/modules/Reports/ReportRun.php ============================================================================== --- vtigercrm/trunk/modules/Reports/ReportRun.php (original) +++ vtigercrm/trunk/modules/Reports/ReportRun.php Sun Apr 30 04:10:12 2006 @@ -1292,6 +1292,7 @@ //<<<<<<<>>>>>>>>>>> $return_data[] = $sHTML; $return_data[] = $noofrows; + $return_data[] = $sSQL; return $return_data; } }elseif($outputformat == "PDF") Modified: vtigercrm/trunk/modules/Reports/SaveAndRun.php ============================================================================== --- vtigercrm/trunk/modules/Reports/SaveAndRun.php (original) +++ vtigercrm/trunk/modules/Reports/SaveAndRun.php Sun Apr 30 04:10:12 2006 @@ -48,6 +48,9 @@ $list_report_form = new vtigerCRM_Smarty; $ogReport->getSelectedStandardCriteria($reportid); + require_once('modules/DashBoard/ReportsCharts.php'); + $image = get_graph_by_type('Report','Report',$primarymodule,'',$sshtml[2]); + $list_report_form->assign("GRAPH", $image); $BLOCK1 = getPrimaryStdFilterHTML($ogReport->primodule,$ogReport->stdselectedcolumn); $BLOCK1 .= getSecondaryStdFilterHTML($ogReport->secmodule,$ogReport->stdselectedcolumn); From vtigercrm-commits at vtiger.fosslabs.com Sun Apr 30 08:39:46 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sun, 30 Apr 2006 12:39:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5603 - /vtigercrm/trunk/include/utils/CommonUtils.php Message-ID: <20060430123946.7CEE440F7D1@vtiger.fosslabs.com> Author: don Date: Sun Apr 30 06:39:40 2006 New Revision: 5603 Log: Added Security to HomPage UI 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 Sun Apr 30 06:39:40 2006 @@ -715,6 +715,7 @@ function getDisplayCurrency() { global $log; + global $adb; $log->debug("Entering getDisplayCurrency() method ..."); $curr_array = Array(); $sql1 = "select * from currency_info where currency_status='Active'"; @@ -2098,21 +2099,36 @@ $log->debug("Exiting getEntityName method ..."); } + function getAllParenttabmoduleslist() { global $adb; + global $current_user; $resultant_array = Array(); - $query = 'select name,tablabel,parenttab_label from parenttabrel inner join tab on parenttabrel.tabid = tab.tabid in -ner join parenttab on parenttabrel.parenttabid = parenttab.parenttabid order by parenttab.sequence'; + $query = 'select name,tablabel,parenttab_label,tab.tabid from parenttabrel inner join tab on parenttabrel.tabid = tab.tabid inner join parenttab on parenttabrel.parenttabid = parenttab.parenttabid order by parenttab.sequence'; $result = $adb->query($query); + require('user_privileges/user_privileges_'.$current_user->id.'.php'); for($i=0;$i<$adb->num_rows($result);$i++) { $parenttabname = $adb->query_result($result,$i,'parenttab_label'); $modulename = $adb->query_result($result,$i,'name'); $tablabel = $adb->query_result($result,$i,'tablabel'); - $resultant_array[$parenttabname][] = Array($modulename,$tablabel); + $tabid = $adb->query_result($result,$i,'tabid'); + if($is_admin) + { + $resultant_array[$parenttabname][] = Array($modulename,$tablabel); + } + elseif($profileGlobalPermission[2]==0 || $profileGlobalPermission[1]==0 || $profileTabsPermission[$tabid]==0) { + $resultant_array[$parenttabname][] = Array($modulename,$tablabel); + } } - return $resultant_array; + + if($is_admin) + { + $resultant_array['Settings'][] = Array('Settings','Settings'); + } + + return $resultant_array; } From vtigercrm-commits at vtiger.fosslabs.com Sun Apr 30 08:46:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sun, 30 Apr 2006 12:46:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5604 - /vtigercrm/trunk/themes/blue/style.css Message-ID: <20060430124603.B593B5CE163@vtiger.fosslabs.com> Author: don Date: Sun Apr 30 06:45:59 2006 New Revision: 5604 Log: Added style to Homepage Modified: vtigercrm/trunk/themes/blue/style.css Modified: vtigercrm/trunk/themes/blue/style.css ============================================================================== --- vtigercrm/trunk/themes/blue/style.css (original) +++ vtigercrm/trunk/themes/blue/style.css Sun Apr 30 06:45:59 2006 @@ -1955,16 +1955,12 @@ border-left:2px solid #CCCCCC; border-bottom:2px solid #666666; border-right:2px solid #666666; - right:300px; - bottom:100px; + left:300px; + top:100px; background-color:#CCCCCC; position:absolute; z-index:1000001; display:none; -} - -body > div#allMenu { - position: fixed; } From vtigercrm-commits at vtiger.fosslabs.com Sun Apr 30 08:48:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sun, 30 Apr 2006 12:48:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5605 - /vtigercrm/trunk/Smarty/templates/HomePage.tpl Message-ID: <20060430124830.079E15CE198@vtiger.fosslabs.com> Author: don Date: Sun Apr 30 06:48:26 2006 New Revision: 5605 Log: Adjusted graph posn in Homepage 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 Sun Apr 30 06:48:26 2006 @@ -106,7 +106,7 @@ - + Total : 340 @@ -121,7 +121,7 @@ - + Total : 340 From vtigercrm-commits at vtiger.fosslabs.com Sun Apr 30 08:49:29 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sun, 30 Apr 2006 12:49:29 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5606 - /vtigercrm/trunk/Smarty/templates/ReportRunContents.tpl Message-ID: <20060430124929.99E6B5CE198@vtiger.fosslabs.com> Author: richie Date: Sun Apr 30 06:49:25 2006 New Revision: 5606 Log: Added graph Modified: vtigercrm/trunk/Smarty/templates/ReportRunContents.tpl Modified: vtigercrm/trunk/Smarty/templates/ReportRunContents.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ReportRunContents.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ReportRunContents.tpl Sun Apr 30 06:49:25 2006 @@ -1,3 +1,10 @@ + + + + +
    + {$GRAPH} +